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 00B10C43334 for ; Mon, 4 Jul 2022 03:27:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230228AbiGDD1y (ORCPT ); Sun, 3 Jul 2022 23:27:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229461AbiGDD1x (ORCPT ); Sun, 3 Jul 2022 23:27:53 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4867A55A0 for ; Sun, 3 Jul 2022 20:27:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656905270; 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=aRPYTHBNTJ6D/pzk3vuj7nrJ9A7vkHl8Eh3Xeb1Gu4I=; b=GWJzdVcGc9JOEgi14c8YHb0/B+nWEfFbjCqnWX5xOMna3z3oD7483XAUmJG/cbhX6ub8Zj cYEvZQNvepw/+nidUM8OVXkxE570TCsHXGFCgwpRTXo0T8ZK8mbGJYiPk7HyLdQvr8pn/C tuJfQZp9goP1OH8sN9FeAek42yhubs4= Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-516-QtrEM8D7NuG6T2Mj6MGHVQ-1; Sun, 03 Jul 2022 23:27:49 -0400 X-MC-Unique: QtrEM8D7NuG6T2Mj6MGHVQ-1 Received: by mail-pf1-f199.google.com with SMTP id o192-20020a62cdc9000000b00527a9108efaso2088579pfg.7 for ; Sun, 03 Jul 2022 20:27:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=aRPYTHBNTJ6D/pzk3vuj7nrJ9A7vkHl8Eh3Xeb1Gu4I=; b=3bdb5kb4CoAaubI3HLUbDcYDu74s6IICbbEqp4W26OtbVwe98tujgUbuV7L4j/c1ZP eMwivgQo0Fc7KokVJ+ZnP7k1UMswkJydoDmZa5YF+hi3LN4otj3t1zUIMqzTMF2sQ8VK KWNCIVdkvUVeWcyiHUKV8WerwpM1DZCoJ086JquRB0IVYlp/D54bTKbX7lBDq1Ayn5ts 2+PT3MbZHBs/KBvB2E1Wz3PLxMnbcJ5FXxeZO6CYvwEGSa/7h5QvRW+dr7WEusitMcw1 K+DesuIeRzDJFp7RbY81ePEhVvKJcqGdCr6EQtdwCCppSj3OZ/IVrBcPDPUo4bIBOSbC r13Q== X-Gm-Message-State: AJIora/dfIU/tE2GTIbjJyPzwZBR/Xb2PCz8SpHBs02aQsW50UvgHKqo yLtFEnfUAJ3o48fgqOA2P/63NhDfJfyDvC6A8qtNPNAEfJhVgb3DpJ5LyYCDtqrd+M57BuRMs+q Jjnm1PuNl6OJA X-Received: by 2002:a17:902:f681:b0:16a:4ca8:65e2 with SMTP id l1-20020a170902f68100b0016a4ca865e2mr33354276plg.63.1656905268179; Sun, 03 Jul 2022 20:27:48 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s/uCdtDZHsC0HjhgrEkOhi+t5KGA26R5v4fDXt8yqlKRWInD3k5Nf4L4GFhmSP9ZEn6fn8Fw== X-Received: by 2002:a17:902:f681:b0:16a:4ca8:65e2 with SMTP id l1-20020a170902f68100b0016a4ca865e2mr33354249plg.63.1656905267861; Sun, 03 Jul 2022 20:27:47 -0700 (PDT) Received: from [10.72.13.251] ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id l189-20020a6225c6000000b005255263a864sm19874688pfl.169.2022.07.03.20.27.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 03 Jul 2022 20:27:47 -0700 (PDT) Message-ID: <0263ecf4-043a-7cc1-950f-f48d3b66bed7@redhat.com> Date: Mon, 4 Jul 2022 11:27:32 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH v11 30/40] virtio_pci: support VIRTIO_F_RING_RESET Content-Language: en-US To: Xuan Zhuo , virtualization@lists.linux-foundation.org Cc: Richard Weinberger , Anton Ivanov , Johannes Berg , "Michael S. Tsirkin" , "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: <20220629065656.54420-1-xuanzhuo@linux.alibaba.com> <20220629065656.54420-31-xuanzhuo@linux.alibaba.com> From: Jason Wang In-Reply-To: <20220629065656.54420-31-xuanzhuo@linux.alibaba.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org 在 2022/6/29 14:56, Xuan Zhuo 写道: > This patch implements virtio pci support for QUEUE RESET. > > Performing reset on a queue is divided into these steps: > > 1. notify the device to reset the queue > 2. recycle the buffer submitted > 3. reset the vring (may re-alloc) > 4. mmap vring to device, and enable the queue > > This patch implements virtio_reset_vq(), virtio_enable_resetq() in the > pci scenario. > > Signed-off-by: Xuan Zhuo > --- > drivers/virtio/virtio_pci_common.c | 12 +++- > drivers/virtio/virtio_pci_modern.c | 96 ++++++++++++++++++++++++++++++ > drivers/virtio/virtio_ring.c | 2 + > include/linux/virtio.h | 1 + > 4 files changed, 108 insertions(+), 3 deletions(-) > > diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c > index ca51fcc9daab..ad258a9d3b9f 100644 > --- a/drivers/virtio/virtio_pci_common.c > +++ b/drivers/virtio/virtio_pci_common.c > @@ -214,9 +214,15 @@ static void vp_del_vq(struct virtqueue *vq) > struct virtio_pci_vq_info *info = vp_dev->vqs[vq->index]; > unsigned long flags; > > - spin_lock_irqsave(&vp_dev->lock, flags); > - list_del(&info->node); > - spin_unlock_irqrestore(&vp_dev->lock, flags); > + /* > + * If it fails during re-enable reset vq. This way we won't rejoin > + * info->node to the queue. Prevent unexpected irqs. > + */ > + if (!vq->reset) { > + spin_lock_irqsave(&vp_dev->lock, flags); > + list_del(&info->node); > + spin_unlock_irqrestore(&vp_dev->lock, flags); > + } > > vp_dev->del_vq(info); > kfree(info); > diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c > index 9041d9a41b7d..754e5e10386b 100644 > --- a/drivers/virtio/virtio_pci_modern.c > +++ b/drivers/virtio/virtio_pci_modern.c > @@ -34,6 +34,9 @@ static void vp_transport_features(struct virtio_device *vdev, u64 features) > if ((features & BIT_ULL(VIRTIO_F_SR_IOV)) && > pci_find_ext_capability(pci_dev, PCI_EXT_CAP_ID_SRIOV)) > __virtio_set_bit(vdev, VIRTIO_F_SR_IOV); > + > + if (features & BIT_ULL(VIRTIO_F_RING_RESET)) > + __virtio_set_bit(vdev, VIRTIO_F_RING_RESET); > } > > /* virtio config->finalize_features() implementation */ > @@ -199,6 +202,95 @@ static int vp_active_vq(struct virtqueue *vq, u16 msix_vec) > return 0; > } > > +static int vp_modern_reset_vq(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); > + > + info = vp_dev->vqs[vq->index]; > + > + /* delete vq from irq handler */ > + spin_lock_irqsave(&vp_dev->lock, flags); > + list_del(&info->node); > + spin_unlock_irqrestore(&vp_dev->lock, flags); > + > + INIT_LIST_HEAD(&info->node); > + > + /* For the case where vq has an exclusive irq, to prevent the irq from > + * being received again and the pending irq, call synchronize_irq(), and > + * break it. > + * > + * We can't use disable_irq() since it conflicts with the affinity > + * managed IRQ that is used by some drivers. So this is done on top of > + * IRQ hardening. > + * > + * In the scenario based on shared interrupts, vq will be searched from > + * the queue virtqueues. Since the previous list_del() has been deleted > + * from the queue, it is impossible for vq to be called in this case. > + * There is no need to close the corresponding interrupt. > + */ > + if (vp_dev->per_vq_vectors && info->msix_vector != VIRTIO_MSI_NO_VECTOR) { > +#ifdef CONFIG_VIRTIO_HARDEN_NOTIFICATION > + __virtqueue_break(vq); > +#endif > + synchronize_irq(pci_irq_vector(vp_dev->pci_dev, info->msix_vector)); > + } > + > + vq->reset = true; > + > + return 0; > +} > + > +static int vp_modern_enable_reset_vq(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, index; > + int err; > + > + if (!vq->reset) > + return -EBUSY; > + > + index = vq->index; > + info = vp_dev->vqs[index]; > + > + if (vp_modern_get_queue_reset(mdev, index)) > + return -EBUSY; > + > + if (vp_modern_get_queue_enable(mdev, index)) > + return -EBUSY; > + > + err = vp_active_vq(vq, info->msix_vector); > + if (err) > + return err; > + > + if (vq->callback) { > + spin_lock_irqsave(&vp_dev->lock, flags); > + list_add(&info->node, &vp_dev->virtqueues); > + spin_unlock_irqrestore(&vp_dev->lock, flags); > + } else { > + INIT_LIST_HEAD(&info->node); > + } > + > +#ifdef CONFIG_VIRTIO_HARDEN_NOTIFICATION > + if (vp_dev->per_vq_vectors && info->msix_vector != VIRTIO_MSI_NO_VECTOR) > + __virtqueue_unbreak(vq); > +#endif > + > + vp_modern_set_queue_enable(&vp_dev->mdev, index, true); > + vq->reset = false; > + > + return 0; > +} > + > static u16 vp_config_vector(struct virtio_pci_device *vp_dev, u16 vector) > { > return vp_modern_config_vector(&vp_dev->mdev, vector); > @@ -413,6 +505,8 @@ static const struct virtio_config_ops virtio_pci_config_nodev_ops = { > .set_vq_affinity = vp_set_vq_affinity, > .get_vq_affinity = vp_get_vq_affinity, > .get_shm_region = vp_get_shm_region, > + .reset_vq = vp_modern_reset_vq, > + .enable_reset_vq = vp_modern_enable_reset_vq, > }; > > static const struct virtio_config_ops virtio_pci_config_ops = { > @@ -431,6 +525,8 @@ static const struct virtio_config_ops virtio_pci_config_ops = { > .set_vq_affinity = vp_set_vq_affinity, > .get_vq_affinity = vp_get_vq_affinity, > .get_shm_region = vp_get_shm_region, > + .reset_vq = vp_modern_reset_vq, > + .enable_reset_vq = vp_modern_enable_reset_vq, > }; > > /* the PCI probing function */ > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index 7b02be7fce67..82b058e8ce34 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -2008,6 +2008,7 @@ static struct virtqueue *vring_create_virtqueue_packed( > vq->vq.vdev = vdev; > vq->vq.name = name; > vq->vq.index = index; > + vq->vq.reset = false; > vq->we_own_ring = true; > vq->notify = notify; > vq->weak_barriers = weak_barriers; > @@ -2487,6 +2488,7 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index, > vq->vq.vdev = vdev; > vq->vq.name = name; > vq->vq.index = index; > + vq->vq.reset = false; > vq->we_own_ring = false; > vq->notify = notify; > vq->weak_barriers = weak_barriers; > diff --git a/include/linux/virtio.h b/include/linux/virtio.h > index dc474a0d48d1..88f21796b1c3 100644 > --- a/include/linux/virtio.h > +++ b/include/linux/virtio.h > @@ -33,6 +33,7 @@ struct virtqueue { > unsigned int num_free; > unsigned int num_max; > void *priv; > + bool reset; > }; I wonder if it's better to move virtio_ring part into a separate patch. Other looks good. Thanks > > int virtqueue_add_outbuf(struct virtqueue *vq,