From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from CY3PR05CU001.outbound.protection.outlook.com (mail-westcentralusazon11013036.outbound.protection.outlook.com [40.93.201.36]) (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 4FFF2341AC5 for ; Wed, 26 Nov 2025 19:36:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.201.36 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764185804; cv=fail; b=HEngfFUBT+U6/0SGLBSpw/C6vybcuzsxSK48lVExIvWoUwd/f+wujlPDZAsn/RXrYjY45dOZ8ab3cZ2ESvqix6iPcBtPav50rBaaUvc8XeOaUSIvfeJw992cK3uBRfEPyMWiE5zF55IO+AEnjvnUDE+ahWX0eYg6jidJ08MCAOY= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764185804; c=relaxed/simple; bh=0KDtvNYruDwTVEgwRoUJY7LBKj5SzgtoSm13cTXBDQI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rj7/pOYo+pXbWQYZBDx3d7cXIbYFibzu6jUyX4HXqWQdOPvRhRtdQVJ75/X4sjQkOZgmdPYtozaI7kP5YP/Cy1y1JIZh4LbOGLFJYOBKrMuXOjsfx747EWb5Z6Hd5njYDcgEi3Z4oN9useit7lUo42S707KO261UjxSCmYMgmCY= 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=PjWbNE1r; arc=fail smtp.client-ip=40.93.201.36 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="PjWbNE1r" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cNcbo3BIrXEvP5xd5dHbvB82tcDYntJjLGPrxiKhsFB0DkeRM7dpVrGQAllkJnO1dDC+afFThnNytmV6g1oNwG1PGOJWvC5EbOgq3O5evAYvfNMLkOk537CxfaYRpwGYTdwC7A6Non5UtJwdM8W4WN/U9F2beUe1fUuvq3LgH1tyWcnjaZyF6YyhCbTyfubkF6H+RsTqhw0EZb4xCxAZs7bWMqjshzjjPORX0/QpSsRLWPza0jnPL0kM586dUcgdFGXDjjepLqMY4kJTNAN4lie33143UfxiJOkw8g3Bx6Lde5jK122Vl6BnC9vddGr/J1boQ9+2mb9DHyb+4ulM6g== 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=oAH2/tMxDhwgy7o3aZ+NBLqVo5imEZIatR1HoEKns4k=; b=kBmi+S5LX2cpbzZ0e2jbgmsMNsN77F33uSIQ4Qbq0kCzn6MrCxgjlyMn62lA0NH3mIEWiP7CxZLG05m5J+HYtzKZhZFfTeYP6O3ly7fvLfMzQnIvCio0IUw++i8r0A3srl2wJess8VOzT17ybYf2Viv/IYldqcPyuz55l6becgC0vnDS5PdaIAbysA0yYNY7CPHtVmFiRDaJneAE6+9caDnB9dgZSBycPXZlljxbfvb77EnXHPC5drSOTloLKRTQW11ZcO5m+PUuiw4boUrWAsS1FCmIe14FnJI2rmBDF6GEk++/MVBY9ayhYwj5DmWOlFVskQM3iKCcNAroiFoU4g== 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=oAH2/tMxDhwgy7o3aZ+NBLqVo5imEZIatR1HoEKns4k=; b=PjWbNE1rl7DjF5EKBKQC7XaLTyGALkpDYw0enFTI1o+T+2/71eob4qg0OsxVzIoVy9rcKC/8eIdwJ9nG3jxSwyQvEGR8FwXtvMI35QMDubJHWNuKAtgQf5px/U99A5AvFQr0+OGSFUmDyPQ551ldr3mBej1szxbBwQFJiO3h5j+D73RRnlRHuXV1hSrgfR0fO5IuOqd7bF1H07JyT4rsolxtS28jLs/LP+w1Cy/9Nbuh9VCv7QDNHb54MX18dvfdqE3Egcu2TDPvJUKH4GoVe8L1gX10T8z1EBcWFdcxBAgnN9gYHgZGjyvEKfpTW4pWAEJkwm/gsUJG4w42GHdzUQ== Received: from CH5PR02CA0004.namprd02.prod.outlook.com (2603:10b6:610:1ed::21) by IA0PR12MB8374.namprd12.prod.outlook.com (2603:10b6:208:40e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9366.12; Wed, 26 Nov 2025 19:36:32 +0000 Received: from CH2PEPF00000141.namprd02.prod.outlook.com (2603:10b6:610:1ed:cafe::73) by CH5PR02CA0004.outlook.office365.com (2603:10b6:610:1ed::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9366.13 via Frontend Transport; Wed, 26 Nov 2025 19:36:30 +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 CH2PEPF00000141.mail.protection.outlook.com (10.167.244.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.9 via Frontend Transport; Wed, 26 Nov 2025 19:36:32 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) 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, 26 Nov 2025 11:36:14 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Wed, 26 Nov 2025 11:36:13 -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, 26 Nov 2025 11:36:12 -0800 From: Daniel Jurgens To: , , , CC: , , , , , , , , , , , "Daniel Jurgens" Subject: [PATCH net-next v13 11/12] virtio_net: Add support for TCP and UDP ethtool rules Date: Wed, 26 Nov 2025 13:35:38 -0600 Message-ID: <20251126193539.7791-12-danielj@nvidia.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251126193539.7791-1-danielj@nvidia.com> References: <20251126193539.7791-1-danielj@nvidia.com> Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev 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: CH2PEPF00000141:EE_|IA0PR12MB8374:EE_ X-MS-Office365-Filtering-Correlation-Id: 40d31934-6484-4104-f73d-08de2d231a54 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|7416014|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?VAqxlRN6ovayzSMhPAJcYHfauL8vBP+FxF3lLCCXkKwJc+TH+Yu8pgjGYFcx?= =?us-ascii?Q?kPeUcm+J6cF+X4g6jjHaL9/Bh8qInG7djqlS+i5jL/SbO7M2DAumkYTKES9E?= =?us-ascii?Q?h1Ildep7zkcIduViw3AgGw5GjaUgzVsXzu8CgdW0LVdfkl4oKF7VrAsu+Qwr?= =?us-ascii?Q?iUUz6OsY8D74tuCtPlMJNMQbWObMVvMRm5/L7x+yYKg0L6mHy8k2a6taVgBM?= =?us-ascii?Q?lBduieHM4Mx4fsnBCWtzgdNV2RbFBuOICp5uy5GuShxp5e0hR+RaoVImazkh?= =?us-ascii?Q?+YxZejS2Y2EjxVfQ8niAfNAxqOKAHCbmQT4yiO+nyKbwj2bI7WFn0xuOxTvP?= =?us-ascii?Q?R0hA3NHzBuN/OmSNGKS1BcJnLTTP3KZ1KGDZyBffomrjBJ56q/5Xb7fTXXnv?= =?us-ascii?Q?zCynNMiMGeTEXWFLQu9318WlRUJMSW+LjuSdFV5kkmMPMguv4vp5CMqW4n3d?= =?us-ascii?Q?Aq0OqUu35Fx8d+IHCV9A1YAcZIe3m/SboXnZHZkqQw8iHKm4eB/AmH5+NCop?= =?us-ascii?Q?R7QsMT29oJiO57Quk6EoVPgGKMoXlkWCMq4SE8B5UChB7RoSXxG4z06Se6mF?= =?us-ascii?Q?nYltaw7a3SabFFJt168u0gbjP6ezS040uoi9FkOiF5SDiiwhTd86HuA6VIPd?= =?us-ascii?Q?RXGlKt0b3U4H2hYty7r0P1aNrX17KqtFbZwYbNDcXepP6DMm2L/wlu4uufF2?= =?us-ascii?Q?UgKtMGe4CfjG5SnQUCSSglshMlfzMCX99ltI90YFltEIViwLmeoRg0qAzKoq?= =?us-ascii?Q?ctGyzm+moD6diO68W5U7bOCzgtaCUXjeJx7tiCBRPniF+bvPo+yFwhhnvxPc?= =?us-ascii?Q?Nfr18t+GF1dk7MeKFJT+VOeqAbf3OkIBFX5OrB1PVKBpVFlEDjE9Ib0fWyGu?= =?us-ascii?Q?ubJ2D6PNw+yfgMW4ZuUdTNSA5WlpfWbl06a6BUyUZ7pvUUpdYEpxUPl+mL3Z?= =?us-ascii?Q?jKVxTdg+qwLaDS8ARYLal/wcOZFAUvOWfCZ9c79XcbgBNI1zZ2SWZ/8q+/vN?= =?us-ascii?Q?L4Px+t3fH+/30qEBvnLR+ZL59ALf6T8MmbMcraOt3GLFJmCLlq45t69FIXIL?= =?us-ascii?Q?xtbetM9EL9xcLNAq4Wj3IZw8YiSZsFnjplzhUJCzJ93HTp0a/DR6g1cYNE+z?= =?us-ascii?Q?myVzjMnZD1JCL4ci2+/VG6qb3AZTR8TgodEIzoiH2+os2vh2dM/a32ptJ0Rp?= =?us-ascii?Q?fRhm+5rD3YXhbz4CQNpFSoqm5YfNKGepx7mMvS2qRFboqtjcUgWHF+sdHCuF?= =?us-ascii?Q?jTj60VYTW9me8HoJ40qNaSGPKXzGlDH83IgXg8hRtwaR7mybasKCjeFRdIop?= =?us-ascii?Q?WXSpgPjLghD4AoyxYpY92d0gdpfnkLQr+mTgc5IJLb4me+Su1EcGub3RSKEL?= =?us-ascii?Q?tlwS34XBxbRVXcEBjxi7uKnLDL6mWKhwq/YGSZeTW+NMDikuR54uzYbvCzYA?= =?us-ascii?Q?syKj2BfO7dDcPWFBYGb/YyTblQW8Anm3ddQYOh7L89bjsUtEfSuG52o6Vdg7?= =?us-ascii?Q?g5PC4KNDcclpzLbSpJVuhElFFWb5hEjgZxghi9q/NJW69WCzgQnSP6l3JBvk?= =?us-ascii?Q?/nFwf6TqqC0SyPRDYx8=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)(82310400026)(7416014)(376014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Nov 2025 19:36:32.0624 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 40d31934-6484-4104-f73d-08de2d231a54 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: CH2PEPF00000141.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8374 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 --- --- drivers/net/virtio_net.c | 229 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 215 insertions(+), 14 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 28d53c8bdec6..908e903272db 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -5963,6 +5963,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) { @@ -5980,11 +6026,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) { @@ -6005,6 +6085,11 @@ static void parse_ip4(struct iphdr *mask, struct iphdr *key, mask->tos = l3_mask->tos; key->tos = l3_val->tos; } + + if (l3_mask->proto) { + mask->protocol = l3_mask->proto; + key->protocol = l3_val->proto; + } } static void parse_ip6(struct ipv6hdr *mask, struct ipv6hdr *key, @@ -6022,16 +6107,35 @@ static void parse_ip6(struct ipv6hdr *mask, struct ipv6hdr *key, memcpy(&mask->daddr, l3_mask->ip6dst, sizeof(mask->daddr)); memcpy(&key->daddr, l3_val->ip6dst, sizeof(key->daddr)); } + + if (l3_mask->l4_proto) { + mask->nexthdr = l3_mask->l4_proto; + key->nexthdr = l3_val->l4_proto; + } } 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, @@ -6171,6 +6275,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; } @@ -6212,6 +6320,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); @@ -6251,7 +6365,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; @@ -6263,27 +6378,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; @@ -6323,6 +6510,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; @@ -6355,11 +6543,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