diff --git a/SOURCE b/SOURCE index 2740633..8537796 100644 --- a/SOURCE +++ b/SOURCE @@ -1 +1 @@ -4.19.90-2409.1.0 +4.19.90-2409.3.0 diff --git a/kernel.spec b/kernel.spec index dc20b72..68c4159 100644 --- a/kernel.spec +++ b/kernel.spec @@ -12,7 +12,7 @@ %global KernelVer %{version}-%{release}.%{_target_cpu} -%global hulkrelease 2409.1.0 +%global hulkrelease 2409.3.0 %define with_patch 1 @@ -32,7 +32,7 @@ Name: kernel Version: 4.19.90 -Release: %{hulkrelease}.0293 +Release: %{hulkrelease}.0294 Summary: Linux Kernel License: GPLv2 URL: http://www.kernel.org/ @@ -850,6 +850,70 @@ fi %changelog +* Tue Sep 10 2024 chenyi - 4.19.90-2409.3.0.0294 +- !11434 v3 cifs: Fix pages leak when cifs_writedata allocate fails in cifs_writedata_direct_alloc() +- cifs: Fix pages leak when cifs_writedata allocate fails in cifs_writedata_direct_alloc() +- !11418 md/raid5: avoid BUG_ON() while continue reshape after reassembling +- !11426 nfc: pn533: Wait for out_urb's completion in pn533_usb_send_frame() +- nfc: pn533: initialize struct pn533_out_arg properly +- nfc: pn533: Wait for out_urb's completion in pn533_usb_send_frame() +- !11404 usb: gadget: f_ncm: fix potential NULL ptr deref in ncm_bitrate() +- !11406 net: hns3: do not allow call hns3_nic_net_open repeatedly +- md/raid5: avoid BUG_ON() while continue reshape after reassembling +- !11177 dma: fix call order in dmam_free_coherent +- !11387 usb: gadget: rndis: add spinlock for rndis response list +- !8301 tty: fix hang on tty device with no_room set +- !7809 net-memcg: Fix scope of sockmem pressure indicators +- net: hns3: do not allow call hns3_nic_net_open repeatedly +- !11386 v5 support block hierarchy stats +- usb: gadget: f_ncm: fix potential NULL ptr deref in ncm_bitrate() +- !11349 jfs: Fix array-index-out-of-bounds in diFree +- !11350 devres: Fix memory leakage caused by driver API devm_free_percpu() +- !11378 drm/i915/gem: Fix Virtual Memory mapping boundaries calculation +- !11370 nilfs2: handle inconsistent state in nilfs_btnode_create_block() +- !11367 ibmvnic: free reset-work-item when flushing +- !11388 dev/parport: fix the array out-of-bounds risk +- dev/parport: fix the array out-of-bounds risk +- usb: gadget: rndis: add spinlock for rndis response list +- blk-io-hierarchy: support new stage for bio lifetime +- blk-io-hierarchy: support new rq based stage rq_driver +- blk-io-hierarchy: support new rq based stage requeue +- blk-io-hierarchy: support new rq based stage hctx +- blk-io-hierarchy: support new rq based stage kyber +- blk-io-hierarchy: support new rq based stage bfq +- blk-io-hierarchy: support new rq based stage mq-deadline +- blk-io-hierarchy: support new rq based stage plug +- blk-io-hierarchy: support new bio based stage gettag +- blk-mq: remove blk_mq_put_ctx() +- blk-io-hierarchy: support new bio based stage blk-wbt +- blk-io-hierarchy: support new bio based stage blk-throtl +- blk-io-hierarchy: support to recored the number of slow IO +- block-io-hierarchy: core hierarchy iodump implementation +- block-io-hierarchy: core hierarchy stats implementation +- block: support to record when request is completed +- blk-mq-debugfs: factor out a new helper to show allocated request +- block: block: fix kabi broken for struct blk_mq_alloc_data +- block: support to recored bio allocation task in request +- block: fix kabi broken for struct request +- block: support to recored bio allocation time in request +- block: support to recored bio allocation task +- block: support to recored bio allocation time +- block: fix kabi broken in struct blk_plug +- block: fix that blk_time_get_ns() doesn't update time after schedule +- block: limit block time caching to in_task() context +- block: update cached timestamp post schedule/preemption +- block: cache current nsec time in struct blk_plug +- block: add blk_time_get_ns() and blk_time_get() helpers +- blk-mq: export blk-mq-debugfs apis +- drm/i915/gem: Fix Virtual Memory mapping boundaries calculation +- nilfs2: handle inconsistent state in nilfs_btnode_create_block() +- ibmvnic: free reset-work-item when flushing +- devres: Fix memory leakage caused by driver API devm_free_percpu() +- jfs: Fix array-index-out-of-bounds in diFree +- dma: fix call order in dmam_free_coherent +- tty: fix hang on tty device with no_room set +- net-memcg: Fix scope of sockmem pressure indicators + * Tue Sep 03 2024 chenyi - 4.19.90-2409.1.0.0293 - !11383 perf/core: Fix missing wakeup when waiting for context reference - !11384 fs/proc: fix softlockup in __read_vmcore diff --git a/patches/0491-net-hns3-do-not-allow-call-hns3_nic_net_open-repeate.patch b/patches/0491-net-hns3-do-not-allow-call-hns3_nic_net_open-repeate.patch deleted file mode 100644 index 033a893..0000000 --- a/patches/0491-net-hns3-do-not-allow-call-hns3_nic_net_open-repeate.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 175240131298a56f823ae21e8629bb605cd99308 Mon Sep 17 00:00:00 2001 -From: Jian Shen -Date: Mon, 15 Nov 2021 19:40:52 +0800 -Subject: [PATCH 130/283] net: hns3: do not allow call hns3_nic_net_open - repeatedly - -mainline inclusion -from mainline-v5.15-rc4 -commit 5b09e88e1bf7fe86540fab4b5f3eece8abead39e -category: bugfix -bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EMYT - -Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5b09e88e1bf7fe86540fab4b5f3eece8abead39e - --------------------------------- - -[ Upstream commit 5b09e88e1bf7fe86540fab4b5f3eece8abead39e ] - -hns3_nic_net_open() is not allowed to called repeatly, but there -is no checking for this. When doing device reset and setup tc -concurrently, there is a small oppotunity to call hns3_nic_net_open -repeatedly, and cause kernel bug by calling napi_enable twice. - -The calltrace information is like below: -[ 3078.222780] ------------[ cut here ]------------ -[ 3078.230255] kernel BUG at net/core/dev.c:6991! -[ 3078.236224] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP -[ 3078.243431] Modules linked in: hns3 hclgevf hclge hnae3 vfio_iommu_type1 vfio_pci vfio_virqfd vfio pv680_mii(O) -[ 3078.258880] CPU: 0 PID: 295 Comm: kworker/u8:5 Tainted: G O 5.14.0-rc4+ #1 -[ 3078.269102] Hardware name: , BIOS KpxxxFPGA 1P B600 V181 08/12/2021 -[ 3078.276801] Workqueue: hclge hclge_service_task [hclge] -[ 3078.288774] pstate: 60400009 (nZCv daif +PAN -UAO -TCO BTYPE=--) -[ 3078.296168] pc : napi_enable+0x80/0x84 -tc qdisc sho[w 3d0e7v8 .e3t0h218 79] lr : hns3_nic_net_open+0x138/0x510 [hns3] - -[ 3078.314771] sp : ffff8000108abb20 -[ 3078.319099] x29: ffff8000108abb20 x28: 0000000000000000 x27: ffff0820a8490300 -[ 3078.329121] x26: 0000000000000001 x25: ffff08209cfc6200 x24: 0000000000000000 -[ 3078.339044] x23: ffff0820a8490300 x22: ffff08209cd76000 x21: ffff0820abfe3880 -[ 3078.349018] x20: 0000000000000000 x19: ffff08209cd76900 x18: 0000000000000000 -[ 3078.358620] x17: 0000000000000000 x16: ffffc816e1727a50 x15: 0000ffff8f4ff930 -[ 3078.368895] x14: 0000000000000000 x13: 0000000000000000 x12: 0000259e9dbeb6b4 -[ 3078.377987] x11: 0096a8f7e764eb40 x10: 634615ad28d3eab5 x9 : ffffc816ad8885b8 -[ 3078.387091] x8 : ffff08209cfc6fb8 x7 : ffff0820ac0da058 x6 : ffff0820a8490344 -[ 3078.396356] x5 : 0000000000000140 x4 : 0000000000000003 x3 : ffff08209cd76938 -[ 3078.405365] x2 : 0000000000000000 x1 : 0000000000000010 x0 : ffff0820abfe38a0 -[ 3078.414657] Call trace: -[ 3078.418517] napi_enable+0x80/0x84 -[ 3078.424626] hns3_reset_notify_up_enet+0x78/0xd0 [hns3] -[ 3078.433469] hns3_reset_notify+0x64/0x80 [hns3] -[ 3078.441430] hclge_notify_client+0x68/0xb0 [hclge] -[ 3078.450511] hclge_reset_rebuild+0x524/0x884 [hclge] -[ 3078.458879] hclge_reset_service_task+0x3c4/0x680 [hclge] -[ 3078.467470] hclge_service_task+0xb0/0xb54 [hclge] -[ 3078.475675] process_one_work+0x1dc/0x48c -[ 3078.481888] worker_thread+0x15c/0x464 -[ 3078.487104] kthread+0x160/0x170 -[ 3078.492479] ret_from_fork+0x10/0x18 -[ 3078.498785] Code: c8027c81 35ffffa2 d50323bf d65f03c0 (d4210000) -[ 3078.506889] ---[ end trace 8ebe0340a1b0fb44 ]--- - -Once hns3_nic_net_open() is excute success, the flag -HNS3_NIC_STATE_DOWN will be cleared. So add checking for this -flag, directly return when HNS3_NIC_STATE_DOWN is no set. - -Fixes: e888402789b9 ("net: hns3: call hns3_nic_net_open() while doing HNAE3_UP_CLIENT") -Signed-off-by: Jian Shen -Signed-off-by: Guangbin Huang -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin -Signed-off-by: Chen Jun -Acked-by: Weilong Chen - -Signed-off-by: Chen Jun -Signed-off-by: Zheng Zengkai -Signed-off-by: Xiaodong Li ---- - drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c -index c84a5e942b68..5b4553743987 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c -@@ -481,6 +481,11 @@ static int hns3_nic_net_open(struct net_device *netdev) - if (hns3_nic_resetting(netdev)) - return -EBUSY; - -+ if (!test_bit(HNS3_NIC_STATE_DOWN, &priv->state)) { -+ netdev_warn(netdev, "net open repeatedly!\n"); -+ return 0; -+ } -+ - netif_carrier_off(netdev); - - ret = hns3_nic_set_real_num_queue(netdev); --- -2.34.1 - diff --git a/series.conf b/series.conf index 1343b9b..b3b6c33 100644 --- a/series.conf +++ b/series.conf @@ -490,7 +490,6 @@ patches/0487-net-hns3-remove-unnecessary-spaces.patch patches/0488-net-hns3-make-hclgevf_cmd_caps_bit_map0-and-hclge_cm.patch patches/0489-net-hns3-fix-misuse-vf-id-and-vport-id-in-some-logs.patch patches/0490-net-hns3-optimize-the-rx-page-reuse-handling-process.patch -patches/0491-net-hns3-do-not-allow-call-hns3_nic_net_open-repeate.patch patches/0492-net-hns3-fix-show-wrong-state-when-add-existing-uc-m.patch patches/0493-net-hns3-fix-always-enable-rx-vlan-filter-problem-af.patch patches/0494-net-hns3-add-limit-ets-dwrr-bandwidth-cannot-be-0.patch