June 2023 - Linux-stable-mirror

FAILED: patch "[PATCH] io_uring/net: save msghdr->msg_control for retries" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x cac9e4418f4cbd548ccb065b3adcafe073f7f7d2 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023061721-shaft-lion-f22c@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From cac9e4418f4cbd548ccb065b3adcafe073f7f7d2 Mon Sep 17 00:00:00 2001 From: Jens Axboe <axboe(a)kernel.dk> Date: Mon, 12 Jun 2023 13:51:36 -0600 Subject: [PATCH] io_uring/net: save msghdr->msg_control for retries If the application sets ->msg_control and we have to later retry this command, or if it got queued with IOSQE_ASYNC to begin with, then we need to retain the original msg_control value. This is due to the net stack overwriting this field with an in-kernel pointer, to copy it in. Hitting that path for the second time will now fail the copy from user, as it's attempting to copy from a non-user address. Cc: stable(a)vger.kernel.org # 5.10+ Link: https://github.com/axboe/liburing/issues/880 Reported-and-tested-by: Marek Majkowski <marek(a)cloudflare.com> Signed-off-by: Jens Axboe <axboe(a)kernel.dk> diff --git a/io_uring/net.c b/io_uring/net.c index 89e839013837..51b0f7fbb4f5 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -65,6 +65,7 @@ struct io_sr_msg { u16 addr_len; u16 buf_group; void __user *addr; + void __user *msg_control; /* used only for send zerocopy */ struct io_kiocb *notif; }; @@ -195,11 +196,15 @@ static int io_sendmsg_copy_hdr(struct io_kiocb *req, struct io_async_msghdr *iomsg) { struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg); + int ret; iomsg->msg.msg_name = &iomsg->addr; iomsg->free_iov = iomsg->fast_iov; - return sendmsg_copy_msghdr(&iomsg->msg, sr->umsg, sr->msg_flags, + ret = sendmsg_copy_msghdr(&iomsg->msg, sr->umsg, sr->msg_flags, &iomsg->free_iov); + /* save msg_control as sys_sendmsg() overwrites it */ + sr->msg_control = iomsg->msg.msg_control; + return ret; } int io_send_prep_async(struct io_kiocb *req) @@ -297,6 +302,7 @@ int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags) if (req_has_async_data(req)) { kmsg = req->async_data; + kmsg->msg.msg_control = sr->msg_control; } else { ret = io_sendmsg_copy_hdr(req, &iomsg); if (ret)

1 year, 6 months

3
2
0 0

Fwd: kernel fault on hibernation: get_zeroed_page/swsusp_write

by Bagas Sanjaya

Hi, I notice a regression report on Bugzilla [1]. Quoting from it: > page allocation error using kernel 6.3.7-desktop-1.mga9 #1 SMP PREEMPT_DYNAMIC, from Fr 09 Jun 2023 22:57:31, Key ID b742fa8b80420f66; see the backtrace in the dmesg >> cat /proc/cpuinfo > siblings : 4 > core id : 1 > cpu cores : 2 > ... > type: regression, worked with the previous kernel, namely 6.3.6, Mo 05 Jun 2023 21:37:15, Key ID b742fa8b80420f66 before updating today And then: > The first hibernation attempt resulted in the backtrace you can see in the dmesg above, my second hibernation attempt from a text console (vt03 or so) has worked without errors and the third one I tried to do from the GUI/X11 again; see the debug options I had turned on). On the third attempt something strange did happen. It seemed to write to disk as it should, the screen turned black but the power led and button still stayed alighted. Waking up by pressing the power button did not yield any effect, nor the SysRq keys (alas forgot to write 511 to >/proc/sys/kernel/sysrq). After a hard power reset it booted as if not hibernated. On the first hibernation attempt I could see lengthy and intermittent disk access. On the third attempt I had waited for some considerable time. See Bugzilla for the full thread and attached infos (dmesg, journalctl, stack trace disassembly). Unfortunately, the reporter can't provide /proc/kcore output and haven't performed bisection yet (he can't build custom kernel). Anyway, I'm adding it to regzbot (as stable-specific regression) for now: #regzbot introduced: v6.3.6..v6.3.7 https://bugzilla.kernel.org/show_bug.cgi?id=217544 #regzbot title: page allocation error (kernel fault on hibernation involving get_zeroed_page/swsusp_write) #regzbot link: https://bugs.mageia.org/show_bug.cgi?id=32044 Thanks. [1]: https://bugzilla.kernel.org/show_bug.cgi?id=217544 -- An old man doll... just what I always wanted! - Clara

1 year, 6 months

3
5
0 0

[PATCH] bus: ixp4xx: fix IXP4XX_EXP_T1_MASK

by Linus Walleij

From: Jonas Gorski <jonas.gorski(a)gmail.com> The IXP4XX_EXP_T1_MASK was shifted one bit to the right, overlapping IXP4XX_EXP_T2_MASK and leaving bit 29 unused. The offset being wrong is also confirmed at least by the datasheet of IXP45X/46X [1]. Fix this by aligning it to IXP4XX_EXP_T1_SHIFT. [1] https://www.intel.com/content/dam/www/public/us/en/documents/manuals/ixp45x… Cc: stable(a)vger.kernel.org Fixes: 1c953bda90ca ("bus: ixp4xx: Add a driver for IXP4xx expansion bus") Signed-off-by: Jonas Gorski <jonas.gorski(a)gmail.com> Link: https://lore.kernel.org/r/20230624112958.27727-1-jonas.gorski@gmail.com Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- SoC maintainers: please apply this for fixes. --- drivers/bus/intel-ixp4xx-eb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/intel-ixp4xx-eb.c b/drivers/bus/intel-ixp4xx-eb.c index f5ba6bee6fd8..320cf307db05 100644 --- a/drivers/bus/intel-ixp4xx-eb.c +++ b/drivers/bus/intel-ixp4xx-eb.c @@ -33,7 +33,7 @@ #define IXP4XX_EXP_TIMING_STRIDE 0x04 #define IXP4XX_EXP_CS_EN BIT(31) #define IXP456_EXP_PAR_EN BIT(30) /* Only on IXP45x and IXP46x */ -#define IXP4XX_EXP_T1_MASK GENMASK(28, 27) +#define IXP4XX_EXP_T1_MASK GENMASK(29, 28) #define IXP4XX_EXP_T1_SHIFT 28 #define IXP4XX_EXP_T2_MASK GENMASK(27, 26) #define IXP4XX_EXP_T2_SHIFT 26 -- 2.40.1

1 year, 6 months

1
0
0 0

Wichtig

by "Mikhail Fridman"＠mail.vast.vn

" <phkhoi(a)htd.vast.vn> Date: Sat, 24 Jun 2023 11:53:37 +0100 Reply-To: alfagroupfridman(a)outlook.com Die Summe von 2.500.000,00 € wurde Ihnen von Mikhail Fridman gespendet. Für weitere Informationen wenden Sie sich bitte an Alfagroupfridman(a)outlook.com

1 year, 6 months

1
0
0 0

hi

by Ms Olena

Hi, I have funds for investment. Can we partner if you have a good business idea? Thanks, Olena.

1 year, 6 months

1
0
0 0

Wichtig

by "Mikhail Fridman"＠mail.vast.vn

" <phkhoi(a)htd.vast.vn> Date: Sat, 24 Jun 2023 01:28:18 +0100 Reply-To: alfagroupfridman(a)outlook.com Ich habe einen Vorschlag für Sie Alfagroupfridman(a)outlook.com

1 year, 6 months

1
0
0 0

[merged mm-hotfixes-stable] mm-mglru-make-memcg_lru-lock-irq-safe.patch removed from -mm tree

by Andrew Morton

The quilt patch titled Subject: mm/mglru: make memcg_lru->lock irq safe has been removed from the -mm tree. Its filename was mm-mglru-make-memcg_lru-lock-irq-safe.patch This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Yu Zhao <yuzhao(a)google.com> Subject: mm/mglru: make memcg_lru->lock irq safe Date: Mon, 19 Jun 2023 13:38:21 -0600 lru_gen_rotate_memcg() can happen in softirq if memory.soft_limit_in_bytes is set. This requires memcg_lru->lock to be irq safe. Lockdep warns on this. This problem only affects memcg v1. Link: https://lkml.kernel.org/r/20230619193821.2710944-1-yuzhao@google.com Fixes: e4dde56cd208 ("mm: multi-gen LRU: per-node lru_gen_folio lists") Signed-off-by: Yu Zhao <yuzhao(a)google.com> Reported-by: syzbot+87c490fd2be656269b6a(a)syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=87c490fd2be656269b6a Reviewed-by: Yosry Ahmed <yosryahmed(a)google.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/vmscan.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) --- a/mm/vmscan.c~mm-mglru-make-memcg_lru-lock-irq-safe +++ a/mm/vmscan.c @@ -4728,10 +4728,11 @@ static void lru_gen_rotate_memcg(struct { int seg; int old, new; + unsigned long flags; int bin = get_random_u32_below(MEMCG_NR_BINS); struct pglist_data *pgdat = lruvec_pgdat(lruvec); - spin_lock(&pgdat->memcg_lru.lock); + spin_lock_irqsave(&pgdat->memcg_lru.lock, flags); VM_WARN_ON_ONCE(hlist_nulls_unhashed(&lruvec->lrugen.list)); @@ -4766,7 +4767,7 @@ static void lru_gen_rotate_memcg(struct if (!pgdat->memcg_lru.nr_memcgs[old] && old == get_memcg_gen(pgdat->memcg_lru.seq)) WRITE_ONCE(pgdat->memcg_lru.seq, pgdat->memcg_lru.seq + 1); - spin_unlock(&pgdat->memcg_lru.lock); + spin_unlock_irqrestore(&pgdat->memcg_lru.lock, flags); } void lru_gen_online_memcg(struct mem_cgroup *memcg) @@ -4779,7 +4780,7 @@ void lru_gen_online_memcg(struct mem_cgr struct pglist_data *pgdat = NODE_DATA(nid); struct lruvec *lruvec = get_lruvec(memcg, nid); - spin_lock(&pgdat->memcg_lru.lock); + spin_lock_irq(&pgdat->memcg_lru.lock); VM_WARN_ON_ONCE(!hlist_nulls_unhashed(&lruvec->lrugen.list)); @@ -4790,7 +4791,7 @@ void lru_gen_online_memcg(struct mem_cgr lruvec->lrugen.gen = gen; - spin_unlock(&pgdat->memcg_lru.lock); + spin_unlock_irq(&pgdat->memcg_lru.lock); } } @@ -4814,7 +4815,7 @@ void lru_gen_release_memcg(struct mem_cg struct pglist_data *pgdat = NODE_DATA(nid); struct lruvec *lruvec = get_lruvec(memcg, nid); - spin_lock(&pgdat->memcg_lru.lock); + spin_lock_irq(&pgdat->memcg_lru.lock); VM_WARN_ON_ONCE(hlist_nulls_unhashed(&lruvec->lrugen.list)); @@ -4826,7 +4827,7 @@ void lru_gen_release_memcg(struct mem_cg if (!pgdat->memcg_lru.nr_memcgs[gen] && gen == get_memcg_gen(pgdat->memcg_lru.seq)) WRITE_ONCE(pgdat->memcg_lru.seq, pgdat->memcg_lru.seq + 1); - spin_unlock(&pgdat->memcg_lru.lock); + spin_unlock_irq(&pgdat->memcg_lru.lock); } } _ Patches currently in -mm which might be from yuzhao(a)google.com are

1 year, 6 months

1
0
0 0

Re: [6.3.y 6.1.y 5.15.y] drm/amd/display: fix the system hang while disable PSR

by Thomas Backlund

Den 2023-06-20 kl. 00:16, skrev Limonciello, Mario: > Hi, > > ea2062dd1f03 ("drm/amd/display: fix the system hang while disable PSR") > was tagged for stable, but failed to apply to 6.3.y, 6.1.y and 5.15.y. > > I've looked into the missing dependencies, and here are the dependencies > needed for the stable backport: > > 5.15.y: > ------- > 97ca308925a5 ("drm/amd/display: Add minimal pipe split transition state") > f7511289821f ("drm/amd/display: Use dc_update_planes_and_stream") > 81f743a08f3b ("drm/amd/display: Add wrapper to call planes and stream > update") > ea2062dd1f03 ("drm/amd/display: fix the system hang while disable PSR") > > 6.1.y / 6.3.y > ------------- > ea2062dd1f03 ("drm/amd/display: fix the system hang while disable PSR") > f7511289821f ("drm/amd/display: Use dc_update_planes_and_stream") > 81f743a08f3b ("drm/amd/display: Add wrapper to call planes and stream > update") > ea2062dd1f03 ("drm/amd/display: fix the system hang while disable PSR") > Is there something missing in that series ? We get a report of those patches on top of 6.3.9 failing on AMD STONEY (0x1002:0x98E4 0x1043:0x1FE0 0xEA) with: ------------[ cut here ]------------ WARNING: CPU: 1 PID: 1248 at drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_aux.c:393 dce_aux_transfer_raw+0x731/0x760 [amdgpu] Modules linked in: rfcomm ip6t_REJECT nf_reject_ipv6 xt_comment ip6table_mangle ip6table_nat ip6table_raw ip6table_filter ip6_tables xt_recent ipt_IFWLOG ipt_psd xt_set ip_set_hash_ip ip_set ipt_REJECT nf_reject_ipv4 xt_conntrack xt_hashlimit xt_addrtype xt_mark iptable_mangle iptable_nat xt_CT xt_tcpudp iptable_raw xt_NFLOG nfnetlink_log xt_LOG nf_log_syslog nf_nat_tftp nf_nat_snmp_basic nf_conntrack_snmp nf_nat_sip nf_nat_pptp nf_nat_irc nf_nat_h323 nf_nat_ftp nf_nat_amanda ts_kmp nf_conntrack_amanda nf_nat nf_conntrack_sane nf_conntrack_tftp nf_conntrack_sip nf_conntrack_pptp nf_conntrack_netlink nfnetlink nf_conntrack_netbios_ns nf_conntrack_broadcast nf_conntrack_irc nf_conntrack_h323 nf_conntrack_ftp nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 iptable_filter ccm af_packet qrtr cmac algif_hash algif_skcipher af_alg bnep nls_iso8859_1 nls_cp437 vfat fat dm_mirror dm_region_hash dm_log rtl8723be btcoexist rtl8723_common rtl_pci rtlwifi mac80211 uvcvideo uvc cfg80211 videobuf2_vmalloc videobuf2_memops videobuf2_v4l2 kvm_amd btusb btmtk btrtl btbcm btintel ccp kvm videodev bluetooth snd_hda_codec_realtek snd_hda_codec_generic snd_hda_codec_hdmi snd_hda_intel snd_intel_dspcfg snd_intel_sdw_acpi videobuf2_common asus_nb_wmi mc ecdh_generic ecc snd_hda_codec asus_wmi ledtrig_audio sparse_keymap platform_profile irqbypass wmi_bmof sha1_generic r8169 rfkill libarc4 realtek i2c_piix4 mdio_devres snd_hda_core tpm_crb snd_hwdep libphy snd_pcm snd_timer snd fam15h_power k10temp soundcore tpm_tis tpm_tis_core tpm asus_wireless acpi_cpufreq input_leds joydev evdev sch_fq_codel fuse dm_mod loop configfs efivarfs dmi_sysfs ip_tables x_tables ipv6 crc_ccitt autofs4 sdhci_pci crc32_pclmul crc32c_intel polyval_clmulni cqhci sdhci polyval_generic gf128mul mmc_core xhci_pci xhci_pci_renesas xhci_hcd atkbd ghash_clmulni_intel vivaldi_fmap sha512_ssse3 aesni_intel crypto_simd cryptd serio_raw ehci_pci ehci_hcd sp5100_tco amdgpu i2c_algo_bit drm_ttm_helper ttm iommu_v2 drm_buddy gpu_sched drm_display_helper drm_kms_helper video hid_multitouch drm wmi i2c_hid_acpi i2c_hid 8250_dw cec CPU: 1 PID: 1248 Comm: Xorg Not tainted 6.3.9-desktop-1.mga9 #1 Hardware name: ASUSTeK COMPUTER INC. X441BA/X441BA, BIOS X441BA.310 02/25/2020 RIP: 0010:dce_aux_transfer_raw+0x731/0x760 [amdgpu] Code: 4c 10 00 8b 54 24 0c 89 e8 83 c5 01 41 88 14 04 3b 6c 24 04 72 c9 e9 3e fd ff ff 3c 01 19 c0 83 e0 c0 83 c0 50 e9 72 f9 ff ff <0f> 0b b8 03 00 00 00 e9 77 ff ff ff b8 03 00 00 00 e9 6d ff ff ff RSP: 0018:ffffa52801b8ba48 EFLAGS: 00010246 RAX: 0000000000000000 RBX: ffff934801cdec80 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 00000000000098e4 RDI: ffff93480c700000 RBP: ffffa52801b8bac0 R08: 0000000000000000 R09: 000000000000000a R10: 0000000000000001 R11: ffff93480c700010 R12: ffffa52801b8babc R13: 0000000000000000 R14: 0000000000000000 R15: ffff934803816a30 FS: 00007f0dd47f82c0(0000) GS:ffff93480dc80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f298f3620d0 CR3: 0000000104d00000 CR4: 00000000001506e0 Call Trace: <TASK> ? dce_aux_transfer_raw+0x731/0x760 [amdgpu] ? __warn+0x7d/0x130 ? dce_aux_transfer_raw+0x731/0x760 [amdgpu] ? report_bug+0x16d/0x1a0 ? handle_bug+0x41/0x70 ? exc_invalid_op+0x13/0x60 ? asm_exc_invalid_op+0x16/0x20 ? dce_aux_transfer_raw+0x731/0x760 [amdgpu] dm_dp_aux_transfer+0xa1/0x160 [amdgpu] drm_dp_dpcd_access+0xad/0x130 [drm_display_helper] drm_dp_dpcd_probe+0x3a/0xf0 [drm_display_helper] drm_dp_dpcd_read+0xbf/0x100 [drm_display_helper] dm_helpers_dp_read_dpcd+0x28/0x50 [amdgpu] amdgpu_dm_update_freesync_caps+0x17b/0x360 [amdgpu] amdgpu_dm_connector_get_modes+0x242/0x4f0 [amdgpu] drm_helper_probe_single_connector_modes+0x18c/0x520 [drm_kms_helper] drm_mode_getconnector+0x390/0x4a0 [drm] ? ____sys_recvmsg+0xdd/0x1a0 ? __pfx_drm_mode_getconnector+0x10/0x10 [drm] drm_ioctl_kernel+0xc1/0x160 [drm] drm_ioctl+0x24c/0x490 [drm] ? __pfx_drm_mode_getconnector+0x10/0x10 [drm] amdgpu_drm_ioctl+0x4a/0x80 [amdgpu] __x64_sys_ioctl+0x90/0xd0 do_syscall_64+0x3a/0x90 entry_SYSCALL_64_after_hwframe+0x72/0xdc RIP: 0033:0x7f0dd3f68e68 Code: 00 00 48 8d 44 24 08 48 89 54 24 e0 48 89 44 24 c0 48 8d 44 24 d0 48 89 44 24 c8 b8 10 00 00 00 c7 44 24 b8 10 00 00 00 0f 05 <89> c2 3d 00 f0 ff ff 77 07 89 d0 c3 0f 1f 40 00 48 8b 15 71 ef 0c RSP: 002b:00007ffe6fb5b398 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 00000000009a5ce0 RCX: 00007f0dd3f68e68 RDX: 00007ffe6fb5b3e0 RSI: 00000000c05064a7 RDI: 0000000000000010 RBP: 00007ffe6fb5b3e0 R08: 0000000000000007 R09: 0000000000bea1c0 R10: 0000000000000003 R11: 0000000000000246 R12: 00000000c05064a7 R13: 0000000000000010 R14: 00000000c05064a7 R15: 00007ffe6fb5b3e0 </TASK> ---[ end trace 0000000000000000 ]--- reverting them from the 6.3.9 build is confirmed to fix the issue. here is full boot journals with working 6.3.8 and failing 6.3.9 with those patches applied: https://bugs.mageia.org/attachment.cgi?id=13888 -- Thomas

1 year, 6 months

2
1
0 0

[PATCH v2 0/2] arm64/signal: Fix handling of TPIDR2

by Mark Brown

The restoring of TPIDR2 signal context has been broken since it was merged, fix this and add a test case covering it. This is a result of TPIDR2 context management following a different flow to any of the other state that we provide and the fact that we don't expose TPIDR (which follows the same pattern) to signals. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- Changes in v2: - Added a feature check for SME to the new test. - Link to v1: https://lore.kernel.org/r/20230621-arm64-fix-tpidr2-signal-restore-v1-0-b6d… --- Mark Brown (2): arm64/signal: Restore TPIDR2 register rather than memory state kselftest/arm64: Add a test case for TPIDR2 restore arch/arm64/kernel/signal.c | 2 +- tools/testing/selftests/arm64/signal/.gitignore | 2 +- .../arm64/signal/testcases/tpidr2_restore.c | 86 ++++++++++++++++++++++ 3 files changed, 88 insertions(+), 2 deletions(-) --- base-commit: 858fd168a95c5b9669aac8db6c14a9aeab446375 change-id: 20230621-arm64-fix-tpidr2-signal-restore-713d93798f99 Best regards, -- Mark Brown <broonie(a)kernel.org>

1 year, 6 months

2
6
0 0

[PATCH V2 net] net: mana: Fix MANA VF unload when host is unresponsive

by souradeep chakrabarti

From: Souradeep Chakrabarti <schakrabarti(a)linux.microsoft.com> This patch addresses the VF unload issue, where mana_dealloc_queues() gets stuck in infinite while loop, because of host unresponsiveness. It adds a timeout in the while loop, to fix it. Also this patch adds a new attribute in mana_context, which gets set when mana_hwc_send_request() hits a timeout because of host unresponsiveness. This flag then helps to avoid the timeouts in successive calls. Signed-off-by: Souradeep Chakrabarti <schakrabarti(a)linux.microsoft.com> --- V1 -> V2: * Added net branch * Removed the typecasting to (struct mana_context*) of void pointer * Repositioned timeout variable in mana_dealloc_queues() * Repositioned vf_unload_timeout in mana_context struct, to utilise the 6 bytes hole --- .../net/ethernet/microsoft/mana/gdma_main.c | 4 +++- .../net/ethernet/microsoft/mana/hw_channel.c | 12 ++++++++++- drivers/net/ethernet/microsoft/mana/mana_en.c | 21 +++++++++++++++++-- include/net/mana/mana.h | 2 ++ 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c index 8f3f78b68592..6411f01be0d9 100644 --- a/drivers/net/ethernet/microsoft/mana/gdma_main.c +++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c @@ -946,10 +946,12 @@ int mana_gd_deregister_device(struct gdma_dev *gd) struct gdma_context *gc = gd->gdma_context; struct gdma_general_resp resp = {}; struct gdma_general_req req = {}; + struct mana_context *ac; int err; if (gd->pdid == INVALID_PDID) return -EINVAL; + ac = gd->driver_data; mana_gd_init_req_hdr(&req.hdr, GDMA_DEREGISTER_DEVICE, sizeof(req), sizeof(resp)); @@ -957,7 +959,7 @@ int mana_gd_deregister_device(struct gdma_dev *gd) req.hdr.dev_id = gd->dev_id; err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp); - if (err || resp.hdr.status) { + if ((err || resp.hdr.status) && !ac->vf_unload_timeout) { dev_err(gc->dev, "Failed to deregister device: %d, 0x%x\n", err, resp.hdr.status); if (!err) diff --git a/drivers/net/ethernet/microsoft/mana/hw_channel.c b/drivers/net/ethernet/microsoft/mana/hw_channel.c index 9d1507eba5b9..492cb2c6e2cb 100644 --- a/drivers/net/ethernet/microsoft/mana/hw_channel.c +++ b/drivers/net/ethernet/microsoft/mana/hw_channel.c @@ -1,8 +1,10 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* Copyright (c) 2021, Microsoft Corporation. */ +#include "asm-generic/errno.h" #include <net/mana/gdma.h> #include <net/mana/hw_channel.h> +#include <net/mana/mana.h> static int mana_hwc_get_msg_index(struct hw_channel_context *hwc, u16 *msg_id) { @@ -786,12 +788,19 @@ int mana_hwc_send_request(struct hw_channel_context *hwc, u32 req_len, struct hwc_wq *txq = hwc->txq; struct gdma_req_hdr *req_msg; struct hwc_caller_ctx *ctx; + struct mana_context *ac; u32 dest_vrcq = 0; u32 dest_vrq = 0; u16 msg_id; int err; mana_hwc_get_msg_index(hwc, &msg_id); + ac = hwc->gdma_dev->driver_data; + if (ac->vf_unload_timeout) { + dev_err(hwc->dev, "HWC: vport is already unloaded.\n"); + err = -ETIMEDOUT; + goto out; + } tx_wr = &txq->msg_buf->reqs[msg_id]; @@ -825,9 +834,10 @@ int mana_hwc_send_request(struct hw_channel_context *hwc, u32 req_len, goto out; } - if (!wait_for_completion_timeout(&ctx->comp_event, 30 * HZ)) { + if (!wait_for_completion_timeout(&ctx->comp_event, 5 * HZ)) { dev_err(hwc->dev, "HWC: Request timed out!\n"); err = -ETIMEDOUT; + ac->vf_unload_timeout = true; goto out; } diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index d907727c7b7a..cb2080b3a00c 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -2329,7 +2329,10 @@ static int mana_dealloc_queues(struct net_device *ndev) { struct mana_port_context *apc = netdev_priv(ndev); struct gdma_dev *gd = apc->ac->gdma_dev; + unsigned long timeout; struct mana_txq *txq; + struct sk_buff *skb; + struct mana_cq *cq; int i, err; if (apc->port_is_up) @@ -2348,13 +2351,26 @@ static int mana_dealloc_queues(struct net_device *ndev) * * Drain all the in-flight TX packets */ + + timeout = jiffies + 120 * HZ; for (i = 0; i < apc->num_queues; i++) { txq = &apc->tx_qp[i].txq; - - while (atomic_read(&txq->pending_sends) > 0) + while (atomic_read(&txq->pending_sends) > 0 && + time_before(jiffies, timeout)) { usleep_range(1000, 2000); + } } + for (i = 0; i < apc->num_queues; i++) { + txq = &apc->tx_qp[i].txq; + cq = &apc->tx_qp[i].tx_cq; + while (atomic_read(&txq->pending_sends)) { + skb = skb_dequeue(&txq->pending_skbs); + mana_unmap_skb(skb, apc); + napi_consume_skb(skb, cq->budget); + atomic_sub(1, &txq->pending_sends); + } + } /* We're 100% sure the queues can no longer be woken up, because * we're sure now mana_poll_tx_cq() can't be running. */ @@ -2605,6 +2621,7 @@ int mana_probe(struct gdma_dev *gd, bool resuming) } } + ac->vf_unload_timeout = false; err = add_adev(gd); out: if (err) diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h index 9eef19972845..5f5affdca1eb 100644 --- a/include/net/mana/mana.h +++ b/include/net/mana/mana.h @@ -358,6 +358,8 @@ struct mana_context { u16 num_ports; + bool vf_unload_timeout; + struct mana_eq *eqs; struct net_device *ports[MAX_PORTS_IN_MANA_DEV]; -- 2.34.1

1 year, 6 months

4
3
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror June 2023