From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=JfCpnrIH; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTPS id F39ED5A0627 for ; Tue, 05 May 2026 01:11:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777936259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5QAI4l8tvHTRlgWQpknWHvJf3d6AJvHEm8MxOqPGxwc=; b=JfCpnrIHqaxLI7tK4H133MI/4y4X2HIZdFdNKgy2CgmSMRnPsvb0wyOeoX/wK1VFJcnX8G rf2XxttsD4sbWPiSOkILprj3NdC3J4jj/lfuATWlq6A94AOK+q9MykN6JxPoeZvZCzfq1Z 2NdQiK+a3rszqVl5E+1pC6eB74ReX7I= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-472-uWLjHxHJOyKXQSaFenesvg-1; Mon, 04 May 2026 19:10:56 -0400 X-MC-Unique: uWLjHxHJOyKXQSaFenesvg-1 X-Mimecast-MFC-AGG-ID: uWLjHxHJOyKXQSaFenesvg_1777936255 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-43efc93e4f6so3567055f8f.3 for ; Mon, 04 May 2026 16:10:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777936255; x=1778541055; h=date:content-transfer-encoding:mime-version:organization:references :in-reply-to:message-id:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5QAI4l8tvHTRlgWQpknWHvJf3d6AJvHEm8MxOqPGxwc=; b=m0xcyyt1oLh4X5pY/FvS1ldC7e9pzXaV6f23WJkTqCngtoblP2icVaROzvWdQD7mZc PZraJDZ5wZQIjlada8UA4H6WTcJQbl46qKDMJlLvrjl2pYJqhC2YA9esm7Oio4wuG/a3 sWQclLEzSt3c8ux0psLsRjgxMMZi5Z5CcQPM+LyXse/p3ixwGheHJeM7Xv5GGq3ypUyJ 7cNq85QSo+63TjjjdS5bWp+JgMr2Ob8D1NZrDKU53apI4E/PG1WqKfjKKXPGZ/enuOPn 4NRWt8Nubd1s1HzjZhxipnZAnhFscdet15cHTNCnyhB4NPCihH+f/KimpJjHowoRgSp3 uE6A== X-Gm-Message-State: AOJu0YwjTDqUiLt7xV2bZbHXEwGZC0Do8LVZfUijHxzeREZJu53joPs4 +RMCh1F0/ADOgra/Wred5l/Yqyh5KptOCBHjSehsP2XPmqCBTZOnX24Z2JqNguRspSprFHiLwyL ram9Nem9v48NSRllLj0r5SOPh+M9HNjd+XQ4o0bjG7xIgpQ2jsWz+IQ== X-Gm-Gg: AeBDievqL+EdQKiksZf5cww05GKydENTyBr+DHMV9ziIqAp91VoKr67OajW9bOyJpgR pZN3IPyXi6fCyaPBf8ZWr6vVzCauAGvfyzJTntAifiaKxPNVd48sP+dITxeE3DM/CloA5VFerBt 6h4/amygTfIYecvooKY4eSu5IlxzCH5A8BZ5BW0tizMKODIBWbIz8rXbNHeJNqzax/yTG9ag3Qk J9xhp6ejXCdFYgQDj6Av09nynxbiY0PXd8tikx0sX+Pqog+1phF5Zy7bq29QKUUgbYp2f6W6dJB cXlX0GgZhIND9fDgx45L66PRugzCssnNxiLbQTj491FILGVrVnK8uae/mUmArYbr75Kv2k7lU/2 jvrdOkj3YwjAyvA9Mtci9f5n6ZvYB1KauCrSXifBfggjFasVn3nDlZUkzhl8c X-Received: by 2002:a05:6000:2311:b0:44b:8fb6:9a2e with SMTP id ffacd0b85a97d-44bb610ff8emr18417719f8f.20.1777936255330; Mon, 04 May 2026 16:10:55 -0700 (PDT) X-Received: by 2002:a05:6000:2311:b0:44b:8fb6:9a2e with SMTP id ffacd0b85a97d-44bb610ff8emr18417672f8f.20.1777936254828; Mon, 04 May 2026 16:10:54 -0700 (PDT) Received: from maya.myfinge.rs (ifcgrfdd.trafficplex.cloud. [176.103.220.4]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4502c01133bsm568824f8f.34.2026.05.04.16.10.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 16:10:53 -0700 (PDT) From: Stefano Brivio To: Laurent Vivier Subject: Re: [PATCH v6 11/18] pesto: Expose list of pifs to pesto and optionally display Message-ID: <20260505011052.7e5e5966@elisabeth> In-Reply-To: <536c86d4-b040-4661-9436-38694681c4c2@redhat.com> References: <20260503215601.823029-1-sbrivio@redhat.com> <20260503215601.823029-12-sbrivio@redhat.com> <536c86d4-b040-4661-9436-38694681c4c2@redhat.com> Organization: Red Hat X-Mailer: Claws Mail 4.2.0 (GTK 3.24.49; x86_64-pc-linux-gnu) MIME-Version: 1.0 Date: Tue, 05 May 2026 01:10:53 +0200 (CEST) X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: qbO0t3NjNbuP8A_mWcPr-HSXfwcQClPqBRFeDljHV6E_1777936255 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID-Hash: SEMPZYLPTQQTT4BMKP5E2VY6IQS352ZC X-Message-ID-Hash: SEMPZYLPTQQTT4BMKP5E2VY6IQS352ZC X-MailFrom: sbrivio@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: passt-dev@passt.top, Jon Maloy , David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On Mon, 4 May 2026 16:34:40 +0200 Laurent Vivier wrote: > On 5/3/26 23:55, Stefano Brivio wrote: > > From: David Gibson > > > > Extend the dynamic update protocol to expose the pif indices and names > > from a running passt/pasta to the pesto tool. pesto records that data > > and, if requested with a new --show flag, prints it out. > > There is no --show flag Ah, right, that comes later in the series now. I dropped that from the commit message, and reworded the title. > > > > Signed-off-by: David Gibson > > [sbrivio: In read_pif_conf(), force a redundant termination of the > > interface name, the existing check isn't obvious enough for static > > checkers] > > [sbrivio: Drop @resv_ left-over in description of struct > > pesto_pif_info, reported by Jon Maloy] > > Signed-off-by: Stefano Brivio > > Reviewed-by: Laurent Vivier > > But I've noticed 3 minor cosmetic flaws below. > > > > --- > > Makefile | 1 + > > common.h | 2 + > > conf.c | 41 ++++++++++++++++ > > pesto.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > > pesto.h | 18 ++++++- > > pif.h | 4 +- > > serialise.c | 4 ++ > > serialise.h | 1 + > > util.h | 2 - > > 9 files changed, 201 insertions(+), 6 deletions(-) > > > > diff --git a/Makefile b/Makefile > > index 1718ddb..6da76b4 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -223,6 +223,7 @@ cppcheck: passt.cppcheck passt-repair.cppcheck pesto.cppcheck qrap.cppcheck > > $(CPPCHECK) $(CPPCHECK_FLAGS) $(BASE_CPPFLAGS) $^ > > > > passt.cppcheck: BASE_CPPFLAGS += -UPESTO > > +passt.cppcheck: CPPCHECK_FLAGS += --suppress=unusedFunction:serialise.c > > passt.cppcheck: $(PASST_SRCS) $(PASST_HEADERS) seccomp.h > > > > passt-repair.cppcheck: $(PASST_REPAIR_SRCS) $(PASST_REPAIR_HEADERS) seccomp_repair.h > > diff --git a/common.h b/common.h > > index 2f2e6f1..45f66ea 100644 > > --- a/common.h > > +++ b/common.h > > @@ -53,4 +53,6 @@ static inline const char *strerror_(int errnum) > > > > #define strerror(x) @ "Don't call strerror() directly, use strerror_() instead" > > > > +#define ARRAY_SIZE(a) ((int)(sizeof(a) / sizeof((a)[0]))) > > + > > #endif /* _COMMON_H */ > > diff --git a/conf.c b/conf.c > > index 823e08d..3b2fe42 100644 > > --- a/conf.c > > +++ b/conf.c > > @@ -1925,6 +1925,43 @@ void conf(struct ctx *c, int argc, char **argv) > > > > static void conf_accept(struct ctx *c); > > > > +/** > > + * conf_send_rules() - Send current forwarding rules to config client (pesto) > > + * @c: Execution context > > + * @fd: Socket to the client > > + * > > + * Return: 0 on success, -1 on failure > > + * > > + * FIXME: So far only sends pif ids and names > > + */ > > +static int conf_send_rules(const struct ctx *c, int fd) > > +{ > > + unsigned pif; > > + > > + for (pif = 0; pif < PIF_NUM_TYPES; pif++) { > > + struct pesto_pif_info info; > > + int rc; > > + > > + if (!c->fwd[pif]) > > + continue; > > + > > + assert(pif != PIF_NONE); > > + > > + rc = snprintf(info.name, sizeof(info.name), "%s", pif_name(pif)); > > + assert(rc >= 0 && (size_t)rc < sizeof(info.name)); > > + > > + if (write_u8(fd, pif) < 0) > > + return -1; > > + if (write_all_buf(fd, &info, sizeof(info)) < 0) > > + return -1; > > + } > > + > > + if (write_u8(fd, PIF_NONE) < 0) > > + return -1; > > + > > + return 0; > > +} > > + > > /** > > * conf_close() - Close configuration / control socket and clean up > > * @c: Execution context > > @@ -1968,6 +2005,7 @@ static void conf_accept(struct ctx *c) > > struct pesto_hello hello = { > > .magic = PESTO_SERVER_MAGIC, > > .version = htonl(PESTO_PROTOCOL_VERSION), > > + .pif_name_size = htonl(PIF_NAME_SIZE), > > }; > > union epoll_ref ref = { .type = EPOLL_TYPE_CONF }; > > struct ucred uc = { 0 }; > > @@ -2009,6 +2047,9 @@ retry: > > "Warning: Using experimental unsupported configuration protocol"); > > } > > > > + if (conf_send_rules(c, fd) < 0) > > + goto fail; > > + > > return; > > > > fail: > > diff --git a/pesto.c b/pesto.c > > index 762cfe9..77244b3 100644 > > --- a/pesto.c > > +++ b/pesto.c > > @@ -60,6 +60,127 @@ static void usage(const char *name, FILE *f, int status) > > exit(status); > > } > > > > +/* Maximum number of pifs with rule tables */ > > +#define MAX_PIFS 3 > > + > > +struct pif_configuration { > > + uint8_t pif; > > + char name[PIF_NAME_SIZE]; > > +}; > > + > > +struct configuration { > > + uint32_t npifs; > > + struct pif_configuration pif[MAX_PIFS]; > > +}; > > + > > +/** > > + * pif_conf_by_num() - Find a pif's configuration by pif id > > + * @conf: Configuration description > > + * @pif: pif id > > + * > > + * Return: pointer to the pif_configuration for @pif, or NULL if not found > > + */ > > +static struct pif_configuration *pif_conf_by_num(struct configuration *conf, > > + uint8_t pif) > > +{ > > + unsigned i; > > + > > + for (i = 0; i < conf->npifs; i++) { > > + if (conf->pif[i].pif == pif) > > + return &conf->pif[i]; > > + } > > + > > + return NULL; > > +} > > + > > +/** > > + * pif_conf_by_name() - Find a pif's configuration by name > > + * @conf: Configuration description > > + * @name: Interface name > > + * > > + * Return: pif_configuration for pif named @name, or NULL if not found > > + */ > > +static struct pif_configuration *pif_conf_by_name(struct configuration *conf, > > + const char *name) > > +{ > > + unsigned i; > > + > > + for (i = 0; i < conf->npifs; i++) { > > + if (strcmp(conf->pif[i].name, name) == 0) > > + return &conf->pif[i]; > > + } > > + > > + return NULL; > > +} > > + > > +/** > > + * pesto_read_rules() - Read rulestate from passt/pasta > > + * @fd: Control socket > > + * @conf: Configuration description to update > > + */ > > +static bool read_pif_conf(int fd, struct configuration *conf) > > +{ > > + struct pif_configuration *pc; > > + struct pesto_pif_info info; > > + uint8_t pif; > > + > > + if (read_u8(fd, &pif) < 0) > > + die("Error reading from control socket"); > > + > > + if (pif == PIF_NONE) > > + return false; > > + > > + debug("Receiving config for PIF %"PRIu8, pif); > > + > > + if (conf->npifs >= ARRAY_SIZE(conf->pif)) { > > + die("passt has more pifs than pesto can manage (max %d)", > > + ARRAY_SIZE(conf->pif)); > > + } > > + > > + pc = &conf->pif[conf->npifs]; > > + pc->pif = pif; > > + > > + if (read_all_buf(fd, &info, sizeof(info)) < 0) > > + die("Error reading from control socket"); > > + > > + if (info.name[sizeof(info.name)-1]) > > + die("Interface name was not NULL terminated"); > > + /* Redundant, to make static checkers happy */ > > + info.name[sizeof(info.name) - 1] = '\0'; > > + > > + static_assert(sizeof(info.name) == sizeof(pc->name), > > + "Mismatching pif name lengths"); > > + memcpy(pc->name, info.name, sizeof(pc->name)); > > + > > + debug("PIF %"PRIu8": %s", pc->pif, pc->name); > > + > > + /* O(n^2), but n is bounded by MAX_PIFS */ > > + if (pif_conf_by_num(conf, pc->pif)) > > + die("Received duplicate interface identifier"); > > + > > + /* O(n^2), but n is bounded by MAX_PIFS */ > > + if (pif_conf_by_name(conf, pc->name)) > > + die("Received duplicate interface name"); > > + > > + conf->npifs++; > > + return true; > > +} > > + > > +/** > > + * show_conf() - Show current configuration obtained from passt/pasta > > + * @conf: Configuration description > > + */ > > +static void show_conf(const struct configuration *conf) > > +{ > > + unsigned i; > > + > > + for (i = 0; i < conf->npifs; i++) { > > + const struct pif_configuration *pc = &conf->pif[i]; > > + printf(" %s\n", pc->name); > > + printf(" TBD\n"); > > + } > > +} > > + > > /** > > * main() - Dynamic reconfiguration client main program > > * @argc: Argument count > > @@ -80,6 +201,7 @@ int main(int argc, char **argv) > > { 0 }, > > }; > > struct sockaddr_un a = { AF_UNIX, "" }; > > + struct configuration conf = { 0 }; > > const char *optstring = "dh"; > > struct pesto_hello hello; > > struct sock_fprog prog; > > @@ -162,6 +284,18 @@ int main(int argc, char **argv) > > "Warning: Using experimental protocol version, client and server must match\n"); > > } > > > > + if (ntohl(hello.pif_name_size) != PIF_NAME_SIZE) { > > + die("Server has unexpected pif name size (%" > > + PRIu32" not %"PRIu32"\n", > > trailing '\n' Fixed in v7. > > + ntohl(hello.pif_name_size), PIF_NAME_SIZE); > > + } > > + > > + while (read_pif_conf(s, &conf)) > > + ; > > + > > + printf("passt/pasta configuration (%s)\n", a.sun_path); > > + show_conf(&conf); > > + > > if (shutdown(s, SHUT_RDWR) < 0 || close(s) < 0) > > die_perror("Error shutting down control socket"); > > > > diff --git a/pesto.h b/pesto.h > > index 92d4df3..1879759 100644 > > --- a/pesto.h > > +++ b/pesto.h > > @@ -17,18 +17,32 @@ > > /* Version 0 is reserved for unreleased / unsupported experimental versions */ > > #define PESTO_PROTOCOL_VERSION 0 > > > > +/* Maxmimum size of a pif name, including \0 */ > > Typo copied from pif.h, should be "Maximum" Fixed in v7. > > +#define PIF_NAME_SIZE (128) > > +#define PIF_NONE 0 > > + > > /** > > * struct pesto_hello - Server introduction message > > - * @magic: PESTO_SERVER_MAGIC > > - * @version: Version number > > + * @magic: PESTO_SERVER_MAGIC > > + * @version: Version number > > + * @pif_name_size: Server's value for PIF_NAME_SIZE > > */ > > struct pesto_hello { > > char magic[8]; > > uint32_t version; > > + uint32_t pif_name_size; > > } __attribute__ ((__packed__)); > > > > static_assert(sizeof(PESTO_SERVER_MAGIC) > > == sizeof(((struct pesto_hello *)0)->magic), > > "PESTO_SERVER_MAGIC has wrong size"); > > > > +/** > > + * struct pesto_pif_info - Message with basic metadata about a pif > > + * @name: Name (\0 terminated) > > + */ > > +struct pesto_pif_info { > > + char name[PIF_NAME_SIZE]; > > +} __attribute__ ((__packed__)); > > + > > #endif /* PESTO_H */ > > diff --git a/pif.h b/pif.h > > index 90dd3a3..d770860 100644 > > --- a/pif.h > > +++ b/pif.h > > @@ -11,6 +11,7 @@ > > > > #include > > > > +#include "pesto.h" > > #include "epoll_type.h" > > > > union inany_addr; > > @@ -24,7 +25,7 @@ union sockaddr_inany; > > */ > > enum pif_type { > > /* Invalid or not present pif */ > > - PIF_NONE = 0, > > + PIF_NONE_ = PIF_NONE, > > /* Host socket interface */ > > PIF_HOST, > > /* Qemu socket or namespace tuntap interface */ > > @@ -36,7 +37,6 @@ enum pif_type { > > }; > > > > /* Maxmimum size of a pif name, including \0 */ > > Perhaps you could remove the above comment too? Fixed in v7. > > -#define PIF_NAME_SIZE (128) > > extern const char pif_type_str[][PIF_NAME_SIZE]; -- Stefano