From nobody Sat Nov 15 19:29:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1748791624; cv=none; d=zohomail.com; s=zohoarc; b=SSpWDUhaRrT5c61etufbUm4kqKygVUKLNAkXcWrw78LrRmexDlf6xdCEnVjEHRh7ajRX88dpyC6F5TU889Q/7IB+BXRnH9Q21oycrj8rja11kVOsi72TMDUzKivloUVZO9Rg5+cjWiP8PQ19Y2ay+B/+Mcjiql0JeJeZr4Sz8tU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748791624; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=04O3W6vzLxgn86PWEaMIddUURG4vqFHvy1Jt5dN9Jtg=; b=j85MjM3ZgQl+lh8B32lOLAa/EkaouRx8nw47JTwhkclmWjN62fSapSO5yLMZC3AgVruNL921+imbmRvMfR3eevyFPipby8JAt5iWWBlUp9wDpWsxzayYmEHnhDQ7HEl8zbCU8ksKoHdJcgdu4MaseW1ovayy9qYpcGWpmxEcjpI= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1748791624757962.8196082619858; Sun, 1 Jun 2025 08:27:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uLkZQ-0002yT-K3; Sun, 01 Jun 2025 11:25:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uLkZP-0002uR-6K for qemu-devel@nongnu.org; Sun, 01 Jun 2025 11:25:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uLkZN-0004fu-Hv for qemu-devel@nongnu.org; Sun, 01 Jun 2025 11:25:54 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-621-7r6fcW3qOPGxjXzNM_xdkg-1; Sun, 01 Jun 2025 11:25:52 -0400 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3a4e713e05bso1680199f8f.3 for ; Sun, 01 Jun 2025 08:25:51 -0700 (PDT) Received: from redhat.com ([2a0d:6fc0:1517:1000:ea83:8e5f:3302:3575]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a4efe5b7bbsm11636706f8f.4.2025.06.01.08.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jun 2025 08:25:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748791552; 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=04O3W6vzLxgn86PWEaMIddUURG4vqFHvy1Jt5dN9Jtg=; b=fRWAtpwrmVt5LPLt76lTuTInfhseKboqctZ0Hib82QlTS3sxMaICmgR+dicCeQCPFSYB0u VlxE+Fftt01z97uy9oSk1E3XO18LlWUgHObTpr4SgiZk6lG6f7lpfjEpA6hBkR6wzgEy1H uNANIKCBt42pBJnJ7BMw9+3cEnEtG3s= X-MC-Unique: 7r6fcW3qOPGxjXzNM_xdkg-1 X-Mimecast-MFC-AGG-ID: 7r6fcW3qOPGxjXzNM_xdkg_1748791551 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748791550; x=1749396350; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=04O3W6vzLxgn86PWEaMIddUURG4vqFHvy1Jt5dN9Jtg=; b=ObdKZC4jodS44XQkzDSOc+CfZLmcsYG4csMVkpivdACvrTgB72K/kPhmBAzbUPjimS AL3jSzxzDMTRp91l7197xtDEnSlG8avrX74dwTR15rDCkyHsKQSlFuNBL/Q4gqqT2jo2 3FSfO4oyH3ndTSPzZZrmBDMRLwVoKh8u575+axv5rea8Ezr5Zc5zQuDanH5xNy3iSl+p 5oXDUkXpPmanw4KL4HvoNE2i+OFuE0cc9GDNqNhhLTvk3Uc9VCNrqo7Zh7yIEaVrwNsx oAomTXAwdgnOV+0FSU6ENxzp8/0mVz9BPLjmIJRA6XWjSt/vMVt39/EJ9lMUbaaOXv+D w0Ag== X-Gm-Message-State: AOJu0Yyo5vMhbJUv14I9h4hoT+eb0Qb/Tnzo+u90wBuAbcZRwHCsfC1J 6EZ3wjn1Ll30t5zprST4ENTFXsWP2TMupj++9F24zuukQcH2OGPaTJGi2ONdGHutO5OmFh9sKyp POanBhW7GYr9V1UAxo6IyHrimCPU5beGfHgQ5APZeCaP/RMgw/p+0Igt8mAuHjeOXTjFeLGpj3p hDtVOeQFh89lerz9e9ysE2bBXjO3tN8OOn7A== X-Gm-Gg: ASbGnctSi73GWShUqB0+sKecs0YrZ8EF6zg+dd8+fS7GYHk9pFc3hFOff3d04fM2FGn WuZUFCWplKSe0g44xKs0UrSqKNXssuFPtANKRAonh+vGsk7JP/B+G/pRHE/t1LNvTv3b20WYfHp RUffPav5duKmM5uwpNT5Sx5PZFJiXYz2nJx/ZiuyLEOPO3uLzDdx1oHBJLmevlziLWIldVIoKaz hIKJXU+3bBZE5DwdgIScw1KzVQtP5nRQDeV/QvbSbkEYMG2VUuvQfoJPx8pIM6By6eufVFC987H AzWB7Q== X-Received: by 2002:a05:6000:2204:b0:3a4:ea7e:4634 with SMTP id ffacd0b85a97d-3a4fe1618afmr3969459f8f.10.1748791550487; Sun, 01 Jun 2025 08:25:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEEqcpc2e6YmT+xlb9gBQzAxXyWTH0o5j2OoJWb/2hnmDyfjqmHI3LrQBmWE+L58VPUHcoXrg== X-Received: by 2002:a05:6000:2204:b0:3a4:ea7e:4634 with SMTP id ffacd0b85a97d-3a4fe1618afmr3969438f8f.10.1748791550086; Sun, 01 Jun 2025 08:25:50 -0700 (PDT) Date: Sun, 1 Jun 2025 11:25:47 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Eugenio =?utf-8?B?UMOpcmV6?= , Lei Yang , Si-Wei Liu , Jason Wang , Jonah Palmer , Stefano Garzarella Subject: [PULL 25/31] vdpa: reorder vhost_vdpa_set_backend_cap Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.071, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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.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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1748791625559116600 From: Eugenio P=C3=A9rez It will be used directly by vhost_vdpa_init. Tested-by: Lei Yang Reviewed-by: Si-Wei Liu Acked-by: Jason Wang Signed-off-by: Eugenio P=C3=A9rez Signed-off-by: Jonah Palmer Message-Id: <20250522145839.59974-3-jonah.palmer@oracle.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost-vdpa.c | 60 +++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 1ab2c11fa8..6b242ca56a 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -594,6 +594,36 @@ static void vhost_vdpa_init_svq(struct vhost_dev *hdev= , struct vhost_vdpa *v) v->shadow_vqs =3D g_steal_pointer(&shadow_vqs); } =20 +static int vhost_vdpa_set_backend_cap(struct vhost_dev *dev) +{ + struct vhost_vdpa *v =3D dev->opaque; + + uint64_t features; + uint64_t f =3D 0x1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2 | + 0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH | + 0x1ULL << VHOST_BACKEND_F_IOTLB_ASID | + 0x1ULL << VHOST_BACKEND_F_SUSPEND; + int r; + + if (vhost_vdpa_call(dev, VHOST_GET_BACKEND_FEATURES, &features)) { + return -EFAULT; + } + + features &=3D f; + + if (vhost_vdpa_first_dev(dev)) { + r =3D vhost_vdpa_call(dev, VHOST_SET_BACKEND_FEATURES, &features); + if (r) { + return -EFAULT; + } + } + + dev->backend_cap =3D features; + v->shared->backend_cap =3D features; + + return 0; +} + static int vhost_vdpa_init(struct vhost_dev *dev, void *opaque, Error **er= rp) { struct vhost_vdpa *v =3D opaque; @@ -841,36 +871,6 @@ static int vhost_vdpa_set_features(struct vhost_dev *d= ev, return vhost_vdpa_add_status(dev, VIRTIO_CONFIG_S_FEATURES_OK); } =20 -static int vhost_vdpa_set_backend_cap(struct vhost_dev *dev) -{ - struct vhost_vdpa *v =3D dev->opaque; - - uint64_t features; - uint64_t f =3D 0x1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2 | - 0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH | - 0x1ULL << VHOST_BACKEND_F_IOTLB_ASID | - 0x1ULL << VHOST_BACKEND_F_SUSPEND; - int r; - - if (vhost_vdpa_call(dev, VHOST_GET_BACKEND_FEATURES, &features)) { - return -EFAULT; - } - - features &=3D f; - - if (vhost_vdpa_first_dev(dev)) { - r =3D vhost_vdpa_call(dev, VHOST_SET_BACKEND_FEATURES, &features); - if (r) { - return -EFAULT; - } - } - - dev->backend_cap =3D features; - v->shared->backend_cap =3D features; - - return 0; -} - static int vhost_vdpa_get_device_id(struct vhost_dev *dev, uint32_t *device_id) { --=20 MST