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=ZiCjNdEm; 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 DCE225A0265 for ; Wed, 06 May 2026 10:39:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778056775; 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=SmDx5KfJnHhmSEcLV6xPBDmJyHHEqB5Vh72wolmWpCk=; b=ZiCjNdEmV4pUCdoOXAukkOo3IxZ5VmgHzQ50113Kgfg+7bVegFWV+yI3rvmn8G9Kyrag3V dI6Z+HMGXQ1J334UINEplGM5DfLbPXpFtA9OgaTMpCDcLhp3wnXKzU5lGzyHJcf65eURKG dwYa9a1U1ft462hWwPfa0pvLKBulFOc= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-612-PS4v8BN_OPW0ercYjrC_Sw-1; Wed, 06 May 2026 04:39:34 -0400 X-MC-Unique: PS4v8BN_OPW0ercYjrC_Sw-1 X-Mimecast-MFC-AGG-ID: PS4v8BN_OPW0ercYjrC_Sw_1778056773 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-488e097a270so36039315e9.1 for ; Wed, 06 May 2026 01:39:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778056773; x=1778661573; 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=SmDx5KfJnHhmSEcLV6xPBDmJyHHEqB5Vh72wolmWpCk=; b=lDauOQljiyh0XWbvOw05QpjA1CMyvCEfgoO4OVxfFO6N86uvoFi+YPvhLN3a1Pp4kV WhsSsFLb7ryXTS31JQ14X29c6fKpT7RkXCtAoHxHCCzE62hz+DzSBWYsDt6MOk/CCnet +XxF9KkgseyzPPCN2zlL8TcBj2e7/+V6yHZEbWDgqRy23/m2qvoJpPbgYXVw23JJ1bsC lWeaQ8Hp8jCfB+ETa8I8iTrEXqNRrkXkfapRX8H+HRExYwf/9bPmGtpfzUEBAd5vvv+3 xlKmCP7Hlno29eobgZ+AU4AT2fdfArHP0UrUGdyJhljVlRzHdwTwTKbpKKEJpxEW8bT4 vbwg== X-Gm-Message-State: AOJu0Yzip9Zmq2ItAiBqkgv4JiD2XwgVh7Mr5LYNlOHL2KemuxLpweST GFIFPryjzYPXFiXm2uagbf2hnvQWXTui+ca7tzl1eHmGpIUOyHWOZzo6zA4DagD83t5GZZKXTCI F2sWOw+GFX8aQxlTRuoPqWSRHRdSIoHfRmTrqIbFTE9mk+uwEByXTqw== X-Gm-Gg: AeBDieu55nBJwaIuqHUXqQiUqwCZ6kqwvINGT52d9zyyorF/FQliV2Gxw4usJt0MiYL cStup+iVJER9S+FeGB6xi0Q0oBHCHmZGH+yFYHM05KKH/scHmHKEZuS43psMXoMXn0tghSE6lhA Xpzo/b5dUcM57HdVy+iQaELIf12OLcx2UQTZoYYSrryqKOVVZJJ6ddWfDj2T58sphHw6Zg8mX/h E6g/GNpYDt9j8l6n1KlitkRBi6Lt4WTwznjhq1Bi8/PKuNtxAfQPMrQ+MzRyB1XI9OFHTDysHwe bJwCSmQ8SoYMb67ZHCtXMlup+K7uV+efYMuPFnww3RCI/43MkJhTpp7OIKyw155qaF1u6g0fGag jd8eTNXBJLNw/0FhSzCiAf65KXHc/l5Eop7/SplkzpM7DH9GvIuurlZj6HMpL X-Received: by 2002:a05:600c:46d2:b0:485:364e:9328 with SMTP id 5b1f17b1804b1-48e51f32aebmr41267775e9.16.1778056773261; Wed, 06 May 2026 01:39:33 -0700 (PDT) X-Received: by 2002:a05:600c:46d2:b0:485:364e:9328 with SMTP id 5b1f17b1804b1-48e51f32aebmr41267335e9.16.1778056772773; Wed, 06 May 2026 01:39:32 -0700 (PDT) Received: from maya.myfinge.rs (ifcgrfdd.trafficplex.cloud. [176.103.220.4]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538fb1a7sm61613715e9.9.2026.05.06.01.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2026 01:39:32 -0700 (PDT) From: Stefano Brivio To: Laurent Vivier Subject: Re: [PATCH v8 17/19] conf, fwd: Allow switching to new rules received from pesto Message-ID: <20260506103930.1b7023a6@elisabeth> In-Reply-To: References: <20260505234719.1437340-1-sbrivio@redhat.com> <20260505234719.1437340-18-sbrivio@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: Wed, 06 May 2026 10:39:31 +0200 (CEST) X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: PTngFCTBv-5clHN1RdcnVn9vXd1GfVFuhTq_vAjS_ns_1778056773 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID-Hash: 43G5A3LKV4TXB2G2FQWSO34T4VFXIGTG X-Message-ID-Hash: 43G5A3LKV4TXB2G2FQWSO34T4VFXIGTG 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 Wed, 6 May 2026 10:12:21 +0200 Laurent Vivier wrote: > On 5/6/26 01:47, 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 > > [sbrivio: In fwd_listen_switch(), use the destination size as argument > > to memcpy(), instead of sizeof(tmp), as suggested by Laurent] > > 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 76344da..3f48793 100644 > > --- a/conf.c > > +++ b/conf.c > > @@ -2160,15 +2160,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..0697435 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; > > + } > > + > > + /* Swap active and pending tables */ > > + static_assert(sizeof(tmp) == sizeof(c->fwd) && > > + sizeof(tmp) == sizeof(c->fwd_pending), > > + "Temporary has wrong size"); > > At this point: > > c->fwd[PIF_HOST] = &fwd_in; > c->fwd[PIF_SPLICE] = &fwd_out; > > c->fwd_pending[PIF_HOST] = &fwd_in_pending; > c->fwd_pending[PIF_SPLICE] = &fwd_out_pending; > > > + memcpy(&tmp, (void *)c->fwd, sizeof(tmp)); > > + memcpy((void *)c->fwd, (void *)c->fwd_pending, sizeof(c->fwd)); > > + memcpy((void *)c->fwd_pending, &tmp, sizeof(c->fwd_pending)); > > At this point: > > c->fwd[PIF_HOST] = &fwd_in_pending; > c->fwd[PIF_SPLICE] = &fwd_out_pending; > > c->fwd_pending[PIF_HOST] = &fwd_in; > c->fwd_pending[PIF_SPLICE] = &fwd_out; Yeah, makes sense, I can change that in v9. > Perhaps it should be noted somewhere to avoid confusion in the future? What do you think should be noted exactly, and where? Can you show a practical example of the change you're proposing? > Or to copy the content of the rules rather than the pointer to the rules? > > Thanks, > Laurent -- Stefano