starlingx/kernel
Code Issues Proposed changes
kernel/kernel-rt/debian/patches/0016-Add-driver-versions-for-ice-i40e-and-iavf.patch
Jiping Ma 2e912eed62 kernel: upgrade the kernel to the version 6.6.40 
We upgrade the kernel to the version 6.6.40 to fix the following CVEs.
CVE-2023-46838: https://nvd.nist.gov/vuln/detail/CVE-2023-46838
CVE-2024-38667: https://nvd.nist.gov/vuln/detail/CVE-2024-38667
CVE-2024-38664: https://nvd.nist.gov/vuln/detail/CVE-2024-38664
CVE-2024-36971: https://nvd.nist.gov/vuln/detail/CVE-2024-36971
CVE-2024-36477: https://nvd.nist.gov/vuln/detail/CVE-2024-36477
CVE-2024-27022: https://nvd.nist.gov/vuln/detail/CVE-2024-27022
CVE-2024-27020: https://nvd.nist.gov/vuln/detail/CVE-2024-27020
CVE-2024-27018: https://nvd.nist.gov/vuln/detail/CVE-2024-27018
CVE-2024-26952: https://nvd.nist.gov/vuln/detail/CVE-2024-26952
CVE-2024-26934: https://nvd.nist.gov/vuln/detail/CVE-2024-26934
CVE-2024-26933: https://nvd.nist.gov/vuln/detail/CVE-2024-26933
CVE-2024-26930: https://nvd.nist.gov/vuln/detail/CVE-2024-26930
CVE-2024-26929: https://nvd.nist.gov/vuln/detail/CVE-2024-26929
CVE-2024-23307: https://nvd.nist.gov/vuln/detail/CVE-2024-23307
CVE-2024-0841: https://nvd.nist.gov/vuln/detail/CVE-2024-0841
CVE-2023-6610: https://nvd.nist.gov/vuln/detail/CVE-2023-6610
CVE-2023-6606: https://nvd.nist.gov/vuln/detail/CVE-2023-6606
CVE-2023-6535: https://nvd.nist.gov/vuln/detail/CVE-2023-6535
CVE-2023-6356: https://nvd.nist.gov/vuln/detail/CVE-2023-6356
CVE-2023-6270: https://nvd.nist.gov/vuln/detail/CVE-2023-6270
CVE-2023-46838: https://nvd.nist.gov/vuln/detail/CVE-2023-46838
CVE-2024-39291: https://nvd.nist.gov/vuln/detail/CVE-2024-39291
CVE-2024-39480: https://nvd.nist.gov/vuln/detail/CVE-2024-39480
CVE-2024-39479: https://nvd.nist.gov/vuln/detail/CVE-2024-39479
CVE-2024-39277: https://nvd.nist.gov/vuln/detail/CVE-2024-39277

The following changes we made to support the kernel upgrade.

For deb_patches folder:
1) We adapt the patch efi-lock-down-the-kernel-if-booted-in-secure-boot-
   mo.patch based on kernel-6.6.40 because of the changed context.
2) The patch 00xx-mod-fix-the-undefined-errors.patch is added to fix the
   mod build failure because symsearch.c is added in kernel-6.6.40.

For patches folder:
1) We adapt the patch 0001, 0016 and 0017 based on kernel-6.6.40.
2) Remove 0018-SUNRPC-use-request-size-to-initialize-bio_vec-in-
   svc.patch because it had been included in kernel-6.6.40.

Verification:
- Build kernel and out of tree modules success for rt and std.
- Build iso success for rt and std.
- Install success onto a All-in-One lab with rt kernel.
- Boot up successfully in the lab.
- The sanity testing was run and the test results PASS.
- The cyclictest benchmark was also run on the starlingx lab, the result
  is "samples:  86400000  avg: 1658.509   std_dev: 44.463 max: 4451
  99.9999th percentile: 2590", It is not big difference with 6.6.7.
- The network performance test had been done, the test results are
  almost same with kernel-6.6.7.

Closes-Bug: 2073449

Change-Id: I0f3bb1210f6ac454db52c22e621b111d22202196
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
2024-08-06 00:49:56 +00:00

283 lines
11 KiB
Diff
Raw Permalink Blame History

From b866d25ee24d62641b9e16a509d08ed4a4e0e1c7 Mon Sep 17 00:00:00 2001
From: Jiping Ma <jiping.ma2@windriver.com>
Date: Sun, 31 Mar 2024 20:13:57 -0700
Subject: [PATCH] Add driver versions for ice, i40e and iavf
As we need driver version to track driver information, add
the necessary driver version for the Intel drivers.
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
---
Makefile | 8 +++++++-
drivers/net/ethernet/intel/i40e/i40e.h | 1 +
drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 ++
drivers/net/ethernet/intel/i40e/i40e_main.c | 16 ++++++++++------
drivers/net/ethernet/intel/iavf/iavf.h | 1 +
drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 1 +
drivers/net/ethernet/intel/iavf/iavf_main.c | 8 ++++++--
drivers/net/ethernet/intel/ice/ice.h | 1 +
drivers/net/ethernet/intel/ice/ice_ethtool.c | 1 +
drivers/net/ethernet/intel/ice/ice_main.c | 15 +++++++++------
10 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
index 8ed7620308d1..2235636756b9 100644
--- a/Makefile
+++ b/Makefile
@@ -1227,6 +1227,9 @@ uapi-asm-generic:
# KERNELRELEASE can change from a few different places, meaning version.h
# needs to be updated, so this check is forced on all builds
+ICE_STX = "-stx.0"
+I40E_STX = "-stx.0"
+IAVF_STX = "-stx.0"
uts_len := 64
define filechk_utsrelease.h
@@ -1249,7 +1252,10 @@ define filechk_version.h
((c) > 255 ? 255 : (c)))'; \
echo \#define LINUX_VERSION_MAJOR $(VERSION); \
echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \
- echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL)
+ echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL); \
+ echo \#define LINUX_ICE_DRIVER_VERSION \"$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(ICE_STX)\"; \
+ echo \#define LINUX_I40E_DRIVER_VERSION \"$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(I40E_STX)\"; \
+ echo \#define LINUX_IAVF_DRIVER_VERSION \"$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(IAVF_STX)\"
endef
ifneq ($(DISTRIBUTION_OFFICIAL_BUILD),)
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index 3e6839ac1f0f..a72be4e1b318 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -1102,6 +1102,7 @@ static inline u32 i40e_get_pf_count(struct i40e_hw *hw)
int i40e_up(struct i40e_vsi *vsi);
void i40e_down(struct i40e_vsi *vsi);
extern const char i40e_driver_name[];
+extern const char i40e_driver_version_str[];
void i40e_do_reset_safe(struct i40e_pf *pf, u32 reset_flags);
void i40e_do_reset(struct i40e_pf *pf, u32 reset_flags, bool lock_acquired);
int i40e_config_rss(struct i40e_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 4e90570ba780..d6a019b27add 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -2005,6 +2005,8 @@ static void i40e_get_drvinfo(struct net_device *netdev,
struct i40e_pf *pf = vsi->back;
strscpy(drvinfo->driver, i40e_driver_name, sizeof(drvinfo->driver));
+ strlcpy(drvinfo->version, i40e_driver_version_str,
+ sizeof(drvinfo->version));
strscpy(drvinfo->fw_version, i40e_nvm_version_str(&pf->hw),
sizeof(drvinfo->fw_version));
strscpy(drvinfo->bus_info, pci_name(pf->pdev),
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index f8d1a994c2f6..b8043e8cb9e2 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -1,13 +1,13 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright(c) 2013 - 2021 Intel Corporation. */
-#include <generated/utsrelease.h>
#include <linux/crash_dump.h>
#include <linux/if_bridge.h>
#include <linux/if_macvlan.h>
#include <linux/module.h>
#include <net/pkt_cls.h>
#include <net/xdp_sock_drv.h>
+#include <linux/version.h>
/* Local includes */
#include "i40e.h"
@@ -28,6 +28,8 @@ const char i40e_driver_name[] = "i40e";
static const char i40e_driver_string[] =
"Intel(R) Ethernet Connection XL710 Network Driver";
+#define DRV_VERSION LINUX_I40E_DRIVER_VERSION
+const char i40e_driver_version_str[] = DRV_VERSION;
static const char i40e_copyright[] = "Copyright (c) 2013 - 2019 Intel Corporation.";
/* a bit of forward declarations */
@@ -101,6 +103,7 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all), Debug mask (0x8XXXXXXX
MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>");
MODULE_DESCRIPTION("Intel(R) Ethernet Connection XL710 Network Driver");
MODULE_LICENSE("GPL v2");
+MODULE_VERSION(DRV_VERSION);
static struct workqueue_struct *i40e_wq;
@@ -10783,11 +10786,11 @@ static void i40e_send_version(struct i40e_pf *pf)
{
struct i40e_driver_version dv;
- dv.major_version = 0xff;
- dv.minor_version = 0xff;
- dv.build_version = 0xff;
+ dv.major_version = LINUX_VERSION_MAJOR;
+ dv.minor_version = LINUX_VERSION_PATCHLEVEL;
+ dv.build_version = LINUX_VERSION_SUBLEVEL;
dv.subbuild_version = 0;
- strscpy(dv.driver_string, UTS_RELEASE, sizeof(dv.driver_string));
+ strscpy(dv.driver_string, DRV_VERSION, sizeof(dv.driver_string));
i40e_aq_send_driver_version(&pf->hw, &dv, NULL);
}
@@ -16768,7 +16771,8 @@ static int __init i40e_init_module(void)
{
int err;
- pr_info("%s: %s\n", i40e_driver_name, i40e_driver_string);
+ pr_info("%s: %s - version %s\n", i40e_driver_name,
+ i40e_driver_string, i40e_driver_version_str);
pr_info("%s: %s\n", i40e_driver_name, i40e_copyright);
/* There is no need to throttle the number of active tasks because
diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/intel/iavf/iavf.h
index 431d9d62c8c6..fec2e5bb77df 100644
--- a/drivers/net/ethernet/intel/iavf/iavf.h
+++ b/drivers/net/ethernet/intel/iavf/iavf.h
@@ -468,6 +468,7 @@ struct iavf_device {
/* needed by iavf_ethtool.c */
extern char iavf_driver_name[];
+extern const char iavf_driver_version[];
static inline const char *iavf_state_str(enum iavf_state_t state)
{
diff --git a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
index 1ac97bd606e3..204f8305f728 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
@@ -586,6 +586,7 @@ static void iavf_get_drvinfo(struct net_device *netdev,
struct iavf_adapter *adapter = netdev_priv(netdev);
strscpy(drvinfo->driver, iavf_driver_name, 32);
+ strlcpy(drvinfo->version, iavf_driver_version, 32);
strscpy(drvinfo->fw_version, "N/A", 4);
strscpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
drvinfo->n_priv_flags = IAVF_PRIV_FLAGS_STR_LEN;
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
index ce0b91999526..10a96793c123 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright(c) 2013 - 2018 Intel Corporation. */
+#include <linux/version.h>
#include "iavf.h"
#include "iavf_prototype.h"
#include "iavf_client.h"
@@ -21,6 +22,8 @@ char iavf_driver_name[] = "iavf";
static const char iavf_driver_string[] =
"Intel(R) Ethernet Adaptive Virtual Function Network Driver";
+#define DRV_VERSION LINUX_IAVF_DRIVER_VERSION
+const char iavf_driver_version[] = DRV_VERSION;
static const char iavf_copyright[] =
"Copyright (c) 2013 - 2018 Intel Corporation.";
@@ -47,6 +50,7 @@ MODULE_ALIAS("i40evf");
MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
MODULE_DESCRIPTION("Intel(R) Ethernet Adaptive Virtual Function Network Driver");
MODULE_LICENSE("GPL v2");
+MODULE_VERSION(DRV_VERSION);
static const struct net_device_ops iavf_netdev_ops;
@@ -5326,8 +5330,8 @@ static struct pci_driver iavf_driver = {
**/
static int __init iavf_init_module(void)
{
- pr_info("iavf: %s\n", iavf_driver_string);
-
+ pr_info("iavf: %s - version %s\n", iavf_driver_string,
+ iavf_driver_version);
pr_info("%s\n", iavf_copyright);
return pci_register_driver(&iavf_driver);
diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index c7962f322db2..2695794a5df7 100644
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -77,6 +77,7 @@
#include "ice_gnss.h"
#include "ice_irq.h"
+extern const char ice_drv_ver[];
#define ICE_BAR0 0
#define ICE_REQ_DESC_MULTIPLE 32
#define ICE_MIN_NUM_DESC 64
diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index 39b5f24be7e4..456cf4785c74 100644
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -358,6 +358,7 @@ __ice_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo,
orom = &hw->flash.orom;
strscpy(drvinfo->driver, KBUILD_MODNAME, sizeof(drvinfo->driver));
+ strscpy(drvinfo->version, ice_drv_ver, sizeof(drvinfo->version));
/* Display NVM version (from which the firmware version can be
* determined) which contains more pertinent information.
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 600a2f537087..149984fb8ab0 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -5,7 +5,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#include <generated/utsrelease.h>
+#include <linux/version.h>
#include <linux/crash_dump.h>
#include "ice.h"
#include "ice_base.h"
@@ -25,7 +25,9 @@
#include "ice_vsi_vlan_ops.h"
#include <net/xdp_sock_drv.h>
+#define DRV_VERSION LINUX_ICE_DRIVER_VERSION
#define DRV_SUMMARY "Intel(R) Ethernet Connection E800 Series Linux Driver"
+const char ice_drv_ver[] = DRV_VERSION;
static const char ice_driver_string[] = DRV_SUMMARY;
static const char ice_copyright[] = "Copyright (c) 2018, Intel Corporation.";
@@ -36,6 +38,7 @@ static const char ice_copyright[] = "Copyright (c) 2018, Intel Corporation.";
MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
MODULE_DESCRIPTION(DRV_SUMMARY);
MODULE_LICENSE("GPL v2");
+MODULE_VERSION(DRV_VERSION);
MODULE_FIRMWARE(ICE_DDP_PKG_FILE);
static int debug = -1;
@@ -4198,11 +4201,11 @@ static int ice_send_version(struct ice_pf *pf)
{
struct ice_driver_ver dv;
- dv.major_ver = 0xff;
- dv.minor_ver = 0xff;
- dv.build_ver = 0xff;
+ dv.major_ver = LINUX_VERSION_MAJOR;
+ dv.minor_ver = LINUX_VERSION_PATCHLEVEL;
+ dv.build_ver = LINUX_VERSION_SUBLEVEL;
dv.subbuild_ver = 0;
- strscpy((char *)dv.driver_string, UTS_RELEASE,
+ strscpy((char *)dv.driver_string, DRV_VERSION,
sizeof(dv.driver_string));
return ice_aq_send_driver_ver(&pf->hw, &dv, NULL);
}
@@ -5657,7 +5660,7 @@ static int __init ice_module_init(void)
{
int status = -ENOMEM;
- pr_info("%s\n", ice_driver_string);
+ pr_info("%s - version %s\n", ice_driver_string, ice_drv_ver);
pr_info("%s\n", ice_copyright);
ice_wq = alloc_workqueue("%s", 0, 0, KBUILD_MODNAME);
--
2.43.0
View Git Blame Copy Permalink