1. Patchew
  2. linux
  3. View series

[PATCH net v3] dpaa_eth: fix XDP queue index

David Gouarin posted 1 patch 1 year, 10 months ago
There is a newer version of this series
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH net v3] dpaa_eth: fix XDP queue index
Posted by David Gouarin 1 year, 10 months ago 
Make it possible to bind a XDP socket to a queue id.
The DPAA FQ Id was passed to the XDP program in the
xdp_rxq_info->queue_index instead of the Ethernet device queue number,
which made it unusable with bpf_map_redirect.
Instead of the DPAA FQ Id, initialise the XDP rx queue with the queue number.

Fixes: d57e57d0cd04 ("dpaa_eth: add XDP_TX support")

Signed-off-by: David Gouarin <dgouarin@gmail.com>
---
v3: reword commit message
v2: add Fixes: in description
---
 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index dcbc598b11c6..988dc9237368 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -1154,7 +1154,7 @@ static int dpaa_fq_init(struct dpaa_fq *dpaa_fq, bool td_enable)
 	if (dpaa_fq->fq_type == FQ_TYPE_RX_DEFAULT ||
 	    dpaa_fq->fq_type == FQ_TYPE_RX_PCD) {
 		err = xdp_rxq_info_reg(&dpaa_fq->xdp_rxq, dpaa_fq->net_dev,
-				       dpaa_fq->fqid, 0);
+				       dpaa_fq->channel, 0);
 		if (err) {
 			dev_err(dev, "xdp_rxq_info_reg() = %d\n", err);
 			return err;
-- 
2.34.1
Re: [PATCH net v3] dpaa_eth: fix XDP queue index
Posted by Paolo Abeni 1 year, 10 months ago 
On Wed, 2024-03-20 at 12:25 +0100, David Gouarin wrote:
> Make it possible to bind a XDP socket to a queue id.
> The DPAA FQ Id was passed to the XDP program in the
> xdp_rxq_info->queue_index instead of the Ethernet device queue number,
> which made it unusable with bpf_map_redirect.
> Instead of the DPAA FQ Id, initialise the XDP rx queue with the queue number.
> 
> Fixes: d57e57d0cd04 ("dpaa_eth: add XDP_TX support")
> 
> Signed-off-by: David Gouarin <dgouarin@gmail.com>

The patch LGTM, but you must avoid empty lines in after the 'Fixes'
tag.

Please have an accurate reading of the process documentation.

Thanks,

Paolo
[PATCH net v4] dpaa_eth: fix XDP queue index
Posted by David Gouarin 1 year, 10 months ago 
Make it possible to bind a XDP socket to a queue id.
The DPAA FQ Id was passed to the XDP program in the
xdp_rxq_info->queue_index instead of the Ethernet device queue number,
which made it unusable with bpf_map_redirect.
Instead of the DPAA FQ Id, initialise the XDP rx queue with the queue number.

Fixes: d57e57d0cd04 ("dpaa_eth: add XDP_TX support")
Signed-off-by: David Gouarin <dgouarin@gmail.com>
---
v4: fix patch formatting
v3: reword commit message
v2: add Fixes: in description
---
 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index dcbc598b11c6..988dc9237368 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -1154,7 +1154,7 @@ static int dpaa_fq_init(struct dpaa_fq *dpaa_fq, bool td_enable)
 	if (dpaa_fq->fq_type == FQ_TYPE_RX_DEFAULT ||
 	    dpaa_fq->fq_type == FQ_TYPE_RX_PCD) {
 		err = xdp_rxq_info_reg(&dpaa_fq->xdp_rxq, dpaa_fq->net_dev,
-				       dpaa_fq->fqid, 0);
+				       dpaa_fq->channel, 0);
 		if (err) {
 			dev_err(dev, "xdp_rxq_info_reg() = %d\n", err);
 			return err;
-- 
2.34.1
Re: [PATCH net v4] dpaa_eth: fix XDP queue index
Posted by Jakub Kicinski 1 year, 10 months ago 
On Tue,  9 Apr 2024 11:30:46 +0200 David Gouarin wrote:
> Make it possible to bind a XDP socket to a queue id.
> The DPAA FQ Id was passed to the XDP program in the
> xdp_rxq_info->queue_index instead of the Ethernet device queue number,
> which made it unusable with bpf_map_redirect.
> Instead of the DPAA FQ Id, initialise the XDP rx queue with the queue number.

Camelia, looks good?
Re: [PATCH net v4] dpaa_eth: fix XDP queue index
Posted by Vladimir Oltean 1 year, 10 months ago 
On Wed, Apr 10, 2024 at 07:40:55PM -0700, Jakub Kicinski wrote:
> On Tue,  9 Apr 2024 11:30:46 +0200 David Gouarin wrote:
> > Make it possible to bind a XDP socket to a queue id.
> > The DPAA FQ Id was passed to the XDP program in the
> > xdp_rxq_info->queue_index instead of the Ethernet device queue number,
> > which made it unusable with bpf_map_redirect.
> > Instead of the DPAA FQ Id, initialise the XDP rx queue with the queue number.
> 
> Camelia, looks good?

Please allow me some time to prepare a response, even if this means the
patch misses this week's 'net' pull request.
Re: [PATCH net v4] dpaa_eth: fix XDP queue index
Posted by Jakub Kicinski 1 year, 9 months ago 
On Thu, 11 Apr 2024 14:34:33 +0300 Vladimir Oltean wrote:
> On Wed, Apr 10, 2024 at 07:40:55PM -0700, Jakub Kicinski wrote:
> > On Tue,  9 Apr 2024 11:30:46 +0200 David Gouarin wrote:  
> > > Make it possible to bind a XDP socket to a queue id.
> > > The DPAA FQ Id was passed to the XDP program in the
> > > xdp_rxq_info->queue_index instead of the Ethernet device queue number,
> > > which made it unusable with bpf_map_redirect.
> > > Instead of the DPAA FQ Id, initialise the XDP rx queue with the queue number.  
> > 
> > Camelia, looks good?  
> 
> Please allow me some time to prepare a response, even if this means the
> patch misses this week's 'net' pull request.

We're getting close to the 'net' pull request of the following week :)
The bug has been around for a while so no huge rush, but would be nice
to get rid of this from patchwork. If you don't have time - would you
be willing to repost it once you found the time to investigate?
Re: [PATCH net v4] dpaa_eth: fix XDP queue index
Posted by Vladimir Oltean 1 year, 9 months ago 
On Wed, Apr 17, 2024 at 06:17:34PM -0700, Jakub Kicinski wrote:
> On Thu, 11 Apr 2024 14:34:33 +0300 Vladimir Oltean wrote:
> > On Wed, Apr 10, 2024 at 07:40:55PM -0700, Jakub Kicinski wrote:
> > > On Tue,  9 Apr 2024 11:30:46 +0200 David Gouarin wrote:  
> > > > Make it possible to bind a XDP socket to a queue id.
> > > > The DPAA FQ Id was passed to the XDP program in the
> > > > xdp_rxq_info->queue_index instead of the Ethernet device queue number,
> > > > which made it unusable with bpf_map_redirect.
> > > > Instead of the DPAA FQ Id, initialise the XDP rx queue with the queue number.  
> > > 
> > > Camelia, looks good?  
> > 
> > Please allow me some time to prepare a response, even if this means the
> > patch misses this week's 'net' pull request.
> 
> We're getting close to the 'net' pull request of the following week :)
> The bug has been around for a while so no huge rush, but would be nice
> to get rid of this from patchwork. If you don't have time - would you
> be willing to repost it once you found the time to investigate?

I have been looking into this, but I do not have a definitive response yet.
The dpaa_fq->channel replacement is not the zero-based RX queue number
that David is looking for, either.

We will work this out. Please remove this patch from patchwork for now.

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.