From nobody Sat Aug 27 22:23:21 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MFWS95Fgwz4bKJt; Sat, 27 Aug 2022 22:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MFWS94hJYz3F32; Sat, 27 Aug 2022 22:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661639001; 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; bh=m/hYbbFKx/GZxiToQ3NokYkXsmX7TU10HMjNlbMbdow=; b=aOK5y5Hp3m60tD/n8VDOr5Fkf6EEq2cqdQ6FFJ4WzCUIHpw+hmUGv2zjMS4CzllChh7psM 0E+2YXCwALZL56heBXBPOCz5qENfvqCqG6pWkYX9LQO7BVT3u2FvICAOjdDg+Mdc0NemMc nU/uRErkS/b58Ar8wfdnrSInbLOxO3d3Ksd8jm+mnRe1ZPV1kI0QcBhDC0JrG1odfbijpo r7X089gEld8no7fR/kP7Nzd31Lik0IdWu9r6/nFmXaQ2KB86CF3ng/2SEOT8CNu9WDZYr0 A1Qx8qp/MYe/pyaRat8ICAcYKbz8WKxaQSckEGvrnLyona0+m9HWwBJ7iWdnXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MFWS93jxszt2Q; Sat, 27 Aug 2022 22:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27RMNLbt037355; Sat, 27 Aug 2022 22:23:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27RMNLrW037354; Sat, 27 Aug 2022 22:23:21 GMT (envelope-from git) Date: Sat, 27 Aug 2022 22:23:21 GMT Message-Id: <202208272223.27RMNLrW037354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 6ab80e727509 - main - pf: do not block new Ethernet rules for in-progress transactions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ab80e7275091c900da8d2e84a7b0bb4c34a1e41 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661639001; 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; bh=m/hYbbFKx/GZxiToQ3NokYkXsmX7TU10HMjNlbMbdow=; b=QUjr8kPBuoeYdoTP6lfjOR1+ZXh6mVvxvSndpq/CCKubQeod0He/WjKMd85zHMSizgVcpt LTm4Sy4/0OU1ZM7sCFwoN1It5qmBE+vPHs9eLVOAH7a8yXjw9tx/5UjI38ySbSgt1ub2Os GQDLe//tAuvyrcZW164uYZ9yjHDkty3DU0QSLVzLOOQvWcj4EzDxMN5UlNMsOan2qhwzQ1 wLzMRkTNZVksICRn8sJHTb3yyNDz2+C4F6/dPmJ5cZefHQbikrGpfi4iOCoRoctiuFiTYo P068bHZTh8woe0e3z7X8pS8HhEipOogL0IK+hVIorIzqzQo5y5PjCktdSaRYOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661639001; a=rsa-sha256; cv=none; b=dB8E8Yaq44GrZRdgjqp7MWJc/HrzqJlvq0eHN0YS1jCzM16riEalmTtXRnwMqXPSVEdka5 gMg72H/9wC3mJQaB/VtKj8xrmmjvtmczw+imvDfACSXPUq1JRpIfQVhxLPpc5KdEuVJHIM MFeOL2JBva9bJjRYf9VPxIc4rKoyjGGpRg6FeljVbUw9ApR+3bbtyannEPHv+32BH/3m3X tc0C5eI1TsJ/zN2D02E90mqGaxB+gF/Yo+H0W3NI6veAaNDSp4l3nv3371wFxkBFDo6tM0 +efBvMOUZAYpjaencM4HHisxJBdC41BGx1J7Lbqmh8OGkYHMmXgluqTu3jg+nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6ab80e7275091c900da8d2e84a7b0bb4c34a1e41 commit 6ab80e7275091c900da8d2e84a7b0bb4c34a1e41 Author: Kristof Provost AuthorDate: 2022-08-19 10:05:12 +0000 Commit: Kristof Provost CommitDate: 2022-08-27 20:25:01 +0000 pf: do not block new Ethernet rules for in-progress transactions Make Ethernet rule addition behave just like L3 rules, in that we now allow ongoing transaction to be interrupted, rather than rejecting a new one. The result of that is that we can no longer end up in a state where a transaction failed, but was not rolled back, blocking us from setting new rules. It's safe to assume there's no pending epoch callback for cleanup here, because we've explicitly called it before hitting pf_begin_eth(). Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_ioctl.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 81f35ba1c98c..13726880a894 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -739,11 +739,6 @@ pf_begin_eth(uint32_t *ticket, const char *anchor) if (rs == NULL) return (EINVAL); - if (rs->inactive.open) - /* We may be waiting for NET_EPOCH_CALL(pf_rollback_eth_cb) to - * finish. */ - return (EBUSY); - /* Purge old inactive rules. */ TAILQ_FOREACH_SAFE(rule, rs->inactive.rules, entries, tmp) {