From: Vinicius Costa Gomes <vinicius.gomes@intel.com>
To: Jeff Evanson <jeff.evanson@gmail.com>,
Jesse Brandeburg <jesse.brandeburg@intel.com>,
Tony Nguyen <anthony.l.nguyen@intel.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Jesper Dangaard Brouer <hawk@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, bpf@vger.kernel.org
Cc: jeff.evanson@qsc.com, jeff.evanson@gmail.com
Subject: Re: [PATCH 1/2] Fix race in igc_xdp_xmit_zc
Date: Mon, 18 Apr 2022 13:39:48 -0400 [thread overview]
Message-ID: <871qxu5lzv.fsf@intel.com> (raw)
In-Reply-To: <20220415210421.11217-1-jeff.evanson@qsc.com>
Hi Jeff,
Jeff Evanson <jeff.evanson@gmail.com> writes:
> in igc_xdp_xmit_zc, initialize next_to_use while holding the netif_tx_lock
> to prevent racing with other users of the tx ring
Some style things to change:
- Some more details on what is the effect of the race condition, and
perhaps the conditions to reproduce it (what I could imagine is that
you would need two applications (one using AF_XDP and another one using
AF_PACKET, for example) sending packets to the same queue.
- I think this patch is solving a real problem, so directing this patch
to the net-queue (using 'PATCH net-queue' as subject prefix) would make
sense.
- Please add the 'Fixes:' tag so this commit can be applied to any
stable tree that makes sense.
Apart from those style changes, the code looks good.
Acked-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
>
> Signed-off-by: Jeff Evanson <jeff.evanson@qsc.com>
> ---
> drivers/net/ethernet/intel/igc/igc_main.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
> index 1c00ee310c19..a36a18c84aeb 100644
> --- a/drivers/net/ethernet/intel/igc/igc_main.c
> +++ b/drivers/net/ethernet/intel/igc/igc_main.c
> @@ -2598,7 +2598,7 @@ static void igc_xdp_xmit_zc(struct igc_ring *ring)
> struct netdev_queue *nq = txring_txq(ring);
> union igc_adv_tx_desc *tx_desc = NULL;
> int cpu = smp_processor_id();
> - u16 ntu = ring->next_to_use;
> + u16 ntu;
> struct xdp_desc xdp_desc;
> u16 budget;
>
> @@ -2607,6 +2607,8 @@ static void igc_xdp_xmit_zc(struct igc_ring *ring)
>
> __netif_tx_lock(nq, cpu);
>
> + ntu = ring->next_to_use;
> +
> budget = igc_desc_unused(ring);
>
> while (xsk_tx_peek_desc(pool, &xdp_desc) && budget--) {
> --
> 2.17.1
>
--
Vinicius
WARNING: multiple messages have this Message-ID (diff)
From: Vinicius Costa Gomes <vinicius.gomes@intel.com>
To: intel-wired-lan@osuosl.org
Subject: [Intel-wired-lan] [PATCH 1/2] Fix race in igc_xdp_xmit_zc
Date: Mon, 18 Apr 2022 13:39:48 -0400 [thread overview]
Message-ID: <871qxu5lzv.fsf@intel.com> (raw)
In-Reply-To: <20220415210421.11217-1-jeff.evanson@qsc.com>
Hi Jeff,
Jeff Evanson <jeff.evanson@gmail.com> writes:
> in igc_xdp_xmit_zc, initialize next_to_use while holding the netif_tx_lock
> to prevent racing with other users of the tx ring
Some style things to change:
- Some more details on what is the effect of the race condition, and
perhaps the conditions to reproduce it (what I could imagine is that
you would need two applications (one using AF_XDP and another one using
AF_PACKET, for example) sending packets to the same queue.
- I think this patch is solving a real problem, so directing this patch
to the net-queue (using 'PATCH net-queue' as subject prefix) would make
sense.
- Please add the 'Fixes:' tag so this commit can be applied to any
stable tree that makes sense.
Apart from those style changes, the code looks good.
Acked-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
>
> Signed-off-by: Jeff Evanson <jeff.evanson@qsc.com>
> ---
> drivers/net/ethernet/intel/igc/igc_main.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
> index 1c00ee310c19..a36a18c84aeb 100644
> --- a/drivers/net/ethernet/intel/igc/igc_main.c
> +++ b/drivers/net/ethernet/intel/igc/igc_main.c
> @@ -2598,7 +2598,7 @@ static void igc_xdp_xmit_zc(struct igc_ring *ring)
> struct netdev_queue *nq = txring_txq(ring);
> union igc_adv_tx_desc *tx_desc = NULL;
> int cpu = smp_processor_id();
> - u16 ntu = ring->next_to_use;
> + u16 ntu;
> struct xdp_desc xdp_desc;
> u16 budget;
>
> @@ -2607,6 +2607,8 @@ static void igc_xdp_xmit_zc(struct igc_ring *ring)
>
> __netif_tx_lock(nq, cpu);
>
> + ntu = ring->next_to_use;
> +
> budget = igc_desc_unused(ring);
>
> while (xsk_tx_peek_desc(pool, &xdp_desc) && budget--) {
> --
> 2.17.1
>
--
Vinicius
next prev parent reply other threads:[~2022-04-18 17:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-15 21:04 [PATCH 1/2] Fix race in igc_xdp_xmit_zc Jeff Evanson
2022-04-15 21:04 ` [Intel-wired-lan] " Jeff Evanson
2022-04-18 17:39 ` Vinicius Costa Gomes [this message]
2022-04-18 17:39 ` Vinicius Costa Gomes
2022-04-20 10:37 ` Alexander Lobakin
2022-04-20 10:37 ` Alexander Lobakin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871qxu5lzv.fsf@intel.com \
--to=vinicius.gomes@intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=hawk@kernel.org \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jeff.evanson@gmail.com \
--cc=jeff.evanson@qsc.com \
--cc=jesse.brandeburg@intel.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.