History

iavf: Fix VLAN_V2 addition/rejection

Fix VLAN addition, so that PF driver does not reject whole VLAN batch. Add VLAN reject handling, so rejected VLANs, won't litter VLAN filter list. Fix handling of active_(c/s)vlans, so it will be possible to re-add VLAN filters for user. Without this patch, after changing trust to off, with VLAN filters saturated, no VLAN is added, due to PF rejecting addition.

Przemyslaw Patynowski committed 4 years ago

Commit 968996c1 parent 7b02f403 files · +74 −10Browse files

Unified · Split

3 files
  1. drivers/net/ethernet/intel/iavf/iavf.h +7 −2
  2. drivers/net/ethernet/intel/iavf/iavf_main.c +4 −6
  3. drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +63 −2
drivers/net/ethernet/intel/iavf/iavf.h+7−2
@@ -159,8 +159,12 @@ struct iavf_vlan { · 158 unmodified lines
159159 struct iavf_vlan_filter {
160160 struct list_head list;
161161 struct iavf_vlan vlan;
162− bool remove; /* filter needs to be removed */
163− bool add; /* filter needs to be added */
162+ struct {
163+ u8 is_new_vlan:1; /* filter is new, wait for PF answer */
164+ u8 remove:1; /* filter needs to be removed */
165+ u8 add:1; /* filter needs to be added */
166+ u8 padding:5;
167+ };
164168 };
165169
166170 #define IAVF_MAX_TRAFFIC_CLASS 4
@@ -520,6 +524,7 @@ int iavf_get_vf_config(struct iavf_adapter *adapter); · 353 unmodified lines
520524 int iavf_get_vf_vlan_v2_caps(struct iavf_adapter *adapter);
521525 int iavf_send_vf_offload_vlan_v2_msg(struct iavf_adapter *adapter);
522526 void iavf_set_queue_vlan_tag_loc(struct iavf_adapter *adapter);
527+u16 iavf_get_num_vlans_added(struct iavf_adapter *adapter);
523528 void iavf_irq_enable(struct iavf_adapter *adapter, bool flush);
524529 void iavf_configure_queues(struct iavf_adapter *adapter);
525530 void iavf_deconfigure_queues(struct iavf_adapter *adapter);
drivers/net/ethernet/intel/iavf/iavf_main.c+4−6
@@ -843,7 +843,7 @@ static void iavf_restore_filters(struct iavf_adapter *adapter) · 842 unmodified lines
843843 * iavf_get_num_vlans_added - get number of VLANs added
844844 * @adapter: board private structure
845845 */
846−static u16 iavf_get_num_vlans_added(struct iavf_adapter *adapter)
846+u16 iavf_get_num_vlans_added(struct iavf_adapter *adapter)
847847 {
848848 return bitmap_weight(adapter->vsi.active_cvlans, VLAN_N_VID) +
849849 bitmap_weight(adapter->vsi.active_svlans, VLAN_N_VID);
@@ -906,11 +906,6 @@ static int iavf_vlan_rx_add_vid(struct net_device *netdev, · 56 unmodified lines
906906 if (!iavf_add_vlan(adapter, IAVF_VLAN(vid, be16_to_cpu(proto))))
907907 return -ENOMEM;
908908
909− if (proto == cpu_to_be16(ETH_P_8021Q))
910− set_bit(vid, adapter->vsi.active_cvlans);
911− else
912− set_bit(vid, adapter->vsi.active_svlans);
913−
914909 return 0;
915910 }
916911
@@ -2956,6 +2951,9 @@ continue_reset: · 2039 unmodified lines
29562951 adapter->aq_required |= IAVF_FLAG_AQ_ADD_CLOUD_FILTER;
29572952 iavf_misc_irq_enable(adapter);
29582953
2954+ bitmap_clear(adapter->vsi.active_cvlans, 0, VLAN_N_VID);
2955+ bitmap_clear(adapter->vsi.active_svlans, 0, VLAN_N_VID);
2956+
29592957 mod_delayed_work(iavf_wq, &adapter->watchdog_task, 2);
29602958
29612959 /* We were running when the reset started, so we need to restore some
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c+63−2
@@ -626,6 +626,33 @@ static void iavf_mac_add_reject(struct iavf_adapter *adapter) · 625 unmodified lines
626626 spin_unlock_bh(&adapter->mac_vlan_list_lock);
627627 }
628628
629+/**
630+ * iavf_vlan_add_reject
631+ * @adapter: adapter structure
632+ *
633+ * Remove VLAN filters from list based on PF response.
634+ **/
635+static void iavf_vlan_add_reject(struct iavf_adapter *adapter)
636+{
637+ struct iavf_vlan_filter *f, *ftmp;
638+
639+ spin_lock_bh(&adapter->mac_vlan_list_lock);
640+ list_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) {
641+ if (f->is_new_vlan) {
642+ if (f->vlan.tpid == ETH_P_8021Q)
643+ clear_bit(f->vlan.vid,
644+ adapter->vsi.active_cvlans);
645+ else
646+ clear_bit(f->vlan.vid,
647+ adapter->vsi.active_svlans);
648+
649+ list_del(&f->list);
650+ kfree(f);
651+ }
652+ }
653+ spin_unlock_bh(&adapter->mac_vlan_list_lock);
654+}
655+
629656 /**
630657 * iavf_add_vlans
631658 * @adapter: adapter structure
@@ -683,6 +710,7 @@ void iavf_add_vlans(struct iavf_adapter *adapter) · 51 unmodified lines
683710 vvfl->vlan_id[i] = f->vlan.vid;
684711 i++;
685712 f->add = false;
713+ f->is_new_vlan = true;
686714 if (i == count)
687715 break;
688716 }
@@ -695,10 +723,18 @@ void iavf_add_vlans(struct iavf_adapter *adapter) · 6 unmodified lines
695723 iavf_send_pf_msg(adapter, VIRTCHNL_OP_ADD_VLAN, (u8 *)vvfl, len);
696724 kfree(vvfl);
697725 } else {
726+ u16 max_vlans = adapter->vlan_v2_caps.filtering.max_filters;
727+ u16 current_vlans = iavf_get_num_vlans_added(adapter);
698728 struct virtchnl_vlan_filter_list_v2 *vvfl_v2;
699729
700730 adapter->current_op = VIRTCHNL_OP_ADD_VLAN_V2;
701731
732+ if ((count + current_vlans) > max_vlans &&
733+ current_vlans < max_vlans) {
734+ count = max_vlans - iavf_get_num_vlans_added(adapter);
735+ more = true;
736+ }
737+
702738 len = sizeof(*vvfl_v2) + ((count - 1) *
703739 sizeof(struct virtchnl_vlan_filter));
704740 if (len > IAVF_MAX_AQ_BUF_SIZE) {
@@ -725,6 +761,9 @@ void iavf_add_vlans(struct iavf_adapter *adapter) · 20 unmodified lines
725761 &adapter->vlan_v2_caps.filtering.filtering_support;
726762 struct virtchnl_vlan *vlan;
727763
764+ if (i == count)
765+ break;
766+
728767 /* give priority over outer if it's enabled */
729768 if (filtering_support->outer)
730769 vlan = &vvfl_v2->filters[i].outer;
@@ -736,8 +775,7 @@ void iavf_add_vlans(struct iavf_adapter *adapter) · 5 unmodified lines
736775
737776 i++;
738777 f->add = false;
739− if (i == count)
740− break;
778+ f->is_new_vlan = true;
741779 }
742780 }
743781
@@ -2080,6 +2118,11 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter, · 1336 unmodified lines
20802118 */
20812119 iavf_netdev_features_vlan_strip_set(netdev, true);
20822120 break;
2121+ case VIRTCHNL_OP_ADD_VLAN_V2:
2122+ iavf_vlan_add_reject(adapter);
2123+ dev_warn(&adapter->pdev->dev, "Failed to add VLAN filter, error %s\n",
2124+ iavf_stat_str(&adapter->hw, v_retval));
2125+ break;
20832126 default:
20842127 dev_err(&adapter->pdev->dev, "PF returned error %d (%s) to our request %d\n",
20852128 v_retval, iavf_stat_str(&adapter->hw, v_retval),
@@ -2332,6 +2375,24 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter, · 246 unmodified lines
23322375 spin_unlock_bh(&adapter->adv_rss_lock);
23332376 }
23342377 break;
2378+ case VIRTCHNL_OP_ADD_VLAN_V2: {
2379+ struct iavf_vlan_filter *f;
2380+
2381+ spin_lock_bh(&adapter->mac_vlan_list_lock);
2382+ list_for_each_entry(f, &adapter->vlan_filter_list, list) {
2383+ if (f->is_new_vlan) {
2384+ f->is_new_vlan = false;
2385+ if (f->vlan.tpid == ETH_P_8021Q)
2386+ set_bit(f->vlan.vid,
2387+ adapter->vsi.active_cvlans);
2388+ else
2389+ set_bit(f->vlan.vid,
2390+ adapter->vsi.active_svlans);
2391+ }
2392+ }
2393+ spin_unlock_bh(&adapter->mac_vlan_list_lock);
2394+ }
2395+ break;
23352396 case VIRTCHNL_OP_ENABLE_VLAN_STRIPPING:
23362397 /* PF enabled vlan strip on this VF.
23372398 * Update netdev->features if needed to be in sync with ethtool.