Patch "i40e: Fix I40E_FLAG_VF_VLAN_PRUNING value" has been added to the 6.1-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

    i40e: Fix I40E_FLAG_VF_VLAN_PRUNING value

to the 6.1-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:
     i40e-fix-i40e_flag_vf_vlan_pruning-value.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit f72239fc20635dd684c7907f93b670f4e8087039
Author: Ivan Vecera <ivecera@xxxxxxxxxx>
Date:   Thu Oct 19 18:37:20 2023 +0200

    i40e: Fix I40E_FLAG_VF_VLAN_PRUNING value
    
    [ Upstream commit 665e7d83c5386f9abdc67b2e4b6e6d9579aadfcb ]
    
    Commit c87c938f62d8f1 ("i40e: Add VF VLAN pruning") added new
    PF flag I40E_FLAG_VF_VLAN_PRUNING but its value collides with
    existing I40E_FLAG_TOTAL_PORT_SHUTDOWN_ENABLED flag.
    
    Move the affected flag at the end of the flags and fix its value.
    
    Reproducer:
    [root@cnb-03 ~]# ethtool --set-priv-flags enp2s0f0np0 link-down-on-close on
    [root@cnb-03 ~]# ethtool --set-priv-flags enp2s0f0np0 vf-vlan-pruning on
    [root@cnb-03 ~]# ethtool --set-priv-flags enp2s0f0np0 link-down-on-close off
    [ 6323.142585] i40e 0000:02:00.0: Setting link-down-on-close not supported on this port (because total-port-shutdown is enabled)
    netlink error: Operation not supported
    [root@cnb-03 ~]# ethtool --set-priv-flags enp2s0f0np0 vf-vlan-pruning off
    [root@cnb-03 ~]# ethtool --set-priv-flags enp2s0f0np0 link-down-on-close off
    
    The link-down-on-close flag cannot be modified after setting vf-vlan-pruning
    because vf-vlan-pruning shares the same bit with total-port-shutdown flag
    that prevents any modification of link-down-on-close flag.
    
    Fixes: c87c938f62d8 ("i40e: Add VF VLAN pruning")
    Cc: Mateusz Palczewski <mateusz.palczewski@xxxxxxxxx>
    Cc: Simon Horman <horms@xxxxxxxxxx>
    Signed-off-by: Ivan Vecera <ivecera@xxxxxxxxxx>
    Reviewed-by: Jacob Keller <jacob.e.keller@xxxxxxxxx>
    Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@xxxxxxxxx> (A Contingent worker at Intel)
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index a81f918091ccf..7d4cc4eafd59e 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -580,7 +580,6 @@ struct i40e_pf {
 #define I40E_FLAG_DISABLE_FW_LLDP		BIT(24)
 #define I40E_FLAG_RS_FEC			BIT(25)
 #define I40E_FLAG_BASE_R_FEC			BIT(26)
-#define I40E_FLAG_VF_VLAN_PRUNING		BIT(27)
 /* TOTAL_PORT_SHUTDOWN
  * Allows to physically disable the link on the NIC's port.
  * If enabled, (after link down request from the OS)
@@ -603,6 +602,7 @@ struct i40e_pf {
  *   in abilities field of i40e_aq_set_phy_config structure
  */
 #define I40E_FLAG_TOTAL_PORT_SHUTDOWN_ENABLED	BIT(27)
+#define I40E_FLAG_VF_VLAN_PRUNING		BIT(28)
 
 	struct i40e_client_instance *cinst;
 	bool stat_offsets_loaded;



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux