From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from BYAPR05CU005.outbound.protection.outlook.com (mail-westusazon11010038.outbound.protection.outlook.com [52.101.85.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7ACE9350281 for ; Wed, 7 Jan 2026 17:05:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.85.38 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767805522; cv=fail; b=XmSk1SPzzJKFrrwKiy3xp3d6/vaUYHLN03DT4puzSpdoaxgQm2nstZ1EC99IOnMHnwQD+lQNoqrTVBfBuqcRHqoeZsmJ5Q4MIySjBdosnDcDEIPcxHi/DpOJQLfm9bRUX2jZjliIA9XUE5ESq3/6jTuTHag6mzXWw2zsfts0mos= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767805522; c=relaxed/simple; bh=Si5VL71x1xY6Q6Gqi/Bdl3OrUhdp3KEeQnuWJisHdXk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lZ8in9khq7AXxDVY4BVGoL43+AmL/kS85CHYgFYMrnOq8u2m7sihQCuC1JYSx+q2Br3hzH7EQmRkN0IjdhqpVgsNwR4ZtDMm7YVN/RBGKVeSFEY9ADT73g1l5u7JUx3lv1E9BGXGNB8/nb4Prel1ONqQN3WTef/bdTIikEdFpOo= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=qYWdUSEY; arc=fail smtp.client-ip=52.101.85.38 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="qYWdUSEY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KthHaWjXXMsRRHCp2Jr8AqtiOWL7/AAFONtCm8K8wB2tVthHVWeNIkNXWFLG8qYvTQpkA08QVplN9BdzhQQns5dKLUtQn+rq3Oj2zpoaMHMK7miJY05ZgrmcdEjqrmuzrvYxh4jwsYTzwO6UNtufRIjmYJOyBdOO2pazC8J3I17tmQkLdiXgpkdGmWQ1W0zQ0LaY6WUxHYKu2a1tfzVXoEverLtzcwFAviu6bhc51RHc5aSt1tyd7VPtXlwY5VsUcqOaayM/FnjJ5Kv1IxsCyFLswWvJF5o2DdmC6yCUu9YQP7Sk7c6TQd8+RS2/ywS07Q1MgrgvbEj9HMw83iXKVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6RYRmYIG4OJW+2YjyZuE43m7DexIxuN+UUS7q4ak3Ds=; b=U9JBA+FYeXJQMUelgUCpjkO7TNoeosbSfaJh0U/qS1T4z4Qcq5SwE397dz8GhZPTW9dXaJyrctDksNC08wg66+2k+Z/WyqfGEDlThBguRZXqZwqzFDxamMdRidXW6wwKUzDMyh1oIJmMOSeAgUe7qBebbj7ocVM3vm19pTm1nJgBpPuifT8zgQERG78aDHvbCFAwsW5BPl/WqVZyHKsHXM6xGm9UuPJcBlvVwVi279gwLIziS+lHqBiGv/XQjgm4io1buSWvlPYNZcXf8w2PRsSkBH5DTJ0jAMjCQlyynryZKUHGxX4CQVRTlRRdEwNgLbf/deHFuA6P/5VVs/YH1w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6RYRmYIG4OJW+2YjyZuE43m7DexIxuN+UUS7q4ak3Ds=; b=qYWdUSEYfMI9nugSqSv5rx2wUcWqz7F8UyJwEZSdRUd7sAaJY0rWcCRj0KOtQCBtekN2EzF/tHzh6DNZ+Qk9/lEzem0QM6DdiCqRlUkipkpNWeMIPlPumMY8lRY8jpE2u0AI1TfWuK/B4anegNZzhiAQIH+XcBjhqS1hsnkVsn7phEoL5vlEumuo4WrTqKEx2TOANpQGj7DiKhsznMnIMR81Wesgd8Nlcf9btR824LN5p+FigEXn6EgqrPte0y5TOGL9FOAfOUux5iGxBhs7JYIDuUp8ZRiY+K7hn7maC97bk7Mym/TgEtaYfOaGzHiFp+858smbcAYpJf398JFo2w== Received: from MN2PR16CA0054.namprd16.prod.outlook.com (2603:10b6:208:234::23) by BL3PR12MB6572.namprd12.prod.outlook.com (2603:10b6:208:38f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.14; Wed, 7 Jan 2026 17:05:07 +0000 Received: from BL02EPF0001A104.namprd05.prod.outlook.com (2603:10b6:208:234:cafe::97) by MN2PR16CA0054.outlook.office365.com (2603:10b6:208:234::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9499.2 via Frontend Transport; Wed, 7 Jan 2026 17:05:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by BL02EPF0001A104.mail.protection.outlook.com (10.167.241.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9499.1 via Frontend Transport; Wed, 7 Jan 2026 17:05:07 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Wed, 7 Jan 2026 09:04:46 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Wed, 7 Jan 2026 09:04:45 -0800 Received: from vdi.nvidia.com (10.127.8.14) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Wed, 7 Jan 2026 09:04:44 -0800 From: Daniel Jurgens To: , , , CC: , , , , , , , , , , , "Daniel Jurgens" Subject: [PATCH net-next v15 11/12] virtio_net: Add support for TCP and UDP ethtool rules Date: Wed, 7 Jan 2026 11:04:21 -0600 Message-ID: <20260107170422.407591-12-danielj@nvidia.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260107170422.407591-1-danielj@nvidia.com> References: <20260107170422.407591-1-danielj@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A104:EE_|BL3PR12MB6572:EE_ X-MS-Office365-Filtering-Correlation-Id: 652b5c48-8cc7-4b07-bec3-08de4e0ee8dd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|7416014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?X1wkZ65U1Ej/ucJxkTl1xIkVXNW+U8zMlohCa9WnKPasp2tzaOjQMlwvOt9H?= =?us-ascii?Q?2s87qvooavLM5JdKlOSSuc6EBv1mFJRX7Ja03qKpBYrSGgVHvr3O9/dXrBth?= =?us-ascii?Q?/cXPFZNszLlJViEgB/EZyCkPdwcga+dMrer/4v4TVE2G2jcjptpCk5rDC7jA?= =?us-ascii?Q?w98oECbrBlLDKTbTt7ptc6gzIlM6WWFVz0/0dp/wkf4oWXxJQpnFpnIZKwXI?= =?us-ascii?Q?u3WzTNGvMrNTu5th1lyb2VH3yVT2o3aDdDp4R8h7/6VdY7j7+FVaOsIFGnck?= =?us-ascii?Q?Q/pR0KczpShLwB8Q1YO4LZKD69v0w8VJ0b4GVOaFRUs2IEkA62Dnv3OgQiOu?= =?us-ascii?Q?fxvW1oBM6AOG7oF9zS4ZG57c4dRSIbp58vf2adgOaIKwlCPnCMcgiiFQnzSh?= =?us-ascii?Q?JmLEJTE197WoIrjRkbiPm0Q41ioQcLwQDqbIhncret4JKCLhvZ+U6GzRuws7?= =?us-ascii?Q?JzVUELQb8/l6Us9eqQ4tUvN0NDgkMYC/h7X73uqLcn+zJ7fZAu/U6p/skMl3?= =?us-ascii?Q?htEuNV3TQC4rbfvk1pmGa1gTTlTdFTZb3KG6dBWblL5jHNoml6laGCy3xF4D?= =?us-ascii?Q?dvBNymY7ftmJ4e8aS1GVieBzQ1nc6dd+09oTIUr1olYx91OpWmBp5nMbkvQn?= =?us-ascii?Q?JQ+nEVi4nIbBfgQ6aJ4g2bBaMR5txEhE0rErNddzXgokGL/LNFeUCA/SVlxm?= =?us-ascii?Q?89HeXMLK8BwjRXi7VIQOwhG0BLIJxp33449L4umVFEa/aw/k4yJyrXdzfVZZ?= =?us-ascii?Q?j7r8JSpug22TpAMiVI/fM4Il6Vik+U3Vdy5AzmvkhYBIxkHblpMNEeKSIBxz?= =?us-ascii?Q?ptx+H2DZl2kyW0iQEv3UsbaUNQxmiUrI8UBbgsbsG3YLWB8ivnN603WKU5lE?= =?us-ascii?Q?GaAbbtvWlk7n+KLrPrTJAflGeRkzVELXRL2WM7M+s/T4iqB/cETlllx9c/5A?= =?us-ascii?Q?FA1OxvX2poBjKES5ZqSGS+rRGFzXfiq09B4vVca9+ZCpdYqhZHrBjEydllk6?= =?us-ascii?Q?Pw6/ewqMWKS+i4q/98A/0cCbIc4rYEdZX2/7kQK/VDqbA3g9g7YYUUk9l6NM?= =?us-ascii?Q?F5v1loCKT6F6pC8VmPWxYHrs+cfrIp18FqT1kc/Hwcfq0KCLEykwS9RqJ0gY?= =?us-ascii?Q?wfM7BgQlF+68fkzPZc/vV1gWChlBUZyN620hWqsftlWtlaWHzoBoG1gR7j4t?= =?us-ascii?Q?tjQIRSBJ/PXdlZolzVj/z5/PvkfwFc+nwEDYSIsMpgsXCWvijJE0PMhxQwgT?= =?us-ascii?Q?m7AwmZG9zsGIaCF9LoZC/BSYxhk0UK6IQByIkUhe8hiL5s3lrJXOLD5FG1k9?= =?us-ascii?Q?T2ZiMSlIu/z1CmDNV+vUsGOKNE6g5P9QqaCS9I5vuPTdLeSrHwRh8T5s6V58?= =?us-ascii?Q?A26+DCCx0X0dMkNoVOXqGcAc8jBOmJ95fmqA/7caXrwMhcdJqjuyuxr3292a?= =?us-ascii?Q?c9MHRoCp424/f8SziSlOsCrMcqsJ9RmKk0rZWUL+A8xubB+O9akLZeiR5HiT?= =?us-ascii?Q?FZSDRHHbeNffU6pDAtxefQyGyprWHfsKueQ4gXPSTxNC35Q3qB+e/HbmHUaI?= =?us-ascii?Q?TsZMmiCTGNwxG+Mi9UE=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.232;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge1.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(1800799024)(7416014)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2026 17:05:07.4749 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 652b5c48-8cc7-4b07-bec3-08de4e0ee8dd X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.232];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0001A104.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6572 Implement TCP and UDP V4/V6 ethtool flow types. Examples: $ ethtool -U ens9 flow-type udp4 dst-ip 192.168.5.2 dst-port\ 4321 action 20 Added rule with ID 4 This example directs IPv4 UDP traffic with the specified address and port to queue 20. $ ethtool -U ens9 flow-type tcp6 src-ip 2001:db8::1 src-port 1234 dst-ip\ 2001:db8::2 dst-port 4321 action 12 Added rule with ID 5 This example directs IPv6 TCP traffic with the specified address and port to queue 12. Signed-off-by: Daniel Jurgens Reviewed-by: Parav Pandit Reviewed-by: Shahar Shitrit Reviewed-by: Xuan Zhuo --- v4: (*num_hdrs)++ to ++(*num_hdrs) v12: - Refactor calculate_flow_sizes. MST - Refactor build_and_insert to remove goto validate. MST - Move parse_ip4/6 l3_mask check here. MST v14: - Add tcp and udp includes. MST - Don't set l3_mask in parse_ipv?. The field isn't in the tcpip?_spec structures. It's fine to remove since it is set explicitly in setup_ip_key_mask. Simon Hormon/Claude Code --- --- drivers/net/virtio_net.c | 221 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 207 insertions(+), 14 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 6dbbdc1422c5..6ac3ac421728 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include #include @@ -5965,6 +5967,52 @@ static bool validate_ip6_mask(const struct virtnet_ff *ff, return true; } +static bool validate_tcp_mask(const struct virtnet_ff *ff, + const struct virtio_net_ff_selector *sel, + const struct virtio_net_ff_selector *sel_cap) +{ + bool partial_mask = !!(sel_cap->flags & VIRTIO_NET_FF_MASK_F_PARTIAL_MASK); + struct tcphdr *cap, *mask; + + cap = (struct tcphdr *)&sel_cap->mask; + mask = (struct tcphdr *)&sel->mask; + + if (mask->source && + !check_mask_vs_cap(&mask->source, &cap->source, + sizeof(cap->source), partial_mask)) + return false; + + if (mask->dest && + !check_mask_vs_cap(&mask->dest, &cap->dest, + sizeof(cap->dest), partial_mask)) + return false; + + return true; +} + +static bool validate_udp_mask(const struct virtnet_ff *ff, + const struct virtio_net_ff_selector *sel, + const struct virtio_net_ff_selector *sel_cap) +{ + bool partial_mask = !!(sel_cap->flags & VIRTIO_NET_FF_MASK_F_PARTIAL_MASK); + struct udphdr *cap, *mask; + + cap = (struct udphdr *)&sel_cap->mask; + mask = (struct udphdr *)&sel->mask; + + if (mask->source && + !check_mask_vs_cap(&mask->source, &cap->source, + sizeof(cap->source), partial_mask)) + return false; + + if (mask->dest && + !check_mask_vs_cap(&mask->dest, &cap->dest, + sizeof(cap->dest), partial_mask)) + return false; + + return true; +} + static bool validate_mask(const struct virtnet_ff *ff, const struct virtio_net_ff_selector *sel) { @@ -5982,11 +6030,45 @@ static bool validate_mask(const struct virtnet_ff *ff, case VIRTIO_NET_FF_MASK_TYPE_IPV6: return validate_ip6_mask(ff, sel, sel_cap); + + case VIRTIO_NET_FF_MASK_TYPE_TCP: + return validate_tcp_mask(ff, sel, sel_cap); + + case VIRTIO_NET_FF_MASK_TYPE_UDP: + return validate_udp_mask(ff, sel, sel_cap); } return false; } +static void set_tcp(struct tcphdr *mask, struct tcphdr *key, + __be16 psrc_m, __be16 psrc_k, + __be16 pdst_m, __be16 pdst_k) +{ + if (psrc_m) { + mask->source = psrc_m; + key->source = psrc_k; + } + if (pdst_m) { + mask->dest = pdst_m; + key->dest = pdst_k; + } +} + +static void set_udp(struct udphdr *mask, struct udphdr *key, + __be16 psrc_m, __be16 psrc_k, + __be16 pdst_m, __be16 pdst_k) +{ + if (psrc_m) { + mask->source = psrc_m; + key->source = psrc_k; + } + if (pdst_m) { + mask->dest = pdst_m; + key->dest = pdst_k; + } +} + static void parse_ip4(struct iphdr *mask, struct iphdr *key, const struct ethtool_rx_flow_spec *fs) { @@ -6028,12 +6110,26 @@ static void parse_ip6(struct ipv6hdr *mask, struct ipv6hdr *key, static bool has_ipv4(u32 flow_type) { - return flow_type == IP_USER_FLOW; + return flow_type == TCP_V4_FLOW || + flow_type == UDP_V4_FLOW || + flow_type == IP_USER_FLOW; } static bool has_ipv6(u32 flow_type) { - return flow_type == IPV6_USER_FLOW; + return flow_type == TCP_V6_FLOW || + flow_type == UDP_V6_FLOW || + flow_type == IPV6_USER_FLOW; +} + +static bool has_tcp(u32 flow_type) +{ + return flow_type == TCP_V4_FLOW || flow_type == TCP_V6_FLOW; +} + +static bool has_udp(u32 flow_type) +{ + return flow_type == UDP_V4_FLOW || flow_type == UDP_V6_FLOW; } static int setup_classifier(struct virtnet_ff *ff, @@ -6173,6 +6269,10 @@ static bool supported_flow_type(const struct ethtool_rx_flow_spec *fs) case ETHER_FLOW: case IP_USER_FLOW: case IPV6_USER_FLOW: + case TCP_V4_FLOW: + case TCP_V6_FLOW: + case UDP_V4_FLOW: + case UDP_V6_FLOW: return true; } @@ -6214,6 +6314,12 @@ static void calculate_flow_sizes(struct ethtool_rx_flow_spec *fs, size += sizeof(struct iphdr); else if (has_ipv6(fs->flow_type)) size += sizeof(struct ipv6hdr); + + if (has_tcp(fs->flow_type) || has_udp(fs->flow_type)) { + ++(*num_hdrs); + size += has_tcp(fs->flow_type) ? sizeof(struct tcphdr) : + sizeof(struct udphdr); + } } BUG_ON(size > 0xff); @@ -6253,7 +6359,8 @@ static void setup_eth_hdr_key_mask(struct virtio_net_ff_selector *selector, static int setup_ip_key_mask(struct virtio_net_ff_selector *selector, u8 *key, - const struct ethtool_rx_flow_spec *fs) + const struct ethtool_rx_flow_spec *fs, + int num_hdrs) { struct ipv6hdr *v6_m = (struct ipv6hdr *)&selector->mask; struct iphdr *v4_m = (struct iphdr *)&selector->mask; @@ -6265,27 +6372,99 @@ static int setup_ip_key_mask(struct virtio_net_ff_selector *selector, selector->length = sizeof(struct ipv6hdr); /* exclude tclass, it's not exposed properly struct ip6hdr */ - if (fs->h_u.usr_ip6_spec.l4_4_bytes || - fs->m_u.usr_ip6_spec.l4_4_bytes || - fs->h_u.usr_ip6_spec.tclass || + if (fs->h_u.usr_ip6_spec.tclass || fs->m_u.usr_ip6_spec.tclass || - fs->h_u.usr_ip6_spec.l4_proto || - fs->m_u.usr_ip6_spec.l4_proto) + (num_hdrs == 2 && (fs->h_u.usr_ip6_spec.l4_4_bytes || + fs->m_u.usr_ip6_spec.l4_4_bytes || + fs->h_u.usr_ip6_spec.l4_proto || + fs->m_u.usr_ip6_spec.l4_proto))) return -EINVAL; parse_ip6(v6_m, v6_k, fs); + + if (num_hdrs > 2) { + v6_m->nexthdr = 0xff; + if (has_tcp(fs->flow_type)) + v6_k->nexthdr = IPPROTO_TCP; + else + v6_k->nexthdr = IPPROTO_UDP; + } } else { selector->type = VIRTIO_NET_FF_MASK_TYPE_IPV4; selector->length = sizeof(struct iphdr); - if (fs->h_u.usr_ip4_spec.l4_4_bytes || - fs->h_u.usr_ip4_spec.ip_ver != ETH_RX_NFC_IP4 || - fs->m_u.usr_ip4_spec.l4_4_bytes || - fs->m_u.usr_ip4_spec.ip_ver || - fs->m_u.usr_ip4_spec.proto) + if (num_hdrs == 2 && + (fs->h_u.usr_ip4_spec.l4_4_bytes || + fs->h_u.usr_ip4_spec.ip_ver != ETH_RX_NFC_IP4 || + fs->m_u.usr_ip4_spec.l4_4_bytes || + fs->m_u.usr_ip4_spec.ip_ver || + fs->m_u.usr_ip4_spec.proto)) return -EINVAL; parse_ip4(v4_m, v4_k, fs); + + if (num_hdrs > 2) { + v4_m->protocol = 0xff; + if (has_tcp(fs->flow_type)) + v4_k->protocol = IPPROTO_TCP; + else + v4_k->protocol = IPPROTO_UDP; + } + } + + return 0; +} + +static int setup_transport_key_mask(struct virtio_net_ff_selector *selector, + u8 *key, + struct ethtool_rx_flow_spec *fs) +{ + struct tcphdr *tcp_m = (struct tcphdr *)&selector->mask; + struct udphdr *udp_m = (struct udphdr *)&selector->mask; + const struct ethtool_tcpip6_spec *v6_l4_mask; + const struct ethtool_tcpip4_spec *v4_l4_mask; + const struct ethtool_tcpip6_spec *v6_l4_key; + const struct ethtool_tcpip4_spec *v4_l4_key; + struct tcphdr *tcp_k = (struct tcphdr *)key; + struct udphdr *udp_k = (struct udphdr *)key; + + if (has_tcp(fs->flow_type)) { + selector->type = VIRTIO_NET_FF_MASK_TYPE_TCP; + selector->length = sizeof(struct tcphdr); + + if (has_ipv6(fs->flow_type)) { + v6_l4_mask = &fs->m_u.tcp_ip6_spec; + v6_l4_key = &fs->h_u.tcp_ip6_spec; + + set_tcp(tcp_m, tcp_k, v6_l4_mask->psrc, v6_l4_key->psrc, + v6_l4_mask->pdst, v6_l4_key->pdst); + } else { + v4_l4_mask = &fs->m_u.tcp_ip4_spec; + v4_l4_key = &fs->h_u.tcp_ip4_spec; + + set_tcp(tcp_m, tcp_k, v4_l4_mask->psrc, v4_l4_key->psrc, + v4_l4_mask->pdst, v4_l4_key->pdst); + } + + } else if (has_udp(fs->flow_type)) { + selector->type = VIRTIO_NET_FF_MASK_TYPE_UDP; + selector->length = sizeof(struct udphdr); + + if (has_ipv6(fs->flow_type)) { + v6_l4_mask = &fs->m_u.udp_ip6_spec; + v6_l4_key = &fs->h_u.udp_ip6_spec; + + set_udp(udp_m, udp_k, v6_l4_mask->psrc, v6_l4_key->psrc, + v6_l4_mask->pdst, v6_l4_key->pdst); + } else { + v4_l4_mask = &fs->m_u.udp_ip4_spec; + v4_l4_key = &fs->h_u.udp_ip4_spec; + + set_udp(udp_m, udp_k, v4_l4_mask->psrc, v4_l4_key->psrc, + v4_l4_mask->pdst, v4_l4_key->pdst); + } + } else { + return -EOPNOTSUPP; } return 0; @@ -6325,6 +6504,7 @@ static int build_and_insert(struct virtnet_ff *ff, struct virtio_net_ff_selector *selector; struct virtnet_classifier *c; size_t classifier_size; + size_t key_offset; int num_hdrs; u8 key_size; u8 *key; @@ -6357,11 +6537,24 @@ static int build_and_insert(struct virtnet_ff *ff, setup_eth_hdr_key_mask(selector, key, fs, num_hdrs); if (has_ipv4(fs->flow_type) || has_ipv6(fs->flow_type)) { + key_offset = selector->length; selector = next_selector(selector); - err = setup_ip_key_mask(selector, key + sizeof(struct ethhdr), fs); + err = setup_ip_key_mask(selector, key + key_offset, + fs, num_hdrs); if (err) goto err_classifier; + + if (has_udp(fs->flow_type) || has_tcp(fs->flow_type)) { + key_offset += selector->length; + selector = next_selector(selector); + + err = setup_transport_key_mask(selector, + key + key_offset, + fs); + if (err) + goto err_classifier; + } } err = validate_classifier_selectors(ff, classifier, num_hdrs); -- 2.50.1