linux-kernel - RE: [PATCH] vdpa: conditionally fill max max queue pair for stats

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:   Wed, 7 Sep 2022 06:11:40 +0000
From:   Eli Cohen <elic@...dia.com>
To:     Jason Wang <jasowang@...hat.com>,
        "mst@...hat.com" <mst@...hat.com>,
        "virtualization@...ts.linux-foundation.org" 
        <virtualization@...ts.linux-foundation.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: [PATCH] vdpa: conditionally fill max max queue pair for stats

> From: Jason Wang <jasowang@...hat.com>
> Sent: Wednesday, 7 September 2022 9:01
> To: mst@...hat.com; jasowang@...hat.com; Eli Cohen <elic@...dia.com>;
> virtualization@...ts.linux-foundation.org; linux-kernel@...r.kernel.org
> Subject: [PATCH] vdpa: conditionally fill max max queue pair for stats
> 
> For the device without multiqueue feature, we will read 0 as
> max_virtqueue_pairs from the config.
If this is the case for other vdpa vendor drivers, shouldn't we fix it there? After all,
config->max_virtqueue_pairs should always show valid values.

> So if we fill
> VDPA_ATTR_DEV_NET_CFG_MAX_VQP with the value we read from the
> config
> we will confuse the user.
> 
> Fixing this by only filling the value when multiqueue is offered by
> the device so userspace can assume 1 when the attr is not provided.
> 
> Fixes: 13b00b135665c("vdpa: Add support for querying vendor statistics")
> Cc: Eli Cohen <elic@...dia.com>
> Signed-off-by: Jason Wang <jasowang@...hat.com>
> ---
>  drivers/vdpa/vdpa.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c
> index c06c02704461..bc328197263f 100644
> --- a/drivers/vdpa/vdpa.c
> +++ b/drivers/vdpa/vdpa.c
> @@ -894,7 +894,6 @@ static int vdpa_fill_stats_rec(struct vdpa_device
> *vdev, struct sk_buff *msg,
>  {
>  	struct virtio_net_config config = {};
>  	u64 features;
> -	u16 max_vqp;
>  	u8 status;
>  	int err;
> 
> @@ -905,15 +904,15 @@ static int vdpa_fill_stats_rec(struct vdpa_device
> *vdev, struct sk_buff *msg,
>  	}
>  	vdpa_get_config_unlocked(vdev, 0, &config, sizeof(config));
> 
> -	max_vqp = __virtio16_to_cpu(true, config.max_virtqueue_pairs);
> -	if (nla_put_u16(msg, VDPA_ATTR_DEV_NET_CFG_MAX_VQP,
> max_vqp))
> -		return -EMSGSIZE;
> -
>  	features = vdev->config->get_driver_features(vdev);
>  	if (nla_put_u64_64bit(msg,
> VDPA_ATTR_DEV_NEGOTIATED_FEATURES,
>  			      features, VDPA_ATTR_PAD))
>  		return -EMSGSIZE;
> 
> +	err = vdpa_dev_net_mq_config_fill(vdev, msg, features, &config);
> +	if (err)
> +		return err;
> +

So that means that you can't read statistics when MQ is not supported. Is this worth sacrificing?

>  	if (nla_put_u32(msg, VDPA_ATTR_DEV_QUEUE_INDEX, index))
>  		return -EMSGSIZE;
> 
> --
> 2.25.1