On 5/2/21, Max Gurtovoy <mgurtovoy@xxxxxxxxxx> wrote:
> Not all virtio_net devices support the ctrl queue feature. Thus, there
> is no need to allocate unused resources.
>
> Signed-off-by: Max Gurtovoy <mgurtovoy@xxxxxxxxxx>
Reviewed-by: Venkatesh Srinivas <venkateshs@xxxxxxxxxxxx>
> ---
> drivers/net/virtio_net.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 7fda2ae4c40f..9b6a4a875c55 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -2870,9 +2870,13 @@ static int virtnet_alloc_queues(struct virtnet_info
> *vi)
> {
> int i;
>
> - vi->ctrl = kzalloc(sizeof(*vi->ctrl), GFP_KERNEL);
> - if (!vi->ctrl)
> - goto err_ctrl;
> + if (vi->has_cvq) {
> + vi->ctrl = kzalloc(sizeof(*vi->ctrl), GFP_KERNEL);
> + if (!vi->ctrl)
> + goto err_ctrl;
> + } else {
> + vi->ctrl = NULL;
> + }
> vi->sq = kcalloc(vi->max_queue_pairs, sizeof(*vi->sq), GFP_KERNEL);
> if (!vi->sq)
> goto err_sq;
> --
> 2.18.1
>
>
