2023-05-09 11:21:03

by Ding Hui

[permalink] [raw]
Subject: [PATCH net v5 0/2] iavf: Fix issues when setting channels concurrency with removing

The patchset fix two issues which can be reproduced by the following script:

[root@host ~]# cat repro.sh
#!/bin/bash

pf_dbsf="0000:41:00.0"
vf0_dbsf="0000:41:02.0"
g_pids=()

function do_set_numvf()
{
echo 2 >/sys/bus/pci/devices/${pf_dbsf}/sriov_numvfs
sleep $((RANDOM%3+1))
echo 0 >/sys/bus/pci/devices/${pf_dbsf}/sriov_numvfs
sleep $((RANDOM%3+1))
}

function do_set_channel()
{
local nic=$(ls -1 --indicator-style=none /sys/bus/pci/devices/${vf0_dbsf}/net/)
[ -z "$nic" ] && { sleep $((RANDOM%3)) ; return 1; }
ifconfig $nic 192.168.18.5 netmask 255.255.255.0
ifconfig $nic up
ethtool -L $nic combined 1
ethtool -L $nic combined 4
sleep $((RANDOM%3))
}

function on_exit()
{
local pid
for pid in "${g_pids[@]}"; do
kill -0 "$pid" &>/dev/null && kill "$pid" &>/dev/null
done
g_pids=()
}

trap "on_exit; exit" EXIT

while :; do do_set_numvf ; done &
g_pids+=($!)
while :; do do_set_channel ; done &
g_pids+=($!)

wait


Ding Hui (2):
iavf: Fix use-after-free in free_netdev
iavf: Fix out-of-bounds when setting channels on remove

drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 4 +++-
drivers/net/ethernet/intel/iavf/iavf_main.c | 6 +-----
2 files changed, 4 insertions(+), 6 deletions(-)

--
2.17.1


2023-05-09 11:36:39

by Ding Hui

[permalink] [raw]
Subject: [PATCH net v5 2/2] iavf: Fix out-of-bounds when setting channels on remove

If we set channels greater during iavf_remove(), and waiting reset done
would be timeout, then returned with error but changed num_active_queues
directly, that will lead to OOB like the following logs. Because the
num_active_queues is greater than tx/rx_rings[] allocated actually.

Reproducer:

[root@host ~]# cat repro.sh
#!/bin/bash

pf_dbsf="0000:41:00.0"
vf0_dbsf="0000:41:02.0"
g_pids=()

function do_set_numvf()
{
echo 2 >/sys/bus/pci/devices/${pf_dbsf}/sriov_numvfs
sleep $((RANDOM%3+1))
echo 0 >/sys/bus/pci/devices/${pf_dbsf}/sriov_numvfs
sleep $((RANDOM%3+1))
}

function do_set_channel()
{
local nic=$(ls -1 --indicator-style=none /sys/bus/pci/devices/${vf0_dbsf}/net/)
[ -z "$nic" ] && { sleep $((RANDOM%3)) ; return 1; }
ifconfig $nic 192.168.18.5 netmask 255.255.255.0
ifconfig $nic up
ethtool -L $nic combined 1
ethtool -L $nic combined 4
sleep $((RANDOM%3))
}

function on_exit()
{
local pid
for pid in "${g_pids[@]}"; do
kill -0 "$pid" &>/dev/null && kill "$pid" &>/dev/null
done
g_pids=()
}

trap "on_exit; exit" EXIT

while :; do do_set_numvf ; done &
g_pids+=($!)
while :; do do_set_channel ; done &
g_pids+=($!)

wait

Result:

[ 3506.152887] iavf 0000:41:02.0: Removing device
[ 3510.400799] ==================================================================
[ 3510.400820] BUG: KASAN: slab-out-of-bounds in iavf_free_all_tx_resources+0x156/0x160 [iavf]
[ 3510.400823] Read of size 8 at addr ffff88b6f9311008 by task repro.sh/55536
[ 3510.400823]
[ 3510.400830] CPU: 101 PID: 55536 Comm: repro.sh Kdump: loaded Tainted: G O --------- -t - 4.18.0 #1
[ 3510.400832] Hardware name: Powerleader PR2008AL/H12DSi-N6, BIOS 2.0 04/09/2021
[ 3510.400835] Call Trace:
[ 3510.400851] dump_stack+0x71/0xab
[ 3510.400860] print_address_description+0x6b/0x290
[ 3510.400865] ? iavf_free_all_tx_resources+0x156/0x160 [iavf]
[ 3510.400868] kasan_report+0x14a/0x2b0
[ 3510.400873] iavf_free_all_tx_resources+0x156/0x160 [iavf]
[ 3510.400880] iavf_remove+0x2b6/0xc70 [iavf]
[ 3510.400884] ? iavf_free_all_rx_resources+0x160/0x160 [iavf]
[ 3510.400891] ? wait_woken+0x1d0/0x1d0
[ 3510.400895] ? notifier_call_chain+0xc1/0x130
[ 3510.400903] pci_device_remove+0xa8/0x1f0
[ 3510.400910] device_release_driver_internal+0x1c6/0x460
[ 3510.400916] pci_stop_bus_device+0x101/0x150
[ 3510.400919] pci_stop_and_remove_bus_device+0xe/0x20
[ 3510.400924] pci_iov_remove_virtfn+0x187/0x420
[ 3510.400927] ? pci_iov_add_virtfn+0xe10/0xe10
[ 3510.400929] ? pci_get_subsys+0x90/0x90
[ 3510.400932] sriov_disable+0xed/0x3e0
[ 3510.400936] ? bus_find_device+0x12d/0x1a0
[ 3510.400953] i40e_free_vfs+0x754/0x1210 [i40e]
[ 3510.400966] ? i40e_reset_all_vfs+0x880/0x880 [i40e]
[ 3510.400968] ? pci_get_device+0x7c/0x90
[ 3510.400970] ? pci_get_subsys+0x90/0x90
[ 3510.400982] ? pci_vfs_assigned.part.7+0x144/0x210
[ 3510.400987] ? __mutex_lock_slowpath+0x10/0x10
[ 3510.400996] i40e_pci_sriov_configure+0x1fa/0x2e0 [i40e]
[ 3510.401001] sriov_numvfs_store+0x214/0x290
[ 3510.401005] ? sriov_totalvfs_show+0x30/0x30
[ 3510.401007] ? __mutex_lock_slowpath+0x10/0x10
[ 3510.401011] ? __check_object_size+0x15a/0x350
[ 3510.401018] kernfs_fop_write+0x280/0x3f0
[ 3510.401022] vfs_write+0x145/0x440
[ 3510.401025] ksys_write+0xab/0x160
[ 3510.401028] ? __ia32_sys_read+0xb0/0xb0
[ 3510.401031] ? fput_many+0x1a/0x120
[ 3510.401032] ? filp_close+0xf0/0x130
[ 3510.401038] do_syscall_64+0xa0/0x370
[ 3510.401041] ? page_fault+0x8/0x30
[ 3510.401043] entry_SYSCALL_64_after_hwframe+0x65/0xca
[ 3510.401073] RIP: 0033:0x7f3a9bb842c0
[ 3510.401079] Code: 73 01 c3 48 8b 0d d8 cb 2c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 0f 1f 44 00 00 83 3d 89 24 2d 00 00 75 10 b8 01 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 31 c3 48 83 ec 08 e8 fe dd 01 00 48 89 04 24
[ 3510.401080] RSP: 002b:00007ffc05f1fe18 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
[ 3510.401083] RAX: ffffffffffffffda RBX: 0000000000000002 RCX: 00007f3a9bb842c0
[ 3510.401085] RDX: 0000000000000002 RSI: 0000000002327408 RDI: 0000000000000001
[ 3510.401086] RBP: 0000000002327408 R08: 00007f3a9be53780 R09: 00007f3a9c8a4700
[ 3510.401086] R10: 0000000000000001 R11: 0000000000000246 R12: 0000000000000002
[ 3510.401087] R13: 0000000000000001 R14: 00007f3a9be52620 R15: 0000000000000001
[ 3510.401090]
[ 3510.401093] Allocated by task 76795:
[ 3510.401098] kasan_kmalloc+0xa6/0xd0
[ 3510.401099] __kmalloc+0xfb/0x200
[ 3510.401104] iavf_init_interrupt_scheme+0x26f/0x1310 [iavf]
[ 3510.401108] iavf_watchdog_task+0x1d58/0x4050 [iavf]
[ 3510.401114] process_one_work+0x56a/0x11f0
[ 3510.401115] worker_thread+0x8f/0xf40
[ 3510.401117] kthread+0x2a0/0x390
[ 3510.401119] ret_from_fork+0x1f/0x40
[ 3510.401122] 0xffffffffffffffff
[ 3510.401123]

In timeout handling, we should keep the original num_active_queues
and reset num_req_queues to 0.

Fixes: 4e5e6b5d9d13 ("iavf: Fix return of set the new channel count")
Signed-off-by: Ding Hui <[email protected]>
Cc: Donglin Peng <[email protected]>
Cc: Huang Cun <[email protected]>
---
v4 to v5:
- remove testing __IAVF_IN_REMOVE_TASK condition
- update commit message
- remove Reviewed-by tags to review again

v3 to v4:
- nothing changed

v2 to v3:
- fix review tag

v1 to v2:
- add reproduction script

---
drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
index 6f171d1d85b7..92443f8e9fbd 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
@@ -1863,7 +1863,7 @@ static int iavf_set_channels(struct net_device *netdev,
}
if (i == IAVF_RESET_WAIT_COMPLETE_COUNT) {
adapter->flags &= ~IAVF_FLAG_REINIT_ITR_NEEDED;
- adapter->num_active_queues = num_req;
+ adapter->num_req_queues = 0;
return -EOPNOTSUPP;
}

--
2.17.1

2023-05-09 13:58:41

by Leon Romanovsky

[permalink] [raw]
Subject: Re: [PATCH net v5 2/2] iavf: Fix out-of-bounds when setting channels on remove

On Tue, May 09, 2023 at 07:11:48PM +0800, Ding Hui wrote:
> If we set channels greater during iavf_remove(), and waiting reset done
> would be timeout, then returned with error but changed num_active_queues
> directly, that will lead to OOB like the following logs. Because the
> num_active_queues is greater than tx/rx_rings[] allocated actually.
>
> Reproducer:
>
> [root@host ~]# cat repro.sh
> #!/bin/bash
>
> pf_dbsf="0000:41:00.0"
> vf0_dbsf="0000:41:02.0"
> g_pids=()
>
> function do_set_numvf()
> {
> echo 2 >/sys/bus/pci/devices/${pf_dbsf}/sriov_numvfs
> sleep $((RANDOM%3+1))
> echo 0 >/sys/bus/pci/devices/${pf_dbsf}/sriov_numvfs
> sleep $((RANDOM%3+1))
> }
>
> function do_set_channel()
> {
> local nic=$(ls -1 --indicator-style=none /sys/bus/pci/devices/${vf0_dbsf}/net/)
> [ -z "$nic" ] && { sleep $((RANDOM%3)) ; return 1; }
> ifconfig $nic 192.168.18.5 netmask 255.255.255.0
> ifconfig $nic up
> ethtool -L $nic combined 1
> ethtool -L $nic combined 4
> sleep $((RANDOM%3))
> }
>
> function on_exit()
> {
> local pid
> for pid in "${g_pids[@]}"; do
> kill -0 "$pid" &>/dev/null && kill "$pid" &>/dev/null
> done
> g_pids=()
> }
>
> trap "on_exit; exit" EXIT
>
> while :; do do_set_numvf ; done &
> g_pids+=($!)
> while :; do do_set_channel ; done &
> g_pids+=($!)
>
> wait
>
> Result:
>
> [ 3506.152887] iavf 0000:41:02.0: Removing device
> [ 3510.400799] ==================================================================
> [ 3510.400820] BUG: KASAN: slab-out-of-bounds in iavf_free_all_tx_resources+0x156/0x160 [iavf]
> [ 3510.400823] Read of size 8 at addr ffff88b6f9311008 by task repro.sh/55536
> [ 3510.400823]
> [ 3510.400830] CPU: 101 PID: 55536 Comm: repro.sh Kdump: loaded Tainted: G O --------- -t - 4.18.0 #1
> [ 3510.400832] Hardware name: Powerleader PR2008AL/H12DSi-N6, BIOS 2.0 04/09/2021
> [ 3510.400835] Call Trace:
> [ 3510.400851] dump_stack+0x71/0xab
> [ 3510.400860] print_address_description+0x6b/0x290
> [ 3510.400865] ? iavf_free_all_tx_resources+0x156/0x160 [iavf]
> [ 3510.400868] kasan_report+0x14a/0x2b0
> [ 3510.400873] iavf_free_all_tx_resources+0x156/0x160 [iavf]
> [ 3510.400880] iavf_remove+0x2b6/0xc70 [iavf]
> [ 3510.400884] ? iavf_free_all_rx_resources+0x160/0x160 [iavf]
> [ 3510.400891] ? wait_woken+0x1d0/0x1d0
> [ 3510.400895] ? notifier_call_chain+0xc1/0x130
> [ 3510.400903] pci_device_remove+0xa8/0x1f0
> [ 3510.400910] device_release_driver_internal+0x1c6/0x460
> [ 3510.400916] pci_stop_bus_device+0x101/0x150
> [ 3510.400919] pci_stop_and_remove_bus_device+0xe/0x20
> [ 3510.400924] pci_iov_remove_virtfn+0x187/0x420
> [ 3510.400927] ? pci_iov_add_virtfn+0xe10/0xe10
> [ 3510.400929] ? pci_get_subsys+0x90/0x90
> [ 3510.400932] sriov_disable+0xed/0x3e0
> [ 3510.400936] ? bus_find_device+0x12d/0x1a0
> [ 3510.400953] i40e_free_vfs+0x754/0x1210 [i40e]
> [ 3510.400966] ? i40e_reset_all_vfs+0x880/0x880 [i40e]
> [ 3510.400968] ? pci_get_device+0x7c/0x90
> [ 3510.400970] ? pci_get_subsys+0x90/0x90
> [ 3510.400982] ? pci_vfs_assigned.part.7+0x144/0x210
> [ 3510.400987] ? __mutex_lock_slowpath+0x10/0x10
> [ 3510.400996] i40e_pci_sriov_configure+0x1fa/0x2e0 [i40e]
> [ 3510.401001] sriov_numvfs_store+0x214/0x290
> [ 3510.401005] ? sriov_totalvfs_show+0x30/0x30
> [ 3510.401007] ? __mutex_lock_slowpath+0x10/0x10
> [ 3510.401011] ? __check_object_size+0x15a/0x350
> [ 3510.401018] kernfs_fop_write+0x280/0x3f0
> [ 3510.401022] vfs_write+0x145/0x440
> [ 3510.401025] ksys_write+0xab/0x160
> [ 3510.401028] ? __ia32_sys_read+0xb0/0xb0
> [ 3510.401031] ? fput_many+0x1a/0x120
> [ 3510.401032] ? filp_close+0xf0/0x130
> [ 3510.401038] do_syscall_64+0xa0/0x370
> [ 3510.401041] ? page_fault+0x8/0x30
> [ 3510.401043] entry_SYSCALL_64_after_hwframe+0x65/0xca
> [ 3510.401073] RIP: 0033:0x7f3a9bb842c0
> [ 3510.401079] Code: 73 01 c3 48 8b 0d d8 cb 2c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 0f 1f 44 00 00 83 3d 89 24 2d 00 00 75 10 b8 01 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 31 c3 48 83 ec 08 e8 fe dd 01 00 48 89 04 24
> [ 3510.401080] RSP: 002b:00007ffc05f1fe18 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
> [ 3510.401083] RAX: ffffffffffffffda RBX: 0000000000000002 RCX: 00007f3a9bb842c0
> [ 3510.401085] RDX: 0000000000000002 RSI: 0000000002327408 RDI: 0000000000000001
> [ 3510.401086] RBP: 0000000002327408 R08: 00007f3a9be53780 R09: 00007f3a9c8a4700
> [ 3510.401086] R10: 0000000000000001 R11: 0000000000000246 R12: 0000000000000002
> [ 3510.401087] R13: 0000000000000001 R14: 00007f3a9be52620 R15: 0000000000000001
> [ 3510.401090]
> [ 3510.401093] Allocated by task 76795:
> [ 3510.401098] kasan_kmalloc+0xa6/0xd0
> [ 3510.401099] __kmalloc+0xfb/0x200
> [ 3510.401104] iavf_init_interrupt_scheme+0x26f/0x1310 [iavf]
> [ 3510.401108] iavf_watchdog_task+0x1d58/0x4050 [iavf]
> [ 3510.401114] process_one_work+0x56a/0x11f0
> [ 3510.401115] worker_thread+0x8f/0xf40
> [ 3510.401117] kthread+0x2a0/0x390
> [ 3510.401119] ret_from_fork+0x1f/0x40
> [ 3510.401122] 0xffffffffffffffff
> [ 3510.401123]
>
> In timeout handling, we should keep the original num_active_queues
> and reset num_req_queues to 0.
>
> Fixes: 4e5e6b5d9d13 ("iavf: Fix return of set the new channel count")
> Signed-off-by: Ding Hui <[email protected]>
> Cc: Donglin Peng <[email protected]>
> Cc: Huang Cun <[email protected]>
> ---
> v4 to v5:
> - remove testing __IAVF_IN_REMOVE_TASK condition
> - update commit message
> - remove Reviewed-by tags to review again
>
> v3 to v4:
> - nothing changed
>
> v2 to v3:
> - fix review tag
>
> v1 to v2:
> - add reproduction script
>
> ---
> drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>

Thanks,
Reviewed-by: Leon Romanovsky <[email protected]>

2023-05-10 12:35:42

by Michal Kubiak

[permalink] [raw]
Subject: Re: [PATCH net v5 0/2] iavf: Fix issues when setting channels concurrency with removing

On Tue, May 09, 2023 at 07:11:46PM +0800, Ding Hui wrote:
> The patchset fix two issues which can be reproduced by the following script:
>
> [root@host ~]# cat repro.sh
> #!/bin/bash
>
> pf_dbsf="0000:41:00.0"
> vf0_dbsf="0000:41:02.0"
> g_pids=()
>
> function do_set_numvf()
> {
> echo 2 >/sys/bus/pci/devices/${pf_dbsf}/sriov_numvfs
> sleep $((RANDOM%3+1))
> echo 0 >/sys/bus/pci/devices/${pf_dbsf}/sriov_numvfs
> sleep $((RANDOM%3+1))
> }
>
> function do_set_channel()
> {
> local nic=$(ls -1 --indicator-style=none /sys/bus/pci/devices/${vf0_dbsf}/net/)
> [ -z "$nic" ] && { sleep $((RANDOM%3)) ; return 1; }
> ifconfig $nic 192.168.18.5 netmask 255.255.255.0
> ifconfig $nic up
> ethtool -L $nic combined 1
> ethtool -L $nic combined 4
> sleep $((RANDOM%3))
> }
>
> function on_exit()
> {
> local pid
> for pid in "${g_pids[@]}"; do
> kill -0 "$pid" &>/dev/null && kill "$pid" &>/dev/null
> done
> g_pids=()
> }
>
> trap "on_exit; exit" EXIT
>
> while :; do do_set_numvf ; done &
> g_pids+=($!)
> while :; do do_set_channel ; done &
> g_pids+=($!)
>
> wait
>
>
> Ding Hui (2):
> iavf: Fix use-after-free in free_netdev
> iavf: Fix out-of-bounds when setting channels on remove
>
> drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 4 +++-
> drivers/net/ethernet/intel/iavf/iavf_main.c | 6 +-----
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
> --
> 2.17.1
>

For the series:
Reviewed-by: Michal Kubiak <[email protected]>

Thanks,
Michal

2023-07-17 14:19:18

by Romanowski, Rafal

[permalink] [raw]
Subject: RE: [Intel-wired-lan] [PATCH net v5 2/2] iavf: Fix out-of-bounds when setting channels on remove

> -----Original Message-----
> From: Intel-wired-lan <[email protected]> On Behalf Of
> Leon Romanovsky
> Sent: wtorek, 9 maja 2023 15:40
> To: Ding, Hui <[email protected]>
> Cc: [email protected]; [email protected];
> [email protected]; Nguyen, Anthony L
> <[email protected]>; Williams, Mitch A
> <[email protected]>; Brandeburg, Jesse
> <[email protected]>; [email protected]; linux-
> [email protected]; [email protected];
> [email protected]; Kubiak, Michal <[email protected]>; intel-
> [email protected]; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]; [email protected]; linux-
> [email protected]
> Subject: Re: [Intel-wired-lan] [PATCH net v5 2/2] iavf: Fix out-of-bounds
> when setting channels on remove
>
> On Tue, May 09, 2023 at 07:11:48PM +0800, Ding Hui wrote:
> > If we set channels greater during iavf_remove(), and waiting reset
> > done would be timeout, then returned with error but changed
> > num_active_queues directly, that will lead to OOB like the following
> > logs. Because the num_active_queues is greater than tx/rx_rings[]
> allocated actually.
> >
> > Reproducer:
> >
> > [root@host ~]# cat repro.sh
> > #!/bin/bash
> >
> > pf_dbsf="0000:41:00.0"
> > vf0_dbsf="0000:41:02.0"
> > g_pids=()
> >
> > function do_set_numvf()
> > {
> > echo 2 >/sys/bus/pci/devices/${pf_dbsf}/sriov_numvfs
> > sleep $((RANDOM%3+1))
> > echo 0 >/sys/bus/pci/devices/${pf_dbsf}/sriov_numvfs
> > sleep $((RANDOM%3+1))
> > }
> >
> > function do_set_channel()
> > {
> > local nic=$(ls -1 --indicator-style=none
> /sys/bus/pci/devices/${vf0_dbsf}/net/)
> > [ -z "$nic" ] && { sleep $((RANDOM%3)) ; return 1; }
> > ifconfig $nic 192.168.18.5 netmask 255.255.255.0
> > ifconfig $nic up
> > ethtool -L $nic combined 1
> > ethtool -L $nic combined 4
> > sleep $((RANDOM%3))
> > }
> >
> > function on_exit()
> > {
> > local pid
> > for pid in "${g_pids[@]}"; do
> > kill -0 "$pid" &>/dev/null && kill "$pid" &>/dev/null
> > done
> > g_pids=()
> > }
> >
> > trap "on_exit; exit" EXIT
> >
> > while :; do do_set_numvf ; done &
> > g_pids+=($!)
> > while :; do do_set_channel ; done &
> > g_pids+=($!)
> >
> > wait
> >
> > Result:
> >
> > [ 3506.152887] iavf 0000:41:02.0: Removing device [ 3510.400799]
> >
> ==========================================================
> ========
> > [ 3510.400820] BUG: KASAN: slab-out-of-bounds in
> > iavf_free_all_tx_resources+0x156/0x160 [iavf] [ 3510.400823] Read of
> > size 8 at addr ffff88b6f9311008 by task repro.sh/55536 [ 3510.400823]
> > [ 3510.400830] CPU: 101 PID: 55536 Comm: repro.sh Kdump: loaded
> Tainted: G O --------- -t - 4.18.0 #1
> > [ 3510.400832] Hardware name: Powerleader PR2008AL/H12DSi-N6, BIOS
> 2.0
> > 04/09/2021 [ 3510.400835] Call Trace:
> > [ 3510.400851] dump_stack+0x71/0xab
> > [ 3510.400860] print_address_description+0x6b/0x290
> > [ 3510.400865] ? iavf_free_all_tx_resources+0x156/0x160 [iavf] [
> > 3510.400868] kasan_report+0x14a/0x2b0 [ 3510.400873]
> > iavf_free_all_tx_resources+0x156/0x160 [iavf] [ 3510.400880]
> > iavf_remove+0x2b6/0xc70 [iavf] [ 3510.400884] ?
> > iavf_free_all_rx_resources+0x160/0x160 [iavf] [ 3510.400891] ?
> > wait_woken+0x1d0/0x1d0 [ 3510.400895] ?
> > notifier_call_chain+0xc1/0x130 [ 3510.400903]
> > pci_device_remove+0xa8/0x1f0 [ 3510.400910]
> > device_release_driver_internal+0x1c6/0x460
> > [ 3510.400916] pci_stop_bus_device+0x101/0x150 [ 3510.400919]
> > pci_stop_and_remove_bus_device+0xe/0x20
> > [ 3510.400924] pci_iov_remove_virtfn+0x187/0x420 [ 3510.400927] ?
> > pci_iov_add_virtfn+0xe10/0xe10 [ 3510.400929] ?
> > pci_get_subsys+0x90/0x90 [ 3510.400932] sriov_disable+0xed/0x3e0 [
> > 3510.400936] ? bus_find_device+0x12d/0x1a0 [ 3510.400953]
> > i40e_free_vfs+0x754/0x1210 [i40e] [ 3510.400966] ?
> > i40e_reset_all_vfs+0x880/0x880 [i40e] [ 3510.400968] ?
> > pci_get_device+0x7c/0x90 [ 3510.400970] ? pci_get_subsys+0x90/0x90 [
> > 3510.400982] ? pci_vfs_assigned.part.7+0x144/0x210
> > [ 3510.400987] ? __mutex_lock_slowpath+0x10/0x10 [ 3510.400996]
> > i40e_pci_sriov_configure+0x1fa/0x2e0 [i40e] [ 3510.401001]
> > sriov_numvfs_store+0x214/0x290 [ 3510.401005] ?
> > sriov_totalvfs_show+0x30/0x30 [ 3510.401007] ?
> > __mutex_lock_slowpath+0x10/0x10 [ 3510.401011] ?
> > __check_object_size+0x15a/0x350 [ 3510.401018]
> > kernfs_fop_write+0x280/0x3f0 [ 3510.401022] vfs_write+0x145/0x440 [
> > 3510.401025] ksys_write+0xab/0x160 [ 3510.401028] ?
> > __ia32_sys_read+0xb0/0xb0 [ 3510.401031] ? fput_many+0x1a/0x120 [
> > 3510.401032] ? filp_close+0xf0/0x130 [ 3510.401038]
> > do_syscall_64+0xa0/0x370 [ 3510.401041] ? page_fault+0x8/0x30 [
> > 3510.401043] entry_SYSCALL_64_after_hwframe+0x65/0xca
> > [ 3510.401073] RIP: 0033:0x7f3a9bb842c0 [ 3510.401079] Code: 73 01 c3
> > 48 8b 0d d8 cb 2c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 0f 1f 44 00 00
> > 83 3d 89 24 2d 00 00 75 10 b8 01 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73
> > 31 c3 48 83 ec 08 e8 fe dd 01 00 48 89 04 24 [ 3510.401080] RSP:
> > 002b:00007ffc05f1fe18 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 [
> > 3510.401083] RAX: ffffffffffffffda RBX: 0000000000000002 RCX:
> > 00007f3a9bb842c0 [ 3510.401085] RDX: 0000000000000002 RSI:
> > 0000000002327408 RDI: 0000000000000001 [ 3510.401086] RBP:
> > 0000000002327408 R08: 00007f3a9be53780 R09: 00007f3a9c8a4700 [
> > 3510.401086] R10: 0000000000000001 R11: 0000000000000246 R12:
> 0000000000000002 [ 3510.401087] R13: 0000000000000001 R14:
> 00007f3a9be52620 R15: 0000000000000001 [ 3510.401090] [ 3510.401093]
> Allocated by task 76795:
> > [ 3510.401098] kasan_kmalloc+0xa6/0xd0 [ 3510.401099]
> > __kmalloc+0xfb/0x200 [ 3510.401104]
> > iavf_init_interrupt_scheme+0x26f/0x1310 [iavf] [ 3510.401108]
> > iavf_watchdog_task+0x1d58/0x4050 [iavf] [ 3510.401114]
> > process_one_work+0x56a/0x11f0 [ 3510.401115]
> worker_thread+0x8f/0xf40
> > [ 3510.401117] kthread+0x2a0/0x390 [ 3510.401119]
> > ret_from_fork+0x1f/0x40 [ 3510.401122] 0xffffffffffffffff [
> > 3510.401123]
> >
> > In timeout handling, we should keep the original num_active_queues and
> > reset num_req_queues to 0.
> >
> > Fixes: 4e5e6b5d9d13 ("iavf: Fix return of set the new channel count")
> > Signed-off-by: Ding Hui <[email protected]>
> > Cc: Donglin Peng <[email protected]>
> > Cc: Huang Cun <[email protected]>
> > ---
> > v4 to v5:
> > - remove testing __IAVF_IN_REMOVE_TASK condition
> > - update commit message
> > - remove Reviewed-by tags to review again
> >
> > v3 to v4:
> > - nothing changed
> >
> > v2 to v3:
> > - fix review tag
> >
> > v1 to v2:
> > - add reproduction script
> >
> > ---
> > drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
>
> Thanks,
> Reviewed-by: Leon Romanovsky <[email protected]>
> _______________________________________________
> Intel-wired-lan mailing list
> [email protected]
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan


Tested-by: Rafal Romanowski <[email protected]>