From nobody Fri Dec 19 04:14:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1741782442; cv=none; d=zohomail.com; s=zohoarc; b=N4ax1VZ7u1z7JTYRIVrPnCbl7lJjL5ifBi4S6uvfPEFdrNqyIeJdrpzwoE6isIfxY7KiPB+c9f/0IVrA81327xGDgzo7gGjyTJrq0qVVPXAxeuOyWs9bdmuUZzhOmAAuA85AbAWVSky+OEhEe61leTV6sH7ivP6D8bVPo5uCyDM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741782442; 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:Subject:Subject:To:To:Message-Id:Reply-To; bh=R7wNjtBDwgJ7tssZxT4YNy1VMUtQPGtZWyomcRwEzSI=; b=WGdF0yVSI6mZJAAeoVnFSronS7XCDDRaHCsjyprOguAXWK26afOaUKUczhqpXHqhjAU1g/l8Q06Lc18K0+ddImVAn79ThRCRLYkHV3maAOmgRAtRHB98Z4Z7IyogWNKIYQ+QFO9LEMYnfzEbXWTa86iF7i+Sf4uED0LgJmoQX0M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741782442697218.3967512381554; Wed, 12 Mar 2025 05:27:22 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 157991EA7; Wed, 12 Mar 2025 08:27:22 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 90D901E65; Wed, 12 Mar 2025 08:26:33 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B8BA2147D; Wed, 12 Mar 2025 08:26:28 -0400 (EDT) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id CE92C147D for ; Wed, 12 Mar 2025 08:26:27 -0400 (EDT) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2235189adaeso16002905ad.0 for ; Wed, 12 Mar 2025 05:26:27 -0700 (PDT) Received: from localhost ([157.82.205.237]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-22410a7f717sm114548455ad.111.2025.03.12.05.26.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 12 Mar 2025 05:26:26 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1741782387; x=1742387187; darn=lists.libvirt.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=R7wNjtBDwgJ7tssZxT4YNy1VMUtQPGtZWyomcRwEzSI=; b=x9Mn9LuSgXbqt+tXqJSu2d0mKXmlgSoD+vrK1dcF1fWOkNHwfZ2jfmnudMIWOVQrkl v42e6Xq+iXE4xMVHdCIZHgPE7PjtadSfypeQMONgHOo2k9ItCuKYhS/C6i4vXIrcbIKd ahEIZJT8oPMG8HfW0j3Cl6Wt6cToWQ8I3HmRtHegntrm89DfuuNbcCLJeSTGHNHrX/3I m3HiP4GglToF8tK0KssRNFL7guCifoa8L5ZTOpPbCzptW6JCj2PQpB5OlAGXdqJJbT5T P682dUCAM1ch1pl7wYg6UcoMEPSL7lHTDy+/Auz+HORWNLkD6tC+nNVGlbVov8NDOkLX 4HKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741782387; x=1742387187; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R7wNjtBDwgJ7tssZxT4YNy1VMUtQPGtZWyomcRwEzSI=; b=uiZ10np9uf0iD160j9f2ADiEUvwFl11Cfwlo8vpg4S6wvBg64hYGwMBJq903QRz4Lx yrv5WgwJA7D4F++PTYCTSZYjnaEBahYetCDS5cbmFilhwtzDrEt5NNZeVkP9EHgulg+q l/1xnNjxqTugqwdeZWDAqkac+pv6e28RJAy33fMBAfRaDkyqY+HO4VTlg7B/GHZ308mn 7GAeWypJizAoMTyGNR87ocMaa1MgvpIqDu5DIXpF1kKqFIoz3Qm6kntZCLhGSRtDekJp PYySxzYCbQuNnw05/J4gKO+PWOc4UaHmU0FDDEnxOdnRdVIHIuoLMJMYa1LyuirFHTY7 N8YA== X-Forwarded-Encrypted: i=1; AJvYcCWM51CyHGoz4ixRBi6TvwPmg7wOip1BOeKI2vWoCR3pcUmdO3uGgWCBuYFFGAudAle/CX+P/A==@lists.libvirt.org X-Gm-Message-State: AOJu0YyMYXBgq00rgJ51jM1bIQ1xumAMFcyNTDz2ziNTCrF2UQ16x+WG YKWkgxh0i0BdH2xPqgGMLceV9mDhtNnC5IEO52ZwJdwxsf0oQ3F/itSKohIX8ag= X-Gm-Gg: ASbGncsC0bg+wKKMkBL5F7xYAQVxJQ0beWjT7fr1m6fWpz46csZVKPle2J8Go0tI/ZX U0ieDs+vHG/KoSuWB1kA9kSb9Xm2IClbo3RMUE3BEvfZqaaYnXQLXk+UB5SEnEMyRSvfBUFiXwt Ma909H6K0JvDih51Tw0cqnStqpEVKGiVXZStM+M31g6Q5miXf55+lPz3frp/jokiqz1SMTAFM99 IhPrISLVM7Kv+AyLc8+jLbW4lFOMbw8YEqpJNHxEky5+937cl3e8QUdbeNThrNR2Pn90MM1v7yi PJh2nlLYuOKpXvL3Nsg88uUpYdRFhfo0TXJu0oH9dWs+XQjT X-Google-Smtp-Source: AGHT+IFkHhyinXwFDduQBNXFJOhV+yUpraFhmRzXNbx1pxapeLn80gajfcYJU3mm4EVvBKtZQw+fyA== X-Received: by 2002:a17:902:e808:b0:221:1356:10c5 with SMTP id d9443c01a7336-22593d5ef30mr93384065ad.9.1741782386818; Wed, 12 Mar 2025 05:26:26 -0700 (PDT) From: Akihiko Odaki Date: Wed, 12 Mar 2025 21:26:19 +0900 Subject: [PATCH 1/2] Remove libnl checks specific to Linux MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250312-linux-v1-1-e5531bbe9708@daynix.com> References: <20250312-linux-v1-0-e5531bbe9708@daynix.com> In-Reply-To: <20250312-linux-v1-0-e5531bbe9708@daynix.com> To: Laine Stump , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , devel@lists.libvirt.org X-Mailer: b4 0.15-dev-edae6 Message-ID-Hash: MZS7GOGLD3BBMNZSOQP5SFZKY7APYQQG X-Message-ID-Hash: MZS7GOGLD3BBMNZSOQP5SFZKY7APYQQG X-MailFrom: akihiko.odaki@daynix.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 CC: devel@daynix.com, Akihiko Odaki X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @daynix-com.20230601.gappssmtp.com) X-ZM-MESSAGEID: 1741782443365019000 Builds for Linux without libnl is broken since commit 582f0966f9b9e2148d8887d072364e2a91aed000 because src/util/virnetdevbridge.c refers to virNetlinkBridgeVlanFilterSet(). A fundamental problem here is that nobody tests such builds. Netlink is a critical part of Linux networking so developers may assume it is readily available, but the libnl dependency check breaks this assumption. Builds without libnl also lack several networking features such as SR-IOV, bridge/tap, switchdev, macvlan, veth, and vlan. This may also contradict with exceptations made by other networking code of libvirt or users. Remove libnl checks specific to Linux to avoid such a problem in libvirt's networking code. More concretely, find patterns like following: #ifdef __linux__ A #ifdef WITH_LIBNL B #endif C #endif And replace them with: #ifdef WITH_LIBNL A B C #endif There are also patterns like following: #ifdef WITH_LIBNL A #elif defined(__linux__) B #endif Replace them with: #ifdef WITH_LIBNL A #endif This change will make less networking features available. Anyone who want these features should enable libnl for the better tested code. It still does not require libnl to build because the client code and some drivers do not need libvirt to configure networking at all. Signed-off-by: Akihiko Odaki --- src/util/virnetdev.c | 44 ++++--------------------------------------= -- src/util/virnetdevbridge.c | 33 +++++---------------------------- tests/virnetdevtest.c | 10 +--------- 3 files changed, 10 insertions(+), 77 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 8ae854245e..7ea029be9e 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -914,29 +914,6 @@ virNetDevGetMaster(const char *ifname, char **master) return 0; } =20 -#elif defined(__linux__) - -/* libnl isn't available, so we can't use netlink. - * Fall back to using sysfs - */ -int -virNetDevGetMaster(const char *ifname, char **master) -{ - g_autofree char *path =3D NULL; - g_autofree char *canonical =3D NULL; - - if (virNetDevSysfsFile(&path, ifname, "master") < 0) - return -1; - - if (!(canonical =3D virFileCanonicalizePath(path))) - return -1; - - *master =3D g_path_get_basename(canonical); - - VIR_DEBUG("IFLA_MASTER for %s is %s", ifname, *master ? *master : "(no= ne)"); - return 0; -} - #else =20 int @@ -1059,7 +1036,7 @@ int virNetDevValidateConfig(const char *ifname G_GNUC= _UNUSED, #endif =20 =20 -#ifdef __linux__ +#ifdef WITH_LIBNL =20 int virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, @@ -1079,8 +1056,6 @@ virNetDevSysfsDeviceFile(char **pf_sysfs_device_link,= const char *ifname, } =20 =20 -# if defined(WITH_LIBNL) - /** * Determine if the device path specified in devpath is a PCI Device * by resolving the 'subsystem'-link in devpath and looking for @@ -1133,7 +1108,6 @@ virNetDevGetPCIDevice(const char *devName) =20 return virPCIDeviceNew(vfPCIAddr); } -# endif =20 =20 /* A wrapper to get content of file from ifname SYSFS_NET_DIR @@ -1381,7 +1355,7 @@ virNetDevGetVirtualFunctionInfo(const char *vfname, c= har **pfname, return ret; } =20 -#else /* !__linux__ */ +#else /* !WITH_LIBNL */ int virNetDevGetPhysPortID(const char *ifname G_GNUC_UNUSED, char **physPortID) @@ -1471,7 +1445,7 @@ virNetDevSysfsFile(char **pf_sysfs_device_link G_GNUC= _UNUSED, } =20 =20 -#endif /* !__linux__ */ +#endif /* !WITH_LIBNL */ #if defined(WITH_LIBNL) =20 =20 @@ -2938,7 +2912,7 @@ int virNetDevGetRxFilter(const char *ifname, return ret; } =20 -#if __linux__ +#ifdef WITH_LIBNL =20 /** * virNetDevRDMAFeature @@ -3095,8 +3069,6 @@ virNetDevGetEthtoolFeatures(const char *ifname, } =20 =20 -# if defined(WITH_LIBNL) - /** * virNetDevGetFamilyId: * This function supplies the devlink family id @@ -3237,14 +3209,6 @@ virNetDevSwitchdevFeature(const char *ifname, nlmsg_free(nl_msg); return ret; } -# else -static int -virNetDevSwitchdevFeature(const char *ifname G_GNUC_UNUSED, - virBitmap **out G_GNUC_UNUSED) -{ - return 0; -} -# endif =20 =20 /** diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index c79d0c79b7..0af7a8d286 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -30,9 +30,7 @@ #endif =20 #ifdef __linux__ -# if defined(WITH_LIBNL) -# include "virnetlink.h" -# endif +# include "virnetlink.h" # include # include /* HZ */ # include @@ -185,7 +183,7 @@ static int virNetDevBridgeGet(const char *brname, } #endif /* __linux__ */ =20 -#if defined(__linux__) +#if defined(WITH_LIBNL) static int virNetDevBridgePortSet(const char *brname, const char *ifname, @@ -450,7 +448,7 @@ virNetDevBridgePortSetIsolated(const char *brname G_GNU= C_UNUSED, * * Returns 0 in case of success or -1 on failure */ -#if defined(WITH_STRUCT_IFREQ) && defined(SIOCBRADDBR) +#if defined(WITH_STRUCT_IFREQ) && defined(SIOCBRADDBR) && defined(WITH_LIB= NL) static int virNetDevBridgeCreateWithIoctl(const char *brname, const virMacAddr *mac) @@ -477,9 +475,7 @@ virNetDevBridgeCreateWithIoctl(const char *brname, =20 return 0; } -#endif =20 -#if defined(WITH_LIBNL) int virNetDevBridgeCreate(const char *brname, const virMacAddr *mac) @@ -509,15 +505,6 @@ virNetDevBridgeCreate(const char *brname, } =20 =20 -#elif defined(WITH_STRUCT_IFREQ) && defined(SIOCBRADDBR) -int -virNetDevBridgeCreate(const char *brname, - const virMacAddr *mac) -{ - return virNetDevBridgeCreateWithIoctl(brname, mac); -} - - #elif defined(WITH_STRUCT_IFREQ) && defined(SIOCIFCREATE2) int virNetDevBridgeCreate(const char *brname, @@ -568,7 +555,7 @@ virNetDevBridgeCreate(const char *brname, * * Returns 0 in case of success or an errno code in case of failure. */ -#if defined(WITH_STRUCT_IFREQ) && defined(SIOCBRDELBR) +#if defined(WITH_STRUCT_IFREQ) && defined(SIOCBRDELBR) && defined(WITH_LIB= NL) static int virNetDevBridgeDeleteWithIoctl(const char *brname) { @@ -587,10 +574,8 @@ virNetDevBridgeDeleteWithIoctl(const char *brname) =20 return 0; } -#endif =20 =20 -#if defined(WITH_LIBNL) int virNetDevBridgeDelete(const char *brname) { @@ -606,14 +591,6 @@ virNetDevBridgeDelete(const char *brname) } =20 =20 -#elif defined(WITH_STRUCT_IFREQ) && defined(SIOCBRDELBR) -int -virNetDevBridgeDelete(const char *brname) -{ - return virNetDevBridgeDeleteWithIoctl(brname); -} - - #elif defined(WITH_STRUCT_IFREQ) && defined(SIOCIFDESTROY) int virNetDevBridgeDelete(const char *brname) @@ -651,7 +628,7 @@ int virNetDevBridgeDelete(const char *brname G_GNUC_UNU= SED) * * Returns 0 in case of success or an errno code in case of failure. */ -#if defined(WITH_STRUCT_IFREQ) && defined(SIOCBRADDIF) +#if defined(WITH_STRUCT_IFREQ) && defined(SIOCBRADDIF) && defined(WITH_LIB= NL) int virNetDevBridgeAddPort(const char *brname, const char *ifname, const virNetDevVlan *virtVlan) diff --git a/tests/virnetdevtest.c b/tests/virnetdevtest.c index 42f1a74ee9..bc1b759502 100644 --- a/tests/virnetdevtest.c +++ b/tests/virnetdevtest.c @@ -23,7 +23,7 @@ =20 #define LIBVIRT_VIRNETDEVPRIV_H_ALLOW =20 -#ifdef __linux__ +#ifdef WITH_LIBNL =20 # include "virmock.h" # include "virnetdevpriv.h" @@ -63,8 +63,6 @@ testVirNetDevGetLinkInfo(const void *opaque) return 0; } =20 -# if defined(WITH_LIBNL) - int (*real_virNetDevSendVfSetLinkRequest)(const char *ifname, int vfInfoType, @@ -301,8 +299,6 @@ testVirNetDevSetVfConfig(const void *opaque G_GNUC_UNUS= ED) return 0; } =20 -# endif /* defined(WITH_LIBNL) */ - static int mymain(void) { @@ -320,8 +316,6 @@ mymain(void) DO_TEST_LINK("lo", VIR_NETDEV_IF_STATE_UNKNOWN, 0); DO_TEST_LINK("eth0-broken", VIR_NETDEV_IF_STATE_DOWN, 0); =20 -# if defined(WITH_LIBNL) - if (virTestRun("Set VF MAC", testVirNetDevSetVfMac, NULL) < 0) ret =3D -1; if (virTestRun("Set VF MAC: missing MAC pointer", testVirNetDevSetVfMi= ssingMac, NULL) < 0) @@ -331,8 +325,6 @@ mymain(void) if (virTestRun("Set VF Config", testVirNetDevSetVfConfig, NULL) < 0) ret =3D -1; =20 -# endif /* defined(WITH_LIBNL) */ - return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } =20 --=20 2.48.1