linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] dpaa_eth: fix build errorr in dpaa_fq_init
@ 2020-12-03 14:43 Anders Roxell
  2020-12-03 14:49 ` Björn Töpel
  2020-12-03 15:51 ` Madalin Bucur (OSS)
  0 siblings, 2 replies; 4+ messages in thread
From: Anders Roxell @ 2020-12-03 14:43 UTC (permalink / raw)
  To: madalin.bucur, davem, kuba, ast, daniel, hawk, john.fastabend
  Cc: netdev, linux-kernel, bpf, Anders Roxell

When building FSL_DPAA_ETH the following build error shows up:

/tmp/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c: In function ‘dpaa_fq_init’:
/tmp/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c:1135:9: error: too few arguments to function ‘xdp_rxq_info_reg’
 1135 |   err = xdp_rxq_info_reg(&dpaa_fq->xdp_rxq, dpaa_fq->net_dev,
      |         ^~~~~~~~~~~~~~~~

Commit b02e5a0ebb17 ("xsk: Propagate napi_id to XDP socket Rx path")
added an extra argument to function xdp_rxq_info_reg and commit
d57e57d0cd04 ("dpaa_eth: add XDP_TX support") didn't know about that
extra argument.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---

I think this issue is seen since both patches went in at the same time
to bpf-next and net-next.

 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 947b3d2f9c7e..6cc8c4e078de 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -1133,7 +1133,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);
+				       dpaa_fq->fqid, 0);
 		if (err) {
 			dev_err(dev, "xdp_rxq_info_reg() = %d\n", err);
 			return err;
-- 
2.29.2


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] dpaa_eth: fix build errorr in dpaa_fq_init
  2020-12-03 14:43 [PATCH] dpaa_eth: fix build errorr in dpaa_fq_init Anders Roxell
@ 2020-12-03 14:49 ` Björn Töpel
  2020-12-04 18:27   ` Jakub Kicinski
  2020-12-03 15:51 ` Madalin Bucur (OSS)
  1 sibling, 1 reply; 4+ messages in thread
From: Björn Töpel @ 2020-12-03 14:49 UTC (permalink / raw)
  To: Anders Roxell
  Cc: madalin.bucur, David Miller, Jakub Kicinski, Alexei Starovoitov,
	Daniel Borkmann, Jesper Dangaard Brouer, John Fastabend, Netdev,
	LKML, bpf

On Thu, 3 Dec 2020 at 15:46, Anders Roxell <anders.roxell@linaro.org> wrote:
>
> When building FSL_DPAA_ETH the following build error shows up:
>
> /tmp/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c: In function ‘dpaa_fq_init’:
> /tmp/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c:1135:9: error: too few arguments to function ‘xdp_rxq_info_reg’
>  1135 |   err = xdp_rxq_info_reg(&dpaa_fq->xdp_rxq, dpaa_fq->net_dev,
>       |         ^~~~~~~~~~~~~~~~
>
> Commit b02e5a0ebb17 ("xsk: Propagate napi_id to XDP socket Rx path")
> added an extra argument to function xdp_rxq_info_reg and commit
> d57e57d0cd04 ("dpaa_eth: add XDP_TX support") didn't know about that
> extra argument.
>
> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
> ---
>
> I think this issue is seen since both patches went in at the same time
> to bpf-next and net-next.
>

Thanks Anders!

Indeed, when bpf-next is pulled into net-next this needs to be applied.

Acked-by: Björn Töpel <bjorn.topel@intel.com>

>  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 947b3d2f9c7e..6cc8c4e078de 100644
> --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> @@ -1133,7 +1133,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);
> +                                      dpaa_fq->fqid, 0);
>                 if (err) {
>                         dev_err(dev, "xdp_rxq_info_reg() = %d\n", err);
>                         return err;
> --
> 2.29.2
>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* RE: [PATCH] dpaa_eth: fix build errorr in dpaa_fq_init
  2020-12-03 14:43 [PATCH] dpaa_eth: fix build errorr in dpaa_fq_init Anders Roxell
  2020-12-03 14:49 ` Björn Töpel
@ 2020-12-03 15:51 ` Madalin Bucur (OSS)
  1 sibling, 0 replies; 4+ messages in thread
From: Madalin Bucur (OSS) @ 2020-12-03 15:51 UTC (permalink / raw)
  To: Anders Roxell, davem, kuba, ast, daniel, hawk, john.fastabend
  Cc: netdev, linux-kernel, bpf

> -----Original Message-----
> From: Anders Roxell <anders.roxell@linaro.org>
> Sent: 03 December 2020 16:44
> To: Madalin Bucur <madalin.bucur@nxp.com>; davem@davemloft.net;
> kuba@kernel.org; ast@kernel.org; daniel@iogearbox.net; hawk@kernel.org;
> john.fastabend@gmail.com
> Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org;
> bpf@vger.kernel.org; Anders Roxell <anders.roxell@linaro.org>
> Subject: [PATCH] dpaa_eth: fix build errorr in dpaa_fq_init
> 
> When building FSL_DPAA_ETH the following build error shows up:
> 
> /tmp/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c: In function
> ‘dpaa_fq_init’:
> /tmp/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c:1135:9: error: too few
> arguments to function ‘xdp_rxq_info_reg’
>  1135 |   err = xdp_rxq_info_reg(&dpaa_fq->xdp_rxq, dpaa_fq->net_dev,
>       |         ^~~~~~~~~~~~~~~~
> 
> Commit b02e5a0ebb17 ("xsk: Propagate napi_id to XDP socket Rx path")
> added an extra argument to function xdp_rxq_info_reg and commit
> d57e57d0cd04 ("dpaa_eth: add XDP_TX support") didn't know about that
> extra argument.
> 
> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
> ---
> 
> I think this issue is seen since both patches went in at the same time
> to bpf-next and net-next.
> 
>  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 947b3d2f9c7e..6cc8c4e078de 100644
> --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> @@ -1133,7 +1133,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);
> +				       dpaa_fq->fqid, 0);
>  		if (err) {
>  			dev_err(dev, "xdp_rxq_info_reg() = %d\n", err);
>  			return err;
> --
> 2.29.2

The XDP support for DPAA 1 and the napi_id propagation were concurrently
applied, thanks for addressing this.

Madalin

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] dpaa_eth: fix build errorr in dpaa_fq_init
  2020-12-03 14:49 ` Björn Töpel
@ 2020-12-04 18:27   ` Jakub Kicinski
  0 siblings, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2020-12-04 18:27 UTC (permalink / raw)
  To: Björn Töpel
  Cc: Anders Roxell, madalin.bucur, David Miller, Alexei Starovoitov,
	Daniel Borkmann, Jesper Dangaard Brouer, John Fastabend, Netdev,
	LKML, bpf

On Thu, 3 Dec 2020 15:49:21 +0100 Björn Töpel wrote:
> On Thu, 3 Dec 2020 at 15:46, Anders Roxell <anders.roxell@linaro.org> wrote:
> >
> > When building FSL_DPAA_ETH the following build error shows up:
> >
> > /tmp/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c: In function ‘dpaa_fq_init’:
> > /tmp/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c:1135:9: error: too few arguments to function ‘xdp_rxq_info_reg’
> >  1135 |   err = xdp_rxq_info_reg(&dpaa_fq->xdp_rxq, dpaa_fq->net_dev,
> >       |         ^~~~~~~~~~~~~~~~
> >
> > Commit b02e5a0ebb17 ("xsk: Propagate napi_id to XDP socket Rx path")
> > added an extra argument to function xdp_rxq_info_reg and commit
> > d57e57d0cd04 ("dpaa_eth: add XDP_TX support") didn't know about that
> > extra argument.
> >
> > Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
> > ---
> >
> > I think this issue is seen since both patches went in at the same time
> > to bpf-next and net-next.
> >  
> 
> Thanks Anders!
> 
> Indeed, when bpf-next is pulled into net-next this needs to be applied.
> 
> Acked-by: Björn Töpel <bjorn.topel@intel.com>

Applied, thanks!

Looks like there is a mention of this function in an
example in Documentation/ that may need updating, too.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-12-04 18:28 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-03 14:43 [PATCH] dpaa_eth: fix build errorr in dpaa_fq_init Anders Roxell
2020-12-03 14:49 ` Björn Töpel
2020-12-04 18:27   ` Jakub Kicinski
2020-12-03 15:51 ` Madalin Bucur (OSS)

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).