From nobody Wed Oct 1 03:13:12 2025 X-Original-To: dev-commits-src-all@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 4cc0P51B11z69t2h; Wed, 01 Oct 2025 03:13:13 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cc0P46YrHz3L4q; Wed, 01 Oct 2025 03:13:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759288392; 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=lvOCUqCKhHjwWPKhabBpPbt2nEog/8ESkunKL/xB9SM=; b=nDMDTyni2Lrt7a98E7/bjtN/y1U8svRSNo/2ftD8G6kPiu52L5+s+k/YAxnFSiYrIJ9s4c UcSHCvr+gZbwh83Uov1aIw7xDtbbMs0rsb9/GNvUHn6qTA3A4/s/n6tS/uqn0XrG2IDhRV IyfJjYQ8EVKdYKV6jxKPCwRmoz5DKnKT+kHqqGJUpstKHVOE9ZBDNpqKl3obSeBj5chge+ rfGoyQ+7UMfdTx69GvaY83XE1moF9YW7OxZPU0pmCRI7fXfpkVPc1YhX112logI+h/kK/I cZOQR3xdMyEF5Wwnmgid/92io+yEzCwBhMW/DB+8wM0sLexchYMCuXVMT8fETQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759288392; 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=lvOCUqCKhHjwWPKhabBpPbt2nEog/8ESkunKL/xB9SM=; b=H5gR0wYm5teNf1yX5s8msYQTryXqU67RtRh7NDDRUNKqfbnyGynRiSNzi0VeZ+k+YmAlBl moNCu6KL3VxqDzl7rKer8p2NGyXrojzasRkaDQfRAdazS0Wa4nuE/4Nfd+abcu6BNHhQhZ 8LGDJLKSpaY2XZIjT0LJGNaVr8KsnhtSc4b1iOcbFUma5nsDWRwMdtbixCWMJCwLl2gix9 XJ7LURzXTRX/acTRvUxQlX4tTe2xjq2dJU2e+w6Ac5iwz7K3HVV0mNmb+6LDWNSweqwEaR eypV6TvDkHNQOBAk//xE8V6csijkNpSHfm2hIbtqJC+WHmqe7h/VkJ4F4s0aTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759288392; a=rsa-sha256; cv=none; b=AmDUuf5j2Mjl8+ufT1v7bANQSn8qrFJP0SmQJp0OSBtRDeRNmh4pPCvhGT7yME0vFA1/UB WDdLy1zpyPHzxhJZTNRtZkaL40MR8FZrQxjUN3wcybRBZOQz9FlHnPEk/4dF5lQJAF0K6c V9Ovb76oKaFsEq1HTG8TO+nas0wX6fpx30d/xTq9tziFvPJWrCCTkE3odSvG36ZbbMRHhi Wt2H/Ux759nABqr9/YjZvslrlG20SbBexUXrCKtGsefggwpT1aXwpJqWByt6ymyB4pP0E2 xlhiDt2mfn3dW9xosBacbN4FJcm6o5PdVf+9mWw9M67w9PrWEggElrO7o9i0+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cc0P464Wvz14SB; Wed, 01 Oct 2025 03:13:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5913DC6c089670; Wed, 1 Oct 2025 03:13:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5913DC3Q089667; Wed, 1 Oct 2025 03:13:12 GMT (envelope-from git) Date: Wed, 1 Oct 2025 03:13:12 GMT Message-Id: <202510010313.5913DC3Q089667@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 45f786241c92 - stable/15 - mlx5 ipsec: Add VLAN tag to IPSec rules to prevent duplicates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 45f786241c9211f8162cb48997c8166051585c36 Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=45f786241c9211f8162cb48997c8166051585c36 commit 45f786241c9211f8162cb48997c8166051585c36 Author: Ariel Ehrenberg AuthorDate: 2025-09-17 13:17:46 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-01 03:00:08 +0000 mlx5 ipsec: Add VLAN tag to IPSec rules to prevent duplicates (cherry picked from commit 84d688af4e625e159af65cd2432af88609d4962a) --- sys/dev/mlx5/mlx5_accel/mlx5_ipsec_fs.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sys/dev/mlx5/mlx5_accel/mlx5_ipsec_fs.c b/sys/dev/mlx5/mlx5_accel/mlx5_ipsec_fs.c index fb9ca94278db..d1f454a5ec41 100644 --- a/sys/dev/mlx5/mlx5_accel/mlx5_ipsec_fs.c +++ b/sys/dev/mlx5/mlx5_accel/mlx5_ipsec_fs.c @@ -1134,6 +1134,11 @@ static int tx_add_kspi_rule(struct mlx5e_ipsec_sa_entry *sa_entry, setup_fte_no_frags(spec); setup_fte_reg_a_with_tag(spec, sa_entry->kspi); + if (sa_entry->vid != VLAN_NONE) + setup_fte_vid(spec, sa_entry->vid); + else + setup_fte_no_vid(spec); + rule = mlx5_add_flow_rules(tx->ft.sa_kspi, spec, flow_act, dest, num_dest); if (IS_ERR(rule)) { err = PTR_ERR(rule); @@ -1169,6 +1174,10 @@ static int tx_add_reqid_ip_rules(struct mlx5e_ipsec_sa_entry *sa_entry, flow_act->flags |= FLOW_ACT_IGNORE_FLOW_LEVEL; if(attrs->reqid) { + if (sa_entry->vid != VLAN_NONE) + setup_fte_vid(spec, sa_entry->vid); + else + setup_fte_no_vid(spec); setup_fte_no_frags(spec); setup_fte_reg_c0(spec, attrs->reqid); rule = mlx5_add_flow_rules(tx->ft.sa, spec, flow_act, dest, num_dest); @@ -1181,6 +1190,11 @@ static int tx_add_reqid_ip_rules(struct mlx5e_ipsec_sa_entry *sa_entry, memset(spec, 0, sizeof(*spec)); } + if (sa_entry->vid != VLAN_NONE) + setup_fte_vid(spec, sa_entry->vid); + else + setup_fte_no_vid(spec); + if (attrs->family == AF_INET) setup_fte_addr4(spec, &attrs->saddr.a4, &attrs->daddr.a4); else @@ -1322,6 +1336,11 @@ static int tx_add_policy(struct mlx5e_ipsec_pol_entry *pol_entry) goto err_mod_header; } + if (attrs->vid != VLAN_NONE) + setup_fte_vid(spec, attrs->vid); + else + setup_fte_no_vid(spec); + flow_act.flags |= FLOW_ACT_NO_APPEND; dest[dstn].ft = tx->ft.sa; dest[dstn].type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;