* [PATCH net-next 0/2][pull request] 100GbE Intel Wired LAN Driver Updates 2022-05-06
@ 2022-05-06 18:00 Tony Nguyen
2022-05-06 18:00 ` [PATCH net-next 1/2] ice: link representors to PCI device Tony Nguyen
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Tony Nguyen @ 2022-05-06 18:00 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet; +Cc: Tony Nguyen, netdev, marcin.szycik
Marcin Szycik says:
This patchset adds support for systemd defined naming scheme for port
representors, as well as re-enables displaying PCI bus-info in ethtool.
bus-info information has previously been removed from ethtool for port
representors, as a workaround for a bug in lshw tool, where the tool would
sometimes display wrong descriptions for port representors/PF. Now the bug
has been fixed in lshw tool [1].
Removing the workaround can be considered a regression (user might be
running an older, unpatched version of lshw) (see [2] for discussion).
However, calling SET_NETDEV_DEV also produces the same effect as removing
the workaround, i.e. lshw is able to access PCI bus-info (this time not
via ethtool, but in some other way) and the bug can occur.
Adding SET_NETDEV_DEV is important, as it greatly improves netdev naming -
- port representors are named based on PF name. Currently port representors
are named "ethX", which might be confusing, especially when spawning VFs on
multiple PFs. Furthermore, it's currently harder to determine to which PF
does a particular port representor belong, as bus-info is not shown in
ethtool.
Consider the following three cases:
Case 1: current code - driver workaround in place, no SET_NETDEV_DEV,
lshw with or without fix. Port representors are not displayed because they
don't have bus-info (the workaround), PFs are labelled correctly:
$ sudo ./lshw -c net -businfo
Bus info Device Class Description
========================================================
pci@0000:02:00.0 ens6f0 network Ethernet Controller E810-XXV for SFP <-- PF
pci@0000:02:00.1 ens6f1 network Ethernet Controller E810-XXV for SFP
pci@0000:02:01.0 ens6f0v0 network Ethernet Adaptive Virtual Function <-- VF
pci@0000:02:01.1 ens6f0v1 network Ethernet Adaptive Virtual Function
...
Case 2: driver workaround in place, SET_NETDEV_DEV, no lshw fix. Port
representors have predictable names. lshw is able to get bus-info because
of SET_NETDEV_DEV and netdevs CAN be mislabelled:
$ sudo ./lshw -c net -businfo
Bus info Device Class Description
=============================================================
pci@0000:02:00.0 ens6f0npf0vf60 network Ethernet Controller E810-XXV for SFP <-- mislabeled port representor
pci@0000:02:00.1 ens6f1 network Ethernet Controller E810-XXV for SFP
pci@0000:02:01.0 ens6f0v0 network Ethernet Adaptive Virtual Function
pci@0000:02:01.1 ens6f0v1 network Ethernet Adaptive Virtual Function
...
pci@0000:02:00.0 ens6f0npf0vf26 network Ethernet interface
pci@0000:02:00.0 ens6f0 network Ethernet interface <-- mislabeled PF
pci@0000:02:00.0 ens6f0npf0vf81 network Ethernet interface
...
$ sudo ethtool -i ens6f0npf0vf60
driver: ice
...
bus-info:
...
Output of lshw would be the same with workaround removed; it does not
change the fact that lshw labels netdevs incorrectly, while at the same
time it prevents ethtool from displaying potentially useful data
(bus-info).
Case 3: workaround removed, SET_NETDEV_DEV, lshw fix:
$ sudo ./lshw -c net -businfo
Bus info Device Class Description
=============================================================
pci@0000:02:00.0 ens6f0npf0vf73 network Ethernet Controller E810-XXV for SFP
pci@0000:02:00.1 ens6f1 network Ethernet Controller E810-XXV for SFP
pci@0000:02:01.0 ens6f0v0 network Ethernet Adaptive Virtual Function
pci@0000:02:01.1 ens6f0v1 network Ethernet Adaptive Virtual Function
...
pci@0000:02:00.0 ens6f0npf0vf5 network Ethernet Controller E810-XXV for SFP
pci@0000:02:00.0 ens6f0 network Ethernet Controller E810-XXV for SFP
pci@0000:02:00.0 ens6f0npf0vf60 network Ethernet Controller E810-XXV for SFP
...
$ sudo ethtool -i ens6f0npf0vf73
driver: ice
...
bus-info: 0000:02:00.0
...
In this case poort representors have predictable names, netdevs are not
mislabelled in lshw, and bus-info is shown in ethtool.
[1] https://ezix.org/src/pkg/lshw/commit/9bf4e4c9c1
[2] https://patchwork.ozlabs.org/project/intel-wired-lan/patch/20220321144731.3935-1-marcin.szycik@linux.intel.com
The following are changes since commit 95730d65708397828f75ca7dbca838edf6727bfd:
Merge branch 'tso-gso-limit-split'
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 100GbE
Marcin Szycik (1):
Revert "ice: Hide bus-info in ethtool for PRs in switchdev mode"
Michal Swiatkowski (1):
ice: link representors to PCI device
drivers/net/ethernet/intel/ice/ice_ethtool.c | 8 +++-----
drivers/net/ethernet/intel/ice/ice_repr.c | 1 +
2 files changed, 4 insertions(+), 5 deletions(-)
--
2.35.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH net-next 1/2] ice: link representors to PCI device
2022-05-06 18:00 [PATCH net-next 0/2][pull request] 100GbE Intel Wired LAN Driver Updates 2022-05-06 Tony Nguyen
@ 2022-05-06 18:00 ` Tony Nguyen
2022-05-06 18:00 ` [PATCH net-next 2/2] Revert "ice: Hide bus-info in ethtool for PRs in switchdev mode" Tony Nguyen
2022-05-10 1:00 ` [PATCH net-next 0/2][pull request] 100GbE Intel Wired LAN Driver Updates 2022-05-06 patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Tony Nguyen @ 2022-05-06 18:00 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: Michal Swiatkowski, netdev, anthony.l.nguyen, Sandeep Penigalapati
From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Link port representors to parent PCI device to benefit from
systemd defined naming scheme.
Example from ip tool:
- without linking:
eth0 ...
- with linking:
eth0 ...
altname enp24s0f0npf0vf0
The port representor name is being shown in altname, because the name is
longer than IFNAMSIZ (16) limit. Altname can be used in ip tool.
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Sandeep Penigalapati <sandeep.penigalapati@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/ice_repr.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/intel/ice/ice_repr.c b/drivers/net/ethernet/intel/ice/ice_repr.c
index a91b81c3088b..0dac67cd9c77 100644
--- a/drivers/net/ethernet/intel/ice/ice_repr.c
+++ b/drivers/net/ethernet/intel/ice/ice_repr.c
@@ -338,6 +338,7 @@ static int ice_repr_add(struct ice_vf *vf)
repr->netdev->min_mtu = ETH_MIN_MTU;
repr->netdev->max_mtu = ICE_MAX_MTU;
+ SET_NETDEV_DEV(repr->netdev, ice_pf_to_dev(vf->pf));
err = ice_repr_reg_netdev(repr->netdev);
if (err)
goto err_netdev;
--
2.35.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next 2/2] Revert "ice: Hide bus-info in ethtool for PRs in switchdev mode"
2022-05-06 18:00 [PATCH net-next 0/2][pull request] 100GbE Intel Wired LAN Driver Updates 2022-05-06 Tony Nguyen
2022-05-06 18:00 ` [PATCH net-next 1/2] ice: link representors to PCI device Tony Nguyen
@ 2022-05-06 18:00 ` Tony Nguyen
2022-05-10 1:00 ` [PATCH net-next 0/2][pull request] 100GbE Intel Wired LAN Driver Updates 2022-05-06 patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Tony Nguyen @ 2022-05-06 18:00 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: Marcin Szycik, netdev, anthony.l.nguyen, Sandeep Penigalapati
From: Marcin Szycik <marcin.szycik@linux.intel.com>
This reverts commit bfaaba99e680bf82bf2cbf69866c3f37434ff766.
Commit bfaaba99e680 ("ice: Hide bus-info in ethtool for PRs in switchdev
mode") was a workaround for lshw tool displaying incorrect
descriptions for port representors and PF in switchdev mode. Now the issue
has been fixed in the lshw tool itself [1].
Removing the workaround can be considered a regression, as the user might
be running older, unpatched lshw version. However, another important change
(ice: link representors to PCI device, which improves port representor
netdev naming with SET_NETDEV_DEV) also causes the same "regression" as
removing the workaround, i.e. unpatched lshw is able to access bus-info
information (this time not via ethtool) and the bug can occur. Therefore,
the workaround no longer prevents the bug and can be removed.
[1] https://ezix.org/src/pkg/lshw/commit/9bf4e4c9c1
Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com>
Tested-by: Sandeep Penigalapati <sandeep.penigalapati@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/ice_ethtool.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index 24cda7e1f916..476bd1c83c87 100644
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -190,19 +190,17 @@ __ice_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo,
snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
"%x.%02x 0x%x %d.%d.%d", nvm->major, nvm->minor,
nvm->eetrack, orom->major, orom->build, orom->patch);
+
+ strscpy(drvinfo->bus_info, pci_name(pf->pdev),
+ sizeof(drvinfo->bus_info));
}
static void
ice_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
{
struct ice_netdev_priv *np = netdev_priv(netdev);
- struct ice_pf *pf = np->vsi->back;
__ice_get_drvinfo(netdev, drvinfo, np->vsi);
-
- strscpy(drvinfo->bus_info, pci_name(pf->pdev),
- sizeof(drvinfo->bus_info));
-
drvinfo->n_priv_flags = ICE_PRIV_FLAG_ARRAY_SIZE;
}
--
2.35.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net-next 0/2][pull request] 100GbE Intel Wired LAN Driver Updates 2022-05-06
2022-05-06 18:00 [PATCH net-next 0/2][pull request] 100GbE Intel Wired LAN Driver Updates 2022-05-06 Tony Nguyen
2022-05-06 18:00 ` [PATCH net-next 1/2] ice: link representors to PCI device Tony Nguyen
2022-05-06 18:00 ` [PATCH net-next 2/2] Revert "ice: Hide bus-info in ethtool for PRs in switchdev mode" Tony Nguyen
@ 2022-05-10 1:00 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-05-10 1:00 UTC (permalink / raw)
To: Tony Nguyen; +Cc: davem, kuba, pabeni, edumazet, netdev, marcin.szycik
Hello:
This series was applied to netdev/net-next.git (master)
by Tony Nguyen <anthony.l.nguyen@intel.com>:
On Fri, 6 May 2022 11:00:50 -0700 you wrote:
> Marcin Szycik says:
>
> This patchset adds support for systemd defined naming scheme for port
> representors, as well as re-enables displaying PCI bus-info in ethtool.
>
> bus-info information has previously been removed from ethtool for port
> representors, as a workaround for a bug in lshw tool, where the tool would
> sometimes display wrong descriptions for port representors/PF. Now the bug
> has been fixed in lshw tool [1].
>
> [...]
Here is the summary with links:
- [net-next,1/2] ice: link representors to PCI device
https://git.kernel.org/netdev/net-next/c/6384b7695953
- [net-next,2/2] Revert "ice: Hide bus-info in ethtool for PRs in switchdev mode"
https://git.kernel.org/netdev/net-next/c/e0c7402270d9
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-10 1:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-06 18:00 [PATCH net-next 0/2][pull request] 100GbE Intel Wired LAN Driver Updates 2022-05-06 Tony Nguyen
2022-05-06 18:00 ` [PATCH net-next 1/2] ice: link representors to PCI device Tony Nguyen
2022-05-06 18:00 ` [PATCH net-next 2/2] Revert "ice: Hide bus-info in ethtool for PRs in switchdev mode" Tony Nguyen
2022-05-10 1:00 ` [PATCH net-next 0/2][pull request] 100GbE Intel Wired LAN Driver Updates 2022-05-06 patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).