From 97c15c64fcdfa77eaa3bd406e12226375a0e43c6 Mon Sep 17 00:00:00 2001 From: hongrongxuan Date: Wed, 21 Feb 2024 11:54:34 +0800 Subject: [PATCH] release 4.19.90-2402.5.0 --- SOURCE | 2 +- kernel.spec | 20 +++++++++- ...ustom-driver-version-in-favour-of-gl.patch | 2 +- ...vice-version-to-replace-pci-revision.patch | 38 +++++++++---------- ...tructure-for-IR-shaper-s-parameter-i.patch | 4 +- .../0444-net-hns3-add-support-for-PTP.patch | 2 +- ...ate-ethtool-advertised-link-modes-fo.patch | 18 ++++----- ...port-customized-exception-handling-i.patch | 2 +- ...-imp-capability-bit-cannot-exceed-32.patch | 2 +- 9 files changed, 53 insertions(+), 37 deletions(-) diff --git a/SOURCE b/SOURCE index bf6379c..7a30a15 100644 --- a/SOURCE +++ b/SOURCE @@ -1 +1 @@ -4.19.90-2402.4.0 +4.19.90-2402.5.0 diff --git a/kernel.spec b/kernel.spec index 349e815..dc1db6b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -12,7 +12,7 @@ %global KernelVer %{version}-%{release}.%{_target_cpu} -%global hulkrelease 2402.4.0 +%global hulkrelease 2402.5.0 %define with_patch 1 @@ -32,7 +32,7 @@ Name: kernel Version: 4.19.90 -Release: %{hulkrelease}.0265 +Release: %{hulkrelease}.0266 Summary: Linux Kernel License: GPLv2 URL: http://www.kernel.org/ @@ -849,6 +849,22 @@ fi %endif %changelog +* Wed Feb 21 2024 hongrongxuan - 4.19.90-2402.5.0.0266 +- !4601 v2 xen-netback: don't produce zero-size SKB frags +- xen-netback: don't produce zero-size SKB frags +- !4583 net: hns3: fix a bug and modify the hns3 driver version +- net: hns3: update hns3 version to 24.2.1 +- net: hns3: fix tm port shapping of fibre port is incorrect after driver initialization +- !4552 v4 CVE-2023-52340 +- !4526 v2 fs:/dcache.c: fix negative dentry flag warning in dentry_free +- ipv6: fix kabi broken in struct dst_ops +- ipv6: Document that max_size sysctl is deprecated +- ipv6: remove max_size check inline with ipv4 +- !4538 fix kprobe reenter bug +- arm64/openeuler_defconfig: add not set config to fix compiling error +- tracing/kprobes: Do the notrace functions check without kprobes on ftrace +- fs:/dcache.c: fix negative dentry flag warning in dentry_free + * Mon Feb 19 2024 yangjunshuo - 4.19.90-2402.4.0.0265 - !4524 fix spi: hisi-sfc-v3xx: Return IRQ_NONE if no interrupts were detected diff --git a/patches/0376-net-hns-Remove-custom-driver-version-in-favour-of-gl.patch b/patches/0376-net-hns-Remove-custom-driver-version-in-favour-of-gl.patch index db78772..541a377 100644 --- a/patches/0376-net-hns-Remove-custom-driver-version-in-favour-of-gl.patch +++ b/patches/0376-net-hns-Remove-custom-driver-version-in-favour-of-gl.patch @@ -68,7 +68,7 @@ index 19f83dfb32aa..ac1659c18b16 100644 #include "hnae3.h" --#define HNS3_MOD_VERSION "23.7.1" +-#define HNS3_MOD_VERSION "24.2.1" - -extern char hns3_driver_version[]; - diff --git a/patches/0394-net-hns3-add-device-version-to-replace-pci-revision.patch b/patches/0394-net-hns3-add-device-version-to-replace-pci-revision.patch index a775814..87d3ebe 100644 --- a/patches/0394-net-hns3-add-device-version-to-replace-pci-revision.patch +++ b/patches/0394-net-hns3-add-device-version-to-replace-pci-revision.patch @@ -1,7 +1,7 @@ -From 00ebd53ab1af1addac638a8b012daa03ee396f9b Mon Sep 17 00:00:00 2001 +From acbb6b40a74fc79a356273a4ade6e30e7f5a82f8 Mon Sep 17 00:00:00 2001 From: Huazhong Tan Date: Thu, 15 Jun 2023 14:40:50 +0800 -Subject: [PATCH 033/283] net: hns3: add device version to replace pci revision +Subject: [PATCH] net: hns3: add device version to replace pci revision mainline inclusion from mainline-v5.10-rc1 @@ -36,7 +36,7 @@ Signed-off-by: Xiaodong Li 10 files changed, 110 insertions(+), 81 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h -index 7ab3c4012b44..61e549bbbf9a 100644 +index 19a8f315aa43..971239db844a 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -36,6 +36,12 @@ @@ -386,7 +386,7 @@ index 9338f030842c..55990ba4b30e 100644 dev_err(dev, "ROCEE Non-Fatal RAS error identified\n"); hclge_handle_rocee_ras_error(ae_dev); diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c -index e0ab39ae5c91..307907896ff4 100644 +index 1248534f3376..d1cf21f86119 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -739,7 +739,7 @@ static int hclge_get_sset_count(struct hnae3_handle *handle, int stringset) @@ -420,12 +420,12 @@ index e0ab39ae5c91..307907896ff4 100644 if (!hdev->support_sfp_query) return 0; -- if (hdev->pdev->revision >= 0x21) -+ if (hdev->ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2) +- if (hdev->pdev->revision >= 0x21) { ++ if (hdev->ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2) { + speed = mac->speed; ret = hclge_get_sfp_info(hdev, mac); - else - ret = hclge_get_sfp_speed(hdev, &speed); -@@ -2928,7 +2928,7 @@ static int hclge_update_port_info(struct hclge_dev *hdev) + } else { +@@ -2931,7 +2931,7 @@ static int hclge_update_port_info(struct hclge_dev *hdev) return ret; } @@ -433,8 +433,8 @@ index e0ab39ae5c91..307907896ff4 100644 + if (hdev->ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2) { if (mac->speed_type == QUERY_ACTIVE_SPEED) { hclge_update_port_capability(mac); - return 0; -@@ -3567,7 +3567,7 @@ static void hclge_clear_reset_cause(struct hclge_dev *hdev) + if (mac->speed != speed) +@@ -3572,7 +3572,7 @@ static void hclge_clear_reset_cause(struct hclge_dev *hdev) /* For revision 0x20, the reset interrupt source * can only be cleared after hardware reset done */ @@ -443,7 +443,7 @@ index e0ab39ae5c91..307907896ff4 100644 hclge_write_dev(&hdev->hw, HCLGE_MISC_RESET_STS_REG, clearval); -@@ -4671,7 +4671,7 @@ static void hclge_rss_init_cfg(struct hclge_dev *hdev) +@@ -4676,7 +4676,7 @@ static void hclge_rss_init_cfg(struct hclge_dev *hdev) int i, rss_algo = HCLGE_RSS_HASH_ALGO_TOEPLITZ; struct hclge_vport *vport = hdev->vport; @@ -452,7 +452,7 @@ index e0ab39ae5c91..307907896ff4 100644 rss_algo = HCLGE_RSS_HASH_ALGO_SIMPLE; for (i = 0; i < hdev->num_vmdq_vport + 1; i++) { -@@ -4871,13 +4871,14 @@ static int hclge_set_promisc_mode(struct hnae3_handle *handle, bool en_uc_pmc, +@@ -4876,13 +4876,14 @@ static int hclge_set_promisc_mode(struct hnae3_handle *handle, bool en_uc_pmc, bool en_mc_pmc) { struct hclge_vport *vport = hclge_get_vport(handle); @@ -471,7 +471,7 @@ index e0ab39ae5c91..307907896ff4 100644 en_bc_pmc = handle->netdev_flags & HNAE3_BPE ? true : false; return hclge_set_vport_promisc_mode(vport, en_uc_pmc, en_mc_pmc, -@@ -6921,7 +6922,7 @@ static int hclge_set_loopback(struct hnae3_handle *handle, +@@ -6926,7 +6927,7 @@ static int hclge_set_loopback(struct hnae3_handle *handle, * the same, the packets are looped back in the SSU. If SSU loopback * is disabled, packets can reach MAC even if SMAC is the same as DMAC. */ @@ -480,7 +480,7 @@ index e0ab39ae5c91..307907896ff4 100644 u8 switch_param = en ? 0 : BIT(HCLGE_SWITCH_ALW_LPBK_B); ret = hclge_config_switch_param(hdev, PF_VPORT_ID, switch_param, -@@ -8795,7 +8796,7 @@ static int hclge_init_vlan_config(struct hclge_dev *hdev) +@@ -8800,7 +8801,7 @@ static int hclge_init_vlan_config(struct hclge_dev *hdev) int ret; int i; @@ -489,7 +489,7 @@ index e0ab39ae5c91..307907896ff4 100644 /* for revision 0x21, vf vlan filter is per function */ for (i = 0; i < hdev->num_alloc_vport; i++) { vport = &hdev->vport[i]; -@@ -9251,7 +9252,7 @@ static int hclge_set_vf_vlan_filter(struct hnae3_handle *handle, int vfid, +@@ -9256,7 +9257,7 @@ static int hclge_set_vf_vlan_filter(struct hnae3_handle *handle, int vfid, u16 state; int ret; @@ -498,7 +498,7 @@ index e0ab39ae5c91..307907896ff4 100644 return -EOPNOTSUPP; vport = hclge_get_vf_vport(hdev, vfid); -@@ -10548,7 +10549,7 @@ static int hclge_set_vf_spoofchk(struct hnae3_handle *handle, int vf, +@@ -10553,7 +10554,7 @@ static int hclge_set_vf_spoofchk(struct hnae3_handle *handle, int vf, u32 new_spoofchk = enable ? 1 : 0; int ret; @@ -507,7 +507,7 @@ index e0ab39ae5c91..307907896ff4 100644 return -EOPNOTSUPP; vport = hclge_get_vf_vport(hdev, vf); -@@ -10581,7 +10582,7 @@ static int hclge_reset_vport_spoofchk(struct hclge_dev *hdev) +@@ -10586,7 +10587,7 @@ static int hclge_reset_vport_spoofchk(struct hclge_dev *hdev) int ret; int i; @@ -688,5 +688,5 @@ index c8b7b3ede445..f688217d4c59 100644 rss_cfg->rss_hash_key); if (ret) -- -2.34.1 +2.27.0 diff --git a/patches/0400-net-hns3-add-a-structure-for-IR-shaper-s-parameter-i.patch b/patches/0400-net-hns3-add-a-structure-for-IR-shaper-s-parameter-i.patch index 7b7c37d..033492a 100644 --- a/patches/0400-net-hns3-add-a-structure-for-IR-shaper-s-parameter-i.patch +++ b/patches/0400-net-hns3-add-a-structure-for-IR-shaper-s-parameter-i.patch @@ -99,8 +99,8 @@ index f5b59c1c9435..b3564e38eba0 100644 return 0; } -@@ -400,21 +400,21 @@ static int hclge_tm_pg_shapping_cfg(struct hclge_dev *hdev, - static int hclge_tm_port_shaper_cfg(struct hclge_dev *hdev) +@@ -400,21 +400,21 @@ int hclge_tm_pg_shapping_cfg(struct hclge_dev *hdev, + int hclge_tm_port_shaper_cfg(struct hclge_dev *hdev) { struct hclge_port_shapping_cmd *shap_cfg_cmd; + struct hclge_shaper_ir_para ir_para; diff --git a/patches/0444-net-hns3-add-support-for-PTP.patch b/patches/0444-net-hns3-add-support-for-PTP.patch index 8e09e71..e8e7f13 100644 --- a/patches/0444-net-hns3-add-support-for-PTP.patch +++ b/patches/0444-net-hns3-add-support-for-PTP.patch @@ -406,7 +406,7 @@ index 081f03e8eae5..660201b8bd11 100644 +#include "hclge_ptp.h" #include "hnae3.h" - #define HCLGE_MOD_VERSION "23.7.1" + #define HCLGE_MOD_VERSION "24.2.1" @@ -177,6 +178,7 @@ enum HLCGE_PORT_TYPE { #define HCLGE_FUN_RST_ING_B 0 diff --git a/patches/0507-net-hns3-add-update-ethtool-advertised-link-modes-fo.patch b/patches/0507-net-hns3-add-update-ethtool-advertised-link-modes-fo.patch index b0db050..3131fbe 100644 --- a/patches/0507-net-hns3-add-update-ethtool-advertised-link-modes-fo.patch +++ b/patches/0507-net-hns3-add-update-ethtool-advertised-link-modes-fo.patch @@ -1,8 +1,8 @@ -From e3c2384cd05be7f3e2b7f9eedd6803855dde8569 Mon Sep 17 00:00:00 2001 +From 95aa028615d507dd1843676a6c1245b9b0b3a3a6 Mon Sep 17 00:00:00 2001 From: Guangbin Huang Date: Thu, 18 Nov 2021 20:44:45 +0800 -Subject: [PATCH 146/283] net: hns3: add update ethtool advertised link modes - for FIBRE port when autoneg off +Subject: [PATCH] net: hns3: add update ethtool advertised link modes for FIBRE + port when autoneg off mainline inclusion from mainline-v5.16-rc1 @@ -37,7 +37,7 @@ Signed-off-by: Xiaodong Li 2 files changed, 94 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c -index 85087927a7f3..2169c60aad03 100644 +index 842ccc673304..a07534583b2d 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -2994,12 +2994,90 @@ static void hclge_update_link_status(struct hclge_dev *hdev) @@ -145,17 +145,17 @@ index 85087927a7f3..2169c60aad03 100644 } } -@@ -3253,7 +3331,7 @@ static int hclge_update_port_info(struct hclge_dev *hdev) +@@ -3256,7 +3334,7 @@ static int hclge_update_port_info(struct hclge_dev *hdev) if (hdev->ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2) { if (mac->speed_type == QUERY_ACTIVE_SPEED) { - hclge_update_port_capability(mac); + hclge_update_port_capability(hdev, mac); + if (mac->speed != speed) + (void)hclge_tm_port_shaper_cfg(hdev); return 0; - } - return hclge_cfg_mac_speed_dup(hdev, mac->speed, diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h -index ad786ae8ae4a..7acf0f091b40 100644 +index a3d94306aa72..048bac08f1bf 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h @@ -1069,6 +1069,15 @@ static inline int hclge_get_queue_id(struct hnae3_queue *queue) @@ -175,5 +175,5 @@ index ad786ae8ae4a..7acf0f091b40 100644 { return !!hdev->reset_pending; -- -2.34.1 +2.27.0 diff --git a/patches/0552-net-hns3-add-support-customized-exception-handling-i.patch b/patches/0552-net-hns3-add-support-customized-exception-handling-i.patch index 5c5b8c4..a58a851 100644 --- a/patches/0552-net-hns3-add-support-customized-exception-handling-i.patch +++ b/patches/0552-net-hns3-add-support-customized-exception-handling-i.patch @@ -746,7 +746,7 @@ index 9d739033daab..f32c8b52f022 100644 -#include "hnae3.h" +#include "hnae3_ext.h" - #define HCLGE_MOD_VERSION "23.7.1" + #define HCLGE_MOD_VERSION "24.2.1" #define HCLGE_DRIVER_NAME "hclge" @@ -1168,4 +1168,7 @@ void hclge_unregister_sysfs(struct hclge_dev *hdev); int hclge_cfg_mac_speed_dup_hw(struct hclge_dev *hdev, int speed, u8 duplex); diff --git a/patches/0598-net-hns3-fix-the-imp-capability-bit-cannot-exceed-32.patch b/patches/0598-net-hns3-fix-the-imp-capability-bit-cannot-exceed-32.patch index 975a498..31ae349 100644 --- a/patches/0598-net-hns3-fix-the-imp-capability-bit-cannot-exceed-32.patch +++ b/patches/0598-net-hns3-fix-the-imp-capability-bit-cannot-exceed-32.patch @@ -39,7 +39,7 @@ index ec9aa9233506..36a7285f68cf 100644 +#include #include - #define HNAE3_MOD_VERSION "23.7.1" + #define HNAE3_MOD_VERSION "24.2.1" @@ -428,7 +429,7 @@ struct hnae3_ae_dev { #ifndef __GENKSYMS__ struct hnae3_dev_specs dev_specs;