From: Vinicius Costa Gomes <vinicius.gomes@intel.com>
To: intel-wired-lan@osuosl.org
Subject: [Intel-wired-lan] [PATCH net-queue v1] igc: Fix trying to register an already registered xdp_rxq
Date: Wed, 12 Jan 2022 16:40:15 -0800 [thread overview]
Message-ID: <20220113004015.449460-1-vinicius.gomes@intel.com> (raw)
In-Reply-To: <YdxZr0wMxvsDCpbV@wantstofly.org>
When changing the number of RX descriptors, for example, by doing
$ ethtool -G enp3s0 rx 1024
the XDP RX queue information (xdp_rxq) may be already registered, if
it's registered there's no need to do any thing in relation to
xdp_rxq, none of it's parameters will change if we change the number
of descriptors, for example.
Fixes: 4609ffb9f615 ("igc: Refactor XDP rxq info registration")
Reported-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
---
Lennert, I added your name and email to the Reported-by tag, please
see if you are ok with it.
drivers/net/ethernet/intel/igc/igc_main.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index e29aadbc6744..d163139161fc 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright (c) 2018 Intel Corporation */
+#include "net/xdp.h"
#include <linux/module.h>
#include <linux/types.h>
#include <linux/if_vlan.h>
@@ -499,12 +500,14 @@ int igc_setup_rx_resources(struct igc_ring *rx_ring)
u8 index = rx_ring->queue_index;
int size, desc_len, res;
- res = xdp_rxq_info_reg(&rx_ring->xdp_rxq, ndev, index,
- rx_ring->q_vector->napi.napi_id);
- if (res < 0) {
- netdev_err(ndev, "Failed to register xdp_rxq index %u\n",
- index);
- return res;
+ if (!xdp_rxq_info_is_reg(&rx_ring->xdp_rxq)) {
+ res = xdp_rxq_info_reg(&rx_ring->xdp_rxq, ndev, index,
+ rx_ring->q_vector->napi.napi_id);
+ if (res < 0) {
+ netdev_err(ndev, "Failed to register xdp_rxq index %u\n",
+ index);
+ return res;
+ }
}
size = sizeof(struct igc_rx_buffer) * rx_ring->count;
--
2.34.1
next prev parent reply other threads:[~2022-01-13 0:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-10 16:07 [Intel-wired-lan] "Missing unregister, handled but fix driver" when changing ring settings on igc interface Lennert Buytenhek
2022-01-13 0:40 ` Vinicius Costa Gomes [this message]
2022-01-13 0:55 ` [Intel-wired-lan] [PATCH net-queue v1] igc: Fix trying to register an already registered xdp_rxq Lennert Buytenhek
2022-01-13 10:03 ` Maciej Fijalkowski
2022-01-13 12:03 ` Alexander Lobakin
2022-01-14 0:47 ` Vinicius Costa Gomes
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=20220113004015.449460-1-vinicius.gomes@intel.com \
--to=vinicius.gomes@intel.com \
--cc=intel-wired-lan@osuosl.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox