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 X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 802E1C433ED for ; Tue, 27 Apr 2021 05:41:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 837E86052B for ; Tue, 27 Apr 2021 05:41:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 837E86052B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lbGTS-0005Tr-Fv for qemu-devel@archiver.kernel.org; Tue, 27 Apr 2021 01:41:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbGRY-0004wd-K3 for qemu-devel@nongnu.org; Tue, 27 Apr 2021 01:39:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34807) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbGRP-0003Jp-9m for qemu-devel@nongnu.org; Tue, 27 Apr 2021 01:39:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619501956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OFM7OggzMh3wxa2i4p4/vpxeY8ZCdoTE/56iTjtFzIA=; b=CeKfA0qllj4GHTrmZ73GDFdbXJGVIPYR0zCSetIeveEMJYw1frJwXSx8ES2qG6hfskYFqT XsY3iu5UoX0dcQA5G/mIQc5mF8urK8kbf86kOWb/CF7NfCQYYcckM8OXKpXJYSkbn528M8 1gze25xBoQgV4ZTJ0jPPvGkQgU5HK5c= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-488-UMgs_6ixOISOdL_WgEknIw-1; Tue, 27 Apr 2021 01:39:14 -0400 X-MC-Unique: UMgs_6ixOISOdL_WgEknIw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D9D67195D561 for ; Tue, 27 Apr 2021 05:39:13 +0000 (UTC) Received: from wangxiaodeMacBook-Air.local (ovpn-12-39.pek2.redhat.com [10.72.12.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F293163EB; Tue, 27 Apr 2021 05:39:08 +0000 (UTC) Subject: Re: [PATCH v6 1/9] hw: Add check for queue number To: Cindy Lu , mst@redhat.com, qemu-devel@nongnu.org References: <20210427033951.29805-1-lulu@redhat.com> <20210427033951.29805-2-lulu@redhat.com> From: Jason Wang Message-ID: <1d1c7244-ac00-94c0-8f53-90b1b93c41a0@redhat.com> Date: Tue, 27 Apr 2021 13:39:06 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <20210427033951.29805-2-lulu@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=gbk; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.219, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_CHARSET_FARAWAY=2.45, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" ÔÚ 2021/4/27 ÉÏÎç11:39, Cindy Lu дµÀ: > In order to support configure interrupt. we will use queue number -1 > as configure interrupt > since all these device are not support the configure interrupt > So we will add an check here, if the idx is -1, the function > will return; The title is confusing since the change is specific for the guest notifiers. A better one would be "virtio: guest notifier support for config interrupt" > > Signed-off-by: Cindy Lu > --- > hw/display/vhost-user-gpu.c | 8 ++++++-- > hw/net/virtio-net.c | 10 +++++++--- > hw/virtio/vhost-user-fs.c | 11 +++++++---- > hw/virtio/vhost-vsock-common.c | 8 ++++++-- > hw/virtio/virtio-crypto.c | 8 ++++++-- > 5 files changed, 32 insertions(+), 13 deletions(-) > > diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c > index 51f1747c4a..d8e26cedf1 100644 > --- a/hw/display/vhost-user-gpu.c > +++ b/hw/display/vhost-user-gpu.c > @@ -490,7 +490,9 @@ static bool > vhost_user_gpu_guest_notifier_pending(VirtIODevice *vdev, int idx) > { > VhostUserGPU *g = VHOST_USER_GPU(vdev); > - > + if (idx == -1) { Let's introduce a macro for this instead of the magic number. Thanks > + return false; > + } > return vhost_virtqueue_pending(&g->vhost->dev, idx); > } > > @@ -498,7 +500,9 @@ static void > vhost_user_gpu_guest_notifier_mask(VirtIODevice *vdev, int idx, bool mask) > { > VhostUserGPU *g = VHOST_USER_GPU(vdev); > - > + if (idx == -1) { > + return; > + } > vhost_virtqueue_mask(&g->vhost->dev, vdev, idx, mask); > } > > diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c > index 9179013ac4..78ccaa228c 100644 > --- a/hw/net/virtio-net.c > +++ b/hw/net/virtio-net.c > @@ -3060,7 +3060,10 @@ static bool virtio_net_guest_notifier_pending(VirtIODevice *vdev, int idx) > VirtIONet *n = VIRTIO_NET(vdev); > NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(idx)); > assert(n->vhost_started); > - return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx); > + if (idx != -1) { > + return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx); > + } > + return false; > } > > static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx, > @@ -3069,8 +3072,9 @@ static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx, > VirtIONet *n = VIRTIO_NET(vdev); > NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(idx)); > assert(n->vhost_started); > - vhost_net_virtqueue_mask(get_vhost_net(nc->peer), > - vdev, idx, mask); > + if (idx != -1) { > + vhost_net_virtqueue_mask(get_vhost_net(nc->peer), vdev, idx, mask); > + } > } > > static void virtio_net_set_config_size(VirtIONet *n, uint64_t host_features) > diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c > index 1bc5d03a00..37424c2193 100644 > --- a/hw/virtio/vhost-user-fs.c > +++ b/hw/virtio/vhost-user-fs.c > @@ -142,18 +142,21 @@ static void vuf_handle_output(VirtIODevice *vdev, VirtQueue *vq) > */ > } > > -static void vuf_guest_notifier_mask(VirtIODevice *vdev, int idx, > - bool mask) > +static void vuf_guest_notifier_mask(VirtIODevice *vdev, int idx, bool mask) > { > VHostUserFS *fs = VHOST_USER_FS(vdev); > - > + if (idx == -1) { > + return; > + } > vhost_virtqueue_mask(&fs->vhost_dev, vdev, idx, mask); > } > > static bool vuf_guest_notifier_pending(VirtIODevice *vdev, int idx) > { > VHostUserFS *fs = VHOST_USER_FS(vdev); > - > + if (idx == -1) { > + return false; > + } > return vhost_virtqueue_pending(&fs->vhost_dev, idx); > } > > diff --git a/hw/virtio/vhost-vsock-common.c b/hw/virtio/vhost-vsock-common.c > index 5b2ebf3496..0adf823d37 100644 > --- a/hw/virtio/vhost-vsock-common.c > +++ b/hw/virtio/vhost-vsock-common.c > @@ -100,7 +100,9 @@ static void vhost_vsock_common_guest_notifier_mask(VirtIODevice *vdev, int idx, > bool mask) > { > VHostVSockCommon *vvc = VHOST_VSOCK_COMMON(vdev); > - > + if (idx == -1) { > + return; > + } > vhost_virtqueue_mask(&vvc->vhost_dev, vdev, idx, mask); > } > > @@ -108,7 +110,9 @@ static bool vhost_vsock_common_guest_notifier_pending(VirtIODevice *vdev, > int idx) > { > VHostVSockCommon *vvc = VHOST_VSOCK_COMMON(vdev); > - > + if (idx == -1) { > + return false; > + } > return vhost_virtqueue_pending(&vvc->vhost_dev, idx); > } > > diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c > index 54f9bbb789..c47f4ffb24 100644 > --- a/hw/virtio/virtio-crypto.c > +++ b/hw/virtio/virtio-crypto.c > @@ -947,7 +947,9 @@ static void virtio_crypto_guest_notifier_mask(VirtIODevice *vdev, int idx, > int queue = virtio_crypto_vq2q(idx); > > assert(vcrypto->vhost_started); > - > + if (idx == -1) { > + return; > + } > cryptodev_vhost_virtqueue_mask(vdev, queue, idx, mask); > } > > @@ -957,7 +959,9 @@ static bool virtio_crypto_guest_notifier_pending(VirtIODevice *vdev, int idx) > int queue = virtio_crypto_vq2q(idx); > > assert(vcrypto->vhost_started); > - > + if (idx == -1) { > + return false; > + } > return cryptodev_vhost_virtqueue_pending(vdev, queue, idx); > } >