From nobody Sat Oct 4 03:00:43 2025 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 AF2032E093A for ; Thu, 21 Aug 2025 06:47:07 +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=1755758829; cv=none; b=nc2xgXjCz6KQAxhVjl67OHOOGBfGi4/SFe8JsmCK2SiMUyrhCKXE44JgylEMbMpIrIZr2gClHanCtQtH69Pp8R55Rodr58mMv5AmDuFJm4618l6XqcwMEvD9qYW67aoPrLe/XSdPj6jtWAi0CTtQVu8ECEGXm5KjFytQySe/E24= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755758829; c=relaxed/simple; bh=7fMUsfKN2CsSl6DoEeDrPGsqMuVzZw3YTz6AyDWCV/I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=p8b2+cb5qqYrUNP72cuhP7GxfawGZV2dm4gJCjdeJSbgomkzAOU/ptmNb0OnjQhrYGYwUWuXhHFSQJXI9AlCxXwJ1DOSBsTDugalNkh7nMPQTUj73bZJf8jsZCp0lCPW6HKKT5BKkdmkA62jrFR8ZkUrHIDInW2OArZH8Tk4Vgs= 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=Bvzmq3DN; 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="Bvzmq3DN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755758826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o1jggwPm8AUkUxN3p/TLUO9UFrJs/g5LLDXwam4R/E8=; b=Bvzmq3DNqOVUIc70rBLJH8qe2icj2bUWxgjL3eWWqdEnG7wyD7f4X5kdMuj1/DJIqznVhp hxYFOq7Aj859X+UYaUvogMIqKJLOdNhQs11yo/ewnMDcx+ObPuB1jjwLks0ZX5vkY+bsYn qgwZ8BnMLsXqukYnY+crAPqGR6mPsLg= 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-523-lPb26JtJPra8WSIxiyKB5Q-1; Thu, 21 Aug 2025 02:47:02 -0400 X-MC-Unique: lPb26JtJPra8WSIxiyKB5Q-1 X-Mimecast-MFC-AGG-ID: lPb26JtJPra8WSIxiyKB5Q_1755758821 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 DCCED180045C; Thu, 21 Aug 2025 06:47:00 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.130]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4511619560B0; Thu, 21 Aug 2025 06:46:50 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com Cc: virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, hch@infradead.org, Christoph Hellwig Subject: [PATCH V6 1/9] virtio_ring: constify virtqueue pointer for DMA helpers Date: Thu, 21 Aug 2025 14:46:33 +0800 Message-ID: <20250821064641.5025-2-jasowang@redhat.com> In-Reply-To: <20250821064641.5025-1-jasowang@redhat.com> References: <20250821064641.5025-1-jasowang@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 This patch consities virtqueue point for DMA helpers. Reviewed-by: Christoph Hellwig Reviewed-by: Xuan Zhuo Reviewed-by: Eugenio P=C3=A9rez Signed-off-by: Jason Wang --- drivers/virtio/virtio_ring.c | 25 +++++++++++++------------ include/linux/virtio.h | 12 ++++++------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index f5062061c408..103bad8cffff 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -3149,12 +3149,12 @@ EXPORT_SYMBOL_GPL(virtqueue_get_vring); * * return DMA address. Caller should check that by virtqueue_dma_mapping_e= rror(). */ -dma_addr_t virtqueue_dma_map_single_attrs(struct virtqueue *_vq, void *ptr, +dma_addr_t virtqueue_dma_map_single_attrs(const struct virtqueue *_vq, voi= d *ptr, size_t size, enum dma_data_direction dir, unsigned long attrs) { - struct vring_virtqueue *vq =3D to_vvq(_vq); + const struct vring_virtqueue *vq =3D to_vvq(_vq); =20 if (!vq->use_dma_api) { kmsan_handle_dma(virt_to_page(ptr), offset_in_page(ptr), size, dir); @@ -3176,11 +3176,12 @@ EXPORT_SYMBOL_GPL(virtqueue_dma_map_single_attrs); * Unmap the address that is mapped by the virtqueue_dma_map_* APIs. * */ -void virtqueue_dma_unmap_single_attrs(struct virtqueue *_vq, dma_addr_t ad= dr, +void virtqueue_dma_unmap_single_attrs(const struct virtqueue *_vq, + dma_addr_t addr, size_t size, enum dma_data_direction dir, unsigned long attrs) { - struct vring_virtqueue *vq =3D to_vvq(_vq); + const struct vring_virtqueue *vq =3D to_vvq(_vq); =20 if (!vq->use_dma_api) return; @@ -3196,9 +3197,9 @@ EXPORT_SYMBOL_GPL(virtqueue_dma_unmap_single_attrs); * * Returns 0 means dma valid. Other means invalid dma address. */ -int virtqueue_dma_mapping_error(struct virtqueue *_vq, dma_addr_t addr) +int virtqueue_dma_mapping_error(const struct virtqueue *_vq, dma_addr_t ad= dr) { - struct vring_virtqueue *vq =3D to_vvq(_vq); + const struct vring_virtqueue *vq =3D to_vvq(_vq); =20 if (!vq->use_dma_api) return 0; @@ -3217,9 +3218,9 @@ EXPORT_SYMBOL_GPL(virtqueue_dma_mapping_error); * * return bool */ -bool virtqueue_dma_need_sync(struct virtqueue *_vq, dma_addr_t addr) +bool virtqueue_dma_need_sync(const struct virtqueue *_vq, dma_addr_t addr) { - struct vring_virtqueue *vq =3D to_vvq(_vq); + const struct vring_virtqueue *vq =3D to_vvq(_vq); =20 if (!vq->use_dma_api) return false; @@ -3240,12 +3241,12 @@ EXPORT_SYMBOL_GPL(virtqueue_dma_need_sync); * the DMA address really needs to be synchronized * */ -void virtqueue_dma_sync_single_range_for_cpu(struct virtqueue *_vq, +void virtqueue_dma_sync_single_range_for_cpu(const struct virtqueue *_vq, dma_addr_t addr, unsigned long offset, size_t size, enum dma_data_direction dir) { - struct vring_virtqueue *vq =3D to_vvq(_vq); + const struct vring_virtqueue *vq =3D to_vvq(_vq); struct device *dev =3D vring_dma_dev(vq); =20 if (!vq->use_dma_api) @@ -3266,12 +3267,12 @@ EXPORT_SYMBOL_GPL(virtqueue_dma_sync_single_range_f= or_cpu); * Before calling this function, use virtqueue_dma_need_sync() to confirm = that * the DMA address really needs to be synchronized */ -void virtqueue_dma_sync_single_range_for_device(struct virtqueue *_vq, +void virtqueue_dma_sync_single_range_for_device(const struct virtqueue *_v= q, dma_addr_t addr, unsigned long offset, size_t size, enum dma_data_direction dir) { - struct vring_virtqueue *vq =3D to_vvq(_vq); + const struct vring_virtqueue *vq =3D to_vvq(_vq); struct device *dev =3D vring_dma_dev(vq); =20 if (!vq->use_dma_api) diff --git a/include/linux/virtio.h b/include/linux/virtio.h index db31fc6f4f1f..eab71a440fba 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -262,18 +262,18 @@ void unregister_virtio_driver(struct virtio_driver *d= rv); module_driver(__virtio_driver, register_virtio_driver, \ unregister_virtio_driver) =20 -dma_addr_t virtqueue_dma_map_single_attrs(struct virtqueue *_vq, void *ptr= , size_t size, +dma_addr_t virtqueue_dma_map_single_attrs(const struct virtqueue *_vq, voi= d *ptr, size_t size, enum dma_data_direction dir, unsigned long attrs); -void virtqueue_dma_unmap_single_attrs(struct virtqueue *_vq, dma_addr_t ad= dr, +void virtqueue_dma_unmap_single_attrs(const struct virtqueue *_vq, dma_add= r_t addr, size_t size, enum dma_data_direction dir, unsigned long attrs); -int virtqueue_dma_mapping_error(struct virtqueue *_vq, dma_addr_t addr); +int virtqueue_dma_mapping_error(const struct virtqueue *_vq, dma_addr_t ad= dr); =20 -bool virtqueue_dma_need_sync(struct virtqueue *_vq, dma_addr_t addr); -void virtqueue_dma_sync_single_range_for_cpu(struct virtqueue *_vq, dma_ad= dr_t addr, +bool virtqueue_dma_need_sync(const struct virtqueue *_vq, dma_addr_t addr); +void virtqueue_dma_sync_single_range_for_cpu(const struct virtqueue *_vq, = dma_addr_t addr, unsigned long offset, size_t size, enum dma_data_direction dir); -void virtqueue_dma_sync_single_range_for_device(struct virtqueue *_vq, dma= _addr_t addr, +void virtqueue_dma_sync_single_range_for_device(const struct virtqueue *_v= q, dma_addr_t addr, unsigned long offset, size_t size, enum dma_data_direction dir); =20 --=20 2.31.1