linux-kernel - RE: [PATCH] dpaa_eth: fix build errorr in dpaa_fq

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Thu, 3 Dec 2020 15:51:05 +0000
From:   "Madalin Bucur (OSS)" <madalin.bucur@....nxp.com>
To:     Anders Roxell <anders.roxell@...aro.org>,
        "davem@...emloft.net" <davem@...emloft.net>,
        "kuba@...nel.org" <kuba@...nel.org>,
        "ast@...nel.org" <ast@...nel.org>,
        "daniel@...earbox.net" <daniel@...earbox.net>,
        "hawk@...nel.org" <hawk@...nel.org>,
        "john.fastabend@...il.com" <john.fastabend@...il.com>
CC:     "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        "bpf@...r.kernel.org" <bpf@...r.kernel.org>
Subject: RE: [PATCH] dpaa_eth: fix build errorr in dpaa_fq_init

> -----Original Message-----
> From: Anders Roxell <anders.roxell@...aro.org>
> Sent: 03 December 2020 16:44
> To: Madalin Bucur <madalin.bucur@....com>; davem@...emloft.net;
> kuba@...nel.org; ast@...nel.org; daniel@...earbox.net; hawk@...nel.org;
> john.fastabend@...il.com
> Cc: netdev@...r.kernel.org; linux-kernel@...r.kernel.org;
> bpf@...r.kernel.org; Anders Roxell <anders.roxell@...aro.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@...aro.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