From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF765221F11 for ; Thu, 24 Jul 2025 06:40:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753339248; cv=none; b=dCDCe1+bAxO9dX3tbMqvBRi9i3Wr9qcpsVgZ2LZZGR1GSYRRnhCqwUg+LtQLGj5HE39Gaq/a/agm7BbiMlbR2aNZ9ZhrdYjxaU+BhX3JXsTmg/K8tb6fzHVAcZGJjy7vI0+Kf7MS5GzP3QdWngp1xyhuGgg2vkBJeJtn8jdnuUE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753339248; c=relaxed/simple; bh=KBR7BgN5zstd1g6lnmFptBjPEUSLbbxgPm6fTJwF4vs=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HmD9je7PO0PujURkoImEjUnxd6EqQDJnR05ma39KmURpIdSizVvxNbevbxBn2GiSppj5YcDBIIPSqOFEk/AflhjC/9mDj9A8tjZD/0sinRfPSZt3pN8oIoxXqui0K+Fy6LiqBQz+YynW09JJgoZPUmpBNR0s+W2bK/gcADpHE2Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=dtaBM4/j; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dtaBM4/j" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1753339245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eYNF07NdjCbeScRweEDKjdTIYj1lDxvOzhF/Gj+8+yk=; b=dtaBM4/jOYmW3xP5JTp+snap1TMUDEqAg2YGdDFczaoELKsbwss1PzVlb3pkB/0pMLcJj/ ytc0K79O1l7k5mZ4DMnzqrI+SuPXDssIMcXDUNIr2W4qqHBQXSqusS8me3gXcUsT3ahLXV lgYVvK6m5d8CXEjP1jPvzZLEiBFcXNk= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-675-vutYopfVPh6oiZdBtDOWWQ-1; Thu, 24 Jul 2025 02:40:44 -0400 X-MC-Unique: vutYopfVPh6oiZdBtDOWWQ-1 X-Mimecast-MFC-AGG-ID: vutYopfVPh6oiZdBtDOWWQ_1753339243 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5444718004A7; Thu, 24 Jul 2025 06:40:43 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.231]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2271F18002AF; Thu, 24 Jul 2025 06:40:39 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH V4 04/19] virtio_ring: switch to use vring_virtqueue for virtqueue resize variants Date: Thu, 24 Jul 2025 14:40:02 +0800 Message-ID: <20250724064017.26058-5-jasowang@redhat.com> In-Reply-To: <20250724064017.26058-1-jasowang@redhat.com> References: <20250724064017.26058-1-jasowang@redhat.com> Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Those variants are used internally so let's switch to use vring_virtqueue as parameter to be consistent with other internal virtqueue helpers. Acked-by: Eugenio Pérez Reviewed-by: Xuan Zhuo Signed-off-by: Jason Wang --- drivers/virtio/virtio_ring.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index daa63fd54693..f30d491678a5 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -1216,11 +1216,10 @@ static struct virtqueue *vring_create_virtqueue_split( return vq; } -static int virtqueue_resize_split(struct virtqueue *_vq, u32 num) +static int virtqueue_resize_split(struct vring_virtqueue *vq, u32 num) { struct vring_virtqueue_split vring_split = {}; - struct vring_virtqueue *vq = to_vvq(_vq); - struct virtio_device *vdev = _vq->vdev; + struct virtio_device *vdev = vq->vq.vdev; int err; err = vring_alloc_queue_split(&vring_split, vdev, num, @@ -2183,11 +2182,10 @@ static struct virtqueue *vring_create_virtqueue_packed( return vq; } -static int virtqueue_resize_packed(struct virtqueue *_vq, u32 num) +static int virtqueue_resize_packed(struct vring_virtqueue *vq, u32 num) { struct vring_virtqueue_packed vring_packed = {}; - struct vring_virtqueue *vq = to_vvq(_vq); - struct virtio_device *vdev = _vq->vdev; + struct virtio_device *vdev = vq->vq.vdev; int err; if (vring_alloc_queue_packed(&vring_packed, vdev, num, vring_dma_dev(vq))) @@ -2809,9 +2807,9 @@ int virtqueue_resize(struct virtqueue *_vq, u32 num, recycle_done(_vq); if (vq->packed_ring) - err = virtqueue_resize_packed(_vq, num); + err = virtqueue_resize_packed(vq, num); else - err = virtqueue_resize_split(_vq, num); + err = virtqueue_resize_split(vq, num); err_reset = virtqueue_enable_after_reset(_vq); if (err_reset) -- 2.39.5