From nobody Sun Feb 8 23:32:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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.129.124]) by mx.zohomail.com with SMTPS id 1637225136208600.5155704146129; Thu, 18 Nov 2021 00:45:36 -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-207-6dA5xUT5Pye4O_Eouijo8w-1; Thu, 18 Nov 2021 03:45:32 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 607531006AA3; Thu, 18 Nov 2021 08:45:27 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4368C104A9EE; Thu, 18 Nov 2021 08:45:27 +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 12A6A4E9F5; Thu, 18 Nov 2021 08:45:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AI8hdo0013343 for ; Thu, 18 Nov 2021 03:43:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id BA1FC1121314; Thu, 18 Nov 2021 08:43:39 +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 B58A11121315 for ; Thu, 18 Nov 2021 08:43:34 +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 3E0E41066558 for ; Thu, 18 Nov 2021 08:43:34 +0000 (UTC) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-566-cb62s29NO7Wdhn0LgvTTJg-1; Thu, 18 Nov 2021 03:43:31 -0500 Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) (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 A94713F31C for ; Thu, 18 Nov 2021 08:43:29 +0000 (UTC) Received: by mail-lf1-f70.google.com with SMTP id bp10-20020a056512158a00b0040376f60e35so3512322lfb.8 for ; Thu, 18 Nov 2021 00:43:29 -0800 (PST) Received: from ws.lan.d-node.is ([95.165.29.203]) by smtp.gmail.com with ESMTPSA id t12sm243207ljg.63.2021.11.18.00.43.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Nov 2021 00:43:28 -0800 (PST) X-MC-Unique: 6dA5xUT5Pye4O_Eouijo8w-1 X-MC-Unique: cb62s29NO7Wdhn0LgvTTJg-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=AO7GWAm6AmeMhAvu9e0He+zQHtzfypB8R28tBByyaXs=; b=lNtZYdeUZl5jfNSl4VLbScamaOnhonwE02cE0DjwDwhqAc6anIvBDsw+gKE6SVh+h/ NNBQz34MyBlL5zfJNt4JD2LV+17A6QEa5OqYkXUSVOfbLagEPaj28coTJqBb1zLk0wGN CstYxC+uyApbZDneybgxME2ok1DlH1wEq1PiQugKg6DnuZy9pv1QLv1Rycc7GDHvhi+a 91iiPQRfs6po8p3N2o9i5CvY1RGDfWs449ff0OQO4+a9O965qSjjLe5/wH6+yBcfhqHH jab8wAwi534n55r4s3Vq/JHx9Bt7vkRI2KptDq66p2QssrNfmdsV8TUrg7YT13O5xqSz l7GQ== X-Gm-Message-State: AOAM531RgQ4Sqqk6sKFVGUd1ptGBnLYbwuUs9DhDOEZwKL/aSOHRPM0L 8AsWFisra5er01I7Zyn3bddzFv+53pTUuhO6CmDvcFa3KZYw0yayy1VpAbCAfMzVt14E+cLFwf0 KxBo5ir/un6vJSz/AaQ1zaVaDHsEHjP0Lkw== X-Received: by 2002:a19:654a:: with SMTP id c10mr21422617lfj.670.1637225009097; Thu, 18 Nov 2021 00:43:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJyYxo7U9v42wBJR4QyBkxKSq/4VpUFw6F21SBxBZ9178AzSpeoWzpJi2fHBYUywxXKajDT2EQ== X-Received: by 2002:a19:654a:: with SMTP id c10mr21422595lfj.670.1637225008903; Thu, 18 Nov 2021 00:43:28 -0800 (PST) From: Dmitrii Shcherbakov To: dmitrii.shcherbakov@canonical.com, libvir-list@redhat.com Subject: [libvirt PATCH v5 2/3] Allow VF vlanid to be passed as a pointer Date: Thu, 18 Nov 2021 11:43:25 +0300 Message-Id: <20211118084326.29204-3-dmitrii.shcherbakov@canonical.com> In-Reply-To: <20211118084326.29204-1-dmitrii.shcherbakov@canonical.com> References: <20211118084326.29204-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.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 1AI8hdo0013343 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.22 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: 1637225138285100001 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 | 36 ++++++++++++++++++++++++------------ src/util/virnetdevpriv.h | 4 ++-- tests/virnetdevtest.c | 27 +++++++++++++++++++++++---- 4 files changed, 52 insertions(+), 19 deletions(-) diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c index 14ea560309..515663222c 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 dfd4506c21..cee23e1a0c 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; @@ -2226,7 +2231,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) { @@ -2285,10 +2290,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 @@ -2370,7 +2382,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 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 15e8f75d8b..5a787fa0f1 100644 --- a/tests/virnetdevtest.c +++ b/tests/virnetdevtest.c @@ -73,7 +73,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) @@ -107,7 +107,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 @@ -208,6 +208,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 { @@ -228,13 +233,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 @@ -262,7 +281,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