Skip to contentSkip to conversation

Patch "[PATCH 007/135] i40e: don't add zero MAC filter" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Sep 9, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

    [PATCH 007/135] i40e: don't add zero MAC filter

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     0007-i40e-don-t-add-zero-MAC-filter.patch

and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 290c71a6a36614671ac13432d26c0e02370afe5b Mon Sep 17 00:00:00 2001

From: Mitch Williams <[email protected]>
Date: Thu, 19 Nov 2015 11:34:17 -0800
Subject: [PATCH 007/135] i40e: don't add zero MAC filter

[ Upstream commit b7b713a8eaf325607d37229f024ad0b9f3e7f320 ]

When VFs are created, the MAC address defaults to all zeros, indicating to the VF driver that it should use a random MAC address. However, the PF driver was incorrectly adding this zero MAC to the filter table, along with the VF's randomly generated MAC address.

Check for a good address before adding the default filter. While we're at it, make the error message a bit more useful.

Change-ID Ia100947d68140e0f73a19ba755cbffc3e79a8fcf
---
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +9 -6
@@ -549,12 +549,15 @@ static int i40e_alloc_vsi_res(struct i40
 			i40e_vsi_add_pvid(vsi, vf->port_vlan_id);
 
 		spin_lock_bh(&vsi->mac_filter_list_lock);
-		f = i40e_add_filter(vsi, vf->default_lan_addr.addr,
-				    vf->port_vlan_id ? vf->port_vlan_id : -1,
-				    true, false);
-		if (!f)
-			dev_info(&pf->pdev->dev,
-				 "Could not allocate VF MAC addr\n");
+		if (is_valid_ether_addr(vf->default_lan_addr.addr)) {
+			f = i40e_add_filter(vsi, vf->default_lan_addr.addr,
+				       vf->port_vlan_id ? vf->port_vlan_id : -1,
+				       true, false);
+			if (!f)
+				dev_info(&pf->pdev->dev,
+					 "Could not add MAC filter %pM for VF %d\n",
+					vf->default_lan_addr.addr, vf->vf_id);
+		}
 		f = i40e_add_filter(vsi, brdcast,
 				    vf->port_vlan_id ? vf->port_vlan_id : -1,
 				    true, false);

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/0008-i40evf-check-rings-before-freeing-resources.patch queue-4.4/0007-i40e-don-t-add-zero-MAC-filter.patch queue-4.4/0002-i40evf-handle-many-MAC-filters-correctly.patch queue-4.4/0006-i40e-properly-delete-VF-MAC-filters.patch