From nobody Mon Feb 9 23:38:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1630925017; cv=none; d=zohomail.com; s=zohoarc; b=KWwIcikjSDqCzH+ogrzuES7Da1XYN+Ub6z9JAL4S9e0iJH+WoYl3M5Au8z9P6dyd2x9YMgt/UPiYUaQTCfYHCh2gLBRTyOfb90pnlolm/+mrHjYrmE6nixiqTSQchi46pmx7qJz6UkiSWAaG1Au8OXQnHUsqQg59MKVnE4RAiVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630925017; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=hnQjUJf863/+mR0eVjMS2XLf+nf0liaJ3GnxfaQW96o=; b=HxpXrhhVJrfPqe0oe1ZGtO8PEWQpvIZ0Djw233EleXrWvShWUy5XlrZkoBfIsfGfvUroOTfPE2XE9wEzhoo5cJFM2gb/otoyF4sMu23F3/bHyxprgW6qyZfkvUNAAAaTAypcW5TM+tdn+MPy3yVFZptotys1hfOYPfwJ4CKtwaM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1630925017290725.7745727027611; Mon, 6 Sep 2021 03:43:37 -0700 (PDT) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-553-XZyNwOJOMUCcPf4W9pYtnA-1; Mon, 06 Sep 2021 06:43:35 -0400 Received: by mail-wr1-f70.google.com with SMTP id z15-20020adff74f000000b001577d70c98dso1085890wrp.12 for ; Mon, 06 Sep 2021 03:43:35 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id k18sm6946622wmi.25.2021.09.06.03.43.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Sep 2021 03:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630925016; 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=hnQjUJf863/+mR0eVjMS2XLf+nf0liaJ3GnxfaQW96o=; b=QjrYruLEbtV1d+G5Py21h7TXbNV7RwFmZa5OEe39fdabMjNSAqBH6w0gdzz4QGDVZq2Ll5 ircZgq8I9NGiAZ/LKxW08HzJRh6XnJLkz8zE2zrg0QrnifA0URrIc/ENhrrxTLWfdLjAAI Fnb/AThUvfLt68PdTLj3MU6yCweVxZs= X-MC-Unique: XZyNwOJOMUCcPf4W9pYtnA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hnQjUJf863/+mR0eVjMS2XLf+nf0liaJ3GnxfaQW96o=; b=aiCC5Js7x1VijYBGxy/NhgKLGicq4EXIE7Wz1iRlWHMnmrgucG1DUiFc3TTSilDS8U 4zHSjHy8pa6FP2wavwK1HsYaai6lY4Ybg15EFXw1Fv2N/BCVUYgFoDrBImLZDo7TBap1 RllKkDoP6fzGspz2Po1wDDz3g5X9bBtxD97w5rmYKpv4L3XDDRG8nk7t6QZAaO3tzkAp z2/zSKcDvPI8l9g1LGtGn1YB6fLR+utchkE6EmSPo9LcnuWkLjlsA9o28n+CziVhooKr vGGxiLA5Oe2wBKjEYZ5KRFKUGJ4uNYplftMm1DxrTNT6hJbs5eBNRVsUCcBfDLZDBIop c2XQ== X-Gm-Message-State: AOAM530P050BX5idvnTcuLtWuOcZ3v9JrUuA8DdTDcZTp+60yTw0In9+ biHd4321/B3+RT5fczQSW7t5KmZ7oeUmaokgY3hQ2SLxhoyetPObt+fmBrlM2hs+bTq6fYR5NhR nOyKpN4IjU4TeZg== X-Received: by 2002:a1c:2313:: with SMTP id j19mr10432855wmj.189.1630925014342; Mon, 06 Sep 2021 03:43:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJfm5PSRAgm++47QCA949GONjrP8h2cc7vrrvhVpxUSEbp3iABDoCQXGrsno4GUyykO8PS4Q== X-Received: by 2002:a1c:2313:: with SMTP id j19mr10432820wmj.189.1630925013958; Mon, 06 Sep 2021 03:43:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jason Wang , Cornelia Huck , Stefano Garzarella , "Michael S. Tsirkin" , Paolo Bonzini , Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 3/3] hw/virtio: Have virtqueue_get_avail_bytes() pass caches arg to callees Date: Mon, 6 Sep 2021 12:43:18 +0200 Message-Id: <20210906104318.1569967-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210906104318.1569967-1-philmd@redhat.com> References: <20210906104318.1569967-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1630925018543100002 Both virtqueue_packed_get_avail_bytes() and virtqueue_split_get_avail_bytes() access the region cache, but their caller also does. Simplify by having virtqueue_get_avail_bytes calling both with RCU lock held, and passing the caches as argument. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Hajnoczi --- hw/virtio/virtio.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 7d3bf9091ee..0dbfb53e51b 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -985,28 +985,23 @@ static int virtqueue_split_read_next_desc(VirtIODevic= e *vdev, VRingDesc *desc, return VIRTQUEUE_READ_DESC_MORE; } =20 +/* Called within rcu_read_lock(). */ static void virtqueue_split_get_avail_bytes(VirtQueue *vq, unsigned int *in_bytes, unsigned int *out_byte= s, - unsigned max_in_bytes, unsigned max_out_bytes) + unsigned max_in_bytes, unsigned max_out_bytes, + VRingMemoryRegionCaches *caches) { VirtIODevice *vdev =3D vq->vdev; unsigned int max, idx; unsigned int total_bufs, in_total, out_total; - VRingMemoryRegionCaches *caches; MemoryRegionCache indirect_desc_cache =3D MEMORY_REGION_CACHE_INVALID; int64_t len =3D 0; int rc; =20 - RCU_READ_LOCK_GUARD(); - idx =3D vq->last_avail_idx; total_bufs =3D in_total =3D out_total =3D 0; =20 max =3D vq->vring.num; - caches =3D vring_get_region_caches(vq); - if (!caches) { - goto err; - } =20 while ((rc =3D virtqueue_num_heads(vq, idx)) > 0) { MemoryRegionCache *desc_cache =3D &caches->desc; @@ -1125,32 +1120,28 @@ static int virtqueue_packed_read_next_desc(VirtQueu= e *vq, return VIRTQUEUE_READ_DESC_MORE; } =20 +/* Called within rcu_read_lock(). */ static void virtqueue_packed_get_avail_bytes(VirtQueue *vq, unsigned int *in_bytes, unsigned int *out_bytes, unsigned max_in_bytes, - unsigned max_out_bytes) + unsigned max_out_bytes, + VRingMemoryRegionCaches *cach= es) { VirtIODevice *vdev =3D vq->vdev; unsigned int max, idx; unsigned int total_bufs, in_total, out_total; MemoryRegionCache *desc_cache; - VRingMemoryRegionCaches *caches; MemoryRegionCache indirect_desc_cache =3D MEMORY_REGION_CACHE_INVALID; int64_t len =3D 0; VRingPackedDesc desc; bool wrap_counter; =20 - RCU_READ_LOCK_GUARD(); idx =3D vq->last_avail_idx; wrap_counter =3D vq->last_avail_wrap_counter; total_bufs =3D in_total =3D out_total =3D 0; =20 max =3D vq->vring.num; - caches =3D vring_get_region_caches(vq); - if (!caches) { - goto err; - } =20 for (;;) { unsigned int num_bufs =3D total_bufs; @@ -1251,6 +1242,8 @@ void virtqueue_get_avail_bytes(VirtQueue *vq, unsigne= d int *in_bytes, uint16_t desc_size; VRingMemoryRegionCaches *caches; =20 + RCU_READ_LOCK_GUARD(); + if (unlikely(!vq->vring.desc)) { goto err; } @@ -1269,10 +1262,12 @@ void virtqueue_get_avail_bytes(VirtQueue *vq, unsig= ned int *in_bytes, =20 if (virtio_vdev_has_feature(vq->vdev, VIRTIO_F_RING_PACKED)) { virtqueue_packed_get_avail_bytes(vq, in_bytes, out_bytes, - max_in_bytes, max_out_bytes); + max_in_bytes, max_out_bytes, + caches); } else { virtqueue_split_get_avail_bytes(vq, in_bytes, out_bytes, - max_in_bytes, max_out_bytes); + max_in_bytes, max_out_bytes, + caches); } =20 return; --=20 2.31.1