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=UVEw/cZt; 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 4DD765A061A for ; Sun, 19 Oct 2025 12:07:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760868463; 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=EDas0A0zEGo1UPp0nDZSD4lOKH9OcN6N8Cy3AF81eNA=; b=UVEw/cZt1hl4zsQeGL5pMh/dzR9617wLfrx4XzGiJcZaRCueONl0bcJI/J0hhKlxTK7Ypm yafvf05F4BV/jhw2or4kV+OCjyrzkTcn/UtPoNSKzAtBYuFYplRffW1sSG3KW1ArqNbGRO SOevOAtUUXgiHiD4Hk5VCiO2UnmZMLo= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-674-meqSII16MimRTI2sLiME6A-1; Sun, 19 Oct 2025 06:07:40 -0400 X-MC-Unique: meqSII16MimRTI2sLiME6A-1 X-Mimecast-MFC-AGG-ID: meqSII16MimRTI2sLiME6A_1760868459 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-470fd49f185so25995285e9.2 for ; Sun, 19 Oct 2025 03:07:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760868459; x=1761473259; h=content-transfer-encoding:mime-version:organization:references :in-reply-to:message-id:subject:cc:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=EDas0A0zEGo1UPp0nDZSD4lOKH9OcN6N8Cy3AF81eNA=; b=PV56Iqtg6Gn15CVHYQD6Ng57HOdG4E8jtJ7USeMUH045/SejVQWnUU+p9LQGfDsFFa l72qVHSQWwivy09mfi43/OhV6oKqeN5EiuxkOxzWj6vF0pHZZQAE/i1QZEzJnsAXzMmf 6WRyOeBHANEOauU5PFulTekrtgA4dcLxJUgej/9weuwrn/wxCWlEnxOB4qTw3hKxK0LP NXiRtqXK2CzuvrecYpZ4fUopb6kgdJRURDhgwbpHxgtJnH5gXlIEFoQOLgUduq3Y5RHj 1nAYbULRlaTgRVRrm5RvyDI+xcSzpELNBk77uEC+dvxjBH1z1yZdEPtPMhFw1tDjxUW7 J/zg== X-Forwarded-Encrypted: i=1; AJvYcCW4Ytef6zWFJtV4d5an1cCsfwEJZjPfdgS4GWYA59AsPCbsdZTukm2H24LOoBkW9lqPBDAsEnNNagI=@passt.top X-Gm-Message-State: AOJu0YwkNz9hXFIRPvA1e7I+HQsFGs3As06gn5RjV5eKQg2bRGXG0j2B C8ZEW7nJgVQ4HrhdBSyq2NUkYIQlWI+e7+8SGSwNPEBTG9MPgjnz27ixzs3PV1U0PjxsUA6e2yJ /2QTM1hl91/4vggrhGaHrt5k8k0yk7lvCkNeeSYiqs8j7mqqPFq2h8A== X-Gm-Gg: ASbGnctvtiOBRHNiXpb68xeomgu9BegSLHVE4X00UYrztM0hDu4EgjMMZW9p5OLmw7/ tImstsWA9SDr0tLU3OsynvPMrshs2WnRbSD+L68yCFpt1p0vqEJ8yhdHT6biUjgGewGrHv0Gn69 Ic4jzPskXT5Uhta6hs/S0EBZ4potL+Ne96ZlSEmDKUJqtCKM7qobHJLCD1xpe3QoBm0PIhagW40 nbhdjw57ayhHcD/U3OJMSE11rvuNUPOO0eQeM/FNEW9zsR8t+sCw/JriABBK6q6NyKtQwidVk// bwdWSHTl0gnogiBPnD/EjwQCgXJdj3j7S4mgkGT6NveYzJ8gIEOzBIkla4sV/y9ZlkmdGJHhx5f lfebev8CxbbdRNpd64WNpaWwuJe0= X-Received: by 2002:a05:6000:2913:b0:428:3fbb:8409 with SMTP id ffacd0b85a97d-4283fbb8df6mr2423539f8f.46.1760868458672; Sun, 19 Oct 2025 03:07:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGydKQwsNwuJvm/l/pFG4uxaepxPwRCZYqvcULJpEBufEYhhyLaieQteQPrz0RgFHvQRkqEng== X-Received: by 2002:a05:6000:2913:b0:428:3fbb:8409 with SMTP id ffacd0b85a97d-4283fbb8df6mr2423522f8f.46.1760868458260; Sun, 19 Oct 2025 03:07:38 -0700 (PDT) Received: from maya.myfinge.rs (ifcgrfdd.trafficplex.cloud. [176.103.220.4]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4711442dbaesm176186145e9.8.2025.10.19.03.07.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Oct 2025 03:07:37 -0700 (PDT) Date: Sun, 19 Oct 2025 12:07:36 +0200 From: Stefano Brivio To: Jon Maloy Subject: Re: [PATCH v14 02/10] passt: add no_map_gw flag to struct ctx Message-ID: <20251019120736.5e123e38@elisabeth> In-Reply-To: <20251015025521.1449156-3-jmaloy@redhat.com> References: <20251015025521.1449156-1-jmaloy@redhat.com> <20251015025521.1449156-3-jmaloy@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 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: vZQFMjk6CqgrIV6qxIHK31YA3UFHaPX3LNmlysYF-OM_1760868459 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID-Hash: HCQ4TZDN5KCQJK5SVSQJKKP2ARGKCZTJ X-Message-ID-Hash: HCQ4TZDN5KCQJK5SVSQJKKP2ARGKCZTJ 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: dgibson@redhat.com, david@gibson.dropbear.id.au, passt-dev@passt.top 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 Tue, 14 Oct 2025 22:55:13 -0400 Jon Maloy wrote: > Later in this series we will introduce a new initialization function > which needs access to the 'no_map_gw' flag. This flag is currently > a local variable inside the conf() call, where it is too early to > call the new function. The new function needs both ctx->hash_secret > and a valid ctx->fd_tap to be set, neither of which are initialized > at that point. > > We therefore add the 'no_map_gw' flag to struct ctx, so it can be > carried along and used by later functions. > > Signed-off-by: Jon Maloy > Reviewed-by: David Gibson > > --- > v14: Fixed typo in commit log > --- > conf.c | 10 +++++----- > passt.h | 1 + > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/conf.c b/conf.c > index 66b9e63..6143b54 100644 > --- a/conf.c > +++ b/conf.c > @@ -1410,7 +1410,7 @@ fail: > */ > void conf(struct ctx *c, int argc, char **argv) > { > - int netns_only = 0, no_map_gw = 0; > + int netns_only = 0; > const struct option options[] = { > {"debug", no_argument, NULL, 'd' }, > {"quiet", no_argument, NULL, 'q' }, > @@ -1442,7 +1442,7 @@ void conf(struct ctx *c, int argc, char **argv) > {"no-ra", no_argument, &c->no_ra, 1 }, > {"no-splice", no_argument, &c->no_splice, 1 }, > {"freebind", no_argument, &c->freebind, 1 }, > - {"no-map-gw", no_argument, &no_map_gw, 1 }, > + {"no-map-gw", no_argument, &c->no_map_gw, 1 }, > {"ipv4-only", no_argument, NULL, '4' }, > {"ipv6-only", no_argument, NULL, '6' }, > {"one-off", no_argument, NULL, '1' }, > @@ -1656,7 +1656,7 @@ void conf(struct ctx *c, int argc, char **argv) > break; > case 21: > conf_nat(optarg, &c->ip4.map_host_loopback, > - &c->ip6.map_host_loopback, &no_map_gw); > + &c->ip6.map_host_loopback, &c->no_map_gw); This is by the way what causes the pre-existing issue you reported in fee75072-42c9-4bc6-959d-9641f0b27ebd@redhat.com as we should process the no_map_gw in a separate argument parsing loop first, and only then we can call conf_nat(). > break; > case 22: > conf_nat(optarg, &c->ip4.map_guest_addr, > @@ -2005,11 +2005,11 @@ void conf(struct ctx *c, int argc, char **argv) > } > } > > - if (c->ifi4 && !no_map_gw && > + if (c->ifi4 && !c->no_map_gw && > IN4_IS_ADDR_UNSPECIFIED(&c->ip4.map_host_loopback)) > c->ip4.map_host_loopback = c->ip4.guest_gw; > > - if (c->ifi6 && !no_map_gw && > + if (c->ifi6 && !c->no_map_gw && > IN6_IS_ADDR_UNSPECIFIED(&c->ip6.map_host_loopback)) > c->ip6.map_host_loopback = c->ip6.guest_gw; > > diff --git a/passt.h b/passt.h > index 0075eb4..830bc36 100644 > --- a/passt.h > +++ b/passt.h > @@ -310,6 +310,7 @@ struct ctx { > int no_ndp; > int no_ra; > int no_splice; > + int no_map_gw; This is now undocumented. See 935bd81936cf ("conf, fwd: Split notion of gateway/router from guest-visible host address") for the hunk you're reverting here. > int host_lo_to_ns_lo; > int freebind; > -- Stefano