From nobody Mon Feb 9 22:38:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=canonical.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1638435570689971.0111037886494; Thu, 2 Dec 2021 00:59:30 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-320-4cRrp59QOIytZ-BLS7xOIw-1; Thu, 02 Dec 2021 03:59:28 -0500 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 12DC181CCB4; Thu, 2 Dec 2021 08:59:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 98B0019C46; Thu, 2 Dec 2021 08:59:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BE52E1809C89; Thu, 2 Dec 2021 08:59:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1B28xKap030128 for ; Thu, 2 Dec 2021 03:59:20 -0500 Received: by smtp.corp.redhat.com (Postfix) id 05365492CA4; Thu, 2 Dec 2021 08:59:20 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 01108492C3B for ; Thu, 2 Dec 2021 08:59:19 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B627B106655A for ; Thu, 2 Dec 2021 08:59:19 +0000 (UTC) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-450-TCEBNqdpMDKpgoWkUT_w-g-1; Thu, 02 Dec 2021 03:59:18 -0500 Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) (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 smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id CD2A23F1EE for ; Thu, 2 Dec 2021 08:59:16 +0000 (UTC) Received: by mail-lj1-f198.google.com with SMTP id s16-20020a2ea710000000b0021b674e9347so9349520lje.8 for ; Thu, 02 Dec 2021 00:59:16 -0800 (PST) Received: from ws.lan.d-node.is ([95.165.29.203]) by smtp.gmail.com with ESMTPSA id b5sm265352lff.278.2021.12.02.00.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Dec 2021 00:59:15 -0800 (PST) X-MC-Unique: 4cRrp59QOIytZ-BLS7xOIw-1 X-MC-Unique: TCEBNqdpMDKpgoWkUT_w-g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=isvvSvX0vtrQHUbkCIj4RvGMDC/yh5DUcHXg6afGzjQ=; b=pU4ZbznzUZKp1yGEEXPp68Gonipfqx8tIyEUbHZ4Z0ymeI/ZPxmOI+3lifSvoNFt3C qFiD6FT13TCmHdknG66WYX5FE0Z2X67NrZovZP4DCoOI2U8W2fNFaFLOiRdkTWiDeGLG s504Bv6lxMU27fMbJ1i/mIx+f8RYvyMftPoBY/4DA1wUTYyr1x0/CTSyNu5tejNqJTaD wBZNyLky5i8Onrai+S6Ymw6AeWMIs1LYV8HJ3oKde9kdGDF65I3ok9geTkJYfgxBaOtT uP/OQQUNCvpIlDJaOIplg3bzERrBuHiBkRXijwudxObJR8X77EVq91kCHdnfFnJM5s11 qNKA== X-Gm-Message-State: AOAM530vkbdkoc4e8L29vR7wPQU/mNYxEkp6rYvIXKiN0LbUQzGUrlG7 34HUrhFV8C1+CtcqtMBvJ7EJqXOZNw79o5yTbnPoeA/2I0UF7SLgStU9jsfZ7M49LfgWvoGOhwN ZisizAkme/H+hkd2XDPXsRC+Jj8zHnMKYFA== X-Received: by 2002:a05:6512:11c5:: with SMTP id h5mr10986803lfr.431.1638435556274; Thu, 02 Dec 2021 00:59:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzfqVwbCaAlaPBwlSFRKtXUsfxNYprNONRKatvVzEXPDbXFuPZaw6vCm0pBj22uhJushEi+cg== X-Received: by 2002:a05:6512:11c5:: with SMTP id h5mr10986787lfr.431.1638435556049; Thu, 02 Dec 2021 00:59:16 -0800 (PST) From: Dmitrii Shcherbakov To: dmitrii.shcherbakov@canonical.com, libvir-list@redhat.com Subject: [libvirt PATCH v7 2/3] Allow VF vlanid to be passed as a pointer Date: Thu, 2 Dec 2021 11:59:12 +0300 Message-Id: <20211202085913.157483-3-dmitrii.shcherbakov@canonical.com> In-Reply-To: <20211202085913.157483-1-dmitrii.shcherbakov@canonical.com> References: <20211202085913.157483-1-dmitrii.shcherbakov@canonical.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 1B28xKap030128 X-loop: libvir-list@redhat.com Cc: laine@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@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=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1638435572524100003 Content-Type: text/plain; charset="utf-8" There should be a way to show no intent in programming a VLAN at all (including clearing it). This allows handling error conditions differently when VLAN clearing is explicit (vlan id =3D=3D 0) vs implicit (vlanid =3D=3D NULL - try to clear it if possible). Signed-off-by: Dmitrii Shcherbakov --- src/hypervisor/virhostdev.c | 4 +++- src/util/virnetdev.c | 41 ++++++++++++++++++++++++------------- src/util/virnetdevpriv.h | 4 ++-- tests/virnetdevtest.c | 27 ++++++++++++++++++++---- 4 files changed, 55 insertions(+), 21 deletions(-) diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c index e44eb7f1d3..929b0a0805 100644 --- a/src/hypervisor/virhostdev.c +++ b/src/hypervisor/virhostdev.c @@ -463,6 +463,7 @@ virHostdevSetNetConfig(virDomainHostdevDef *hostdev, const virNetDevVPortProfile *virtPort; int vf =3D -1; bool port_profile_associate =3D true; + bool setVlan =3D false; =20 if (!virHostdevIsPCINetDevice(hostdev)) return 0; @@ -471,6 +472,7 @@ virHostdevSetNetConfig(virDomainHostdevDef *hostdev, return -1; =20 vlan =3D virDomainNetGetActualVlan(hostdev->parentnet); + setVlan =3D vlan !=3D NULL; virtPort =3D virDomainNetGetActualVirtPortProfile(hostdev->parentnet); if (virtPort) { if (vlan) { @@ -486,7 +488,7 @@ virHostdevSetNetConfig(virDomainHostdevDef *hostdev, return -1; } else { if (virNetDevSetNetConfig(linkdev, vf, &hostdev->parentnet->mac, - vlan, NULL, true) < 0) + vlan, NULL, setVlan) < 0) return -1; } =20 diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index ea8cae0dcf..d4d505f7c1 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1607,20 +1607,25 @@ virNetDevSendVfSetLinkRequest(const char *ifname, i= nt vfInfoType, } =20 int -virNetDevSetVfVlan(const char *ifname, int vf, int vlanid) +virNetDevSetVfVlan(const char *ifname, int vf, const int *vlanid) { int rc =3D 0; int requestError =3D 0; =20 struct ifla_vf_vlan ifla_vf_vlan =3D { .vf =3D vf, - .vlan =3D vlanid, .qos =3D 0, + /* If vlanid is NULL, assume it needs to be cleared. */ + .vlan =3D 0, }; =20 - /* VLAN ids 0 and 4095 are reserved per 802.1Q but are valid values. */ - if ((vlanid < 0 || vlanid > 4095)) { - return -ERANGE; + if (vlanid !=3D NULL) { + /* VLAN ids 0 and 4095 are reserved per 802.1Q but are valid value= s. */ + if ((*vlanid < 0 || *vlanid > 4095)) { + return -ERANGE; + } else { + ifla_vf_vlan.vlan =3D *vlanid; + } } =20 requestError =3D virNetDevSendVfSetLinkRequest(ifname, IFLA_VF_VLAN, @@ -1630,12 +1635,12 @@ virNetDevSetVfVlan(const char *ifname, int vf, int = vlanid) virReportSystemError(-requestError, _("Cannot set interface vlanid to %d " "for ifname %s vf %d"), - vlanid, ifname ? ifname : "(unspecified)", vf= ); + ifla_vf_vlan.vlan, ifname ? ifname : "(unspec= ified)", vf); rc =3D requestError; } VIR_DEBUG("RTM_SETLINK %s vf %d vlanid=3D%d - %s", ifname, vf, - vlanid, rc < 0 ? "Fail" : "Success"); + ifla_vf_vlan.vlan, rc < 0 ? "Fail" : "Success"); return rc; } =20 @@ -1689,7 +1694,7 @@ virNetDevSetVfMac(const char *ifname, int vf, =20 int virNetDevSetVfConfig(const char *ifname, int vf, - const virMacAddr *macaddr, int vlanid, + const virMacAddr *macaddr, const int *vlanid, bool *allowRetry) { int rc =3D 0; @@ -2225,7 +2230,7 @@ virNetDevSetNetConfig(const char *linkdev, int vf, const char *pfDevName =3D NULL; g_autofree char *pfDevOrig =3D NULL; g_autofree char *vfDevOrig =3D NULL; - int vlanTag =3D -1; + g_autofree int *vlanTag =3D NULL; g_autoptr(virPCIDevice) vfPCIDevice =3D NULL; =20 if (vf >=3D 0) { @@ -2284,10 +2289,17 @@ virNetDevSetNetConfig(const char *linkdev, int vf, return -1; } =20 - vlanTag =3D vlan->tag[0]; + vlanTag =3D g_new0(int, 1); + *vlanTag =3D vlan->tag[0]; =20 } else if (setVlan) { - vlanTag =3D 0; /* assure any existing vlan tag is reset */ + vlanTag =3D g_new0(int, 1); + /* Assure any existing vlan tag is reset. */ + *vlanTag =3D 0; + } else { + /* Indicate that setting a VLAN has not been explicitly reques= ted. + * This allows selected errors in clearing a VF VLAN to be ign= ored. */ + vlanTag =3D NULL; } } =20 @@ -2369,7 +2381,7 @@ virNetDevSetNetConfig(const char *linkdev, int vf, } } =20 - if (adminMAC || vlanTag >=3D 0) { + if (adminMAC) { /* Set vlanTag and admin MAC using an RTM_SETLINK request sent to * PFdevname+VF#, if mac !=3D NULL this will set the "admin MAC" v= ia * the PF, *not* the actual VF MAC - the admin MAC only takes @@ -2464,7 +2476,8 @@ virNetDevSendVfSetLinkRequest(const char *ifname G_GN= UC_UNUSED, int vfInfoType G } =20 int -virNetDevSetVfVlan(const char *ifname G_GNUC_UNUSED, int vf G_GNUC_UNUSED,= int vlanid G_GNUC_UNUSED) +virNetDevSetVfVlan(const char *ifname G_GNUC_UNUSED, int vf G_GNUC_UNUSED, + const int *vlanid G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to set a VF VLAN on this platform")); @@ -2483,7 +2496,7 @@ virNetDevSetVfMac(const char *ifname G_GNUC_UNUSED, i= nt vf G_GNUC_UNUSED, =20 int virNetDevSetVfConfig(const char *ifname G_GNUC_UNUSED, int vf G_GNUC_UNUSE= D, - const virMacAddr *macaddr G_GNUC_UNUSED, int vlanid G= _GNUC_UNUSED, + const virMacAddr *macaddr G_GNUC_UNUSED, const int *v= lanid G_GNUC_UNUSED, bool *allowRetry G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", diff --git a/src/util/virnetdevpriv.h b/src/util/virnetdevpriv.h index 7990bf5269..84a42fb747 100644 --- a/src/util/virnetdevpriv.h +++ b/src/util/virnetdevpriv.h @@ -31,7 +31,7 @@ virNetDevSendVfSetLinkRequest(const char *ifname, int vfI= nfoType, const void *payload, const size_t payloadLen= ); =20 int -virNetDevSetVfVlan(const char *ifname, int vf, int vlanid); +virNetDevSetVfVlan(const char *ifname, int vf, const int *vlanid); =20 int virNetDevSetVfMac(const char *ifname, int vf, @@ -40,5 +40,5 @@ virNetDevSetVfMac(const char *ifname, int vf, =20 int virNetDevSetVfConfig(const char *ifname, int vf, - const virMacAddr *macaddr, int vlanid, + const virMacAddr *macaddr, const int *vlanid, bool *allowRetry); diff --git a/tests/virnetdevtest.c b/tests/virnetdevtest.c index c8dba05c31..f5f54653bb 100644 --- a/tests/virnetdevtest.c +++ b/tests/virnetdevtest.c @@ -75,7 +75,7 @@ int (*real_virNetDevSetVfMac)(const char *ifname, int vf, const virMacAddr *ma= caddr, bool *allowRetry); =20 int -(*real_virNetDevSetVfVlan)(const char *ifname, int vf, int vlanid); +(*real_virNetDevSetVfVlan)(const char *ifname, int vf, const int *vlanid); =20 static void init_syms(void) @@ -109,7 +109,7 @@ virNetDevSetVfMac(const char *ifname, int vf, } =20 int -virNetDevSetVfVlan(const char *ifname, int vf, int vlanid) +virNetDevSetVfVlan(const char *ifname, int vf, const int *vlanid) { init_syms(); =20 @@ -210,6 +210,11 @@ testVirNetDevSetVfVlan(const void *opaque G_GNUC_UNUSE= D) const int vlan_id; const int rc; }; + struct nullVlanTestCase { + const char *ifname; + const int vf_num; + const int rc; + }; size_t i =3D 0; int rc =3D 0; const struct testCase testCases[] =3D { @@ -230,13 +235,27 @@ testVirNetDevSetVfVlan(const void *opaque G_GNUC_UNUS= ED) { .ifname =3D "fakeiface-ok", .vf_num =3D 1, .vlan_id =3D 42, .rc = =3D 0 }, }; =20 + const struct nullVlanTestCase nullVLANTestCases[] =3D { + { .ifname =3D "fakeiface-eperm", .vf_num =3D 1, .rc =3D -EPERM }, + { .ifname =3D "fakeiface-eagain", .vf_num =3D 1, .rc =3D -EAGAIN }, + /* Successful requests with vlan id 0 need to have a zero return c= ode. */ + { .ifname =3D "fakeiface-ok", .vf_num =3D 1, .rc =3D 0 }, + }; + for (i =3D 0; i < sizeof(testCases) / sizeof(struct testCase); ++i) { - rc =3D virNetDevSetVfVlan(testCases[i].ifname, testCases[i].vf_num,= testCases[i].vlan_id); + rc =3D virNetDevSetVfVlan(testCases[i].ifname, testCases[i].vf_num,= &testCases[i].vlan_id); if (rc !=3D testCases[i].rc) { return -1; } } =20 + for (i =3D 0; i < sizeof(nullVLANTestCases) / sizeof(struct nullVlanTe= stCase); ++i) { + rc =3D virNetDevSetVfVlan(nullVLANTestCases[i].ifname, nullVLANTest= Cases[i].vf_num, NULL); + if (rc !=3D nullVLANTestCases[i].rc) { + return -1; + } + } + return 0; } =20 @@ -264,7 +283,7 @@ testVirNetDevSetVfConfig(const void *opaque G_GNUC_UNUS= ED) }; =20 for (i =3D 0; i < sizeof(testCases) / sizeof(struct testCase); ++i) { - rc =3D virNetDevSetVfConfig(testCases[i].ifname, vfNum, &mac, vlani= d, allowRetry); + rc =3D virNetDevSetVfConfig(testCases[i].ifname, vfNum, &mac, &vlan= id, allowRetry); if (rc !=3D testCases[i].rc) { return -1; } --=20 2.32.0