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=eJg8pwiJ; 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 7A3325A0262 for ; Tue, 05 May 2026 11:08:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777972113; 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:autocrypt:autocrypt; bh=K3m5EEZmwx08rARXATmFNI5EXPsK5ycIXAJXhV58Fn4=; b=eJg8pwiJc6Y3lAXV1ECcpQAy1gEIeVq0QRPDwq7G5gGszJR7kb9H7gvFTWvQjK+OCd84D9 rG2ZRSgrmW+xQ3NQlssYOYNTckZ2FcQBUoF7S9HP+Vx/FnGgCV1fSkoPmqwS5HKEZ/+sKb 7/vmVNbm7gW7R4X5wcTIV8TA3g/jHHA= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-528-Q0TPVQRAOPWAKYYvzGQDFA-1; Tue, 05 May 2026 05:08:32 -0400 X-MC-Unique: Q0TPVQRAOPWAKYYvzGQDFA-1 X-Mimecast-MFC-AGG-ID: Q0TPVQRAOPWAKYYvzGQDFA_1777972111 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-4411a2c034fso3821488f8f.3 for ; Tue, 05 May 2026 02:08:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777972111; x=1778576911; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=K3m5EEZmwx08rARXATmFNI5EXPsK5ycIXAJXhV58Fn4=; b=fYOPzSWxU9AJxB4oq5/Rnw/ZKj5SNAh7ac+CeTsI2222c1jWmi+W7tQ/rV9yN6F4a5 1IwsnQSPBP3o8/7lMBuUfCKF0kB6+je8AXt1ZX4p3iTjoyEIqFRPgqDFzuTXRIDF+RxK QJ8Ph/pSWJ6UhL2K4NuL/3A+xlCconoqCFC5D+lZfYIzrSl22EpIa72pj9C7iJybzLN7 v2Gl8L4kcXN8Czjwcv7CDZcq6WvMnU6o4OA1yOeXJ0LTNANR+oKeCYrGrg+pjpjy3mF5 Mcvu0ZhO/2sCgTYPViLQUat8PRA+/v8mz1MvWJYDkFxahnHLbYpswXuo0w9XI6E3Rm5w HxIA== X-Forwarded-Encrypted: i=1; AFNElJ+x8Rj3uoK9PUK0G6oHXe3iQQXYKzWoANhLyz47aW092tva3Npyt8Y3OLOHB79Sn65UQEft+PViFw8=@passt.top X-Gm-Message-State: AOJu0Yzpph4LWnlTBHecoZ2fKC5eaf+pMRQSoBj5s/LAUKql16z0uZpp sqHQbZQecgXhyUuEmCJtAc2FgzXK/zax7KmTo/w3cHJJcwoMqGJaj9W7FC92q8O1fKPnjmXn51d VuCWwqjmxI8eLVeWxsu45gI3JT08ardGR0L+lMxN3q5yRCmwvDvN2zw== X-Gm-Gg: AeBDieuYQjbIE8jcpzBf4YUCtLyyBrPI6zXjhWqy6QNRVzA4MBjHKiHUN78X5OTlm5r cDgVAtPTFjlz/ENft60fbuXS6xLkntFo+B7DeQ/MSIZ6KqsGwzHvXM4ZqwnisFnDfF8z+0/H4hy 4iGooxbVLxbPgOBxCcCnETWhcIlzDh+sS4WnIETrO7361NJ/0KBnQ77SH4NtNf1z72nzjnvPeTG XMrqL3aCsZOYqqYwaVqd2235APPRj30PAsZFSkwbA0q+T0J5cJM47tJAl+SZ/U0XVphVcB599i3 +MUc6JecJ2i1Jk9jwumAYKjvrdnFRyumzfyH7b/Md2+yOFS/4FomKndkBvGO9AVKsFGragjF0oU cjxNCFmpysTos1Gfo9pOY2zobAYWC9V6p90Rs X-Received: by 2002:a05:6000:2586:b0:43d:7b7b:ab76 with SMTP id ffacd0b85a97d-45003fc719dmr4209896f8f.10.1777972111001; Tue, 05 May 2026 02:08:31 -0700 (PDT) X-Received: by 2002:a05:6000:2586:b0:43d:7b7b:ab76 with SMTP id ffacd0b85a97d-45003fc719dmr4209815f8f.10.1777972110456; Tue, 05 May 2026 02:08:30 -0700 (PDT) Received: from [192.168.100.100] ([82.64.211.94]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055960aa2sm2926759f8f.29.2026.05.05.02.08.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 May 2026 02:08:30 -0700 (PDT) Message-ID: Date: Tue, 5 May 2026 11:08:27 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7 17/18] conf, fwd: Allow switching to new rules received from pesto To: Stefano Brivio , passt-dev@passt.top References: <20260504231142.1118652-1-sbrivio@redhat.com> <20260504231142.1118652-18-sbrivio@redhat.com> From: Laurent Vivier Autocrypt: addr=lvivier@redhat.com; keydata= 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 In-Reply-To: <20260504231142.1118652-18-sbrivio@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: DT81eaBX34vuS6wS1cPZUxu0rEsD7ywl023rgCoCE8c_1777972111 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Message-ID-Hash: 5PIAG6MRKQWTLR6BPTRJ7V6IO4NR7BLO X-Message-ID-Hash: 5PIAG6MRKQWTLR6BPTRJ7V6IO4NR7BLO X-MailFrom: lvivier@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: 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 5/5/26 01:11, Stefano Brivio wrote: > From: David Gibson > > We can now receive updates to the forwarding rules from the pesto client > and store them in a "pending" copy of the forwarding tables. Implement > switching to using the new rules. > > The logic is in a new fwd_listen_switch(). For now this closes all > listening sockets related to the old tables, swaps the active and pending > tables, then listens based on the new tables. In future we look to improve > this so that we don't temporarily stop listening on ports that both the > old and new tables specify. > > Signed-off-by: David Gibson > Signed-off-by: Stefano Brivio > --- > conf.c | 5 ++--- > fwd.c | 34 ++++++++++++++++++++++++++++++++++ > fwd.h | 1 + > 3 files changed, 37 insertions(+), 3 deletions(-) > > diff --git a/conf.c b/conf.c > index f035fd3..75b8291 100644 > --- a/conf.c > +++ b/conf.c > @@ -2159,15 +2159,14 @@ void conf_handler(struct ctx *c, uint32_t events) > fwd_rules_dump(info, fwd->rules, fwd->count, > " ", ""); > } > + > + fwd_listen_switch(c); > } > > if (events & EPOLLHUP) { > debug("Configuration client hangup"); > - goto close; > } > > - return; > - > close: > conf_close(c); > > diff --git a/fwd.c b/fwd.c > index d93d2e5..35b9e2b 100644 > --- a/fwd.c > +++ b/fwd.c > @@ -534,6 +534,40 @@ int fwd_listen_init(const struct ctx *c) > return 0; > } > > +/** > + * fwd_listen_switch() - Switch from current to pending rules table > + * @c: Execution context > + */ > +void fwd_listen_switch(struct ctx *c) > +{ > + struct fwd_table *tmp[PIF_NUM_TYPES]; > + unsigned i; > + > + /* Stop listening on the old tables */ > + for (i = 0; i < PIF_NUM_TYPES; i++) { > + struct fwd_table *fwd = c->fwd[i]; > + > + if (!fwd) > + continue; > + > + debug("Flushing %u old %s rules", fwd->count, pif_name(i)); > + fwd_listen_close(fwd); > + fwd->count = fwd->sock_count = 0; Perhaps we can reset fwd->count and fwd->sock_count in fwd_listen_close() as after fwd_listen_close() these values are wrong? > + } > + > + /* Swap active and pending tables */ > + static_assert(sizeof(tmp) == sizeof(c->fwd) && > + sizeof(tmp) == sizeof(c->fwd_pending), > + "Temporary has wrong size"); > + memcpy(&tmp, (void *)c->fwd, sizeof(tmp)); > + memcpy((void *)c->fwd, (void *)c->fwd_pending, sizeof(tmp)); > + memcpy((void *)c->fwd_pending, &tmp, sizeof(tmp)); I know we have the static_assert(), but with memcpy() we usually use the sizeof() of the destination to avoid write overflow. Why do we keep the old active table? Do we plan to have a "--restore" option? > + > + /* Start listening on the new tables */ > + if (fwd_listen_init(c) < 0) > + err("Error switching to new forwarding rules"); > +} > + > /* See enum in kernel's include/net/tcp_states.h */ > #define UDP_LISTEN 0x07 > #define TCP_LISTEN 0x0a > diff --git a/fwd.h b/fwd.h > index ac24782..b60697d 100644 > --- a/fwd.h > +++ b/fwd.h > @@ -61,6 +61,7 @@ int fwd_listen_sync(const struct ctx *c, uint8_t pif, > const struct fwd_scan *tcp, const struct fwd_scan *udp); > void fwd_listen_close(const struct fwd_table *fwd); > int fwd_listen_init(const struct ctx *c); > +void fwd_listen_switch(struct ctx *c); > > bool nat_inbound(const struct ctx *c, const union inany_addr *addr, > union inany_addr *translated);