From nobody Tue Oct 28 08:13:22 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1759647633; cv=none; d=zohomail.com; s=zohoarc; b=AGzLIvbn761d8JvOdmhcJeQlaDwmre0M9S1Q0W0VoDelRGUilHOg1aNcCMpg3cz9I32srxmx6EsLsoOSfnxf553ynRJ/Cy/rY2hp3f0na0WKJtSqy6YixF3BucDiaWphOfnAHN51Ba/rsQd3SHTdZRUU54Hra9DTbHZjUCaRzhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759647633; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=UCS4Brz8TI0p06XepOYKrKpweFy993IsQ2iWlYrGV5o=; b=D7n2n/Hl6uJo5HSEDUoJRlWKR3yqOMdhXebxn4AAWx/JPYXMcLxRGslB1UW6GLM+nSf3xFrVLXycdNz11/er6EunZnuXec+nHkwFW9P0qTmnfuXIyPtrDDrTqZ3O4jzm4Yjb4pOlxj0Mdk69X3boc1jkAkvuE690vwC0jQCOGio= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1759647633800451.0378010298823; Sun, 5 Oct 2025 00:00:33 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 5D4E943FD1; Sun, 5 Oct 2025 03:00:29 -0400 (EDT) Received: from [172.19.199.17] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 5E2E844030; Sun, 5 Oct 2025 02:59:40 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 984AD43F87; Sun, 5 Oct 2025 02:59:23 -0400 (EDT) Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 70D4F41C13 for ; Sun, 5 Oct 2025 02:59:21 -0400 (EDT) Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-6398ff5fbd3so65600a12.2 for ; Sat, 04 Oct 2025 23:59:21 -0700 (PDT) Received: from tulp.dynamic.ziggo.nl (84-25-144-101.cable.dynamic.v4.ziggo.nl. [84.25.144.101]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b48652aa04bsm853742766b.6.2025.10.04.23.59.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Oct 2025 23:59:19 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759647560; x=1760252360; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=UCS4Brz8TI0p06XepOYKrKpweFy993IsQ2iWlYrGV5o=; b=FZLyB8YYAoeTUM6XL3bh/eDAYTHYLP7KHIHXrmZXgs1B5TqqdQnR51jgxPlhogxowJ OdKCqYyji8UQq1N7AEGjxdcb1VuyaQOZqcByPPr7HI5rEuDKQi6jkzxS0a9i/9Eactj4 IYD8DGRulr3/y7boF6tAytMLRKRFh9BggGBRlWIyIwyjrM998+pQTGEzRlphf0GdI/CR DH91RwtWXZhV6ev9NORUsxyyA5VcPiZxqd7uKcYGfPHAcQQMNLwmC+5Pdfrz57H/05fu 3I1jyOQ9a4xZDkdt2SCPhVHSLUH3ZT0TZBMudftWDpXg8wOQ7jqsfLo4yxA4r1uSOkNk TqoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759647560; x=1760252360; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UCS4Brz8TI0p06XepOYKrKpweFy993IsQ2iWlYrGV5o=; b=eYLwB7gA/zJOQylgS6vcNJ8P0WjB/ls6utfH2rJR6G8izKOC1JoixelbCVU6j2WZqr COJMLCc+9IMGjcxk2j51CNLt49w3Jf7ILb5dBCYaQvqkn+rSj9IfptjNxrKiPcMD2gqY nMHlPJ1+6748mqegR8+HFcMDbBO/ZWJjTTpyVGPpsarCv/YM3fHmfZoClc7g+5lCo3p9 HXw/DVKJNB7PgC5DVXpVrPPb4gH8kKYOtOmdl8+lJfSqNIsKLqDXxwRNFcBO/RvMuXrC iKJwgbxet15zSMOykWA6bFnM0JRIvnvlDO/sOpCP3SSAbmPcIkGujqQnoWKjKH4IHiXe BrrQ== X-Gm-Message-State: AOJu0Yx38Najk5aaZgkVMadM4bNYkojuvtATxaPu87a3/ulysHqKgaSh hWkcxth4TccFu478x+dThg1HZ8cMMv6qfVFNDRSngojCLgwwjAY6+BaRXwc/mI9plrWB9g== X-Gm-Gg: ASbGnctOEvNIpR7eoJoDpltSiEA29OT8qL4A2DltxMovLJlGsMK+EqdLtGH82PT4u9d U7ByvOyNHytrsBWlf6V7xjNlgAcL5VSlk0zIeGd1VzKs5Q6j2rQE3C5BeNFr/p1xXOojge5uYRe 9+7GJG574qCQBO7o6Z/aCF/LLjDs149dvH8dIH6oL+r5+X4r+xwG0qZ26blS3C9EPHV3Wtv+wbB qEuU4jvc5ZIhqWC4daSnDuIWfR+UHHXAypTrhmdqS766UFkU1lGWsIHWuel45MOuJmSvZR8356M YjO3GIDIH+RDEI6FaE/SKZtSKi5N2LR7U2NiSstYyxbYZZFgRkBmjT07KymDii5JBtiOqMjQTNH CKWJBeDS1DLiEWaHZFkKYp3HP4GbHpsf2KaQ5uIotS0aK1BeQwloipY7IGHceBx8YJ59K1PYxsK m1rB9u2tXekTCmp30DH3Hv0YS2UIFD4ND4OHE5 X-Google-Smtp-Source: AGHT+IEWH9Ll8UvaS8OBDmARVMoTqvvg2OCb5UeqmgPnv9e00QCXZh9JCdYaXwUj8rze9wAW8I6+og== X-Received: by 2002:a17:907:2d1f:b0:b3c:717a:71fd with SMTP id a640c23a62f3a-b49c4498bc1mr1154452166b.62.1759647559508; Sat, 04 Oct 2025 23:59:19 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH] network: pf: split flush and rules commands Date: Sun, 5 Oct 2025 08:58:26 +0200 Message-ID: <20251005065826.18529-1-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: KLJZFCVXCTP4KDVIHLJ76RTZIHC33YS4 X-Message-ID-Hash: KLJZFCVXCTP4KDVIHLJ76RTZIHC33YS4 X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1759647638708116600 Content-Type: text/plain; charset="utf-8" Current implementation uses a single command to flush the old rules and create new ones. This is not optimal because if flush fails for some non-critical reasons (e.g. because the anchor didn't previously exist), it will block rules creation and network start. Split this command into two: one for flush, and one for rules creation. Also, don't fail if the flush command fails. Signed-off-by: Roman Bogorodskiy Reviewed-by: Laine Stump --- src/network/network_pf.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/network/network_pf.c b/src/network/network_pf.c index ce4461c999..a39eef5fa2 100644 --- a/src/network/network_pf.c +++ b/src/network/network_pf.c @@ -168,6 +168,7 @@ pfAddNatFirewallRules(virNetworkDef *def, g_autofree const char *forwardIf =3D g_strdup(virNetworkDefForwardIf(d= ef, 0)); g_auto(virBuffer) pf_rules_buf =3D VIR_BUFFER_INITIALIZER; g_autoptr(virCommand) cmd =3D virCommandNew(PFCTL); + g_autoptr(virCommand) flush_cmd =3D virCommandNew(PFCTL); virPortRange *portRange =3D &def->forward.port; g_autofree char *portRangeStr =3D NULL; =20 @@ -240,13 +241,25 @@ pfAddNatFirewallRules(virNetworkDef *def, "block on %s\n", def->bridge); =20 - /* pfctl -a libvirt/default -F all -f - */ + /* pfctl -a libvirt/default -f - */ virCommandAddArg(cmd, "-a"); virCommandAddArgFormat(cmd, "libvirt/%s", def->name); - virCommandAddArgList(cmd, "-F", "all", "-f", "-", NULL); + virCommandAddArgList(cmd, "-f", "-", NULL); =20 virCommandSetInputBuffer(cmd, virBufferContentAndReset(&pf_rules_buf)); =20 + /* pfctl -a libvirt/default -F all */ + /* Flush rules as a separate command, so when it fails, e.g. because t= he + * anchor didn't exist, we still proceed with rules creation */ + virCommandAddArg(flush_cmd, "-a"); + virCommandAddArgFormat(flush_cmd, "libvirt/%s", def->name); + virCommandAddArgList(flush_cmd, "-F", "all", NULL); + + if (virCommandRun(flush_cmd, NULL) < 0) { + VIR_WARN("Failed to flush firewall rules for network %s", + def->name); + } + if (virCommandRun(cmd, NULL) < 0) { VIR_WARN("Failed to create firewall rules for network %s", def->name); --=20 2.51.0