| Message ID | 20231019163721.1333370-1-ivecera@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 665e7d83c5386f9abdc67b2e4b6e6d9579aadfcb |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v2] i40e: Fix I40E_FLAG_VF_VLAN_PRUNING value | expand |
On 10/19/2023 9:37 AM, Ivan Vecera wrote: > 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@intel.com> > Cc: Simon Horman <horms@kernel.org> > Signed-off-by: Ivan Vecera <ivecera@redhat.com> Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Ivan Vecera > Sent: Thursday, October 19, 2023 10:07 PM > To: netdev@vger.kernel.org > Cc: Przemyslaw Patynowski <przemyslawx.patynowski@intel.com>; Palczewski, Mateusz <mateusz.palczewski@intel.com>; Brandeburg, Jesse <jesse.brandeburg@intel.com>; open list <linux-kernel@vger.kernel.org>; Eric Dumazet <edumazet@google.com>; Nguyen, Anthony L <anthony.l.nguyen@intel.com>; Simon Horman <horms@kernel.org>; Sylwester Dziedziuch <sylwesterx.dziedziuch@intel.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; David S. Miller <davem@davemloft.net>; moderated list:INTEL ETHERNET DRIVERS <intel-wired-lan@lists.osuosl.org> > Subject: [Intel-wired-lan] [PATCH net v2] i40e: Fix I40E_FLAG_VF_VLAN_PRUNING value > > 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@intel.com> > Cc: Simon Horman <horms@kernel.org> > Signed-off-by: Ivan Vecera <ivecera@redhat.com> > --- > drivers/net/ethernet/intel/i40e/i40e.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Thu, 19 Oct 2023 18:37:20 +0200 you wrote: > 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 > > [...] Here is the summary with links: - [net,v2] i40e: Fix I40E_FLAG_VF_VLAN_PRUNING value https://git.kernel.org/netdev/net/c/665e7d83c538 You are awesome, thank you!
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h index 6e310a53946782..55bb0b5310d5b4 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;
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@intel.com> Cc: Simon Horman <horms@kernel.org> Signed-off-by: Ivan Vecera <ivecera@redhat.com> --- drivers/net/ethernet/intel/i40e/i40e.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)