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=EU3io6pA; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTPS id DC83B5A0262 for ; Tue, 05 May 2026 12:20:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777976410; 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=qkgHFcBhmdeBKZ8ngAfgwFfcFMvapKH0wmOF4D6z9ZU=; b=EU3io6pA9K+cKb1hNeKpAFV/NQxr5vFrscRuOnN35OczIuZ+I7KWBxP8lVI8U/BGrAkbv0 q/YwHLf22BMUn4D6uOiIB/8IZ8yZzHYfEOc537gjHqkp1XjOot/GlwEyjoISEY08AdOPqf QvZfldwGQHOkwiSrHF84PiR+rV9S+fM= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-625-Sc0UD1ifOMmLvhbaAr7ASA-1; Tue, 05 May 2026 06:20:09 -0400 X-MC-Unique: Sc0UD1ifOMmLvhbaAr7ASA-1 X-Mimecast-MFC-AGG-ID: Sc0UD1ifOMmLvhbaAr7ASA_1777976408 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-488ba2f4094so36992685e9.1 for ; Tue, 05 May 2026 03:20:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777976408; x=1778581208; 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=qkgHFcBhmdeBKZ8ngAfgwFfcFMvapKH0wmOF4D6z9ZU=; b=WMp49yGtitSLfUCjaybSVsKJdyJHwRMBVCprs597JY4tpHV1fyUCBHreQBQNw3S4pn CZ96DgbPebtmptpSSlyBBMhkCVZmiwt4Bg9klM3xYTMdsycRBW1odlC79FLgyjUwRA5/ XlrQiLqHfSqEkvDmbq7NKOOMafQDaW2JEta3D7k+9V7jYSiyc0tcQ3rZLtSbvmg5aGkS naMCxwUpLW/xlWkNUetBQxbY4X5N1AFEGhmefQLRN3qAI4qZhrdjpPGJyTm2gSk4LxBn IBj2rI+iQfMqvqd/DnWwmWIFsscyI7THOSd3OLbMHszCysI3cViupfFPX2S7gtGdS0a4 jbsw== X-Gm-Message-State: AOJu0YwI86mNRV83MJBPyxVJzMtpHJgWV1ejVAW7jJnMA5FQyLzuwTLZ CYfXYUpUd5v6wAzGnDx9EGeJtFYe9qxNwdDZ9tcIdz3rWxSGk591iVPR2irC0u+MtyS0yFXuCjK qCKqef///vLU2Hw2Cpy/BKBHiDtlVpQUB1YqouGIogypSbAqSJ/4oSg== X-Gm-Gg: AeBDieuljQjCl3nuOwu7SdO7y1qB0Xq/hEHdu10ehZ4ZSD0jw/YkdT1JKG0ADWlBdGH JvKZemM5ffVdX2mekbYwBdZIvcX6LPV6n0yvhbyGfyYsJFVYKtjRLb0JX8+4FZD23hmvQbXz89x 2/RGFMph79ghU8ojST2MmCp/eNPuaq1MzrLb1XW0+aRx6+WsdCFOHNyeX79+Bs+VzTUcQXwqJhB 6u+jBNuGGyqON2wQhSXj4YoePTrDaYD0/kr0orPlpuGyPxTiv2yvjOz/xbyB4NCHSoYY4xnANPt s71SkcP19Uu59akot2PZxF2gSPkWC6Ien4OSvtOz9jG+Dm0pBHASarkGNFxFj90sx5W5PCgz6BI 04JJn6BbdXrAc9Dr7tN4Y+zMTnKYIK+h+PHdCIpZpczJtomCWdmbFU7DB2gK1XzfJXg== X-Received: by 2002:a05:600c:a30a:b0:489:149a:f9e6 with SMTP id 5b1f17b1804b1-48d18cef14dmr25261945e9.28.1777976408429; Tue, 05 May 2026 03:20:08 -0700 (PDT) X-Received: by 2002:a05:600c:a30a:b0:489:149a:f9e6 with SMTP id 5b1f17b1804b1-48d18cef14dmr25261585e9.28.1777976407981; Tue, 05 May 2026 03:20:07 -0700 (PDT) Received: from [192.168.100.100] (82-64-211-94.subs.proxad.net. [82.64.211.94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48a81ed6bafsm699724285e9.2.2026.05.05.03.20.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 May 2026 03:20:07 -0700 (PDT) Message-ID: Date: Tue, 5 May 2026 12:20:06 +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 , David Gibson References: <20260504231142.1118652-1-sbrivio@redhat.com> <20260504231142.1118652-18-sbrivio@redhat.com> <20260505121513.2ce28bfd@elisabeth> From: Laurent Vivier Autocrypt: addr=lvivier@redhat.com; keydata= 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 In-Reply-To: <20260505121513.2ce28bfd@elisabeth> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ZXp9QEG6PmbzJHl48GLrY_CF4XM70MoNcw5HqAB2ZOU_1777976408 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: AOUDJA6WTPDWTQ4YHU4VH3HAT3UAWQGQ X-Message-ID-Hash: AOUDJA6WTPDWTQ4YHU4VH3HAT3UAWQGQ 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: passt-dev@passt.top, Jon Maloy 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 12:15, Stefano Brivio wrote: > On Tue, 5 May 2026 19:53:43 +1000 > David Gibson wrote: > >> On Tue, May 05, 2026 at 11:08:27AM +0200, Laurent Vivier wrote: >>> 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? >> >> No, they're not. fwd_listen_close() closes the listening sockets, but >> it doesn't remove the rules. fwd->sock_count isn't the number of >> *open* listening sockets, it's the maximum potential number of sockets >> for all the rules. Having some or all of the sockets close (-1 stored >> in the array) is an allowed state. It's rare for most rules, but >> routine for SCAN ("auto") rules. > > Ah, oops, I didn't realise that would be the case for "auto" rules. > I'll leave this part as it is then. > Then add my: Reviewed-by: Laurent Vivier