* [PATCH iwl-net v1] igc: Fix infinite initialization loop with early XDP redirect
@ 2023-09-05 21:37 Vinicius Costa Gomes
2023-09-06 22:55 ` Maciej Fijalkowski
0 siblings, 1 reply; 3+ messages in thread
From: Vinicius Costa Gomes @ 2023-09-05 21:37 UTC (permalink / raw)
To: intel-wired-lan
Cc: sasha.neftin, Vinicius Costa Gomes, Ferenc Fejes,
Jesse Brandeburg, Tony Nguyen, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Jithu Joseph, Maciej Fijalkowski,
Vedang Patel, Andre Guedes, netdev, linux-kernel
When a XDP redirect happens before the link is ready, that
transmission will not finish and will timeout, causing an adapter
reset. If the redirects do not stop, the adapter will not stop
resetting.
Wait for the driver to signal that there's a carrier before allowing
transmissions to proceed.
Fixes: 4ff320361092 ("igc: Add support for XDP_REDIRECT action")
Reported-by: Ferenc Fejes <ferenc.fejes@ericsson.com>
Closes: https://lore.kernel.org/netdev/0caf33cf6adb3a5bf137eeaa20e89b167c9986d5.camel@ericsson.com/
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Tested-by: Ferenc Fejes <ferenc.fejes@ericsson.com>
---
drivers/net/ethernet/intel/igc/igc_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 293b45717683..98de34d0ce07 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -6491,7 +6491,7 @@ static int igc_xdp_xmit(struct net_device *dev, int num_frames,
struct igc_ring *ring;
int i, drops;
- if (unlikely(test_bit(__IGC_DOWN, &adapter->state)))
+ if (unlikely(!netif_carrier_ok(dev)))
return -ENETDOWN;
if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK))
--
2.41.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH iwl-net v1] igc: Fix infinite initialization loop with early XDP redirect
2023-09-05 21:37 [PATCH iwl-net v1] igc: Fix infinite initialization loop with early XDP redirect Vinicius Costa Gomes
@ 2023-09-06 22:55 ` Maciej Fijalkowski
2023-09-06 23:37 ` Vinicius Costa Gomes
0 siblings, 1 reply; 3+ messages in thread
From: Maciej Fijalkowski @ 2023-09-06 22:55 UTC (permalink / raw)
To: Vinicius Costa Gomes
Cc: intel-wired-lan, sasha.neftin, Ferenc Fejes, Jesse Brandeburg,
Tony Nguyen, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Jithu Joseph, Vedang Patel, Andre Guedes, netdev,
linux-kernel
On Tue, Sep 05, 2023 at 02:37:52PM -0700, Vinicius Costa Gomes wrote:
> When a XDP redirect happens before the link is ready, that
When exactly link was 'ready' in your setup? You said it was enough to
launch traffic towards igc iface before running xdp-bench. Was the iface
down or up or?
> transmission will not finish and will timeout, causing an adapter
> reset. If the redirects do not stop, the adapter will not stop
> resetting.
Please highlight that this driver shares tx resources with netstack. I
believe the source of this bug is that the watchdog is responsible to call
netif_carrier_on() from a workqueue which happens to be scheduled *after*
clearing __IGC_DOWN in igc_up().
>
> Wait for the driver to signal that there's a carrier before allowing
> transmissions to proceed.
>
> Fixes: 4ff320361092 ("igc: Add support for XDP_REDIRECT action")
> Reported-by: Ferenc Fejes <ferenc.fejes@ericsson.com>
> Closes: https://lore.kernel.org/netdev/0caf33cf6adb3a5bf137eeaa20e89b167c9986d5.camel@ericsson.com/
> Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
> Tested-by: Ferenc Fejes <ferenc.fejes@ericsson.com>
> ---
> drivers/net/ethernet/intel/igc/igc_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
> index 293b45717683..98de34d0ce07 100644
> --- a/drivers/net/ethernet/intel/igc/igc_main.c
> +++ b/drivers/net/ethernet/intel/igc/igc_main.c
> @@ -6491,7 +6491,7 @@ static int igc_xdp_xmit(struct net_device *dev, int num_frames,
> struct igc_ring *ring;
> int i, drops;
>
> - if (unlikely(test_bit(__IGC_DOWN, &adapter->state)))
> + if (unlikely(!netif_carrier_ok(dev)))
> return -ENETDOWN;
I thought about keeping the bit check as well but given what i wrote above
it is probably redundant, so:
Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
>
> if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK))
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH iwl-net v1] igc: Fix infinite initialization loop with early XDP redirect
2023-09-06 22:55 ` Maciej Fijalkowski
@ 2023-09-06 23:37 ` Vinicius Costa Gomes
0 siblings, 0 replies; 3+ messages in thread
From: Vinicius Costa Gomes @ 2023-09-06 23:37 UTC (permalink / raw)
To: Maciej Fijalkowski
Cc: intel-wired-lan, sasha.neftin, Ferenc Fejes, Jesse Brandeburg,
Tony Nguyen, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Jithu Joseph, Vedang Patel, Andre Guedes, netdev,
linux-kernel
Maciej Fijalkowski <maciej.fijalkowski@intel.com> writes:
> On Tue, Sep 05, 2023 at 02:37:52PM -0700, Vinicius Costa Gomes wrote:
>> When a XDP redirect happens before the link is ready, that
>
> When exactly link was 'ready' in your setup? You said it was enough to
> launch traffic towards igc iface before running xdp-bench. Was the iface
> down or up or?
In short, the interface was up and it was brought down "externally".
I should have explained my test better: A is the system under test, B is
the monitor; 1. initially the link between systems A and B is up; 2. I
setup the vlans and xdp-bench; 3. I start sending traffic; 4. on system
B, I brind the NIC connected to A down; 5. infinite initialization loop.
>
>> transmission will not finish and will timeout, causing an adapter
>> reset. If the redirects do not stop, the adapter will not stop
>> resetting.
>
> Please highlight that this driver shares tx resources with netstack. I
> believe the source of this bug is that the watchdog is responsible to call
> netif_carrier_on() from a workqueue which happens to be scheduled *after*
> clearing __IGC_DOWN in igc_up().
>
Sure, will add this information to the commit message and send a v2.
>>
>> Wait for the driver to signal that there's a carrier before allowing
>> transmissions to proceed.
>>
>> Fixes: 4ff320361092 ("igc: Add support for XDP_REDIRECT action")
>> Reported-by: Ferenc Fejes <ferenc.fejes@ericsson.com>
>> Closes: https://lore.kernel.org/netdev/0caf33cf6adb3a5bf137eeaa20e89b167c9986d5.camel@ericsson.com/
>> Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
>> Tested-by: Ferenc Fejes <ferenc.fejes@ericsson.com>
>> ---
>> drivers/net/ethernet/intel/igc/igc_main.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
>> index 293b45717683..98de34d0ce07 100644
>> --- a/drivers/net/ethernet/intel/igc/igc_main.c
>> +++ b/drivers/net/ethernet/intel/igc/igc_main.c
>> @@ -6491,7 +6491,7 @@ static int igc_xdp_xmit(struct net_device *dev, int num_frames,
>> struct igc_ring *ring;
>> int i, drops;
>>
>> - if (unlikely(test_bit(__IGC_DOWN, &adapter->state)))
>> + if (unlikely(!netif_carrier_ok(dev)))
>> return -ENETDOWN;
>
> I thought about keeping the bit check as well but given what i wrote above
> it is probably redundant, so:
>
> Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
>
>>
>> if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK))
>> --
>> 2.41.0
>>
Cheers,
--
Vinicius
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-06 23:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-05 21:37 [PATCH iwl-net v1] igc: Fix infinite initialization loop with early XDP redirect Vinicius Costa Gomes
2023-09-06 22:55 ` Maciej Fijalkowski
2023-09-06 23:37 ` Vinicius Costa Gomes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).