lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 24 Feb 2020 11:41:16 +0200 From: Leon Romanovsky <leon@...nel.org> To: "Kiyanovski, Arthur" <akiyano@...zon.com> Cc: "David S. Miller" <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>, Tom Lendacky <thomas.lendacky@....com>, Keyur Chudgar <keyur@...amperecomputing.com>, Don Fry <pcnet32@...ntier.com>, Veaceslav Falico <vfalico@...il.com>, Jay Vosburgh <j.vosburgh@...il.com>, "linux-acenic@...site.dk" <linux-acenic@...site.dk>, Maxime Ripard <mripard@...nel.org>, Heiko Stuebner <heiko@...ech.de>, Mark Einon <mark.einon@...il.com>, Chris Snook <chris.snook@...il.com>, "linux-rockchip@...ts.infradead.org" <linux-rockchip@...ts.infradead.org>, Iyappan Subramanian <iyappan@...amperecomputing.com>, Igor Russkikh <irusskikh@...vell.com>, David Dillow <dave@...dillows.org>, "Belgazal, Netanel" <netanel@...zon.com>, Quan Nguyen <quan@...amperecomputing.com>, Jay Cliburn <jcliburn@...il.com>, Lino Sanfilippo <LinoSanfilippo@....de>, "linux-arm-kernel@...ts.infradead.org" <linux-arm-kernel@...ts.infradead.org>, Andreas Larsson <andreas@...sler.com>, Andy Gospodarek <andy@...yhouse.net>, "netdev@...r.kernel.org" <netdev@...r.kernel.org>, Thor Thayer <thor.thayer@...ux.intel.com>, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, Ion Badulescu <ionut@...ula.org>, Jes Sorensen <jes@...ined-monkey.org>, "nios2-dev@...ts.rocketboards.org" <nios2-dev@...ts.rocketboards.org>, Chen-Yu Tsai <wens@...e.org> 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 <leon@...nel.org> > > Sent: Monday, February 24, 2020 10:53 AM > > To: David S. Miller <davem@...emloft.net>; Jakub Kicinski <kuba@...nel.org> > > Cc: Leon Romanovsky <leonro@...lanox.com>; Tom Lendacky > > <thomas.lendacky@....com>; Keyur Chudgar > > <keyur@...amperecomputing.com>; Don Fry <pcnet32@...ntier.com>; > > Veaceslav Falico <vfalico@...il.com>; Jay Vosburgh <j.vosburgh@...il.com>; > > linux-acenic@...site.dk; Maxime Ripard <mripard@...nel.org>; Heiko Stuebner > > <heiko@...ech.de>; Mark Einon <mark.einon@...il.com>; Chris Snook > > <chris.snook@...il.com>; linux-rockchip@...ts.infradead.org; Iyappan > > Subramanian <iyappan@...amperecomputing.com>; Igor Russkikh > > <irusskikh@...vell.com>; David Dillow <dave@...dillows.org>; Belgazal, > > Netanel <netanel@...zon.com>; Quan Nguyen > > <quan@...amperecomputing.com>; Jay Cliburn <jcliburn@...il.com>; Lino > > Sanfilippo <LinoSanfilippo@....de>; linux-arm-kernel@...ts.infradead.org; > > Andreas Larsson <andreas@...sler.com>; Andy Gospodarek > > <andy@...yhouse.net>; netdev@...r.kernel.org; Thor Thayer > > <thor.thayer@...ux.intel.com>; linux-kernel@...r.kernel.org; Ion Badulescu > > <ionut@...ula.org>; Kiyanovski, Arthur <akiyano@...zon.com>; Jes Sorensen > > <jes@...ined-monkey.org>; nios2-dev@...ts.rocketboards.org; Chen-Yu Tsai > > <wens@...e.org> > > Subject: [PATCH net-next v1 12/18] net/amazon: Ensure that driver version is > > aligned to the linux kernel > > > > From: Leon Romanovsky <leonro@...lanox.com> > > > > 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 <leonro@...lanox.com> > > --- > > 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 >
Powered by blists - more mailing lists