netdev - Re: [PATCH v2 2/3] sfc: revert "adjust efx->xdp_tx_queue_count with the real number of initialized queues"

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]

Message-ID: <4d8a691f-b447-8dbb-08a9-9dd8ca38e703@gmail.com>
Date:   Fri, 9 Jul 2021 14:53:52 +0100
From:   Edward Cree <ecree.xilinx@...il.com>
To:     Íñigo Huguet <ihuguet@...hat.com>,
        habetsm.xilinx@...il.com, davem@...emloft.net, kuba@...nel.org,
        ivan@...udflare.com
Cc:     ast@...nel.org, daniel@...earbox.net, hawk@...nel.org,
        john.fastabend@...il.com, netdev@...r.kernel.org
Subject: Re: [PATCH v2 2/3] sfc: revert "adjust efx->xdp_tx_queue_count with
 the real number of initialized queues"

On 09/07/2021 13:55, Íñigo Huguet wrote:
> This reverts commit 99ba0ea616aa ("sfc: adjust efx->xdp_tx_queue_count
> with the real number of initialized queues"). It intended to fix a
> problem caused by a round up when calculating the number of XDP channels
> and queues.
> 
> However, that was not the real problem. The real problem was that the
> number of XDP TX queues created had been reduced to half in
> commit e26ca4b53582 ("sfc: reduce the number of requested xdp ev queues"),
> but the variable xdp_tx_queue_count had remained the same.
> 
> After reverting that commit in the previous patch of this series, this
> also can be reverted since the error doesn't actually exist.
> 
> Signed-off-by: Íñigo Huguet <ihuguet@...hat.com>
> ---
>  drivers/net/ethernet/sfc/efx_channels.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/sfc/efx_channels.c b/drivers/net/ethernet/sfc/efx_channels.c
> index 5b71f8a03a6d..e25c8f9d9ff4 100644
> --- a/drivers/net/ethernet/sfc/efx_channels.c
> +++ b/drivers/net/ethernet/sfc/efx_channels.c
> @@ -915,8 +915,6 @@ int efx_set_channels(struct efx_nic *efx)
>  			}
>  		}
>  	}
> -	if (xdp_queue_number)
> -		efx->xdp_tx_queue_count = xdp_queue_number;
>  

Probably best to add in a WARN_ON[_ONCE] here to catch if these ever
 aren't already equal.  Or at least a netif_warn().

-ed