by Leon Romanovsky

[permalink] [raw]

Subject: Re: [PATCH net-next v1 12/18] net/amazon: Ensure that driver version is aligned to the linux kernel

On Mon, Feb 24, 2020 at 09:03:14AM +0000, Kiyanovski, Arthur wrote:
>
>
> > -----Original Message-----
> > From: Leon Romanovsky <[email protected]>
> > Sent: Monday, February 24, 2020 10:53 AM
> > To: David S. Miller <[email protected]>; Jakub Kicinski <[email protected]>
> > Cc: Leon Romanovsky <[email protected]>; Tom Lendacky
> > <[email protected]>; Keyur Chudgar
> > <[email protected]>; Don Fry <[email protected]>;
> > Veaceslav Falico <[email protected]>; Jay Vosburgh <[email protected]>;
> > [email protected]; Maxime Ripard <[email protected]>; Heiko Stuebner
> > <[email protected]>; Mark Einon <[email protected]>; Chris Snook
> > <[email protected]>; [email protected]; Iyappan
> > Subramanian <[email protected]>; Igor Russkikh
> > <[email protected]>; David Dillow <[email protected]>; Belgazal,
> > Netanel <[email protected]>; Quan Nguyen
> > <[email protected]>; Jay Cliburn <[email protected]>; Lino
> > Sanfilippo <[email protected]>; [email protected];
> > Andreas Larsson <[email protected]>; Andy Gospodarek
> > <[email protected]>; [email protected]; Thor Thayer
> > <[email protected]>; [email protected]; Ion Badulescu
> > <[email protected]>; Kiyanovski, Arthur <[email protected]>; Jes Sorensen
> > <[email protected]>; [email protected]; Chen-Yu Tsai
> > <[email protected]>
> > Subject: [PATCH net-next v1 12/18] net/amazon: Ensure that driver version is
> > aligned to the linux kernel
> >
> > From: Leon Romanovsky <[email protected]>
> >
> > Upstream drivers are managed inside global repository and released all
> > together, this ensure that driver version is the same as linux kernel, so update
> > amazon drivers to properly reflect it.
> >
> > Signed-off-by: Leon Romanovsky <[email protected]>
> > ---
> > drivers/net/ethernet/amazon/ena/ena_ethtool.c | 1 -
> > drivers/net/ethernet/amazon/ena/ena_netdev.c | 17 ++---------------
> > drivers/net/ethernet/amazon/ena/ena_netdev.h | 11 -----------
> > 3 files changed, 2 insertions(+), 27 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
> > b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
> > index ced1d577b62a..19262f37db84 100644
> > --- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
> > +++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
> > @@ -404,7 +404,6 @@ static void ena_get_drvinfo(struct net_device *dev,
> > struct ena_adapter *adapter = netdev_priv(dev);
> >
> > strlcpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
> > - strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version));
> > strlcpy(info->bus_info, pci_name(adapter->pdev),
> > sizeof(info->bus_info));
> > }
> > diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c
> > b/drivers/net/ethernet/amazon/ena/ena_netdev.c
> > index 0b2fd96b93d7..4faf81c456d8 100644
> > --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
> > +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
> > @@ -49,12 +49,9 @@
> > #include <linux/bpf_trace.h>
> > #include "ena_pci_id_tbl.h"
> >
> > -static char version[] = DEVICE_NAME " v" DRV_MODULE_VERSION "\n";
> > -
> > MODULE_AUTHOR("Amazon.com, Inc. or its affiliates");
> > MODULE_DESCRIPTION(DEVICE_NAME); MODULE_LICENSE("GPL"); -
> > MODULE_VERSION(DRV_MODULE_VERSION);
> >
> > /* Time in jiffies before concluding the transmitter is hung. */ #define
> > TX_TIMEOUT (5 * HZ) @@ -3093,11 +3090,7 @@ static void
> > ena_config_host_info(struct ena_com_dev *ena_dev,
> > host_info->os_dist = 0;
> > strncpy(host_info->os_dist_str, utsname()->release,
> > sizeof(host_info->os_dist_str) - 1);
> > - host_info->driver_version =
> > - (DRV_MODULE_VER_MAJOR) |
> > - (DRV_MODULE_VER_MINOR <<
> > ENA_ADMIN_HOST_INFO_MINOR_SHIFT) |
> > - (DRV_MODULE_VER_SUBMINOR <<
> > ENA_ADMIN_HOST_INFO_SUB_MINOR_SHIFT) |
> > - ("K"[0] << ENA_ADMIN_HOST_INFO_MODULE_TYPE_SHIFT);
> > + host_info->driver_version = LINUX_VERSION_CODE;
> > host_info->num_cpus = num_online_cpus();
> >
> > host_info->driver_supported_features = @@ -3476,9 +3469,7 @@
> > static int ena_restore_device(struct ena_adapter *adapter)
> > netif_carrier_on(adapter->netdev);
> >
> > mod_timer(&adapter->timer_service, round_jiffies(jiffies + HZ));
> > - dev_err(&pdev->dev,
> > - "Device reset completed successfully, Driver info: %s\n",
> > - version);
> > + dev_err(&pdev->dev, "Device reset completed successfully\n");
> >
> > return rc;
> > err_disable_msix:
> > @@ -4116,8 +4107,6 @@ static int ena_probe(struct pci_dev *pdev, const
> > struct pci_device_id *ent)
> >
> > dev_dbg(&pdev->dev, "%s\n", __func__);
> >
> > - dev_info_once(&pdev->dev, "%s", version);
> > -
> > rc = pci_enable_device_mem(pdev);
> > if (rc) {
> > dev_err(&pdev->dev, "pci_enable_device_mem() failed!\n");
> > @@ -4429,8 +4418,6 @@ static struct pci_driver ena_pci_driver = {
> >
> > static int __init ena_init(void)
> > {
> > - pr_info("%s", version);
> > -
> > ena_wq = create_singlethread_workqueue(DRV_MODULE_NAME);
> > if (!ena_wq) {
> > pr_err("Failed to create workqueue\n"); diff --git
> > a/drivers/net/ethernet/amazon/ena/ena_netdev.h
> > b/drivers/net/ethernet/amazon/ena/ena_netdev.h
> > index 8795e0b1dc3c..74c7f10b60dd 100644
> > --- a/drivers/net/ethernet/amazon/ena/ena_netdev.h
> > +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.h
> > @@ -45,18 +45,7 @@
> > #include "ena_com.h"
> > #include "ena_eth_com.h"
> >
> > -#define DRV_MODULE_VER_MAJOR 2
> > -#define DRV_MODULE_VER_MINOR 1
> > -#define DRV_MODULE_VER_SUBMINOR 0
> > -
> > #define DRV_MODULE_NAME "ena"
> > -#ifndef DRV_MODULE_VERSION
> > -#define DRV_MODULE_VERSION \
> > - __stringify(DRV_MODULE_VER_MAJOR) "." \
> > - __stringify(DRV_MODULE_VER_MINOR) "." \
> > - __stringify(DRV_MODULE_VER_SUBMINOR) "K"
> > -#endif
> > -
> > #define DEVICE_NAME "Elastic Network Adapter (ENA)"
> >
> > /* 1 for AENQ + ADMIN */
> > --
> > 2.24.1
>
> Hi Leon, David,
>
> This patch is not good for the ENA driver as it breaks the interface with the FW of the ENA device in ena_config_host_info(), host_info is later reported to the FW.
> Please do not merge it yet.

As I wrote here [1], I tried to avoid any changes in SW<->FW interfaces.
Can you please show me the dump stack of how is such info forwarded to FW?
How do you distinguish between different distro versions and driver
releases?

> We are now working on altering your patch so that it won't break this interface and will send it to you in the next few hours.

It is good, thanks.

[1] https://lore.kernel.org/netdev/20200223091031.GA422704@unreal

>
> Thanks,
> Arthur
>

2020-02-24 09:44:33

On Mon, Apr 13, 2020 at 11:40:26AM +0300, Leon Romanovsky wrote:
> On Mon, Apr 13, 2020 at 10:04:52AM +0200, Borislav Petkov wrote:
> > On Sun, Apr 12, 2020 at 10:36:04PM -0700, David Miller wrote:
> > > From: Leon Romanovsky <[email protected]>
> > > Date: Mon, 13 Apr 2020 08:26:37 +0300
> > >
> > > > How do you want us to handle it? Boris resend, me to send, you to fix?
> > >
> > > Anyone other than me can do it ;-)
> >
> > Ok, here's what I'm thinking: that vermagic.h is normally automatically
> > included in the *mod.c as part of the module creation, see add_header()
> > in modpost.c.
> >
> > So then perhaps drivers should not use it directly due to the current
> > inclusion order:
> >
> > linux/module.h includes asm/module.h and that arch-specific header
> > defines MODULE_VERMAGIC* for the respective arch.
> >
> > linux/vermagic.h defines all those fallbacks for those MODULE_VERMAGIC*
> > things and if the inclusion order is swapped - we get the redefinition
> > warning.
> >
> > Yesterday I tried the below - basically get rid of all the remaining
> > includers of linux/vermagic.h but two are left:
> >
> > drivers/net/ethernet/hisilicon/hns3/hns3_enet.c:18:#include <linux/vermagic.h>
> > drivers/net/ethernet/netronome/nfp/nfp_main.c:17:#include <linux/vermagic.h>
> >
> > because both use VERMAGIC_STRING directly.
> >
> > So,
> >
> > * one could either allow that and sort the inclusion order so that, for
> > example, asm/module.h includes linux/vermagic.h and thus the fallbacks
> > are there present.
> >
> > or
> >
> > * remove all uses of VERMAGIC_STRING from the drivers, add a header
> > guard which prevents people from using it directly and leave
> > VERMAGIC_STRING only to the internal module machinery in the kernel.
> >
> > Judging by how only a handful of old drivers are even using that,
> > perhaps not too far fetched.
> >
> > In any case, this needs a maintainer decision.
> >
> > Leon, if you wanna do it whatever you guys end up agreeing on, just go
> > ahead and submit the patches - it's not like I don't have anything else
> > on the TODO :-) Just add a Reported-by: me and that should be enough.
>
> I broke it so I should fix and will send a patch today/tomorrow.

ok, the patches are here, will wait for the kbuild results and will send.
https://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git/log/?h=vermagic

Thanks

>
> Thanks
>
> >
> > If you're busy too, lemme know and I'll put it on my todo then.
> >
> > Thx.
> >
> > diff --git a/drivers/net/bonding/bonding_priv.h b/drivers/net/bonding/bonding_priv.h
> > index 45b77bc8c7b3..48cdf3a49a7d 100644
> > --- a/drivers/net/bonding/bonding_priv.h
> > +++ b/drivers/net/bonding/bonding_priv.h
> > @@ -14,7 +14,7 @@
> >
> > #ifndef _BONDING_PRIV_H
> > #define _BONDING_PRIV_H
> > -#include <linux/vermagic.h>
> > +#include <generated/utsrelease.h>
> >
> > #define DRV_NAME "bonding"
> > #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
> > diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c
> > index b762176a1406..139d0120f511 100644
> > --- a/drivers/net/ethernet/3com/3c509.c
> > +++ b/drivers/net/ethernet/3com/3c509.c
> > @@ -85,7 +85,6 @@
> > #include <linux/device.h>
> > #include <linux/eisa.h>
> > #include <linux/bitops.h>
> > -#include <linux/vermagic.h>
> >
> > #include <linux/uaccess.h>
> > #include <asm/io.h>
> > diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c
> > index 90312fcd6319..47b4215bb93b 100644
> > --- a/drivers/net/ethernet/3com/3c515.c
> > +++ b/drivers/net/ethernet/3com/3c515.c
> > @@ -22,7 +22,6 @@
> >
> > */
> >
> > -#include <linux/vermagic.h>
> > #define DRV_NAME "3c515"
> >
> > #define CORKSCREW 1
> > diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
> > index 2db42211329f..a64191fc2af9 100644
> > --- a/drivers/net/ethernet/adaptec/starfire.c
> > +++ b/drivers/net/ethernet/adaptec/starfire.c
> > @@ -45,7 +45,6 @@
> > #include <asm/processor.h> /* Processor type for cache alignment. */
> > #include <linux/uaccess.h>
> > #include <asm/io.h>
> > -#include <linux/vermagic.h>
> >
> > /*
> > * The current frame processor firmware fails to checksum a fragment
> > diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c
> > index 588c62e9add7..3ed150512091 100644
> > --- a/drivers/net/ethernet/pensando/ionic/ionic_main.c
> > +++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c
> > @@ -6,7 +6,7 @@
> > #include <linux/module.h>
> > #include <linux/netdevice.h>
> > #include <linux/utsname.h>
> > -#include <linux/vermagic.h>
> > +#include <generated/utsrelease.h>
> >
> > #include "ionic.h"
> > #include "ionic_bus.h"
> > diff --git a/drivers/power/supply/test_power.c b/drivers/power/supply/test_power.c
> > index 65c23ef6408d..b3c05ff05783 100644
> > --- a/drivers/power/supply/test_power.c
> > +++ b/drivers/power/supply/test_power.c
> > @@ -16,7 +16,7 @@
> > #include <linux/power_supply.h>
> > #include <linux/errno.h>
> > #include <linux/delay.h>
> > -#include <linux/vermagic.h>
> > +#include <generated/utsrelease.h>
> >
> > enum test_power_id {
> > TEST_AC,
> > diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
> > index 89d0b1827aaf..adab97e500cf 100644
> > --- a/net/ethtool/ioctl.c
> > +++ b/net/ethtool/ioctl.c
> > @@ -17,7 +17,6 @@
> > #include <linux/phy.h>
> > #include <linux/bitops.h>
> > #include <linux/uaccess.h>
> > -#include <linux/vermagic.h>
> > #include <linux/vmalloc.h>
> > #include <linux/sfp.h>
> > #include <linux/slab.h>
> > @@ -29,6 +28,8 @@
> > #include <net/flow_offload.h>
> > #include <linux/ethtool_netlink.h>
> >
> > +#include <generated/utsrelease.h>
> > +
> > #include "common.h"
> >
> > /*
> >
> >
> > --
> > Regards/Gruss,
> > Boris.
> >
> > https://people.kernel.org/tglx/notes-about-netiquette