Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp443510pxb; Wed, 22 Sep 2021 05:48:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkttFilScVk7yaYA99Jb0fCJZffhxSY318cLXZgwk05DxPV85zUcI2kOX6kfgctBuKlNR5 X-Received: by 2002:a50:d84c:: with SMTP id v12mr16836635edj.201.1632314938718; Wed, 22 Sep 2021 05:48:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632314938; cv=none; d=google.com; s=arc-20160816; b=fhru6kQfjLb5p4JrMI75MX5m7xjl+ZOuPg/187Jolu1HV+XQoQ20tP2CM2lJBI0RGx r/9rV7ajLigJRznzoCrTej3P1YhdKqSWam09ZhY7CB/X8fIbaQ/RnXX+S8mu+PVAg8le 8xQ0AclBAgtILV/GXlEjTZ/a8AvF3EZ4nfwbcKYQlB/YPyvcZIfvOV128L9XzAhIPngx syydlJyx2iaFfWhybgIPiik9sWFSFHy9MWQNPSGG1+dla+EoVw74JSyrLRD+fRcXAfDp rWdhOivkS3smFow0+oHQ9vL8ube5WnKiKPl7Hwp/NMA0WFqqCKEM0L+9ZyFtpuyYuGVc 5DHw== 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=kk+olC4cUDk2aT/9sL5bXwILbWiulkll8Ty/m0Wlu6A=; b=uHdsrlIp8eXd5Qh3cZ2Rp+liajOj9B+ugJHN2LorqQyWC7Xkkaw2V8tSGO3JR1oRvE 5x00m8our3vnKOELaZNM0em2hi60/cxVkrLMvhNxttG5CmEAkgu/GFoZPG2VyVErmy9f MMIa4KHIrOf/EqB16L+0KmCn0VAd3ioN0RWWdxwfBsLX47z2EfN5U/a/2KmEwf2dOc0b JTCnfWQpT3M8doQCLLvgQOB+cyp8bwva8umvWzimwMuToWxTv8tKWUc0yo5+/of5DZSh Q5bJRw8rZkMCTdamhRJhzDBszgyvMMQsHV+SY2V1HHFizXmhbCunnRnVK5hEogm8D7mt X1CQ== 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 g21si2158797edb.488.2021.09.22.05.48.34; Wed, 22 Sep 2021 05:48:58 -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 S236081AbhIVMsX (ORCPT + 99 others); Wed, 22 Sep 2021 08:48:23 -0400 Received: from out30-132.freemail.mail.aliyun.com ([115.124.30.132]:39582 "EHLO out30-132.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236042AbhIVMsS (ORCPT ); Wed, 22 Sep 2021 08:48:18 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R491e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04394;MF=wuzongyong@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0UpEJoj9_1632314798; Received: from localhost.localdomain(mailfrom:wuzongyong@linux.alibaba.com fp:SMTPD_---0UpEJoj9_1632314798) by smtp.aliyun-inc.com(127.0.0.1); Wed, 22 Sep 2021 20:46:47 +0800 From: Wu Zongyong To: wuzongyong@linux.alibaba.com, jasowang@redhat.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, mst@redhat.com Cc: wei.yang1@linux.alibaba.com Subject: [PATCH v3 5/7] virtio_vdpa: setup correct vq size with callbacks get_vq_num_{max,min} Date: Wed, 22 Sep 2021 20:46:28 +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 Signed-off-by: Wu Zongyong --- drivers/virtio/virtio_vdpa.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c index 72eaef2caeb1..8aa4ebe2a2a2 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 = 0; + bool may_reduce_num = true; int err; if (!name) @@ -163,22 +164,36 @@ 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); + if (min_num > max_num) { + err = -ENOENT; + goto error_new_virtqueue; + } + + 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; goto error_new_virtqueue; } + if (virtqueue_get_vring_size(vq) < min_num) { + err = -EINVAL; + goto err_vq; + } + /* Setup virtqueue callback */ cb.callback = virtio_vdpa_virtqueue_cb; cb.private = info; -- 2.31.1