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=Umo0rRs5; 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 4243A5A0265 for ; Fri, 05 Jun 2026 08:28:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780640927; 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=HDKsdGxf0Y0dIdV6V4y8fga5JUZC08vLQ2S0Sh7TywM=; b=Umo0rRs59HkkZns16VX3kt+tbEvWP/xLeF31xExYEUOQC91siaJ7331UCycfjQ5/uIyTw8 0HyLO1h2degeMVio+hQ8FO0nU9QL5t2n1MrhbGfcTYkIozk40zyCeiihLotHWacS6UFGlJ s2Q8QQiHW4l5ww/ZmgQW/VKmBXB0K9E= 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-351-naYBqbJoOc-TrYMtbgxhrA-1; Fri, 05 Jun 2026 02:28:45 -0400 X-MC-Unique: naYBqbJoOc-TrYMtbgxhrA-1 X-Mimecast-MFC-AGG-ID: naYBqbJoOc-TrYMtbgxhrA_1780640924 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-490b37e1f47so13345135e9.0 for ; Thu, 04 Jun 2026 23:28:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780640924; x=1781245724; 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=HDKsdGxf0Y0dIdV6V4y8fga5JUZC08vLQ2S0Sh7TywM=; b=gE/2Wii6P0Poi6K15xshFHhw+vpSfiCcMiCaEnnY+qlPLvIbGs7I+cWcZGM5cKdmY8 nHwVsTIAJco0JplKUOjBF9TvQzFyMmTcU2f17Uv4v7y/aNNFCN3Rk3E7u0uLMkLrlpiO fFxtGkAsbwhMuQjF4CImrhf5RXGnfScRNwLYrKxI0bApjR2fYW6eSXa8AKkJZr5vWoYr nbLTvHN+MYR3tj8RzctSry2XmSQiqllkeVtvolJRjyJMaMGvjiVTE8zy96CMv4KnWm9U HD7KL/KcuHJtykzZ12dC39gGslpBRqHf+RK41LvNLLvnEQFCIzehIT5yAaAw6TddeqAa dXYQ== X-Gm-Message-State: AOJu0YwraBtxaX+aQ8m7LjogLopXiGRODCTRuFDb82YukTkORF0y8KCv PAuARxcum2hjgf46SyWZEIOnAv9OQQKIT5mG92B+Cf26ncvt62J27KN0paWfTBRnMVKLyovEHFJ WfgAa1ZUgFTJNmmV1Phg4/dLGkesaNFl9JAb9ZOJPv5A+flwaStYdwg== X-Gm-Gg: Acq92OGq0r4CQ9UqH/psQsWBZ0CLFLwmdlhG0itctuEE8ZosUW0rJBd2hIXc38jH21e BVkmIGadzcIQ9/MkNqgGISmfY4jyBbzWxid79fJw6Lez1XwS0weaxBON9nNfb2I8GvWRG4/kjxR 19CLVMwTnTE6sLnXwkvzxOVb0S/bdv1K6ZK7g2LCSXpXaBx14pYO/s32w9ToP9Cq5SGExf+AIKN PXu1gAPP0w12TCAdlrPI48W6TDpfUf4uC8Vo9pbWucIDjmvxbSsFkzLBygU9sL8Va5pxlffhdmd VRsCKiMANW7cOYbkrjXzad9ZL2rzWw4F6T+nOhuTsHI/aVaa8uPRv2Tw12y3+2UEuPZApuR44yf o7gz1qOmADfOGJ78qSGjVZF/tHp0ZZu8jeDIGIFIUH9ss61Q0ustIXxcDzDig X-Received: by 2002:a05:600c:1f83:b0:490:b724:5085 with SMTP id 5b1f17b1804b1-490c2621a5cmr27473805e9.33.1780640924179; Thu, 04 Jun 2026 23:28:44 -0700 (PDT) X-Received: by 2002:a05:600c:1f83:b0:490:b724:5085 with SMTP id 5b1f17b1804b1-490c2621a5cmr27473415e9.33.1780640923671; Thu, 04 Jun 2026 23:28:43 -0700 (PDT) Received: from maya.myfinge.rs (ifcgrfdd.trafficplex.cloud. [176.103.220.4]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490bc39def5sm121296845e9.5.2026.06.04.23.28.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 23:28:42 -0700 (PDT) From: Stefano Brivio To: Laurent Vivier Subject: Re: [PATCH] passt, tcp: Inline CALL_PROTO_HANDLER() and merge tcp_timer() Message-ID: <20260605082833.79ff6ff9@elisabeth> In-Reply-To: <20260602131708.2726632-1-lvivier@redhat.com> References: <20260602131708.2726632-1-lvivier@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: Fri, 05 Jun 2026 08:28:42 +0200 (CEST) X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: T0MXTmWbC3IwdtULf4RxoLaXR23sys0mQvhvLihJrJs_1780640924 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID-Hash: NUT27DFUJ2CYFD23A74HTJEQHWLR6AIU X-Message-ID-Hash: NUT27DFUJ2CYFD23A74HTJEQHWLR6AIU 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, 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 Tue, 2 Jun 2026 15:17:08 +0200 Laurent Vivier wrote: > Since 260075bde769 ("tcp, udp, fwd: Run all port scanning from a > single timer"), CALL_PROTO_HANDLER() has only one user (tcp), so > inline it at the call site and remove the macro. > > Merge tcp_timer() into tcp_defer_handler(), moving the timer interval > check there, matching the pattern used by flow_defer_handler() and > fwd_scan_ports_timer(). > > The weak declaration and null check for tcp_defer_handler are also > dropped as the function is always defined. > > Signed-off-by: Laurent Vivier > --- > passt.c | 23 ++--------------------- > tcp.c | 22 ++++++++++------------ > tcp.h | 3 +-- > 3 files changed, 13 insertions(+), 35 deletions(-) > > diff --git a/passt.c b/passt.c > index b6fc12d4ed81..b3f806b9a15e 100644 > --- a/passt.c > +++ b/passt.c > @@ -101,27 +101,8 @@ struct passt_stats { > */ > static void post_handler(struct ctx *c, const struct timespec *now) > { > -#define CALL_PROTO_HANDLER(lc, uc) \ > - do { \ > - extern void \ > - lc ## _defer_handler (struct ctx *c) \ > - __attribute__ ((weak)); \ > - \ > - if (!c->no_ ## lc) { \ > - if (lc ## _defer_handler) \ > - lc ## _defer_handler(c); \ > - \ > - if (timespec_diff_ms((now), &c->lc.timer_run) \ > - >= uc ## _TIMER_INTERVAL) { \ > - lc ## _timer(c, now); \ > - c->lc.timer_run = *now; \ > - } \ > - } \ My beautiful write-only macro crap going away... :( Applied. -- Stefano