ixgbe: Add locking to prevent panic when setting sriov_numvfs to zero
Subsystems (2)
PATCH v2 1/1 ixgbe: Add locking to prevent panic when setting sriov_numvfs to zero
It is possible to disable VFs while the PF driver is processing requests from the VF driver. This can result in a panic.
BUG: unable to handle kernel paging request at 000000000000106c PGD 0 P4D 0 Oops: 0000 [#1] SMP NOPTI CPU: 8 PID: 0 Comm: swapper/8 Kdump: loaded Tainted: G I --------- - Hardware name: Dell Inc. PowerEdge R740/06WXJT, BIOS 2.8.2 08/27/2020 RIP: 0010:ixgbe_msg_task+0x4c8/0x1690 [ixgbe] Code: 00 00 48 8d 04 40 48 c1 e0 05 89 7c 24 24 89 fd 48 89 44 24 10 83 ff 01 0f 84 b8 04 00 00 4c 8b 64 24 10 4d 03 a5 48 22 00 00 <41> 80 7c 24 4c 00 0f 84 8a 03 00 00 0f b7 c7 83 f8 08 0f 84 8f 0a RSP: 0018:ffffb337869f8df8 EFLAGS: 00010002 RAX: 0000000000001020 RBX: 0000000000000000 RCX: 000000000000002b RDX: 0000000000000002 RSI: 0000000000000008 RDI: 0000000000000006 RBP: 0000000000000006 R08: 0000000000000002 R09: 0000000000029780 R10: 00006957d8f42832 R11: 0000000000000000 R12: 0000000000001020 R13: ffff8a00e8978ac0 R14: 000000000000002b R15: ffff8a00e8979c80 FS: 0000000000000000(0000) GS:ffff8a07dfd00000(0000) knlGS:00000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000000000106c CR3: 0000000063e10004 CR4: 00000000007726e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: <IRQ> ? ttwu_do_wakeup+0x19/0x140 ? try_to_wake_up+0x1cd/0x550 ? ixgbevf_update_xcast_mode+0x71/0xc0 [ixgbevf] ixgbe_msix_other+0x17e/0x310 [ixgbe] __handle_irq_event_percpu+0x40/0x180 handle_irq_event_percpu+0x30/0x80 handle_irq_event+0x36/0x53 handle_edge_irq+0x82/0x190 handle_irq+0x1c/0x30 do_IRQ+0x49/0xd0 common_interrupt+0xf/0xf
This can be eventually be reproduced with the following script:
while :
do
echo 63 > /sys/class/net/<devname>/device/sriov_numvfs sleep 1
echo 0 > /sys/class/net/<devname>/device/sriov_numvfs sleep 1
done
Add lock when disabling SR-IOV to prevent process VF mailbox communication.
---
changes in v2:
- replace type spin_lock_bh to spin_lock
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 ++ .../net/ethernet/intel/ixgbe/ixgbe_sriov.c | 28 ++++++++++++------- 3 files changed, 22 insertions(+), 10 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe.h +1 -0
@@ -779,6 +779,7 @@ struct ixgbe_adapter {#ifdef CONFIG_IXGBE_IPSEC struct ixgbe_ipsec *ipsec;#endif /* CONFIG_IXGBE_IPSEC */ +spinlock_t vfs_lock; };static inline int ixgbe_determine_xdp_q_idx (int cpu)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +3 -0
@@ -6402,6 +6402,9 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter,/* n-tuple support exists, always init our spinlock */ spin_lock_init (&adapter->fdir_perfect_lock); +/* init spinlock to avoid concurrency of VF resources */ +spin_lock_init (&adapter->vfs_lock); +#ifdef CONFIG_IXGBE_DCB ixgbe_init_dcb (adapter);#endif
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +18 -10
@@ -207,6 +207,8 @@ int ixgbe_disable_sriov(struct ixgbe_adapter *adapter)unsigned int num_vfs = adapter->num_vfs, vf;int rss; +spin_lock (&adapter->vfs_lock); +/* set num VFs to 0 to prevent access to vfinfo */ adapter->num_vfs =0 ;
@@ -228,6 +230,8 @@ int ixgbe_disable_sriov(struct ixgbe_adapter *adapter)kfree (adapter->mv_list); adapter->mv_list =NULL ; +spin_unlock (&adapter->vfs_lock); +/* if SR-IOV is already disabled then there is nothing to do */ if (!(adapter->flags &IXGBE_FLAG_SRIOV_ENABLED ))return 0 ;
@@ -1357,19 +1361,23 @@ void ixgbe_msg_task(struct ixgbe_adapter *adapter)struct ixgbe_hw *hw = &adapter->hw;u32 vf; -for (vf =0 ; vf < adapter->num_vfs; vf++) { -/* process any reset requests */ -if (!ixgbe_check_for_rst (hw, vf)) -ixgbe_vf_reset_event (adapter, vf); +spin_lock (&adapter->vfs_lock); +if (adapter->vfinfo) { +for (vf =0 ; vf < adapter->num_vfs; vf++) { +/* process any reset requests */ +if (!ixgbe_check_for_rst (hw, vf)) +ixgbe_vf_reset_event (adapter, vf); -/* process any messages pending */ -if (!ixgbe_check_for_msg (hw, vf)) -ixgbe_rcv_msg_from_vf (adapter, vf); +/* process any messages pending */ +if (!ixgbe_check_for_msg (hw, vf)) +ixgbe_rcv_msg_from_vf (adapter, vf); -/* process any acks */ -if (!ixgbe_check_for_ack (hw, vf)) -ixgbe_rcv_ack_from_vf (adapter, vf); +/* process any acks */ +if (!ixgbe_check_for_ack (hw, vf)) +ixgbe_rcv_ack_from_vf (adapter, vf); + } } +spin_unlock (&adapter->vfs_lock); }static inline void ixgbe_ping_vf (struct ixgbe_adapter *adapter,int vf)
Signature · 1 line
2.35.0.rc0
PATCH v2 1/1 ixgbe: Add locking to prevent panic when setting sriov_numvfs to zero
Quoted 48 lines · Piotr Skajewski
It is possible to disable VFs while the PF driver is processing requests from the VF driver. This can result in a panic.
BUG: unable to handle kernel paging request at 000000000000106c PGD 0 P4D 0 Oops: 0000 [#1] SMP NOPTI CPU: 8 PID: 0 Comm: swapper/8 Kdump: loaded Tainted: G I --------- - Hardware name: Dell Inc. PowerEdge R740/06WXJT, BIOS 2.8.2 08/27/2020 RIP: 0010:ixgbe_msg_task+0x4c8/0x1690 [ixgbe] Code: 00 00 48 8d 04 40 48 c1 e0 05 89 7c 24 24 89 fd 48 89 44 24 10 83 ff 01 0f 84 b8 04 00 00 4c 8b 64 24 10 4d 03 a5 48 22 00 00 <41> 80 7c 24 4c 00 0f 84 8a 03 00 00 0f b7 c7 83 f8 08 0f 84 8f 0a RSP: 0018:ffffb337869f8df8 EFLAGS: 00010002 RAX: 0000000000001020 RBX: 0000000000000000 RCX: 000000000000002b RDX: 0000000000000002 RSI: 0000000000000008 RDI: 0000000000000006 RBP: 0000000000000006 R08: 0000000000000002 R09: 0000000000029780 R10: 00006957d8f42832 R11: 0000000000000000 R12: 0000000000001020 R13: ffff8a00e8978ac0 R14: 000000000000002b R15: ffff8a00e8979c80 FS: 0000000000000000(0000) GS:ffff8a07dfd00000(0000) knlGS:00000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000000000106c CR3: 0000000063e10004 CR4: 00000000007726e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: <IRQ> ? ttwu_do_wakeup+0x19/0x140 ? try_to_wake_up+0x1cd/0x550 ? ixgbevf_update_xcast_mode+0x71/0xc0 [ixgbevf] ixgbe_msix_other+0x17e/0x310 [ixgbe] __handle_irq_event_percpu+0x40/0x180 handle_irq_event_percpu+0x30/0x80 handle_irq_event+0x36/0x53 handle_edge_irq+0x82/0x190 handle_irq+0x1c/0x30 do_IRQ+0x49/0xd0 common_interrupt+0xf/0xfThis can be eventually be reproduced with the following script:
while :
do
echo 63 > /sys/class/net/<devname>/device/sriov_numvfs sleep 1
echo 0 > /sys/class/net/<devname>/device/sriov_numvfs sleep 1
done
Quoted 3 lines
Add lock when disabling SR-IOV to prevent process VF mailbox communication.
Signed-off-by Piotr Skajewski <[email protected]>
This is a fix for sure. Please target it to net tree and add fixes tag.
Quoted 3 lines
---
changes in v2:
- replace typespin_lock_bhtospin_lock
Why? Please explain what contexts are being synchronized.k
Quoted 55 lines
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 ++ .../net/ethernet/intel/ixgbe/ixgbe_sriov.c | 28 ++++++++++++------- 3 files changed, 22 insertions(+), 10 deletions(-)drivers/net/ethernet/intel/ixgbe/ixgbe.h +1
-0@@ -779,6 +779,7 @@ struct ixgbe_adapter {#ifdef CONFIG_IXGBE_IPSEC struct ixgbe_ipsec *ipsec;#endif /* CONFIG_IXGBE_IPSEC */ +spinlock_t vfs_lock; };static inline int ixgbe_determine_xdp_q_idx (int cpu)drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +3
-0@@ -6402,6 +6402,9 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter,/* n-tuple support exists, always init our spinlock */ spin_lock_init (&adapter->fdir_perfect_lock); +/* init spinlock to avoid concurrency of VF resources */ +spin_lock_init (&adapter->vfs_lock); +#ifdef CONFIG_IXGBE_DCB ixgbe_init_dcb (adapter);#endif drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +4
-0@@ -207,6 +207,8 @@ int ixgbe_disable_sriov(struct ixgbe_adapter *adapter)unsigned int num_vfs = adapter->num_vfs, vf;int rss; +spin_lock (&adapter->vfs_lock); +/* set num VFs to 0 to prevent access to vfinfo */ adapter->num_vfs =0 ;@@ -228,6 +230,8 @@ int ixgbe_disable_sriov(struct ixgbe_adapter *adapter)kfree (adapter->mv_list); adapter->mv_list =NULL ; +spin_unlock (&adapter->vfs_lock); +/* if SR-IOV is already disabled then there is nothing to do */ if (!(adapter->flags &IXGBE_FLAG_SRIOV_ENABLED ))return 0 ;
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c void ixgbe_msg_task(struct ixgbe_adapter *adapter) · line 1365
Quoted 9 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +2
-4@@ -1357,19 +1361,23 @@ void ixgbe_msg_task(struct ixgbe_adapter *adapter)struct ixgbe_hw *hw = &adapter->hw;u32 vf; -for (vf =0 ; vf < adapter->num_vfs; vf++) { -/* process any reset requests */ -if (!ixgbe_check_for_rst (hw, vf)) -ixgbe_vf_reset_event (adapter, vf); +spin_lock (&adapter->vfs_lock); +if (adapter->vfinfo) {
why this is needed?
also maybe revert the logic and flatten the code:
if (!adapter->vfinfo) goto unlock; (...) unlock: spin_unlock(&adapter->vfs_lock);
Quoted 31 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +12
-6+for (vf =0 ; vf < adapter->num_vfs; vf++) { +/* process any reset requests */ +if (!ixgbe_check_for_rst (hw, vf)) +ixgbe_vf_reset_event (adapter, vf); -/* process any messages pending */ -if (!ixgbe_check_for_msg (hw, vf)) -ixgbe_rcv_msg_from_vf (adapter, vf); +/* process any messages pending */ +if (!ixgbe_check_for_msg (hw, vf)) +ixgbe_rcv_msg_from_vf (adapter, vf); -/* process any acks */ -if (!ixgbe_check_for_ack (hw, vf)) -ixgbe_rcv_ack_from_vf (adapter, vf); +/* process any acks */ +if (!ixgbe_check_for_ack (hw, vf)) +ixgbe_rcv_ack_from_vf (adapter, vf); + } } +spin_unlock (&adapter->vfs_lock); }static inline void ixgbe_ping_vf (struct ixgbe_adapter *adapter,int vf)Signature · 6 lines
2.35.0.rc0 _______________________________________________ Intel-wired-lan mailing list Intel-wired-lan at osuosl.org https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
PATCH v2 1/1 ixgbe: Add locking to prevent panic when setting sriov_numvfs to zero
In reply to Piotr SkajewskiQuoted 53 lines · Piotr Skajewski
Quoted 48 lines
It is possible to disable VFs while the PF driver is processing requests from the VF driver. This can result in a panic.
BUG: unable to handle kernel paging request at 000000000000106c PGD 0 P4D 0 Oops: 0000 [#1] SMP NOPTI CPU: 8 PID: 0 Comm: swapper/8 Kdump: loaded Tainted: G I --------- - Hardware name: Dell Inc. PowerEdge R740/06WXJT, BIOS 2.8.2 08/27/2020 RIP: 0010:ixgbe_msg_task+0x4c8/0x1690 [ixgbe] Code: 00 00 48 8d 04 40 48 c1 e0 05 89 7c 24 24 89 fd 48 89 44 24 10 83 ff 01 0f 84 b8 04 00 00 4c 8b 64 24 10 4d 03 a5 48 22 00 00 <41> 80 7c 24 4c 00 0f 84 8a 03 00 00 0f b7 c7 83 f8 08 0f 84 8f 0a RSP: 0018:ffffb337869f8df8 EFLAGS: 00010002 RAX: 0000000000001020 RBX: 0000000000000000 RCX: 000000000000002b RDX: 0000000000000002 RSI: 0000000000000008 RDI: 0000000000000006 RBP: 0000000000000006 R08: 0000000000000002 R09: 0000000000029780 R10: 00006957d8f42832 R11: 0000000000000000 R12: 0000000000001020 R13: ffff8a00e8978ac0 R14: 000000000000002b R15: ffff8a00e8979c80 FS: 0000000000000000(0000) GS:ffff8a07dfd00000(0000) knlGS:00000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000000000106c CR3: 0000000063e10004 CR4: 00000000007726e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: <IRQ> ? ttwu_do_wakeup+0x19/0x140 ? try_to_wake_up+0x1cd/0x550 ? ixgbevf_update_xcast_mode+0x71/0xc0 [ixgbevf] ixgbe_msix_other+0x17e/0x310 [ixgbe] __handle_irq_event_percpu+0x40/0x180 handle_irq_event_percpu+0x30/0x80 handle_irq_event+0x36/0x53 handle_edge_irq+0x82/0x190 handle_irq+0x1c/0x30 do_IRQ+0x49/0xd0 common_interrupt+0xf/0xfThis can be eventually be reproduced with the following script:
while :
do
echo 63 > /sys/class/net/<devname>/device/sriov_numvfs sleep 1
echo 0 > /sys/class/net/<devname>/device/sriov_numvfs sleep 1
doneQuoted 3 lines
Add lock when disabling SR-IOV to prevent process VF mailbox communication.
Signed-off-by Piotr Skajewski <[email protected]>
Quoted 7 lines
This is a fix for sure. Please target it to net tree and add fixes tag.
Quoted 3 lines
---
changes in v2:
- replace typespin_lock_bhtospin_lockWhy? Please explain what contexts are being synchronized.k
The synchronization of shared resources while creating and removing many virtual function simultaneously.
Quoted 59 lines
Quoted 59 lines
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 ++ .../net/ethernet/intel/ixgbe/ixgbe_sriov.c | 28 ++++++++++++------- 3 files changed, 22 insertions(+), 10 deletions(-)drivers/net/ethernet/intel/ixgbe/ixgbe.h +1
-0@@ -779,6 +779,7 @@ struct ixgbe_adapter {#ifdef CONFIG_IXGBE_IPSEC struct ixgbe_ipsec *ipsec;#endif /* CONFIG_IXGBE_IPSEC */ +spinlock_t vfs_lock; };static inline int ixgbe_determine_xdp_q_idx (int cpu)drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +3
-0@@ -6402,6 +6402,9 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter,/* n-tuple support exists, always init our spinlock */ spin_lock_init (&adapter->fdir_perfect_lock); +/* init spinlock to avoid concurrency of VF resources */ +spin_lock_init (&adapter->vfs_lock); +#ifdef CONFIG_IXGBE_DCB ixgbe_init_dcb (adapter);#endif drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +4
-0@@ -207,6 +207,8 @@ int ixgbe_disable_sriov(struct ixgbe_adapter *adapter)unsigned int num_vfs = adapter->num_vfs, vf;int rss; +spin_lock (&adapter->vfs_lock); +/* set num VFs to 0 to prevent access to vfinfo */ adapter->num_vfs =0 ;@@ -228,6 +230,8 @@ int ixgbe_disable_sriov(struct ixgbe_adapter *adapter)kfree (adapter->mv_list); adapter->mv_list =NULL ; +spin_unlock (&adapter->vfs_lock); +/* if SR-IOV is already disabled then there is nothing to do */ if (!(adapter->flags &IXGBE_FLAG_SRIOV_ENABLED ))return 0 ;@@ -1357,19 +1361,23 @@ void ixgbe_msg_task(struct ixgbe_adapter *adapter)struct ixgbe_hw *hw = &adapter->hw;u32 vf;
Quoted 8 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c void ixgbe_msg_task(struct ixgbe_adapter *adapter) · line 1365
Quoted 6 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +2
-4-for (vf =0 ; vf < adapter->num_vfs; vf++) { -/* process any reset requests */ -if (!ixgbe_check_for_rst (hw, vf)) -ixgbe_vf_reset_event (adapter, vf); +spin_lock (&adapter->vfs_lock); +if (adapter->vfinfo) {why this is needed?
While creating and removing many VF at the same time, it happens that we process messages from VF whose resources have already been released. Driver should not process message while this is happening.
Quoted 8 lines
also maybe revert the logic and flatten the code:
if (!adapter->vfinfo) goto unlock; (...) unlock: spin_unlock(&adapter->vfs_lock);
This check is not related to spinlock itself but
stick to the loop where VF message is processed.
Quoted 31 lines
Quoted 31 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +12
-6+for (vf =0 ; vf < adapter->num_vfs; vf++) { +/* process any reset requests */ +if (!ixgbe_check_for_rst (hw, vf)) +ixgbe_vf_reset_event (adapter, vf); -/* process any messages pending */ -if (!ixgbe_check_for_msg (hw, vf)) -ixgbe_rcv_msg_from_vf (adapter, vf); +/* process any messages pending */ +if (!ixgbe_check_for_msg (hw, vf)) +ixgbe_rcv_msg_from_vf (adapter, vf); -/* process any acks */ -if (!ixgbe_check_for_ack (hw, vf)) -ixgbe_rcv_ack_from_vf (adapter, vf); +/* process any acks */ +if (!ixgbe_check_for_ack (hw, vf)) +ixgbe_rcv_ack_from_vf (adapter, vf); + } } +spin_unlock (&adapter->vfs_lock); }static inline void ixgbe_ping_vf (struct ixgbe_adapter *adapter,int vf)Signature · 6 lines
2.35.0.rc0 _______________________________________________ Intel-wired-lan mailing list Intel-wired-lan at osuosl.org https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Quoted 55 lines · Piotr Skajewski
Quoted 55 lines · Piotr Skajewski
Quoted 48 lines
It is possible to disable VFs while the PF driver is processing requests from the VF driver. This can result in a panic.
BUG: unable to handle kernel paging request at 000000000000106c PGD 0 P4D 0 Oops: 0000 [#1] SMP NOPTI CPU: 8 PID: 0 Comm: swapper/8 Kdump: loaded Tainted: G I --------- - Hardware name: Dell Inc. PowerEdge R740/06WXJT, BIOS 2.8.2 08/27/2020 RIP: 0010:ixgbe_msg_task+0x4c8/0x1690 [ixgbe] Code: 00 00 48 8d 04 40 48 c1 e0 05 89 7c 24 24 89 fd 48 89 44 24 10 83 ff 01 0f 84 b8 04 00 00 4c 8b 64 24 10 4d 03 a5 48 22 00 00 <41> 80 7c 24 4c 00 0f 84 8a 03 00 00 0f b7 c7 83 f8 08 0f 84 8f 0a RSP: 0018:ffffb337869f8df8 EFLAGS: 00010002 RAX: 0000000000001020 RBX: 0000000000000000 RCX: 000000000000002b RDX: 0000000000000002 RSI: 0000000000000008 RDI: 0000000000000006 RBP: 0000000000000006 R08: 0000000000000002 R09: 0000000000029780 R10: 00006957d8f42832 R11: 0000000000000000 R12: 0000000000001020 R13: ffff8a00e8978ac0 R14: 000000000000002b R15: ffff8a00e8979c80 FS: 0000000000000000(0000) GS:ffff8a07dfd00000(0000) knlGS:00000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000000000106c CR3: 0000000063e10004 CR4: 00000000007726e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: <IRQ> ? ttwu_do_wakeup+0x19/0x140 ? try_to_wake_up+0x1cd/0x550 ? ixgbevf_update_xcast_mode+0x71/0xc0 [ixgbevf] ixgbe_msix_other+0x17e/0x310 [ixgbe] __handle_irq_event_percpu+0x40/0x180 handle_irq_event_percpu+0x30/0x80 handle_irq_event+0x36/0x53 handle_edge_irq+0x82/0x190 handle_irq+0x1c/0x30 do_IRQ+0x49/0xd0 common_interrupt+0xf/0xfThis can be eventually be reproduced with the following script:
while :
do
echo 63 > /sys/class/net/<devname>/device/sriov_numvfs sleep 1
echo 0 > /sys/class/net/<devname>/device/sriov_numvfs sleep 1
doneQuoted 3 lines
Add lock when disabling SR-IOV to prevent process VF mailbox communication.
Signed-off-by Piotr Skajewski <[email protected]>This is a fix for sure. Please target it to net tree and add fixes tag.
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
---
changes in v2:
- replace typespin_lock_bhtospin_lockWhy? Please explain what contexts are being synchronized.k
The synchronization of shared resources while creating and removing many virtual function simultaneously.
This doesn't answer my question unfortunately :(
Quoted 60 lines
Quoted 60 lines
Quoted 60 lines
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 ++ .../net/ethernet/intel/ixgbe/ixgbe_sriov.c | 28 ++++++++++++------- 3 files changed, 22 insertions(+), 10 deletions(-)drivers/net/ethernet/intel/ixgbe/ixgbe.h +1
-0@@ -779,6 +779,7 @@ struct ixgbe_adapter {#ifdef CONFIG_IXGBE_IPSEC struct ixgbe_ipsec *ipsec;#endif /* CONFIG_IXGBE_IPSEC */ +spinlock_t vfs_lock; };static inline int ixgbe_determine_xdp_q_idx (int cpu)drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +3
-0@@ -6402,6 +6402,9 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter,/* n-tuple support exists, always init our spinlock */ spin_lock_init (&adapter->fdir_perfect_lock); +/* init spinlock to avoid concurrency of VF resources */ +spin_lock_init (&adapter->vfs_lock); +#ifdef CONFIG_IXGBE_DCB ixgbe_init_dcb (adapter);#endif drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +4
-0@@ -207,6 +207,8 @@ int ixgbe_disable_sriov(struct ixgbe_adapter *adapter)unsigned int num_vfs = adapter->num_vfs, vf;int rss; +spin_lock (&adapter->vfs_lock); +/* set num VFs to 0 to prevent access to vfinfo */ adapter->num_vfs =0 ;@@ -228,6 +230,8 @@ int ixgbe_disable_sriov(struct ixgbe_adapter *adapter)kfree (adapter->mv_list); adapter->mv_list =NULL ; +spin_unlock (&adapter->vfs_lock); +/* if SR-IOV is already disabled then there is nothing to do */ if (!(adapter->flags &IXGBE_FLAG_SRIOV_ENABLED ))return 0 ;@@ -1357,19 +1361,23 @@ void ixgbe_msg_task(struct ixgbe_adapter *adapter)struct ixgbe_hw *hw = &adapter->hw;u32 vf;
Quoted 5 lines
Quoted 5 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c void ixgbe_msg_task(struct ixgbe_adapter *adapter) · line 1364
Quoted 5 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +1
-4-for (vf =0 ; vf < adapter->num_vfs; vf++) { -/* process any reset requests */ -if (!ixgbe_check_for_rst (hw, vf)) -ixgbe_vf_reset_event (adapter, vf); +spin_lock (&adapter->vfs_lock);
So this is broken and that's why I was asking for explanation in regards to what contexts we're playing with.
ixgbe_msg_task() which splat points to is run in interrupt context, so you need to disable the interrupts before holding a lock. You should use spin_lock_irqsave(). Otherwise there is a chance that ixgbe_disable_sriov() would be interrupted by ixgbe_msg_task() on the same cpu and you'll run into the deadlock.
Quoted 8 lines
Quoted 3 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c void ixgbe_msg_task(struct ixgbe_adapter *adapter) · line 1365
Quoted 1 line
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +1
-0+if (adapter->vfinfo) {why this is needed?
While creating and removing many VF at the same time, it happens that we process messages from VF whose resources have already been released. Driver should not process message while this is happening.
I was only asking why we need check for adapter->vinfo and I feel that you started to explain why locking is needed here.
Quoted 36 lines
Quoted 9 lines
also maybe revert the logic and flatten the code:
if (!adapter->vfinfo) goto unlock; (...) unlock: spin_unlock(&adapter->vfs_lock);This check is not related to spinlock itself but
stick to the loop where VF message is processed.Quoted 23 lines
Quoted 23 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +12
-6+for (vf =0 ; vf < adapter->num_vfs; vf++) { +/* process any reset requests */ +if (!ixgbe_check_for_rst (hw, vf)) +ixgbe_vf_reset_event (adapter, vf); -/* process any messages pending */ -if (!ixgbe_check_for_msg (hw, vf)) -ixgbe_rcv_msg_from_vf (adapter, vf); +/* process any messages pending */ +if (!ixgbe_check_for_msg (hw, vf)) +ixgbe_rcv_msg_from_vf (adapter, vf); -/* process any acks */ -if (!ixgbe_check_for_ack (hw, vf)) -ixgbe_rcv_ack_from_vf (adapter, vf); +/* process any acks */ +if (!ixgbe_check_for_ack (hw, vf)) +ixgbe_rcv_ack_from_vf (adapter, vf); + } } +spin_unlock (&adapter->vfs_lock); }
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +0
-0static inline void ixgbe_ping_vf (struct ixgbe_adapter *adapter,int vf)Signature · 6 lines
2.35.0.rc0 _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan