From nobody Wed Sep 16 14:12:59 2026 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 4hlLSq56ksz6rXCY for ; Wed, 16 Sep 2026 14:12:59 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hlLSq1N42z3LyC for ; Wed, 16 Sep 2026 14:12:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789567979; 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; bh=KfoxUlb3AZnUp7dzV4WGTOF3gIVtuA+0DQafUd4JHL0=; b=vaV+F3Jzao9L0KVeOaJYDj3hKq2pAwuS+NHgqKz27l8bDh9ME2I+YXnwfItMVa93wSisag 8dKXllfKV8szyXlX6cvCSzAnECp4fbxJ7dCH5V0QRmR+/aR6we5PVyJz4QiYIx1+1ZlyHv ksBuQXo7j/94c6CHcZDjdNa1g2mrh4D33y6yy0pdC5y/u+fcKNwDA4FyPmCI2PqzlXPD8w sSimr7LIvEkZTGWjxP05wsA/PydfXJr+s6CcjOlLSzmtujTh2ffMirTS/Q1LxjiY6ul0xb raM4mJdz1xN899PxP3+N/IUhr4GMzBVwffJgYuyV89esqOEyT9IQYnkt9oCU+A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789567979; b=Z2Ps6rErkostYLK4ueUsr3DTj6RuALPAstw9MqlK5It9XKdY4aedjl5DjjCoT/mWWy2YK0 XESQc/aI95Nyk8BKxBaZctx/FxLlNdwWBusUy/Ii7HfBrmzM32dfe06WpuwbjvExsFchgo erVQnplQedic22TFQ1cZekpQMEB02l64llFTMpgOuKf79pKerp4t4Faq8OJsD6BIGjVQvA X8KIM9qpRVFPlm7GO8usiCMxRVEIzu81KzEhA4Zi0eUfywjM3OUbqvnvpsyVQDzoDiH4Tk IB0h75I20ZUBPj21BpnXwo33vkX/WU4vCguY0XuR0gjBNLtcuialLl8xWvGN7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789567979; 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; bh=KfoxUlb3AZnUp7dzV4WGTOF3gIVtuA+0DQafUd4JHL0=; b=CQfI5uTE5eVQMy8vIawFORxXRfHX3WPcW1DjWPvdXTkztyI45J0qv1MYGJf9ySIvVST60t io8lGrufF3fLzgyqGJn3+R8z9gaKzAo+ierYm+6uNCIky8P2y7Y5IDwzINISUG0t4LmOUW use5wxUCTY7CTBRV8jyK2/Vu6STvqyMBc0iOZ8r7kjiORJYqIPNtNrXkyN1DbiuSP6L5zm nOV8pjablrfUCN+nrojReECVNxA2A7EynAE9XVolBRmW7T48LFnSSYj4YnFu8OKziYi7/i 8E5sC5pxjTAi4ih6wmaI43QeZLab8FCAzKCtNlFrqs7ydDwZk4mtk4RCIzPYXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hlLSq0SlNzqby for ; Wed, 16 Sep 2026 14:12:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37331 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 16 Sep 2026 14:12:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ariel Ehrenberg From: Konstantin Belousov Subject: git: 138873b604ae - main - fixup! IB/mlx5: Support Vxlan tunneling specification 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: 138873b604aeb5062813a85f60e1fbec7095e1c2 Auto-Submitted: auto-generated Date: Wed, 16 Sep 2026 14:12:59 +0000 Message-Id: <6aaaa3eb.37331.48bcd94a@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=138873b604aeb5062813a85f60e1fbec7095e1c2 commit 138873b604aeb5062813a85f60e1fbec7095e1c2 Author: Ariel Ehrenberg AuthorDate: 2026-07-28 12:02:44 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-16 14:12:08 +0000 fixup! IB/mlx5: Support Vxlan tunneling specification Import Linux upstream commits 37da2a03c036 ("RDMA/mlx5: Use proper spec flow label type") and 0f750966dca8 ("IB/mlx5: Add inner spec and IPv6 validation in user's flow attribute list"). The first widens set_flow_label()'s mask and value to u32, so the 20-bit IPv6 flow label is no longer truncated to 8 bits. The second validates the ethertype of inner flow specs as well as outer ones, and adds the IPv6 ethertype checking this tree was missing. Sponsored by: NVidia networking MFC after: 1 month --- sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c | 46 ++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c index 81bd1a66294d..658bbd1a39ff 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c @@ -1903,7 +1903,7 @@ static void set_proto(void *outer_c, void *outer_v, u8 mask, u8 val) MLX5_SET(fte_match_set_lyr_2_4, outer_v, ip_protocol, val); } -static void set_flow_label(void *misc_c, void *misc_v, u8 mask, u8 val, +static void set_flow_label(void *misc_c, void *misc_v, u32 mask, u32 val, bool inner) { if (inner) { @@ -2171,26 +2171,50 @@ static bool flow_is_multicast_only(struct ib_flow_attr *ib_attr) is_multicast_ether_addr(eth_spec->val.dst_mac); } -static bool is_valid_attr(const struct ib_flow_attr *flow_attr) +static bool is_valid_ethertype(const struct ib_flow_attr *flow_attr, + bool check_inner) { union ib_flow_spec *ib_spec = (union ib_flow_spec *)(flow_attr + 1); - bool has_ipv4_spec = false; - bool eth_type_ipv4 = true; + int inner_bit = check_inner ? IB_FLOW_SPEC_INNER : 0; + bool ipv4_spec_valid, ipv6_spec_valid; + unsigned int ip_spec_type = 0; + bool has_ethertype = false; unsigned int spec_index; + bool mask_valid = true; + u16 eth_type = 0; + bool type_valid; /* Validate that ethertype is correct */ for (spec_index = 0; spec_index < flow_attr->num_of_specs; spec_index++) { - if (ib_spec->type == IB_FLOW_SPEC_ETH && + if ((ib_spec->type == (IB_FLOW_SPEC_ETH | inner_bit)) && ib_spec->eth.mask.ether_type) { - if (!((ib_spec->eth.mask.ether_type == htons(0xffff)) && - ib_spec->eth.val.ether_type == htons(ETH_P_IP))) - eth_type_ipv4 = false; - } else if (ib_spec->type == IB_FLOW_SPEC_IPV4) { - has_ipv4_spec = true; + mask_valid = (ib_spec->eth.mask.ether_type == + htons(0xffff)); + has_ethertype = true; + eth_type = ntohs(ib_spec->eth.val.ether_type); + } else if ((ib_spec->type == (IB_FLOW_SPEC_IPV4 | inner_bit)) || + (ib_spec->type == (IB_FLOW_SPEC_IPV6 | inner_bit))) { + ip_spec_type = ib_spec->type; } ib_spec = (void *)ib_spec + ib_spec->size; } - return !has_ipv4_spec || eth_type_ipv4; + + type_valid = (!has_ethertype) || (!ip_spec_type); + if (!type_valid && mask_valid) { + ipv4_spec_valid = (eth_type == ETH_P_IP) && + (ip_spec_type == (IB_FLOW_SPEC_IPV4 | inner_bit)); + ipv6_spec_valid = (eth_type == ETH_P_IPV6) && + (ip_spec_type == (IB_FLOW_SPEC_IPV6 | inner_bit)); + type_valid = ipv4_spec_valid || ipv6_spec_valid; + } + + return type_valid; +} + +static bool is_valid_attr(const struct ib_flow_attr *flow_attr) +{ + return is_valid_ethertype(flow_attr, false) && + is_valid_ethertype(flow_attr, true); } static void put_flow_table(struct mlx5_ib_dev *dev,