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 4D3AB20D4E9 for ; Mon, 20 Oct 2025 15:21:01 +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=1760973663; cv=none; b=QAu07QGXKoYwkBGZbGcSBImzD+vFAItjfRwg9LBxMDurNRLrQITTT7GVWYyTJx2vP6nly7Be589EF5RPdzlNNGbt3gszym/0m02XM7YcnhewBKJ73wm7a39Iy6vWK1cDfeUeqqxXoB4B/d0hrQ9JJqOmbQoesMIHw0/34Mhikjo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760973663; c=relaxed/simple; bh=0EsglKgJq2u+sNuw6Gm2VhREcrtVOUL0U6edSIE/3L8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=INGLzbg1C6hQ90dYivaW7WQgiE2XfXWhNPOII+BNYlNRmjII6fysTYZKxtzdiLNwjpHpZIORRFNsocyEMnSk5P5nuD9XJ0qWBi3eranMYIV8nnjZ27chL9nk//ezVsDpnCeR1YwctXy80LpbklrHM1cBmeeHLScL4Gyj/8NqXt0= 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=VtyCXmoj; 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="VtyCXmoj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760973660; 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=tCBAB6Z1obZZB6PCkdJGovTGPzB/XSmWx3N34the0Lw=; b=VtyCXmojH9HWosELJX+Hr1FyNm0kLO0+vnUELlbCPWxaH72/vOKfKjKlMNam4z6ZgD3L+i Mg44myxT5GeuAHubsAcWonAuPQ70O3mzmXbhPwzeH6PTTUZodsE1tPVZcgEDoKTy+8Qwgg t8iJMMvklvu6D+AK12mk9REmKxSY+6g= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-573-CXbTmfTfMIGji1VYS1F3Ng-1; Mon, 20 Oct 2025 11:20:59 -0400 X-MC-Unique: CXbTmfTfMIGji1VYS1F3Ng-1 X-Mimecast-MFC-AGG-ID: CXbTmfTfMIGji1VYS1F3Ng_1760973658 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4710c04a403so50229085e9.3 for ; Mon, 20 Oct 2025 08:20:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760973658; x=1761578458; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tCBAB6Z1obZZB6PCkdJGovTGPzB/XSmWx3N34the0Lw=; b=ar6ayjC2pwJb29Y9Y/SoFEDlXd7Jd0kvxqGwdQlUqMQJ6AwyUt9WKgHsfxetvlQGQ6 RKfYUiH4FKkZODU6vB8y0Zm0jtOQ5Z48CGRXTw8RY01AuPwK5D2xeO2r6T7Db/+0uMuo 7EbGl3dPXrYJFMk79QHgtlplid6P+8uXDhYwk/elXAnbS+d5NmgNethVLmwGKkk9+TQ4 PVu4qtU0V8uKNyrgOHG87PpsDKQwq7FB28nwGx9mipo1csdEsqL6eMgR3T14CRT6n42h 37HSTd7nhEE0O3k2PlWy6jBVK2T3DpSx+bG3V0u56dAGEZuZ8ZVvjqqYvAFc5S77bhNY NdJA== X-Forwarded-Encrypted: i=1; AJvYcCUeEyufddYQBX8P54rdb99tudTmkSCRuLJfF9blaQ91ekfUkkryEOLHa1h0x3snt5uuuFIkcIHFah0ev6c=@vger.kernel.org X-Gm-Message-State: AOJu0YzgcaROoEYvjTbPvDOA+fptmsN9dnIUz6uYReIay5BYz06TFbMl BPRoTsWuIGC/rvUzbHpgeNJYgzuqtTBvb1s202Twph/YNvBpucikcLhAizPCQO2zPiW0l+5VJ87 +v33Jn4WDxCBPqWudOialaduAZkiWK1gFtmeC8kN+nwqKBgtd1D21t72SWobEU/Xbdw== X-Gm-Gg: ASbGncv0nQgA0BV1BFRVUCFlZLs6QpkSqbq6Cc1EiFAgwWIwvN8D8Wurz4g8osdKNLv ZrnrdcSNC8U9hLlbjajZBJeX8MIhrO3oPYtV52OAVDl6Xp6h7pCVrcUEH1dlw3hkqPZ8HV2g4Tn ykgejOGrYJyY8uTmgzcWC8B38IqErCT+dANcYHaM6VSiiSeUgfzXIUMhRy0Xxof7fKOj2amjaXq x6T0uZW2bu6IKc48Hrorg+PYYm4Aj1MrOWJgrv0EkPE4z2uqhLwj128xPvb8+PVl92Hzf18NWZy OGbB6L3Phv3wr3huaE9Nm+u7NvRjb3P26QMjuN41WB4tEQZEAlxk2s2Hc9cNQX/SxzKW X-Received: by 2002:a05:600c:5026:b0:470:bcc4:b07c with SMTP id 5b1f17b1804b1-47117925d38mr109583415e9.37.1760973657500; Mon, 20 Oct 2025 08:20:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEr6nNZSd8NCkpiaeW3J3hHZukHYwj3sU75aClsukBYxe6WG35VM7ntv5LYKEqel/bW2STHNQ== X-Received: by 2002:a05:600c:5026:b0:470:bcc4:b07c with SMTP id 5b1f17b1804b1-47117925d38mr109583225e9.37.1760973656949; Mon, 20 Oct 2025 08:20:56 -0700 (PDT) Received: from redhat.com ([2a0d:6fc0:152d:b200:2a90:8f13:7c1e:f479]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00b988dsm16193350f8f.35.2025.10.20.08.20.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Oct 2025 08:20:56 -0700 (PDT) Date: Mon, 20 Oct 2025 11:20:54 -0400 From: "Michael S. Tsirkin" To: Jason Wang Cc: xuanzhuo@linux.alibaba.com, eperezma@redhat.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Subject: Re: [PATCH V8 13/19] virtio_ring: introduce virtqueue ops Message-ID: <20251020111938-mutt-send-email-mst@kernel.org> References: <20251020071003.28834-1-jasowang@redhat.com> <20251020071003.28834-14-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=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20251020071003.28834-14-jasowang@redhat.com> On Mon, Oct 20, 2025 at 03:09:57PM +0800, Jason Wang wrote: > This patch introduces virtqueue ops which is a set of the callbacks a set of callbacks > that will be called for different queue layout or features. This would > help to avoid branches for split/packed and will ease the future > implementation like in order. > > Note that in order to eliminate the indirect calls this patch uses > global array of const ops to allow compiler to avoid indirect > branches. > > Tested with CONFIG_MITIGATION_RETPOLINE, no performance differences > were noticed. > > Acked-by: Eugenio Pérez > Suggested-by: Michael S. Tsirkin > Signed-off-by: Jason Wang > --- > drivers/virtio/virtio_ring.c | 174 ++++++++++++++++++++++++++--------- > 1 file changed, 131 insertions(+), 43 deletions(-) > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index 73dcc6984e33..37b16ef906a4 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -67,6 +67,12 @@ > #define LAST_ADD_TIME_INVALID(vq) > #endif > > +enum vq_layout { > + SPLIT = 0, > + PACKED, > + VQ_TYPE_MAX, > +}; > + > struct vring_desc_state_split { > void *data; /* Data for callback. */ > > @@ -159,12 +165,29 @@ struct vring_virtqueue_packed { > size_t event_size_in_bytes; > }; > > +struct vring_virtqueue; > + > +struct virtqueue_ops { > + int (*add)(struct vring_virtqueue *_vq, struct scatterlist *sgs[], > + unsigned int total_sg, unsigned int out_sgs, > + unsigned int in_sgs, void *data, > + void *ctx, bool premapped, gfp_t gfp); > + void *(*get)(struct vring_virtqueue *vq, unsigned int *len, void **ctx); > + bool (*kick_prepare)(struct vring_virtqueue *vq); > + void (*disable_cb)(struct vring_virtqueue *vq); > + bool (*enable_cb_delayed)(struct vring_virtqueue *vq); > + unsigned int (*enable_cb_prepare)(struct vring_virtqueue *vq); > + bool (*poll)(const struct vring_virtqueue *vq, > + unsigned int last_used_idx); > + void *(*detach_unused_buf)(struct vring_virtqueue *vq); > + bool (*more_used)(const struct vring_virtqueue *vq); > + int (*resize)(struct vring_virtqueue *vq, u32 num); > + void (*reset)(struct vring_virtqueue *vq); > +}; > + > struct vring_virtqueue { > struct virtqueue vq; > > - /* Is this a packed ring? */ > - bool packed_ring; > - > /* Is DMA API used? */ > bool use_map_api; > > @@ -180,6 +203,8 @@ struct vring_virtqueue { > /* Host publishes avail event idx */ > bool event; > > + enum vq_layout layout; > + > /* Head of free buffer list. */ > unsigned int free_head; > /* Number we've added since last sync. */ > @@ -231,6 +256,12 @@ static void vring_free(struct virtqueue *_vq); > > #define to_vvq(_vq) container_of_const(_vq, struct vring_virtqueue, vq) > > + > +static inline bool virtqueue_is_packed(const struct vring_virtqueue *vq) > +{ > + return vq->layout == PACKED; > +} > + > static bool virtqueue_use_indirect(const struct vring_virtqueue *vq, > unsigned int total_sg) > { > @@ -433,7 +464,7 @@ static void virtqueue_init(struct vring_virtqueue *vq, u32 num) > { > vq->vq.num_free = num; > > - if (vq->packed_ring) > + if (virtqueue_is_packed(vq)) > vq->last_used_idx = 0 | (1 << VRING_PACKED_EVENT_F_WRAP_CTR); > else > vq->last_used_idx = 0; > @@ -1122,6 +1153,8 @@ static int vring_alloc_queue_split(struct vring_virtqueue_split *vring_split, > return 0; > } > > +static const struct virtqueue_ops split_ops; > + > static struct virtqueue *__vring_new_virtqueue_split(unsigned int index, > struct vring_virtqueue_split *vring_split, > struct virtio_device *vdev, > @@ -1139,7 +1172,7 @@ static struct virtqueue *__vring_new_virtqueue_split(unsigned int index, > if (!vq) > return NULL; > > - vq->packed_ring = false; > + vq->layout = SPLIT; > vq->vq.callback = callback; > vq->vq.vdev = vdev; > vq->vq.name = name; > @@ -2077,6 +2110,8 @@ static void virtqueue_reset_packed(struct vring_virtqueue *vq) > virtqueue_vring_init_packed(&vq->packed, !!vq->vq.callback); > } > > +static const struct virtqueue_ops packed_ops; > + > static struct virtqueue *__vring_new_virtqueue_packed(unsigned int index, > struct vring_virtqueue_packed *vring_packed, > struct virtio_device *vdev, > @@ -2107,7 +2142,7 @@ static struct virtqueue *__vring_new_virtqueue_packed(unsigned int index, > #else > vq->broken = false; > #endif > - vq->packed_ring = true; > + vq->layout = PACKED; > vq->map = map; > vq->use_map_api = vring_use_map_api(vdev); > > @@ -2195,6 +2230,39 @@ static int virtqueue_resize_packed(struct vring_virtqueue *vq, u32 num) > return -ENOMEM; > } > > +static const struct virtqueue_ops split_ops = { > + .add = virtqueue_add_split, > + .get = virtqueue_get_buf_ctx_split, > + .kick_prepare = virtqueue_kick_prepare_split, > + .disable_cb = virtqueue_disable_cb_split, > + .enable_cb_delayed = virtqueue_enable_cb_delayed_split, > + .enable_cb_prepare = virtqueue_enable_cb_prepare_split, > + .poll = virtqueue_poll_split, > + .detach_unused_buf = virtqueue_detach_unused_buf_split, > + .more_used = more_used_split, > + .resize = virtqueue_resize_split, > + .reset = virtqueue_reset_split, > +}; > + > +static const struct virtqueue_ops packed_ops = { > + .add = virtqueue_add_packed, > + .get = virtqueue_get_buf_ctx_packed, > + .kick_prepare = virtqueue_kick_prepare_packed, > + .disable_cb = virtqueue_disable_cb_packed, > + .enable_cb_delayed = virtqueue_enable_cb_delayed_packed, > + .enable_cb_prepare = virtqueue_enable_cb_prepare_packed, > + .poll = virtqueue_poll_packed, > + .detach_unused_buf = virtqueue_detach_unused_buf_packed, > + .more_used = more_used_packed, > + .resize = virtqueue_resize_packed, > + .reset = virtqueue_reset_packed, > +}; > + > +static const struct virtqueue_ops *const all_ops[VQ_TYPE_MAX] = { > + [SPLIT] = &split_ops, > + [PACKED] = &packed_ops > +}; > + > static int virtqueue_disable_and_recycle(struct virtqueue *_vq, > void (*recycle)(struct virtqueue *vq, void *buf)) > { > @@ -2237,6 +2305,39 @@ static int virtqueue_enable_after_reset(struct virtqueue *_vq) > * Generic functions and exported symbols. > */ > > +#define VIRTQUEUE_CALL(vq, op, ...) \ > + ({ \ > + typeof(all_ops[SPLIT]->op(vq, ##__VA_ARGS__)) ret; \ > + \ > + switch (vq->layout) { \ > + case SPLIT: \ > + ret = all_ops[SPLIT]->op(vq, ##__VA_ARGS__); \ > + break; \ > + case PACKED: \ > + ret = all_ops[PACKED]->op(vq, ##__VA_ARGS__); \ > + break; \ > + default: \ > + BUG(); \ > + break; \ > + } \ > + ret; \ > +}) > + > +#define VOID_VIRTQUEUE_CALL(vq, op, ...) \ > + ({ \ > + switch ((vq)->layout) { \ > + case SPLIT: \ > + all_ops[SPLIT]->op(vq, ##__VA_ARGS__); \ > + break; \ > + case PACKED: \ > + all_ops[PACKED]->op(vq, ##__VA_ARGS__); \ > + break; \ > + default: \ > + BUG(); \ > + break; \ > + } \ > +}) > + > static inline int virtqueue_add(struct virtqueue *_vq, > struct scatterlist *sgs[], > unsigned int total_sg, > @@ -2249,10 +2350,9 @@ static inline int virtqueue_add(struct virtqueue *_vq, > { > struct vring_virtqueue *vq = to_vvq(_vq); > > - return vq->packed_ring ? virtqueue_add_packed(vq, sgs, total_sg, > - out_sgs, in_sgs, data, ctx, premapped, gfp) : > - virtqueue_add_split(vq, sgs, total_sg, > - out_sgs, in_sgs, data, ctx, premapped, gfp); > + return VIRTQUEUE_CALL(vq, add, sgs, total_sg, > + out_sgs, in_sgs, data, > + ctx, premapped, gfp); > } > > /** > @@ -2442,8 +2542,7 @@ bool virtqueue_kick_prepare(struct virtqueue *_vq) > { > struct vring_virtqueue *vq = to_vvq(_vq); > > - return vq->packed_ring ? virtqueue_kick_prepare_packed(vq) : > - virtqueue_kick_prepare_split(vq); > + return VIRTQUEUE_CALL(vq, kick_prepare); > } > EXPORT_SYMBOL_GPL(virtqueue_kick_prepare); > > @@ -2513,8 +2612,7 @@ void *virtqueue_get_buf_ctx(struct virtqueue *_vq, unsigned int *len, > { > struct vring_virtqueue *vq = to_vvq(_vq); > > - return vq->packed_ring ? virtqueue_get_buf_ctx_packed(vq, len, ctx) : > - virtqueue_get_buf_ctx_split(vq, len, ctx); > + return VIRTQUEUE_CALL(vq, get, len, ctx); > } > EXPORT_SYMBOL_GPL(virtqueue_get_buf_ctx); > > @@ -2536,10 +2634,7 @@ void virtqueue_disable_cb(struct virtqueue *_vq) > { > struct vring_virtqueue *vq = to_vvq(_vq); > > - if (vq->packed_ring) > - virtqueue_disable_cb_packed(vq); > - else > - virtqueue_disable_cb_split(vq); > + VOID_VIRTQUEUE_CALL(vq, disable_cb); > } > EXPORT_SYMBOL_GPL(virtqueue_disable_cb); > > @@ -2562,8 +2657,7 @@ unsigned int virtqueue_enable_cb_prepare(struct virtqueue *_vq) > if (vq->event_triggered) > vq->event_triggered = false; > > - return vq->packed_ring ? virtqueue_enable_cb_prepare_packed(vq) : > - virtqueue_enable_cb_prepare_split(vq); > + return VIRTQUEUE_CALL(vq, enable_cb_prepare); > } > EXPORT_SYMBOL_GPL(virtqueue_enable_cb_prepare); > > @@ -2584,8 +2678,8 @@ bool virtqueue_poll(struct virtqueue *_vq, unsigned int last_used_idx) > return false; > > virtio_mb(vq->weak_barriers); > - return vq->packed_ring ? virtqueue_poll_packed(vq, last_used_idx) : > - virtqueue_poll_split(vq, last_used_idx); > + > + return VIRTQUEUE_CALL(vq, poll, last_used_idx); > } > EXPORT_SYMBOL_GPL(virtqueue_poll); > > @@ -2628,8 +2722,7 @@ bool virtqueue_enable_cb_delayed(struct virtqueue *_vq) > if (vq->event_triggered) > data_race(vq->event_triggered = false); > > - return vq->packed_ring ? virtqueue_enable_cb_delayed_packed(vq) : > - virtqueue_enable_cb_delayed_split(vq); > + return VIRTQUEUE_CALL(vq, enable_cb_delayed); > } > EXPORT_SYMBOL_GPL(virtqueue_enable_cb_delayed); > > @@ -2645,14 +2738,13 @@ void *virtqueue_detach_unused_buf(struct virtqueue *_vq) > { > struct vring_virtqueue *vq = to_vvq(_vq); > > - return vq->packed_ring ? virtqueue_detach_unused_buf_packed(vq) : > - virtqueue_detach_unused_buf_split(vq); > + return VIRTQUEUE_CALL(vq, detach_unused_buf); > } > EXPORT_SYMBOL_GPL(virtqueue_detach_unused_buf); > > static inline bool more_used(const struct vring_virtqueue *vq) > { > - return vq->packed_ring ? more_used_packed(vq) : more_used_split(vq); > + return VIRTQUEUE_CALL(vq, more_used); > } > > /** > @@ -2782,7 +2874,8 @@ int virtqueue_resize(struct virtqueue *_vq, u32 num, > if (!num) > return -EINVAL; > > - if ((vq->packed_ring ? vq->packed.vring.num : vq->split.vring.num) == num) > + if ((virtqueue_is_packed(vq) ? vq->packed.vring.num : > + vq->split.vring.num) == num) > return 0; > > err = virtqueue_disable_and_recycle(_vq, recycle); > @@ -2791,10 +2884,7 @@ int virtqueue_resize(struct virtqueue *_vq, u32 num, > if (recycle_done) > recycle_done(_vq); > > - if (vq->packed_ring) > - err = virtqueue_resize_packed(vq, num); > - else > - err = virtqueue_resize_split(vq, num); > + err = VIRTQUEUE_CALL(vq, resize, num); > > err_reset = virtqueue_enable_after_reset(_vq); > if (err_reset) > @@ -2832,10 +2922,7 @@ int virtqueue_reset(struct virtqueue *_vq, > if (recycle_done) > recycle_done(_vq); > > - if (vq->packed_ring) > - virtqueue_reset_packed(vq); > - else > - virtqueue_reset_split(vq); > + VOID_VIRTQUEUE_CALL(vq, reset); > > return virtqueue_enable_after_reset(_vq); > } > @@ -2878,7 +2965,7 @@ static void vring_free(struct virtqueue *_vq) > struct vring_virtqueue *vq = to_vvq(_vq); > > if (vq->we_own_ring) { > - if (vq->packed_ring) { > + if (virtqueue_is_packed(vq)) { > vring_free_queue(vq->vq.vdev, > vq->packed.ring_size_in_bytes, > vq->packed.vring.desc, > @@ -2907,7 +2994,7 @@ static void vring_free(struct virtqueue *_vq) > vq->map); > } > } > - if (!vq->packed_ring) { > + if (!virtqueue_is_packed(vq)) { > kfree(vq->split.desc_state); > kfree(vq->split.desc_extra); > } > @@ -2932,7 +3019,7 @@ u32 vring_notification_data(struct virtqueue *_vq) > struct vring_virtqueue *vq = to_vvq(_vq); > u16 next; > > - if (vq->packed_ring) > + if (virtqueue_is_packed(vq)) > next = (vq->packed.next_avail_idx & > ~(-(1 << VRING_PACKED_EVENT_F_WRAP_CTR))) | > vq->packed.avail_wrap_counter << > @@ -2985,7 +3072,8 @@ unsigned int virtqueue_get_vring_size(const struct virtqueue *_vq) > > const struct vring_virtqueue *vq = to_vvq(_vq); > > - return vq->packed_ring ? vq->packed.vring.num : vq->split.vring.num; > + return virtqueue_is_packed(vq) ? vq->packed.vring.num : > + vq->split.vring.num; > } > EXPORT_SYMBOL_GPL(virtqueue_get_vring_size); > > @@ -3068,7 +3156,7 @@ dma_addr_t virtqueue_get_desc_addr(const struct virtqueue *_vq) > > BUG_ON(!vq->we_own_ring); > > - if (vq->packed_ring) > + if (virtqueue_is_packed(vq)) > return vq->packed.ring_dma_addr; > > return vq->split.queue_dma_addr; > @@ -3081,7 +3169,7 @@ dma_addr_t virtqueue_get_avail_addr(const struct virtqueue *_vq) > > BUG_ON(!vq->we_own_ring); > > - if (vq->packed_ring) > + if (virtqueue_is_packed(vq)) > return vq->packed.driver_event_dma_addr; > > return vq->split.queue_dma_addr + > @@ -3095,7 +3183,7 @@ dma_addr_t virtqueue_get_used_addr(const struct virtqueue *_vq) > > BUG_ON(!vq->we_own_ring); > > - if (vq->packed_ring) > + if (virtqueue_is_packed(vq)) > return vq->packed.device_event_dma_addr; > > return vq->split.queue_dma_addr + > -- > 2.31.1