From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D89A2E7D0BC for ; Fri, 22 Sep 2023 01:51:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230056AbjIVBvQ (ORCPT ); Thu, 21 Sep 2023 21:51:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229458AbjIVBvQ (ORCPT ); Thu, 21 Sep 2023 21:51:16 -0400 Received: from out30-98.freemail.mail.aliyun.com (out30-98.freemail.mail.aliyun.com [115.124.30.98]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11D50F1; Thu, 21 Sep 2023 18:51:06 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R521e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046056;MF=xuanzhuo@linux.alibaba.com;NM=1;PH=DS;RN=36;SR=0;TI=SMTPD_---0Vsa-hC4_1695347462; Received: from localhost(mailfrom:xuanzhuo@linux.alibaba.com fp:SMTPD_---0Vsa-hC4_1695347462) by smtp.aliyun-inc.com; Fri, 22 Sep 2023 09:51:04 +0800 Message-ID: <1695347358.2770545-1-xuanzhuo@linux.alibaba.com> Subject: Re: [PATCH v14 30/42] virtio_pci: introduce helper to get/set queue reset Date: Fri, 22 Sep 2023 09:49:18 +0800 From: Xuan Zhuo To: "Michael S. Tsirkin" Cc: virtualization@lists.linux-foundation.org, Richard Weinberger , Anton Ivanov , Johannes Berg , Jason Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Hans de Goede , Mark Gross , Vadim Pasternak , Bjorn Andersson , Mathieu Poirier , Cornelia Huck , Halil Pasic , Eric Farman , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Vincent Whitchurch , linux-um@lists.infradead.org, netdev@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org, bpf@vger.kernel.org, kangjie.xu@linux.alibaba.com References: <20220801063902.129329-1-xuanzhuo@linux.alibaba.com> <20220801063902.129329-31-xuanzhuo@linux.alibaba.com> <20230921100112-mutt-send-email-mst@kernel.org> In-Reply-To: <20230921100112-mutt-send-email-mst@kernel.org> Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org On Thu, 21 Sep 2023 10:02:53 -0400, "Michael S. Tsirkin" wrote: > On Mon, Aug 01, 2022 at 02:38:50PM +0800, Xuan Zhuo wrote: > > Introduce new helpers to implement queue reset and get queue reset > > status. > > > > https://github.com/oasis-tcs/virtio-spec/issues/124 > > https://github.com/oasis-tcs/virtio-spec/issues/139 > > > > Signed-off-by: Xuan Zhuo > > Acked-by: Jason Wang > > --- > > drivers/virtio/virtio_pci_modern_dev.c | 39 ++++++++++++++++++++++++++ > > include/linux/virtio_pci_modern.h | 2 ++ > > 2 files changed, 41 insertions(+) > > > > diff --git a/drivers/virtio/virtio_pci_modern_dev.c b/drivers/virtio/virtio_pci_modern_dev.c > > index fa2a9445bb18..869cb46bef96 100644 > > --- a/drivers/virtio/virtio_pci_modern_dev.c > > +++ b/drivers/virtio/virtio_pci_modern_dev.c > > @@ -3,6 +3,7 @@ > > #include > > #include > > #include > > +#include > > > > /* > > * vp_modern_map_capability - map a part of virtio pci capability > > @@ -474,6 +475,44 @@ void vp_modern_set_status(struct virtio_pci_modern_device *mdev, > > } > > EXPORT_SYMBOL_GPL(vp_modern_set_status); > > > > +/* > > + * vp_modern_get_queue_reset - get the queue reset status > > + * @mdev: the modern virtio-pci device > > + * @index: queue index > > + */ > > +int vp_modern_get_queue_reset(struct virtio_pci_modern_device *mdev, u16 index) > > +{ > > + struct virtio_pci_modern_common_cfg __iomem *cfg; > > + > > + cfg = (struct virtio_pci_modern_common_cfg __iomem *)mdev->common; > > + > > + vp_iowrite16(index, &cfg->cfg.queue_select); > > + return vp_ioread16(&cfg->queue_reset); > > +} > > +EXPORT_SYMBOL_GPL(vp_modern_get_queue_reset); > > + > > Actually, this does not validate that the config structure is big > enough. So it can access some unrelated memory. Don't know whether > that's exploitable e.g. for CoCo but not nice, anyway. > Need to validate the size and disable reset if it's too small. static int vp_modern_disable_vq_and_reset(struct virtqueue *vq) { struct virtio_pci_device *vp_dev = to_vp_device(vq->vdev); struct virtio_pci_modern_device *mdev = &vp_dev->mdev; struct virtio_pci_vq_info *info; unsigned long flags; -> if (!virtio_has_feature(vq->vdev, VIRTIO_F_RING_RESET)) return -ENOENT; vp_modern_set_queue_reset(mdev, vq->index); I checked VIRTIO_F_RING_RESET before call this. Do you mean, we should put the check to this function. Thanks. > > > > +/* > > + * vp_modern_set_queue_reset - reset the queue > > + * @mdev: the modern virtio-pci device > > + * @index: queue index > > + */ > > +void vp_modern_set_queue_reset(struct virtio_pci_modern_device *mdev, u16 index) > > +{ > > + struct virtio_pci_modern_common_cfg __iomem *cfg; > > + > > + cfg = (struct virtio_pci_modern_common_cfg __iomem *)mdev->common; > > + > > + vp_iowrite16(index, &cfg->cfg.queue_select); > > + vp_iowrite16(1, &cfg->queue_reset); > > + > > + while (vp_ioread16(&cfg->queue_reset)) > > + msleep(1); > > + > > + while (vp_ioread16(&cfg->cfg.queue_enable)) > > + msleep(1); > > +} > > +EXPORT_SYMBOL_GPL(vp_modern_set_queue_reset); > > + > > /* > > * vp_modern_queue_vector - set the MSIX vector for a specific virtqueue > > * @mdev: the modern virtio-pci device > > diff --git a/include/linux/virtio_pci_modern.h b/include/linux/virtio_pci_modern.h > > index 05123b9a606f..c4eeb79b0139 100644 > > --- a/include/linux/virtio_pci_modern.h > > +++ b/include/linux/virtio_pci_modern.h > > @@ -113,4 +113,6 @@ void __iomem * vp_modern_map_vq_notify(struct virtio_pci_modern_device *mdev, > > u16 index, resource_size_t *pa); > > int vp_modern_probe(struct virtio_pci_modern_device *mdev); > > void vp_modern_remove(struct virtio_pci_modern_device *mdev); > > +int vp_modern_get_queue_reset(struct virtio_pci_modern_device *mdev, u16 index); > > +void vp_modern_set_queue_reset(struct virtio_pci_modern_device *mdev, u16 index); > > #endif > > -- > > 2.31.0 >