Message ID | 20221226074908.8154-3-jasowang@redhat.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp795130wrt; Sun, 25 Dec 2022 23:52:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXsZP02Uqch1NRkpKC0EB5STXg3yDzkSJtHYRmam8zmG21nn6U3hCKE9z0pLXRumMspKhSNm X-Received: by 2002:a05:6402:33a:b0:469:ae36:b954 with SMTP id q26-20020a056402033a00b00469ae36b954mr18520651edw.30.1672041142023; Sun, 25 Dec 2022 23:52:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672041142; cv=none; d=google.com; s=arc-20160816; b=h6zc3e1oF7uPU1xzXWRt7Y1//RZYDqMPFKnpIvz+nfuEXigAA479pjmemX1o/Q7Eir s/E8uKVvPJRocmF6XPvIN7yNLJMw2AND6fXL2QY9V62K5OO5A+gZBRqb5DRZR9FCYp/S 0ZlsyzrbmylBD9Id+OvPwaedNreKBM488OeUdP5oM//JM+0hC460VOItBcq+v+zye9dW qvRvCpbQ6ht8CNw+mCBAZAiZFrGWhDnn2VyqJwzbh0W1zEFOMzzG5pVAnefsBa7Xlrl5 P7e1WcJuTJcmSmu8XGpOVOs7kul8cCc0iz7L798bxsPqjLBrOEfi7vK+48Sh6wNndh99 zfTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=35zLZwgpZzPWsmc0E40bJzgqya6RhlIevYxkApG1GCU=; b=0vhP/CX0w80iANLlZOn8CYJbpWxUMoocNmqHREjglEeVyYaBY08d7uR1O3hwXQVtTx m7uKLKI9kKnFsNKfvVUr+UH5YrxfehN6XE7Yd/zsj5VN+t5/L2ZtXdVzBzjM4iRN9Bjg R84MgqN/VJGfNQBF1v2KPRSXaSqSdsiMPVI9GjPC+ubHp22pVIq1lHeX9+DooVKf5OV6 ktUFrX6k1Bd5/P/pF1KC9hRHz3E0SwHJyKt52Jxl4MVknNZ7cgasSGm2zgvWpgL8CtW8 V8ISUYBmCxql2sHMgQQiIcVuXxeytUzDmk7kBg/MVrVZ78+iTmcFMgeyFl5mL4RUCWWR liZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gSJXZ4jP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o15-20020a056402038f00b00481f6b77528si6390176edv.392.2022.12.25.23.51.58; Sun, 25 Dec 2022 23:52:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gSJXZ4jP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231824AbiLZHu0 (ORCPT <rfc822;eddaouddi.ayoub@gmail.com> + 99 others); Mon, 26 Dec 2022 02:50:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231777AbiLZHuM (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 26 Dec 2022 02:50:12 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAEFE55B0 for <linux-kernel@vger.kernel.org>; Sun, 25 Dec 2022 23:49:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672040969; 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=35zLZwgpZzPWsmc0E40bJzgqya6RhlIevYxkApG1GCU=; b=gSJXZ4jPVbWOTXYbqdiHDvSxJvfCFEf8dEHn7fPHAFAZAJnlwqFq92Nv6Pf5okKvJP7p4y iDYiciyODeHpsiPSQ3S1mMenYdK7RUmdNTry3+6Hi/VqdsbGXlWWxCKkaBmvTcUHbaVGTi HX509qZXx37h6ZdzlXZa0ONjfRAnlnU= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-167-Sn-ZY8cfO-CI_5uqf-CTGg-1; Mon, 26 Dec 2022 02:49:26 -0500 X-MC-Unique: Sn-ZY8cfO-CI_5uqf-CTGg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C5DCC380406F; Mon, 26 Dec 2022 07:49:25 +0000 (UTC) Received: from localhost.localdomain (ovpn-13-100.pek2.redhat.com [10.72.13.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E0B9492B00; Mon, 26 Dec 2022 07:49:20 +0000 (UTC) From: Jason Wang <jasowang@redhat.com> To: mst@redhat.com, jasowang@redhat.com Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, maxime.coquelin@redhat.com, alvaro.karsz@solid-run.com, eperezma@redhat.com Subject: [PATCH 2/4] virtio_ring: switch to use BAD_RING() Date: Mon, 26 Dec 2022 15:49:06 +0800 Message-Id: <20221226074908.8154-3-jasowang@redhat.com> In-Reply-To: <20221226074908.8154-1-jasowang@redhat.com> References: <20221226074908.8154-1-jasowang@redhat.com> MIME-Version: 1.0 Content-type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753262212549640542?= X-GMAIL-MSGID: =?utf-8?q?1753262212549640542?= |
Series | virtio-net: don't busy poll for cvq command | |
Commit Message
Jason Wang
Dec. 26, 2022, 7:49 a.m. UTC
Switch to reuse BAD_RING() to allow common logic to be implemented in
BAD_RING().
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
Changes since V1:
- switch to use BAD_RING in virtio_break_device()
---
drivers/virtio/virtio_ring.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Comments
On Mon, Dec 26, 2022 at 03:49:06PM +0800, Jason Wang wrote: > Switch to reuse BAD_RING() to allow common logic to be implemented in > BAD_RING(). > > Signed-off-by: Jason Wang <jasowang@redhat.com> > --- > Changes since V1: > - switch to use BAD_RING in virtio_break_device() > --- > drivers/virtio/virtio_ring.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index 2e7689bb933b..5cfb2fa8abee 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -58,7 +58,8 @@ > do { \ > dev_err(&_vq->vq.vdev->dev, \ > "%s:"fmt, (_vq)->vq.name, ##args); \ > - (_vq)->broken = true; \ > + /* Pairs with READ_ONCE() in virtqueue_is_broken(). */ \ I don't think WRITE_ONCE/READ_ONCE pair as such. Can you point me at documentation of such pairing? > + WRITE_ONCE((_vq)->broken, true); \ > } while (0) > #define START_USE(vq) > #define END_USE(vq) > @@ -2237,7 +2238,7 @@ bool virtqueue_notify(struct virtqueue *_vq) > > /* Prod other side to tell it about changes. */ > if (!vq->notify(_vq)) { > - vq->broken = true; > + BAD_RING(vq, "vq %d is broken\n", vq->vq.index); > return false; > } > return true; > @@ -2786,8 +2787,7 @@ void virtio_break_device(struct virtio_device *dev) > list_for_each_entry(_vq, &dev->vqs, list) { > struct vring_virtqueue *vq = to_vvq(_vq); > > - /* Pairs with READ_ONCE() in virtqueue_is_broken(). */ > - WRITE_ONCE(vq->broken, true); > + BAD_RING(vq, "Device break vq %d", _vq->index); > } > spin_unlock(&dev->vqs_list_lock); > } > -- > 2.25.1
On Tue, Dec 27, 2022 at 7:36 AM Michael S. Tsirkin <mst@redhat.com> wrote: > > On Mon, Dec 26, 2022 at 03:49:06PM +0800, Jason Wang wrote: > > Switch to reuse BAD_RING() to allow common logic to be implemented in > > BAD_RING(). > > > > Signed-off-by: Jason Wang <jasowang@redhat.com> > > --- > > Changes since V1: > > - switch to use BAD_RING in virtio_break_device() > > --- > > drivers/virtio/virtio_ring.c | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > > index 2e7689bb933b..5cfb2fa8abee 100644 > > --- a/drivers/virtio/virtio_ring.c > > +++ b/drivers/virtio/virtio_ring.c > > @@ -58,7 +58,8 @@ > > do { \ > > dev_err(&_vq->vq.vdev->dev, \ > > "%s:"fmt, (_vq)->vq.name, ##args); \ > > - (_vq)->broken = true; \ > > + /* Pairs with READ_ONCE() in virtqueue_is_broken(). */ \ > > I don't think WRITE_ONCE/READ_ONCE pair as such. Can you point > me at documentation of such pairing? Introduced by: commit 60f0779862e4ab943810187752c462e85f5fa371 Author: Parav Pandit <parav@nvidia.com> Date: Wed Jul 21 17:26:45 2021 +0300 virtio: Improve vq->broken access to avoid any compiler optimization I think it might still apply here since virtqueue_is_broken() is still put into a loop inside wait_event(). Thanks > > > + WRITE_ONCE((_vq)->broken, true); \ > > } while (0) > > #define START_USE(vq) > > #define END_USE(vq) > > @@ -2237,7 +2238,7 @@ bool virtqueue_notify(struct virtqueue *_vq) > > > > /* Prod other side to tell it about changes. */ > > if (!vq->notify(_vq)) { > > - vq->broken = true; > > + BAD_RING(vq, "vq %d is broken\n", vq->vq.index); > > return false; > > } > > return true; > > @@ -2786,8 +2787,7 @@ void virtio_break_device(struct virtio_device *dev) > > list_for_each_entry(_vq, &dev->vqs, list) { > > struct vring_virtqueue *vq = to_vvq(_vq); > > > > - /* Pairs with READ_ONCE() in virtqueue_is_broken(). */ > > - WRITE_ONCE(vq->broken, true); > > + BAD_RING(vq, "Device break vq %d", _vq->index); > > } > > spin_unlock(&dev->vqs_list_lock); > > } > > -- > > 2.25.1 >
On Tue, Dec 27, 2022 at 11:51:02AM +0800, Jason Wang wrote: > On Tue, Dec 27, 2022 at 7:36 AM Michael S. Tsirkin <mst@redhat.com> wrote: > > > > On Mon, Dec 26, 2022 at 03:49:06PM +0800, Jason Wang wrote: > > > Switch to reuse BAD_RING() to allow common logic to be implemented in > > > BAD_RING(). > > > > > > Signed-off-by: Jason Wang <jasowang@redhat.com> > > > --- > > > Changes since V1: > > > - switch to use BAD_RING in virtio_break_device() > > > --- > > > drivers/virtio/virtio_ring.c | 8 ++++---- > > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > > > index 2e7689bb933b..5cfb2fa8abee 100644 > > > --- a/drivers/virtio/virtio_ring.c > > > +++ b/drivers/virtio/virtio_ring.c > > > @@ -58,7 +58,8 @@ > > > do { \ > > > dev_err(&_vq->vq.vdev->dev, \ > > > "%s:"fmt, (_vq)->vq.name, ##args); \ > > > - (_vq)->broken = true; \ > > > + /* Pairs with READ_ONCE() in virtqueue_is_broken(). */ \ > > > > I don't think WRITE_ONCE/READ_ONCE pair as such. Can you point > > me at documentation of such pairing? > > Introduced by: > > commit 60f0779862e4ab943810187752c462e85f5fa371 > Author: Parav Pandit <parav@nvidia.com> > Date: Wed Jul 21 17:26:45 2021 +0300 > > virtio: Improve vq->broken access to avoid any compiler optimization > > I think it might still apply here since virtqueue_is_broken() is still > put into a loop inside wait_event(). > > Thanks Oh I see. Maybe it's a response to some discussion we had at the time, at this point I can no longer say what it meant. But you are doing right not changing it here of course. > > > > > + WRITE_ONCE((_vq)->broken, true); \ > > > } while (0) > > > #define START_USE(vq) > > > #define END_USE(vq) > > > @@ -2237,7 +2238,7 @@ bool virtqueue_notify(struct virtqueue *_vq) > > > > > > /* Prod other side to tell it about changes. */ > > > if (!vq->notify(_vq)) { > > > - vq->broken = true; > > > + BAD_RING(vq, "vq %d is broken\n", vq->vq.index); > > > return false; > > > } > > > return true; > > > @@ -2786,8 +2787,7 @@ void virtio_break_device(struct virtio_device *dev) > > > list_for_each_entry(_vq, &dev->vqs, list) { > > > struct vring_virtqueue *vq = to_vvq(_vq); > > > > > > - /* Pairs with READ_ONCE() in virtqueue_is_broken(). */ > > > - WRITE_ONCE(vq->broken, true); > > > + BAD_RING(vq, "Device break vq %d", _vq->index); > > > } > > > spin_unlock(&dev->vqs_list_lock); > > > } > > > -- > > > 2.25.1 > >
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 2e7689bb933b..5cfb2fa8abee 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -58,7 +58,8 @@ do { \ dev_err(&_vq->vq.vdev->dev, \ "%s:"fmt, (_vq)->vq.name, ##args); \ - (_vq)->broken = true; \ + /* Pairs with READ_ONCE() in virtqueue_is_broken(). */ \ + WRITE_ONCE((_vq)->broken, true); \ } while (0) #define START_USE(vq) #define END_USE(vq) @@ -2237,7 +2238,7 @@ bool virtqueue_notify(struct virtqueue *_vq) /* Prod other side to tell it about changes. */ if (!vq->notify(_vq)) { - vq->broken = true; + BAD_RING(vq, "vq %d is broken\n", vq->vq.index); return false; } return true; @@ -2786,8 +2787,7 @@ void virtio_break_device(struct virtio_device *dev) list_for_each_entry(_vq, &dev->vqs, list) { struct vring_virtqueue *vq = to_vvq(_vq); - /* Pairs with READ_ONCE() in virtqueue_is_broken(). */ - WRITE_ONCE(vq->broken, true); + BAD_RING(vq, "Device break vq %d", _vq->index); } spin_unlock(&dev->vqs_list_lock); }