From nobody Sat Feb 7 07:09:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652988461; cv=none; d=zohomail.com; s=zohoarc; b=dS9P+ei9Eg6jh7JHpUz6u4ZAmcVyPyKz3jNqR7cJBSzIQsbtgTaJNpSEQWL5EsCLXRGu0MpKXnbaSQ94Ib2kt3dcF8fuJFWsyde2gQipnuxQFu4zOUG/llJrBvQowBx5a+XcclkNggyfEQfJyyLEbAUnk1l0ypYZe7Nb91KZ0Cc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652988461; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PAexm7b2Cs4jUq28oY1VpULrfRFl6S2JEkKMgFXH7f4=; b=XhJmThr72TvfMkkrYOTVQSFtDpApTrK1Tu9KZXT7E3+FuXChH4wG2uuy+6lEepxQ7EUJC6yFR8iGbXZn5gZWGmxzn1cPV3K6fOm9R+bSMT34m5ejls0iYr0Mrew/AuIHJsan1MVNp4gS3IHhFQZPVdXhEtXGz8ubIsy1cO7fYN8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652988461070687.4410193172428; Thu, 19 May 2022 12:27:41 -0700 (PDT) Received: from localhost ([::1]:48586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrloB-0000w1-H6 for importer@patchew.org; Thu, 19 May 2022 15:27:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrlb2-0005fD-2f for qemu-devel@nongnu.org; Thu, 19 May 2022 15:14:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:22752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrlaz-0006Rd-Re for qemu-devel@nongnu.org; Thu, 19 May 2022 15:14:03 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-403-nOaSx4UgPzW9YcdemDnJrQ-1; Thu, 19 May 2022 15:13:57 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3BD84185A794; Thu, 19 May 2022 19:13:57 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.193.126]) by smtp.corp.redhat.com (Postfix) with ESMTP id A78D72026D6A; Thu, 19 May 2022 19:13:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652987641; 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=PAexm7b2Cs4jUq28oY1VpULrfRFl6S2JEkKMgFXH7f4=; b=REV5fKlrGlzo1Xc+9OELgMdGbkFKo97WY2zcYgSALBnCtbedV56WHicp14PPOvhegTNo0d jA/PDI44YxEvn93l4i4cBilcKEY4KNFbRv1hkx5aas0OEMaueRZ6hO/fm8YcOl4o0bA1bF yH+3J9E68AnylaUjmNAjgvyCSfU8XJg= X-MC-Unique: nOaSx4UgPzW9YcdemDnJrQ-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Gautam Dawar , "Michael S. Tsirkin" , Markus Armbruster , "Gonglei (Arei)" , Harpreet Singh Anand , Cornelia Huck , Zhu Lingshan , Laurent Vivier , Eli Cohen , Paolo Bonzini , Liuxiangdong , Eric Blake , Cindy Lu , Jason Wang , Parav Pandit Subject: [RFC PATCH v8 16/21] vdpa: Add vhost_vdpa_start_control_svq Date: Thu, 19 May 2022 21:13:01 +0200 Message-Id: <20220519191306.821774-17-eperezma@redhat.com> In-Reply-To: <20220519191306.821774-1-eperezma@redhat.com> References: <20220519191306.821774-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652988462072100003 As a first step we only enable CVQ first than others. Future patches add state restore. Signed-off-by: Eugenio P=C3=A9rez --- net/vhost-vdpa.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 174fec5e77..a66f73ff63 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -188,6 +188,66 @@ static NetClientInfo net_vhost_vdpa_info =3D { .check_peer_type =3D vhost_vdpa_check_peer_type, }; =20 +static int vhost_vdpa_start_control_svq(VhostShadowVirtqueue *svq, + struct vhost_dev *dev) +{ + struct vhost_vring_state state =3D { + .index =3D virtio_get_queue_index(svq->vq), + .num =3D 1, + }; + struct vhost_vdpa *v =3D dev->opaque; + VirtIONet *n =3D VIRTIO_NET(dev->vdev); + uint64_t features =3D dev->vdev->host_features; + int r; + size_t num =3D 0; + + assert(dev->vhost_ops->backend_type =3D=3D VHOST_BACKEND_TYPE_VDPA); + + r =3D ioctl(v->device_fd, VHOST_VDPA_SET_VRING_ENABLE, &state); + if (r < 0) { + return -errno; + } + + if (features & BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR)) { + const struct virtio_net_ctrl_hdr ctrl =3D { + .class =3D VIRTIO_NET_CTRL_MAC, + .cmd =3D VIRTIO_NET_CTRL_MAC_ADDR_SET, + }; + uint8_t mac[6]; + virtio_net_ctrl_ack ack; + const struct iovec data[] =3D { + { + .iov_base =3D (void *)&ctrl, + .iov_len =3D sizeof(ctrl), + },{ + .iov_base =3D mac, + .iov_len =3D sizeof(mac), + },{ + .iov_base =3D &ack, + .iov_len =3D sizeof(ack), + } + }; + + memcpy(mac, n->mac, sizeof(mac)); + r =3D vhost_svq_inject(svq, data, 2, 1); + if (unlikely(r)) { + return r; + } + num++; + } + + while (num) { + /* + * We can call vhost_svq_poll here because BQL protects calls to r= un. + */ + size_t used =3D vhost_svq_poll(svq); + assert(used <=3D num); + num -=3D used; + } + + return 0; +} + static void vhost_vdpa_net_handle_ctrl(VirtIODevice *vdev, const VirtQueueElement *elem) { @@ -226,6 +286,7 @@ static void vhost_vdpa_net_handle_ctrl(VirtIODevice *vd= ev, =20 static const VhostShadowVirtqueueOps vhost_vdpa_net_svq_ops =3D { .used_elem_handler =3D vhost_vdpa_net_handle_ctrl, + .start =3D vhost_vdpa_start_control_svq, }; =20 static NetClientState *net_vhost_vdpa_init(NetClientState *peer, --=20 2.27.0