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=cSPjYtT+; 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 BA9B55A026E for ; Mon, 20 Apr 2026 19:15:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776705328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to: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=OalPKwu3MMPvIzIy+vbi7mNCwMTiZXx4olsWIxBk8Xs=; b=cSPjYtT+9kin1EQjc4TrkL2GQhwFZ7SlXgtlEYHDSnzC6vl9G53wiC2rsLI8g2sYzKTAQr qYOAahLKwU4m2dnELVSBGxeiCINrv92ZIQrYmCdaQF4QWYvflnYao2/yB20YsKDG9Fa9mV fGkHHCglQ6W/0+qcv/zxugNMB4gWWNQ= Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-556-MLSIl8dQOuCtBJUodEcQDg-1; Mon, 20 Apr 2026 13:15:27 -0400 X-MC-Unique: MLSIl8dQOuCtBJUodEcQDg-1 X-Mimecast-MFC-AGG-ID: MLSIl8dQOuCtBJUodEcQDg_1776705327 Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-82f0e12d375so1939066b3a.1 for ; Mon, 20 Apr 2026 10:15:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776705326; x=1777310126; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references: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=OalPKwu3MMPvIzIy+vbi7mNCwMTiZXx4olsWIxBk8Xs=; b=PLfOtEr6J+A8PzNegA4oCH64BYC0DjHNM439QDp1GEDcnPj73Kt6ScdPA9lrQuPFP/ gTOtPhRr+GWTPalYD8bqfwld5f0vkTEN9KMKJWr/ufG3/zbyyQVgR6Z5sR0QYRjrLNb2 BPRMt+oFXtdtF+HZuWLoGR13XQG8m+onD41tycI2J4wj3BxkL35jM4V9gmiGa6JHLmGG yQ6XeDivj05Apt+hzJKQ0R74WHzK4p5maM0nT1mSQa24ku9dyODKiarvQjy5Kcqyh1hI slmeaChxt+EBG5a1p3amQd6f9FZ7bEl+s8C/Pe6t9pnbUkXuQRXmRdS9vTprD9zb2/0Z FKQA== X-Forwarded-Encrypted: i=1; AFNElJ8numR1AzJ5s8XLD7dVxWLH+EReg9AGLQGUGdafqCOjh4xrZ9foToeE4cNyzIBhtoQ6ZLMgrKGJN+c=@passt.top X-Gm-Message-State: AOJu0Ywh0l7xERYYTV7JG5BcpQsXs7wT6qwmPE9zYlWFQQPU0oJbogi9 Z87mW7wnGc4SBnu0v1ZYsFzd7qjeJlz5YAyv4lIBT2r3ywfZ6uUBARhoe2E+Z+HyolzY8HV7QFP fo7+I09qzxUvkIH6mZmkzx19vyJs7YqpH5A8tPRvtCvIq5eKY0Ts+RLFSsE74ag== X-Gm-Gg: AeBDietaW5y3h1oPDFT1MseeZpXAnzgDNj9tXKKUe/Ase+QFAzsW5ybS7yqZQ9OyZgX LnkpYkbmfS2Bq1fMrlwzjK6SR2eN/plMlXFpMK/zh6u6q3OfWnDJYdOVSQZIT4jPNneBLC90FR2 FnRuZMQPJu4G+JzqWMu/p7s880wrdK2gzwJmEwcZWF5tjlNPC/uL4WbHHws2/eVDtTQ8n+kNaut 1PaFTCe4vJN/gvjlZ9w3jhxGV+UZ3T5te141/+/aseC1d5qpXofqB/rpU2bx0GJEi9yiECs7jNz f09ZJEO8XiktLvmSw3oFQ/i4R1AF0mcQbCtrgP90kj9uGR5qpZ+YFcOd26aZUu69ghUHzMGKlg8 ZDKBeN/nfEm4Eh0JYxtYCJ0BI3u7IpT+l6x2B408qteIHu0u7sweNKtF1VNBAuuXm1g== X-Received: by 2002:a05:6a00:2d15:b0:82f:6a87:f75 with SMTP id d2e1a72fcca58-82f8c93e84bmr14867174b3a.33.1776705321329; Mon, 20 Apr 2026 10:15:21 -0700 (PDT) X-Received: by 2002:a05:6a00:2d15:b0:82f:6a87:f75 with SMTP id d2e1a72fcca58-82f8c93e84bmr14867125b3a.33.1776705320648; Mon, 20 Apr 2026 10:15:20 -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 d2e1a72fcca58-82f97eb5ce8sm9241702b3a.61.2026.04.20.10.15.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 20 Apr 2026 10:15:19 -0700 (PDT) Message-ID: Date: Mon, 20 Apr 2026 19:15:14 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 10/11] fwd_rule: Move conflict checking back within fwd_rule_add() To: David Gibson , passt-dev@passt.top, Stefano Brivio References: <20260417050520.102247-1-david@gibson.dropbear.id.au> <20260417050520.102247-11-david@gibson.dropbear.id.au> From: Laurent Vivier Autocrypt: addr=lvivier@redhat.com; keydata= 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 In-Reply-To: <20260417050520.102247-11-david@gibson.dropbear.id.au> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: SFt1r5erS8tSfdwM3xxaBIIgLqneMma4watDRc6nDXM_1776705327 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: 5TBRRHPUV3QZATFXVPTLOGAEREWBWJFB X-Message-ID-Hash: 5TBRRHPUV3QZATFXVPTLOGAEREWBWJFB 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 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 4/17/26 07:05, David Gibson wrote: > 2bffb631d31e ("fwd_rule: Move rule conflict checking from fwd_rule_add() > to caller") moved rule conflict checking out of fwd_rule_add(). This > seemed like a good idea at the time, but turns out to be kind of awkward: > it means we're now checking for conflicts *before* we've checked the rule > for internal consistency (including first <= last), which leaves an awkward > assert() which might fire in unexpected places. > > While it's true that it's not really necessary to include this in order to > safely add a rule, the benefits from skipping it are pretty marginal. So, > for simplicity, fold this check back into fwd_rule_add(), making it > non-fatal. If we ever have cases with enough rules that the O(n^2) nature > of the check matters, we might need to revisit. > > Signed-off-by: David Gibson Reviewed-by: Laurent Vivier > --- > fwd_rule.c | 38 +++++++++++++------------------------- > 1 file changed, 13 insertions(+), 25 deletions(-) > > diff --git a/fwd_rule.c b/fwd_rule.c > index 7bba2602..cb462401 100644 > --- a/fwd_rule.c > +++ b/fwd_rule.c > @@ -195,29 +195,6 @@ static bool fwd_rule_conflicts(const struct fwd_rule *a, const struct fwd_rule * > return true; > } > > -/** > - * fwd_rule_conflict_check() - Die if given rule conflicts with any in list > - * @new: New rule > - * @rules: Existing rules against which to test > - * @count: Number of rules in @rules > - */ > -static void fwd_rule_conflict_check(const struct fwd_rule *new, > - const struct fwd_rule *rules, size_t count) > -{ > - unsigned i; > - > - for (i = 0; i < count; i++) { > - char newstr[FWD_RULE_STRLEN], rulestr[FWD_RULE_STRLEN]; > - > - if (!fwd_rule_conflicts(new, &rules[i])) > - continue; > - > - die("Forwarding configuration conflict: %s versus %s", > - fwd_rule_fmt(new, newstr, sizeof(newstr)), > - fwd_rule_fmt(&rules[i], rulestr, sizeof(rulestr))); > - } > -} > - > /** > * fwd_rule_add() - Validate and add a rule to a forwarding table > * @fwd: Table to add to > @@ -230,7 +207,7 @@ static int fwd_rule_add(struct fwd_table *fwd, const struct fwd_rule *new) > /* Flags which can be set from the caller */ > const uint8_t allowed_flags = FWD_WEAK | FWD_SCAN | FWD_DUAL_STACK_ANY; > unsigned num = (unsigned)new->last - new->first + 1; > - unsigned port; > + unsigned port, i; > > if (new->first > new->last) { > warn("Rule has invalid port range %u-%u", > @@ -292,6 +269,18 @@ static int fwd_rule_add(struct fwd_table *fwd, const struct fwd_rule *new) > return -EINVAL; > } > > + for (i = 0; i < fwd->count; i++) { > + char newstr[FWD_RULE_STRLEN], rulestr[FWD_RULE_STRLEN]; > + > + if (!fwd_rule_conflicts(new, &fwd->rules[i])) > + continue; > + > + warn("Forwarding configuration conflict: %s versus %s", > + fwd_rule_fmt(new, newstr, sizeof(newstr)), > + fwd_rule_fmt(&fwd->rules[i], rulestr, sizeof(rulestr))); > + return -EEXIST; > + } > + > if (fwd->count >= ARRAY_SIZE(fwd->rules)) { > warn("Too many rules (maximum %u)", ARRAY_SIZE(fwd->rules)); > return -ENOSPC; > @@ -436,7 +425,6 @@ static void fwd_rule_range_except(struct fwd_table *fwd, uint8_t proto, > rule.last = i - 1; > rule.to = base + delta; > > - fwd_rule_conflict_check(&rule, fwd->rules, fwd->count); > if (fwd_rule_add(fwd, &rule) < 0) > goto fail; >