Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2483957pxb; Fri, 29 Oct 2021 02:17:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhguV0of79bWAog8h9gT2rRGvRL/qZShIG512tl4AcoOCy8Xb+pfBglOpA0VgbU5QJ8ddB X-Received: by 2002:a63:b402:: with SMTP id s2mr7312152pgf.324.1635499057971; Fri, 29 Oct 2021 02:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635499057; cv=none; d=google.com; s=arc-20160816; b=uLMhxxE+tcNGvkjD3NucDuzWp2vPJ3Qx7HHl52/buHPIAh2S3cdsp5RJxtE0MQitA+ JUwxlCFlSUyosse3XZc3zMYKMu1NkBUYf4BUS/Rh7DdM5WKeprJImtgSyqHzk9AD0bw9 BnEBNU4kltT/hMGqHeQmDmybC9AgXkX3KyjLLH3gSJ8gSq8uwCwCKwwcuRW9sUsYNFwj 9xfAYgei9azr5oRu3U7W8Asv8QGxvcqYzheQYuTuqk/3SMT2ou4YceiJR7sqPnQAAnsp s1+5s9WiROfqUcbu/9vrKvo8GV4UQZnaPzRYx6LfngFPSTsg3BeYTqN4qXGAe6V5vDsm xDIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=RPQ+PUW9Z/lG/NAs6iL0D5sJHXR5J8/fBB+Crmy4XK4=; b=oPZnWeNfRFRcw4GQqfZ63IWXjGDvRWP0OadiWU13bQQLaT54aNH+Fg8QiP8FScAPBQ aDywSsuwm+E7AFGaGX4Enm+OGO+5LdRVwIOGXSnu7H9yMPCuWlTt1NB6cDW0eKrbg7jd 1ZqSDF5Vp1nT5t+ikDSowN6uQ3brYBn/vFecVngMdI69fZH0e2uGcBC2aeTM8qDd2Vqn 5DI6hPXb1Q+AzofjH4/MiA2l/CxQeXhvc+t5i0LwTwS2sAMt1W5Qs+6m7EEd1UKT5Ob5 zv2swsGmc+uRT1SVZXaUTicc4xRN5f2Rlqo0NvikFYCf1ZfuLtDdqoj6sQIFc7b2zp/t bw5g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b5si1169676plg.16.2021.10.29.02.17.25; Fri, 29 Oct 2021 02:17:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231722AbhJ2JSi (ORCPT + 99 others); Fri, 29 Oct 2021 05:18:38 -0400 Received: from out30-56.freemail.mail.aliyun.com ([115.124.30.56]:43514 "EHLO out30-56.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231502AbhJ2JRd (ORCPT ); Fri, 29 Oct 2021 05:17:33 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R441e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04395;MF=wuzongyong@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0Uu7wNNx_1635498896; Received: from localhost.localdomain(mailfrom:wuzongyong@linux.alibaba.com fp:SMTPD_---0Uu7wNNx_1635498896) by smtp.aliyun-inc.com(127.0.0.1); Fri, 29 Oct 2021 17:15:04 +0800 From: Wu Zongyong To: jasowang@redhat.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, mst@redhat.com, wuzongyong@linux.alibaba.com Cc: wei.yang1@linux.alibaba.com Subject: [PATCH v7 6/9] virtio_vdpa: setup correct vq size with callbacks get_vq_num_{max,min} Date: Fri, 29 Oct 2021 17:14:47 +0800 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For the devices which implement the get_vq_num_min callback, the driver should not negotiate with virtqueue size with the backend vdpa device if the value returned by get_vq_num_min equals to the value returned by get_vq_num_max. This is useful for vdpa devices based on legacy virtio specfication. Signed-off-by: Wu Zongyong --- drivers/virtio/virtio_vdpa.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c index 72eaef2caeb1..6b62aaf08cc5 100644 --- a/drivers/virtio/virtio_vdpa.c +++ b/drivers/virtio/virtio_vdpa.c @@ -145,7 +145,8 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsigned int index, /* Assume split virtqueue, switch to packed if necessary */ struct vdpa_vq_state state = {0}; unsigned long flags; - u32 align, num; + u32 align, max_num, min_num = 1; + bool may_reduce_num = true; int err; if (!name) @@ -163,16 +164,21 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsigned int index, if (!info) return ERR_PTR(-ENOMEM); - num = ops->get_vq_num_max(vdpa); - if (num == 0) { + max_num = ops->get_vq_num_max(vdpa); + if (max_num == 0) { err = -ENOENT; goto error_new_virtqueue; } + if (ops->get_vq_num_min) + min_num = ops->get_vq_num_min(vdpa); + + may_reduce_num = (max_num == min_num) ? false : true; + /* Create the vring */ align = ops->get_vq_align(vdpa); - vq = vring_create_virtqueue(index, num, align, vdev, - true, true, ctx, + vq = vring_create_virtqueue(index, max_num, align, vdev, + true, may_reduce_num, ctx, virtio_vdpa_notify, callback, name); if (!vq) { err = -ENOMEM; -- 2.31.1