linux-kernel - Re: [PATCH v1 net 2/2] vmxnet3: use correct intrConf reference when using extended 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]

Date:   Mon, 28 Nov 2022 15:49:33 -0800
From:   Jacob Keller <jacob.e.keller@...el.com>
To:     Ronak Doshi <doshir@...are.com>, <netdev@...r.kernel.org>
CC:     VMware PV-Drivers Reviewers <pv-drivers@...are.com>,
        "David S. Miller" <davem@...emloft.net>,
        Eric Dumazet <edumazet@...gle.com>,
        Jakub Kicinski <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>,
        Guolin Yang <gyang@...are.com>,
        open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v1 net 2/2] vmxnet3: use correct intrConf reference when
 using extended queues



On 11/28/2022 11:32 AM, Ronak Doshi wrote:
> 'Commit 39f9895a00f4 ("vmxnet3: add support for 32 Tx/Rx queues")'
> added support for 32Tx/Rx queues. As a part of this patch, intrConf
> structure was extended to incorporate increased queues.
> 

Nit: no need to quote around the commit reference here.

I don't personally think its worth a re-roll to fix that, but good to be 
aware of in future submission.

The patch itself makes sense.

Reviewed-by: Jacob Keller <jacob.e.keller@...el.com>

> This patch fixes the issue where incorrect reference is being used.
> 
> Fixes: 39f9895a00f4 ("vmxnet3: add support for 32 Tx/Rx queues")
> Signed-off-by: Ronak Doshi <doshir@...are.com>
> Acked-by: Guolin Yang <gyang@...are.com>
> ---
>   drivers/net/vmxnet3/vmxnet3_drv.c | 16 ++++++++++++++--
>   1 file changed, 14 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
> index 611e8a85de17..39a7e90d4254 100644
> --- a/drivers/net/vmxnet3/vmxnet3_drv.c
> +++ b/drivers/net/vmxnet3/vmxnet3_drv.c
> @@ -75,8 +75,14 @@ vmxnet3_enable_all_intrs(struct vmxnet3_adapter *adapter)
>   
>   	for (i = 0; i < adapter->intr.num_intrs; i++)
>   		vmxnet3_enable_intr(adapter, i);
> -	adapter->shared->devRead.intrConf.intrCtrl &=
> +	if (!VMXNET3_VERSION_GE_6(adapter) ||
> +	    !adapter->queuesExtEnabled) {
> +		adapter->shared->devRead.intrConf.intrCtrl &=
>   					cpu_to_le32(~VMXNET3_IC_DISABLE_ALL);
> +	} else {
> +		adapter->shared->devReadExt.intrConfExt.intrCtrl &=
> +					cpu_to_le32(~VMXNET3_IC_DISABLE_ALL);
> +	}
>   }
>   
>   
> @@ -85,8 +91,14 @@ vmxnet3_disable_all_intrs(struct vmxnet3_adapter *adapter)
>   {
>   	int i;
>   
> -	adapter->shared->devRead.intrConf.intrCtrl |=
> +	if (!VMXNET3_VERSION_GE_6(adapter) ||
> +	    !adapter->queuesExtEnabled) {
> +		adapter->shared->devRead.intrConf.intrCtrl |=
>   					cpu_to_le32(VMXNET3_IC_DISABLE_ALL);
> +	} else {
> +		adapter->shared->devReadExt.intrConfExt.intrCtrl |=
> +					cpu_to_le32(VMXNET3_IC_DISABLE_ALL);
> +	}
>   	for (i = 0; i < adapter->intr.num_intrs; i++)
>   		vmxnet3_disable_intr(adapter, i);
>   }