From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010046.outbound.protection.outlook.com [52.101.46.46]) (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 331552F49F4 for ; Wed, 5 Nov 2025 22:45:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.46 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762382719; cv=fail; b=nomh8iDAwjjQmdRGPlEinom/InOBXT1ORx/6HqVjmGNf9pEMBZ5hDAp9p6QptzE26AsJn4y/Dru17/ARQlBcnbdl9/Fp8JYdZ9oW5BtDOI7iMLgd/dwIpegJWVeD+BeavHqNJhE14ee175pWYT+ZvoSA8eTGTyAemdNYw3fGWKA= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762382719; c=relaxed/simple; bh=e9mtbMvQC3Ah6jOvtizWKzhZLr2ELmd3J8PKs61h5q8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kLnMXqa5zMWD0j6gWzAjdRwlMpB3m/GXSJIYhsdKNZa2sU6/AsyYodkOEocAQ4HfvfYd2iY3Bb5cM7eSkYfaRkBBxljaujxGREap3KW3M9QeQXAk4EpR+LY/npCCXpNwYxxJMMRUK0R/g/OLVpBLmvC7MbzHm96dS5gc86oACrM= 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=udPqQaCu; arc=fail smtp.client-ip=52.101.46.46 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="udPqQaCu" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JTtQqEUY9bHJi6c/8w4E7s2KLn4tN/tX7H4imiwOGk0ucRWOV6sPlDijbAdLWZdmZilK8/JshFhUcBA/Na/KAQoBone3hjVNSXLl1opx53SDoLpmMJfGr/8N/dwJ1YlB0gR1nenAYWqhahwDHU+dmkN9Rma3Bx1zc08Ars4MnTk1IBxjq4ExOFJowB7J7zbc1s8tBaeUTRPeacooLlCs8xGzeYAIdGLq6AatgrymX5H1KbitPt6jZ4K5UGD8u3MXSvGsw76FkRxncw27+SLoWgmz6ig8xIaD0GVtaMIRSp0SkbpucAKZYTHxSAnlfPDWmd0/8L82dC0zEaAly16DwA== 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=8COAtw3sbpPmaCLd7vB/LIM9mHHJro4P3UXEJtNejoA=; b=SszqqDOukTkEAUTh2VxjxOQWeJTopRjzvdnNJZEsXSkXAmA1P/1UomhpigU59XjBL46N5efeB4NIbdDnAENLkmJgmZ1ucpanQHUv78glLmPD0NoCsXlOzXuxlevEYnHlLsgDEZlRiUlkdeQBe5EU5mbpqpk+Me04Oupc8AA5y8gGnTyf84aRPd43JUYQ4a4y4bW08MrG3E/lGsaDhF/s5Tg1EKHllK4atRN9kp7EsHuwUDV67BalDvKqq3VvWP+1BYSN0EzN31yoiYuC1tHFHCzhIsI2IqJmz/tVEdN6S0rF8TBKGI12Ymvzm3yszCW/EdECzoCAkLoN3K0hALhvxA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=8COAtw3sbpPmaCLd7vB/LIM9mHHJro4P3UXEJtNejoA=; b=udPqQaCubq/dMpY35iH05VN2t2A1prWLWfFr1LyFO37zxl4JfJxw6K4gGJ3aEqzjwZKSHndOEFSnISPQ/ae2TMRWH27kXNgBXMGbi+xTRTTcE5vhqdL/ZfAaPnboGqxLQjx9kaBXecR0WPFesxLGjCqkhThO3xBnfga/ABhoJhUkLT8k8KdJ3V5u9FCJ19d3/tijo0qQXkElpf3oPMU8E7NBCsKvNYJJJjpPHsOJ5xRnri/jJFY2o6PGwhRkqsQbES4HHaJrldFggojFkTSBZEdSfrGyqi6MC244tgFvL6K/+Iz3A5vjY4IX04HTal2SAcDQe6AMBO6c+6ELrGTwZg== Received: from BL1P221CA0020.NAMP221.PROD.OUTLOOK.COM (2603:10b6:208:2c5::7) by SA1PR12MB6703.namprd12.prod.outlook.com (2603:10b6:806:253::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9275.16; Wed, 5 Nov 2025 22:45:13 +0000 Received: from MN1PEPF0000ECD8.namprd02.prod.outlook.com (2603:10b6:208:2c5:cafe::5d) by BL1P221CA0020.outlook.office365.com (2603:10b6:208:2c5::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9298.9 via Frontend Transport; Wed, 5 Nov 2025 22:45:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MN1PEPF0000ECD8.mail.protection.outlook.com (10.167.242.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9298.6 via Frontend Transport; Wed, 5 Nov 2025 22:45:12 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Wed, 5 Nov 2025 14:44:57 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Wed, 5 Nov 2025 14:44:57 -0800 Received: from vdi.nvidia.com (10.127.8.14) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Wed, 5 Nov 2025 14:44:55 -0800 From: Daniel Jurgens To: , , , CC: , , , , , , , , , , , , Daniel Jurgens Subject: [PATCH net-next v8 11/12] virtio_net: Add support for TCP and UDP ethtool rules Date: Wed, 5 Nov 2025 16:43:55 -0600 Message-ID: <20251105224356.4234-12-danielj@nvidia.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251105224356.4234-1-danielj@nvidia.com> References: <20251105224356.4234-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: MN1PEPF0000ECD8:EE_|SA1PR12MB6703:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d5dadd7-a160-48a0-86b2-08de1cbcfb65 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|7416014|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?oUstKIQDfS4wXyTrd+s2OlS6KNwzLiULs4UJsyEJDMty+lYwKIVHCdmuec6h?= =?us-ascii?Q?MmrCX8vBXdGqye0aI8KsDw9Dg7W9u0aqsCQLaOiyuAFx+S/CEAeXdKrOA23I?= =?us-ascii?Q?XpU1yP+KQar83ljkAnEx1+jdou2RdS9kFl5PsJG+HJsEhSuKjZYArQMC0G4e?= =?us-ascii?Q?dBeWpkzNnaIxAoEqnMlzhCylp/22JFDKDkR9ICAcERkv5ccVM4ce80EGsT/H?= =?us-ascii?Q?A/vyiO7qwC/A2Q4Q8qbXoaNq+UsjoE8uDx4wrT+xkxInbuPGL9QM4drlxHI2?= =?us-ascii?Q?w7eNtLaDEi5OXJ7NOXf+DfzkuFvTPWTMUZjS06WGSsx9HvreiUsM+seNwjMy?= =?us-ascii?Q?l24zIxmiWJXP2vLjaUf3HDEwdAc8ORs9mJpgXWnRini9cuwO8WSZNoY6BLq3?= =?us-ascii?Q?Vzy/O+pEQ7pct3u481lh5MknyAhwMtUYdUm/LLqIXS9ez5BFdBc3Q/avPw9n?= =?us-ascii?Q?uOvMgx9+zURGDY/ItTG5q3t+oG5T5U2UGl0bBy9MN4yGOg6f6F8XTImP73ib?= =?us-ascii?Q?FXQZzUSEIl6ENY9rQYzZLd/JTf9HF4g0AViofQcGwtARljkf3VfUNsoz9wjM?= =?us-ascii?Q?FOS1uIOL0iAGxvftF6OnVJhaGqSkWEG/ha+p+Rh8NSCrARa28Y+XLgn8cCta?= =?us-ascii?Q?h06DpG6jMaPBaelVUVNOEoFcN9M3fBb6Efni1y0g1LUP1Qrh5snrGgXkFiGq?= =?us-ascii?Q?wfoLkCV/zX1M3cLcp2wIKA6nItf/cBpPCXL187Y+TRj4lPmsz8R7IHHeGrXO?= =?us-ascii?Q?Su+SPtnd5hZWuU3apwFXRmSm/zSmeVzN0N0V1ewOBuoPJpgb5RDge13Yu3/I?= =?us-ascii?Q?txjMB1fONJzP5rwNIRWOQEF7QlVI3qmiapTacNzYQ/VrCaxDwGUZAqMJjA5Q?= =?us-ascii?Q?XqsgwGySN+0BQ00cnm96pCKvdE/VNvK0iJsumq6ODBK/ma3Z5E998i47FlDq?= =?us-ascii?Q?wzsj4huCgwIbGiw+lwrYUuMGMCTdOEoU28VlDTUUQBxNmzIBlxrrUq/uVVyJ?= =?us-ascii?Q?OmoqZIcFVwvRF1VgDJ6pmsxH/OVH8Ii1iqmYIA3IOzvw8/lEMkGcvM5Sg+YO?= =?us-ascii?Q?UlaV6wMakKGC+/P3+BFaTeTuglw+wDUUqOxaAH0grIQSImBcE8OMIknq6y2l?= =?us-ascii?Q?93dUmHu6Xk+TcZtWE2oi9VzAD4lnW37jd1RvHNvNhENm2yN7wXPN5SnFKZnd?= =?us-ascii?Q?ZpqciW+Z+ZNS3rXYN9GQhsrH/L5VZ7Buw/WdIueXRmc2/iarpQH1b1SCh01f?= =?us-ascii?Q?GEcpoJKlX8OJkd+AkTuq1q2kp3byzu5QjIh97TB2wkpIJdpnQTECPCuumes0?= =?us-ascii?Q?nSVy0HBvKXEZ/Zxnpgo/6W1S5JP4naiyWXqDp3TEsee87NGxSLL50k8kpUgH?= =?us-ascii?Q?b2VNheTTB8MGwjhhpXHgTn0QfF1qeHFYpI1MbE1ezzMCj+MZ39IgSmYWsH9E?= =?us-ascii?Q?1EBb/vgeYN6nOWlTabtoxAIG9jrncKZl2b/p7w+1RaCCtBcOWgJ/7uLMIWkC?= =?us-ascii?Q?SUYwdzPWHwiFWPY3jFIFfliDED6HluELRu4qKSZsVdOSwF/7DCJ0PSopL9RF?= =?us-ascii?Q?slYKu74TWE+QrAD+9aY=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(7416014)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2025 22:45:12.8576 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9d5dadd7-a160-48a0-86b2-08de1cbcfb65 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000ECD8.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6703 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) --- drivers/net/virtio_net.c | 207 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 198 insertions(+), 9 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 6bf8bc5c1915..c876a18a97e3 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -6944,6 +6944,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) { @@ -6961,11 +7007,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) { @@ -7007,12 +7087,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, @@ -7151,6 +7245,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; } @@ -7195,6 +7293,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); + } done: *key_size = size; /* @@ -7229,7 +7333,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; @@ -7240,21 +7345,93 @@ static int setup_ip_key_mask(struct virtio_net_ff_selector *selector, selector->type = VIRTIO_NET_FF_MASK_TYPE_IPV6; selector->length = sizeof(struct ipv6hdr); - if (fs->h_u.usr_ip6_spec.l4_4_bytes || - fs->h_u.usr_ip6_spec.tclass) + if (num_hdrs == 2 && (fs->h_u.usr_ip6_spec.l4_4_bytes || + fs->h_u.usr_ip6_spec.tclass)) return -EOPNOTSUPP; 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.tos || - fs->h_u.usr_ip4_spec.ip_ver != ETH_RX_NFC_IP4) + if (num_hdrs == 2 && + (fs->h_u.usr_ip4_spec.l4_4_bytes || + fs->h_u.usr_ip4_spec.tos || + fs->h_u.usr_ip4_spec.ip_ver != ETH_RX_NFC_IP4)) return -EOPNOTSUPP; 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; @@ -7294,6 +7471,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; size_t key_size; int num_hdrs; u8 *key; @@ -7327,9 +7505,20 @@ static int build_and_insert(struct virtnet_ff *ff, if (num_hdrs == 1) goto validate; + key_offset = selector->length; + selector = next_selector(selector); + + err = setup_ip_key_mask(selector, key + key_offset, fs, num_hdrs); + if (err) + goto err_classifier; + + if (num_hdrs == 2) + goto validate; + + key_offset += selector->length; selector = next_selector(selector); - err = setup_ip_key_mask(selector, key + sizeof(struct ethhdr), fs); + err = setup_transport_key_mask(selector, key + key_offset, fs); if (err) goto err_classifier; -- 2.50.1