From nobody Sun Feb 8 20:52:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1547175710626754.7177680697994; Thu, 10 Jan 2019 19:01:50 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 84FC4144099; Fri, 11 Jan 2019 03:01:48 +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 D5BD25C221; Fri, 11 Jan 2019 03:01:47 +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 B6FEB181BA1A; Fri, 11 Jan 2019 03:01:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x0B31ign026463 for ; Thu, 10 Jan 2019 22:01:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7E667601A3; Fri, 11 Jan 2019 03:01:44 +0000 (UTC) Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 74DD1600CD for ; Fri, 11 Jan 2019 03:01:42 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BC620A53BD for ; Fri, 11 Jan 2019 03:01:40 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id l12so16722875qtf.8 for ; Thu, 10 Jan 2019 19:01:40 -0800 (PST) Received: from localhost.localdomain ([177.103.107.138]) by smtp.gmail.com with ESMTPSA id r18sm48539521qta.83.2019.01.10.19.01.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 19:01:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Di+4HJnk7X4nHtCJqVQLviFR68g4CpYNHCQsk2xeKTs=; b=QQw3iHU2rfUsGvxhe//4JPsau+2JKhAKedjfv72ZW1ER1B8DVVUuZsAZWIGpsK4H7R yYC6Dmg5adBe+ER39oZ5LdjaRHZnn57e+U1l0Iqw9U72A9eXFUlDmno9VDP9WYVlTSqr zpSzwAE5YNkmKDWsGiRXy5RXR2VQZI8oPFAFvRPeuWX37qYsqEHILA0FO2YsY8GJKQ/Q z1uwIyX2AzE67RREcChOn1vA2ftXcDpzBXFqun94+BascWWMgSQSfGdGyRnWKZ2jazPE b3jxUwBnrwvapKiKO4h8jibED3SUX5Fg9Tmvl5s1xNsTXcpXHsenKY3NBluG7ze/31li AZbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Di+4HJnk7X4nHtCJqVQLviFR68g4CpYNHCQsk2xeKTs=; b=tUNtGl7UiYSNB3N4WPw/Tx01Iz9/kKpOBmBkZXZ7OA/Qiuf8Ekgu/rUlCn1Zo5On/6 HjJJUqADB8rSs3o3m3NguCAyZn1/yZ58GJ/WT/YkWMuRgglmVmAsil9u6490F1wdAu6T lF3swpAUIQyh1ahc3kslfO9pN5sTcjUgwvyqA3ZptKlkC7XXFH77goUjOWD/hOxYeUrH 2bX0LICD7SJVZjhynXhZVRYeVUdQ22EpAuQxshACG6bnM6KVbtcQ3s5ushhY0QqMsgMT TRfogMZvF25hCILn2+uxh+msTTksZAsphY0DPfa2YmIW05Czu1naGwluD1yZejW3esYC mJ6g== X-Gm-Message-State: AJcUukdMWBqtG5rsNdRoXRNbgDo1UCETFa0DELWl9cTBepPe3DbEpnq4 PfxDamRDqgstpICCa2XnAPRtXrpH X-Google-Smtp-Source: ALg8bN4t8JZeW2/9WkXJg97LBNji+Zv7y3bOkfCGCY7DdrdMj23VHKMpbJyVoZhIT0bylYb+k+YDDg== X-Received: by 2002:a37:6c05:: with SMTP id h5mr11634955qkc.175.1547175699646; Thu, 10 Jan 2019 19:01:39 -0800 (PST) From: Julio Faracco To: libvir-list@redhat.com Date: Fri, 11 Jan 2019 01:01:21 -0200 Message-Id: <20190111030123.25211-2-jcfaracco@gmail.com> In-Reply-To: <20190111030123.25211-1-jcfaracco@gmail.com> References: <20190111030123.25211-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 11 Jan 2019 03:01:41 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 11 Jan 2019 03:01:41 +0000 (UTC) for IP:'209.85.160.193' DOMAIN:'mail-qt1-f193.google.com' HELO:'mail-qt1-f193.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.108 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 209.85.160.193 mail-qt1-f193.google.com 209.85.160.193 mail-qt1-f193.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.26 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 1/3] lxc: refactoring LXC network definition with a sparse array. 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 11 Jan 2019 03:01:49 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" LXC was using a single data structure to define all LXC NICs. In terms of optimization it is very interesting, but it is not useful when you use a index to define networks. After major release 3.0, LXC adopted indexes for network definitions. So, this commit adds a sparse vector to handle network indexes. Now, networks can be defined in sequence using the legacy config. Or using a sparse array, using version 3 with indexes. Signed-off-by: Julio Faracco --- src/lxc/lxc_native.c | 195 ++++++++++++++++++++++++++++--------------- 1 file changed, 128 insertions(+), 67 deletions(-) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 1eee3fc2bb..8ddcdc8180 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -22,6 +22,7 @@ #include =20 #include "internal.h" +#include "c-ctype.h" #include "lxc_container.h" #include "lxc_native.h" #include "util/viralloc.h" @@ -409,8 +410,9 @@ lxcCreateHostdevDef(int mode, int type, const char *dat= a) return hostdev; } =20 -typedef struct { - virDomainDefPtr def; +typedef struct _lxcNetworkParseData lxcNetworkParseData; +typedef lxcNetworkParseData *lxcNetworkParseDataPtr; +struct _lxcNetworkParseData { char *type; char *link; char *mac; @@ -422,9 +424,13 @@ typedef struct { size_t nips; char *gateway_ipv4; char *gateway_ipv6; - bool privnet; - size_t networks; -} lxcNetworkParseData; + size_t index; +}; + +typedef struct { + lxcNetworkParseDataPtr *data; + size_t nnetworks; +} lxcNetworkParseArray; =20 static int lxcAddNetworkRouteDefinition(const char *address, @@ -464,7 +470,7 @@ lxcAddNetworkRouteDefinition(const char *address, } =20 static int -lxcAddNetworkDefinition(lxcNetworkParseData *data) +lxcAddNetworkDefinition(virDomainDefPtr def, lxcNetworkParseData *data) { virDomainNetDefPtr net =3D NULL; virDomainHostdevDefPtr hostdev =3D NULL; @@ -512,9 +518,9 @@ lxcAddNetworkDefinition(lxcNetworkParseData *data) &hostdev->source.caps.u.net.ip.nr= outes) < 0) goto error; =20 - if (VIR_EXPAND_N(data->def->hostdevs, data->def->nhostdevs, 1) < 0) + if (VIR_EXPAND_N(def->hostdevs, def->nhostdevs, 1) < 0) goto error; - data->def->hostdevs[data->def->nhostdevs - 1] =3D hostdev; + def->hostdevs[def->nhostdevs - 1] =3D hostdev; } else { if (!(net =3D lxcCreateNetDef(data->type, data->link, data->mac, data->flag, data->macvlanmode, @@ -536,9 +542,9 @@ lxcAddNetworkDefinition(lxcNetworkParseData *data) &net->guestIP.nroutes) < 0) goto error; =20 - if (VIR_EXPAND_N(data->def->nets, data->def->nnets, 1) < 0) + if (VIR_EXPAND_N(def->nets, def->nnets, 1) < 0) goto error; - data->def->nets[data->def->nnets - 1] =3D net; + def->nets[def->nnets - 1] =3D net; } =20 return 1; @@ -552,51 +558,93 @@ lxcAddNetworkDefinition(lxcNetworkParseData *data) return -1; } =20 +static inline int lxcNetworkHasIndex(const char *entry) +{ + return STRPREFIX(entry, "lxc.net.") && c_isdigit(entry[8]); +} + +static inline int lxcNetworkIndexHasType(const char *entry, const char *ty= pe) +{ + return lxcNetworkHasIndex(entry) && virFileHasSuffix(entry, type); +} + static int lxcNetworkWalkCallback(const char *name, virConfValuePtr value, void *data) { - lxcNetworkParseData *parseData =3D data; - int status; + lxcNetworkParseArray *parseData =3D data; + size_t index; + + /* Managing memory and indexes for version 3.0 */ + if (lxcNetworkHasIndex(name)) { + sscanf(name, "lxc.net.%zu", &index); + + if (index >=3D parseData->nnetworks) { + if (!parseData->data) { + if (VIR_ALLOC_N(parseData->data, index + 1) < 0) + return -1; + } else { + if (VIR_REALLOC_N(parseData->data, index + 1) < 0) + return -1; + } =20 - if (STREQ(name, "lxc.network.type")) { - virDomainDefPtr def =3D parseData->def; - size_t networks =3D parseData->networks; - bool privnet =3D parseData->privnet; + parseData->nnetworks =3D index + 1; + } =20 - /* Store the previous NIC */ - status =3D lxcAddNetworkDefinition(parseData); + if (!parseData->data[index]) { + if (VIR_ALLOC(parseData->data[index]) < 0) + return -1; + } + } else { + /* Indexes can be 0 when a network is defined */ + index =3D parseData->nnetworks - 1; + } =20 - if (status < 0) - return -1; - else if (status > 0) - networks++; - else if (parseData->type !=3D NULL && STREQ(parseData->type, "none= ")) - privnet =3D false; + if (STREQ(name, "lxc.network.type")) { + /* A new NIC will be added */ + index =3D parseData->nnetworks; =20 - /* clean NIC to store a new one */ - memset(parseData, 0, sizeof(*parseData)); + if (!parseData->data) { + if (VIR_ALLOC_N(parseData->data, index + 1) < 0) + return -1; + } else { + if (VIR_REALLOC_N(parseData->data, index + 1) < 0) + return -1; + } =20 - parseData->def =3D def; - parseData->networks =3D networks; - parseData->privnet =3D privnet; + if (VIR_ALLOC(parseData->data[index]) < 0) + return -1; =20 /* Keep the new value */ - parseData->type =3D value->str; + parseData->data[index]->type =3D value->str; + parseData->data[index]->index =3D index; + + /* Network interface added */ + parseData->nnetworks++; } - else if (STREQ(name, "lxc.network.link")) - parseData->link =3D value->str; - else if (STREQ(name, "lxc.network.hwaddr")) - parseData->mac =3D value->str; - else if (STREQ(name, "lxc.network.flags")) - parseData->flag =3D value->str; - else if (STREQ(name, "lxc.network.macvlan.mode")) - parseData->macvlanmode =3D value->str; - else if (STREQ(name, "lxc.network.vlan.id")) - parseData->vlanid =3D value->str; - else if (STREQ(name, "lxc.network.name")) - parseData->name =3D value->str; - else if (STREQ(name, "lxc.network.ipv4") || - STREQ(name, "lxc.network.ipv6")) { + else if (lxcNetworkIndexHasType(name, ".type")) + parseData->data[index]->type =3D value->str; + else if (STREQ(name, "lxc.network.link") || + lxcNetworkIndexHasType(name, ".link")) + parseData->data[index]->link =3D value->str; + else if (STREQ(name, "lxc.network.hwaddr") || + lxcNetworkIndexHasType(name, ".hwaddr")) + parseData->data[index]->mac =3D value->str; + else if (STREQ(name, "lxc.network.flags") || + lxcNetworkIndexHasType(name, ".flags")) + parseData->data[index]->flag =3D value->str; + else if (STREQ(name, "lxc.network.macvlan.mode") || + lxcNetworkIndexHasType(name, ".macvlan.mode")) + parseData->data[index]->macvlanmode =3D value->str; + else if (STREQ(name, "lxc.network.vlan.id") || + lxcNetworkIndexHasType(name, ".vlan.id")) + parseData->data[index]->vlanid =3D value->str; + else if (STREQ(name, "lxc.network.name") || + lxcNetworkIndexHasType(name, ".name")) + parseData->data[index]->name =3D value->str; + else if ((STREQ(name, "lxc.network.ipv4") || + STREQ(name, "lxc.network.ipv6")) || + (lxcNetworkIndexHasType(name, ".ipv4") || + lxcNetworkIndexHasType(name, ".ipv6"))) { int family =3D AF_INET; char **ipparts =3D NULL; virNetDevIPAddrPtr ip =3D NULL; @@ -604,7 +652,8 @@ lxcNetworkWalkCallback(const char *name, virConfValuePt= r value, void *data) if (VIR_ALLOC(ip) < 0) return -1; =20 - if (STREQ(name, "lxc.network.ipv6")) + if (STREQ(name, "lxc.network.ipv6") || + lxcNetworkIndexHasType(name, ".ipv6")) family =3D AF_INET6; =20 ipparts =3D virStringSplit(value->str, "/", 2); @@ -622,15 +671,19 @@ lxcNetworkWalkCallback(const char *name, virConfValue= Ptr value, void *data) =20 virStringListFree(ipparts); =20 - if (VIR_APPEND_ELEMENT(parseData->ips, parseData->nips, ip) < 0) { + if (VIR_APPEND_ELEMENT(parseData->data[index]->ips, + parseData->data[index]->nips, ip) < 0) { VIR_FREE(ip); return -1; } - } else if (STREQ(name, "lxc.network.ipv4.gateway")) { - parseData->gateway_ipv4 =3D value->str; - } else if (STREQ(name, "lxc.network.ipv6.gateway")) { - parseData->gateway_ipv6 =3D value->str; - } else if (STRPREFIX(name, "lxc.network")) { + } else if (STREQ(name, "lxc.network.ipv4.gateway") || + lxcNetworkIndexHasType(name, ".ipv4.gateway")) { + parseData->data[index]->gateway_ipv4 =3D value->str; + } else if (STREQ(name, "lxc.network.ipv6.gateway") || + lxcNetworkIndexHasType(name, ".ipv6.gateway")) { + parseData->data[index]->gateway_ipv6 =3D value->str; + } else if (STRPREFIX(name, "lxc.network") || + lxcNetworkHasIndex(name)) { VIR_WARN("Unhandled network property: %s =3D %s", name, value->str); @@ -645,25 +698,29 @@ lxcConvertNetworkSettings(virDomainDefPtr def, virCon= fPtr properties) int status; int result =3D -1; size_t i; - lxcNetworkParseData data =3D {def, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, 0, - NULL, NULL, true, 0}; + bool privnet =3D true; + lxcNetworkParseArray nets =3D {NULL, 0}; =20 - if (virConfWalk(properties, lxcNetworkWalkCallback, &data) < 0) + if (virConfWalk(properties, lxcNetworkWalkCallback, &nets) < 0) goto error; =20 + for (i =3D 0; i < nets.nnetworks; i++) { + lxcNetworkParseDataPtr data =3D nets.data[i]; =20 - /* Add the last network definition found */ - status =3D lxcAddNetworkDefinition(&data); + /* It needs to guarantee that index exists. */ + /* Since there is a sparse array. */ + if (data) { + /* Add network definitions */ + status =3D lxcAddNetworkDefinition(def, data); =20 - if (status < 0) - goto error; - else if (status > 0) - data.networks++; - else if (data.type !=3D NULL && STREQ(data.type, "none")) - data.privnet =3D false; + if (status < 0) + goto error; + else if (data->type !=3D NULL && STREQ(data->type, "none")) + privnet =3D false; + } + } =20 - if (data.networks =3D=3D 0 && data.privnet) { + if (nets.nnetworks =3D=3D 0 && privnet) { /* When no network type is provided LXC only adds loopback */ def->features[VIR_DOMAIN_FEATURE_PRIVNET] =3D VIR_TRISTATE_SWITCH_= ON; } @@ -672,9 +729,13 @@ lxcConvertNetworkSettings(virDomainDefPtr def, virConf= Ptr properties) return result; =20 error: - for (i =3D 0; i < data.nips; i++) - VIR_FREE(data.ips[i]); - VIR_FREE(data.ips); + for (i =3D 0; i < nets.nnetworks; i++) { + for (i =3D 0; i < nets.data[i]->nips; i++) + VIR_FREE(nets.data[i]->ips[i]); + VIR_FREE(nets.data[i]->ips); + } + for (i =3D 0; i < nets.nnetworks; i++) + VIR_FREE(nets.data[i]); return -1; } =20 --=20 2.19.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list