From nobody Sat Nov 15 15:29:50 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=1750262480; cv=none; d=zohomail.com; s=zohoarc; b=NAPJaqYVkyJmxDOT7lubIKKnFLvVD6x+lmfikEtnACSAGsF710vZitTBXumtEB/eUz1UViDKYEKmZ+4ygz9J/faGi9bRPDwn3HcrHk0yL2sGkftj9E+QYG/VFQxobH6D7QhrEOF+fcq2egUmLTvHYqjg7h/6Q5xu7MftxzjLYqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750262480; h=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=qaib6U2aKJ5dc9kwGx+BE5kvhAn3cL9g74aPPQnsqqk=; b=M23CkB1kW9bjrKhXRRBsPnupqUdJ68uDL9qNWntx6gwwfzUzjUq8IfDfW0W15U0meZNlrI/n8TX90mxcehd+dy8EXjNyONdaZm1hp7bUxFz7BvlZOn0hS7HFgQQv+xI0IC6YWQt1XVPj7HL0zk5s5PZMWc/OOradlr/LOlldzIA= 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 1750262480449390.7135642844679; Wed, 18 Jun 2025 09:01:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRvAn-0003IM-5Z; Wed, 18 Jun 2025 11:58:01 -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 1uRvAk-0003Hk-8h for qemu-devel@nongnu.org; Wed, 18 Jun 2025 11:57:58 -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 1uRvAi-0008B0-9Q for qemu-devel@nongnu.org; Wed, 18 Jun 2025 11:57:57 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-639-zoj3SqwENUq8srl_8c9tMQ-1; Wed, 18 Jun 2025 11:57:52 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3240E180028D; Wed, 18 Jun 2025 15:57:51 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.44.33.123]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 890BE18003FC; Wed, 18 Jun 2025 15:57:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750262275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qaib6U2aKJ5dc9kwGx+BE5kvhAn3cL9g74aPPQnsqqk=; b=ZzvbJ7EhFNRvWbd3SL4jIksl5nE+IXnkQca745WgFWxh6Z0fwF3sn8vNH3TyRMQX/MSpcF zRwMkuUy2zojfCEXadLOppezGURgSTrDfEQm4iuyl9/oOMKe+0uIwZRAiAkAHMItRyVXiP yJn6Ja0OFH4Bn6/2G+60QFkqVYdWW4U= X-MC-Unique: zoj3SqwENUq8srl_8c9tMQ-1 X-Mimecast-MFC-AGG-ID: zoj3SqwENUq8srl_8c9tMQ_1750262271 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster , Stefan Weil , Stefano Garzarella , Jason Wang , "Michael S. Tsirkin" , "Dr. David Alan Gilbert" , Eric Blake , Paolo Bonzini , Laurent Vivier Subject: [PATCH v2 06/10] net: Add get_acked_features callback to NetClientInfo Date: Wed, 18 Jun 2025 17:57:14 +0200 Message-ID: <20250618155718.550968-7-lvivier@redhat.com> In-Reply-To: <20250618155718.550968-1-lvivier@redhat.com> References: <20250618155718.550968-1-lvivier@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -39 X-Spam_score: -4.0 X-Spam_bar: ---- X-Spam_report: (-4.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.895, 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=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 1750262482296116600 Content-Type: text/plain; charset="utf-8" This patch continues the effort to decouple the generic vhost layer from specific network backend implementations. Previously, the vhost_net initialization code contained a hardcoded check for the vhost-user client type to retrieve its acked features by calling vhost_user_get_acked_features(). This exposed an internal vhost-user function in a public header and coupled the two modules. Following the pattern of recent commits, this patch introduces a generic helper, qemu_get_acked_features(), and a corresponding get_acked_features callback in the NetClientInfo struct. The vhost-user backend is updated to provide this callback, and its getter function is now static. The call site in vhost_net.c is simplified to use the new generic helper, removing the type check and the direct dependency. Signed-off-by: Laurent Vivier --- hw/net/vhost_net.c | 18 +++++++----------- include/net/net.h | 4 ++++ include/net/vhost-user.h | 2 -- net/net.c | 10 ++++++++++ net/vhost-user.c | 3 ++- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index 3dff819d2dbd..9cfe41b40b41 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -245,8 +245,8 @@ struct vhost_net *vhost_net_init(VhostNetOptions *optio= ns) int r; bool backend_kernel =3D options->backend_type =3D=3D VHOST_BACKEND_TYP= E_KERNEL; struct vhost_net *net =3D g_new0(struct vhost_net, 1); - uint64_t features =3D 0; Error *local_err =3D NULL; + uint64_t features; =20 if (!options->net_backend) { fprintf(stderr, "vhost-net requires net backend to be setup\n"); @@ -297,17 +297,13 @@ struct vhost_net *vhost_net_init(VhostNetOptions *opt= ions) } =20 /* Set sane init value. Override when guest acks. */ -#ifdef CONFIG_VHOST_NET_USER - if (net->nc->info->type =3D=3D NET_CLIENT_DRIVER_VHOST_USER) { - features =3D vhost_user_get_acked_features(net->nc); - if (~net->dev.features & features) { - fprintf(stderr, "vhost lacks feature mask 0x%" PRIx64 - " for backend\n", - (uint64_t)(~net->dev.features & features)); - goto fail; - } + features =3D qemu_get_acked_features(net->nc); + if (~net->dev.features & features) { + fprintf(stderr, "vhost lacks feature mask 0x%" PRIx64 + " for backend\n", + (uint64_t)(~net->dev.features & features)); + goto fail; } -#endif =20 vhost_net_ack_features(net, features); =20 diff --git a/include/net/net.h b/include/net/net.h index dd11be11a39f..37dc97a06752 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -69,6 +69,7 @@ typedef bool (SetSteeringEBPF)(NetClientState *, int); typedef bool (NetCheckPeerType)(NetClientState *, ObjectClass *, Error **); typedef bool (IsVHostUser)(NetClientState *); typedef struct vhost_net *(GetVHostNet)(NetClientState *nc); +typedef uint64_t (GetAckedFeatures)(NetClientState *nc); =20 typedef struct NetClientInfo { NetClientDriver type; @@ -97,6 +98,7 @@ typedef struct NetClientInfo { const int *vhost_feature_bits; IsVHostUser *is_vhost_user; GetVHostNet *get_vhost_net; + GetAckedFeatures *get_acked_features; } NetClientInfo; =20 struct NetClientState { @@ -198,6 +200,8 @@ int qemu_set_vnet_le(NetClientState *nc, bool is_le); int qemu_set_vnet_be(NetClientState *nc, bool is_be); bool qemu_is_vhost_user(NetClientState *nc); void qemu_macaddr_default_if_unset(MACAddr *macaddr); +uint64_t qemu_get_acked_features(NetClientState *nc); + /** * qemu_find_nic_info: Obtain NIC configuration information * @typename: Name of device object type diff --git a/include/net/vhost-user.h b/include/net/vhost-user.h index 0b233a267345..a4d0ce4b8dd1 100644 --- a/include/net/vhost-user.h +++ b/include/net/vhost-user.h @@ -11,8 +11,6 @@ #ifndef VHOST_USER_H #define VHOST_USER_H =20 -struct vhost_net; -uint64_t vhost_user_get_acked_features(NetClientState *nc); void vhost_user_save_acked_features(NetClientState *nc); =20 #endif /* VHOST_USER_H */ diff --git a/net/net.c b/net/net.c index 8726c59915a3..ba051441053f 100644 --- a/net/net.c +++ b/net/net.c @@ -608,6 +608,16 @@ int qemu_set_vnet_be(NetClientState *nc, bool is_be) #endif } =20 +uint64_t qemu_get_acked_features(NetClientState *nc) +{ + if (nc->info->get_acked_features) { + return nc->info->get_acked_features(nc); + } + + return 0; +} + + int qemu_can_receive_packet(NetClientState *nc) { if (nc->receive_disabled) { diff --git a/net/vhost-user.c b/net/vhost-user.c index d8fef801de5a..e590b39503de 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -81,7 +81,7 @@ static struct vhost_net *vhost_user_get_vhost_net(NetClie= ntState *nc) return s->vhost_net; } =20 -uint64_t vhost_user_get_acked_features(NetClientState *nc) +static uint64_t vhost_user_get_acked_features(NetClientState *nc) { NetVhostUserState *s =3D DO_UPCAST(NetVhostUserState, nc, nc); assert(nc->info->type =3D=3D NET_CLIENT_DRIVER_VHOST_USER); @@ -283,6 +283,7 @@ static NetClientInfo net_vhost_user_info =3D { .is_vhost_user =3D vhost_user_is_vhost_user, .get_vhost_net =3D vhost_user_get_vhost_net, .vhost_feature_bits =3D user_feature_bits, + .get_acked_features =3D vhost_user_get_acked_features, }; =20 static gboolean net_vhost_user_watch(void *do_not_use, GIOCondition cond, --=20 2.49.0