From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11012001.outbound.protection.outlook.com [52.101.43.1]) (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 CE95A289374 for ; Fri, 7 Nov 2025 04:16:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.43.1 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762488999; cv=fail; b=LRWKzTX2OzKqjKc4iTK4rv1L7FLBeOb3ygZIefSQdOB4fKpXR3qIHGb4zo/SA4AmqhHR0LDVvyebIZ2f8REij5aJCiplxIyqnBWj7CQwfTorFU2wRlLB5ITNBACkM0phBMF4bMd+SanlvMUl1b0atQjSqE4tg4F5+bt4TNfC6Ig= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762488999; c=relaxed/simple; bh=w2b+ckx52g49eehysqh66lE9V1rqhzaVDwwC+iZOM4k=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=I8a/HJ/5d9kswgJJgK47uqwplvA6Sxb4HSCRL0QGykXly5K9+ohkJY2vqRzE+VcYQngruoplEPQ6u8LXgz/P1WlRjsDyUF+45eshC9v7wQ9tryfmL4zJqErRJD0Yk/U6CjqsRAukPSHq6Pt+foy7cggmWCkWoTpVL0n1WtmJfbY= 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=fCdc+mBH; arc=fail smtp.client-ip=52.101.43.1 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="fCdc+mBH" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WUp25JCsfKGZB0L4GuJ3ONnl+fSOXU2WfjBmNUTFS98l6lgdWQPRy2FcjIMn7Fsxb+EeOkbWwegFJs1LxC7E+Wl9PliGxeJYSNH2KG5EdcI5md2YXvalcup/3aEldnNoJdH8nVJUsX7utXKoM9Myn0bPZWkM42jCBE5398TUZv6TzBOmsrU9kP+FycNeTAhRYn4sWSNIPOmXOqCFXXnDvkGR1lBm1MI4VoFf4k/z8ESHmg3hasXUnLst5FuKwD0SBaKgAWK2GYUl/wHhzsbPPnAimQuqqelzLq+Q6ofZrv/7x4vO7JPD0jRvCFNRHnTdZD2ZR4/xP02WRznWq5GCHw== 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=L1gQ1ufCk8DJrZQnV0l03pEaV5H0qvVHh/bZayL2Tmo=; b=NLozkFpySfKhgSSTPlTR9WBwuPgKila6PC0mUYL1oBsDEedFCVMb9V4HOFjg50Yp9eE0rPG+TmReQQFEC9IO0Dkt30TzzGZla55zZ5YS6cdwYawifP6UkWHZ3iZBtZU2gXWRwgJsHs4pM5jmCtuoZD6P7E+km5yyY6/PUiJS2nvVeiBfir0fJENBzD9JEQCcir/eUes874kpjBCgqXYW4VBVk4O+AWBO5W6naJZUHb28SkezTKqAx6Rttk+fnSCUoK+fT+gKkREC+gljjz37eGnD5ozNAkNGLwnELxMlSlJjBDeULdvi0AhdVzRtVCQP3nSTvJeKr/7Y/u8pb/ag7Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=L1gQ1ufCk8DJrZQnV0l03pEaV5H0qvVHh/bZayL2Tmo=; b=fCdc+mBHFDrfm3Ldcib3H9tl2ogrYAnrSNh1J+yhOdTTrx05M7nTCU91SYf/+lsKJ24zrCwl8UiMEW/SisXbiuh0QhLuzENIdk5t37qSgTCDvqJdnxzYsraLx1tQEOcos+yJ3r/P8TeBo41lRjWrT9GWJfDXkPsjEjd3AM6GGGwsoPsfoyMXBbTEnAw2TgHoUNTdIlEP3ZOUJog/B3zi7dxh8Qe+sX4v0OqYRSYAVxLmChiVwa97iNDobQ3WsiGH6KSyJF+K4RX0AI0UdFqlmM2Ch0WGud9IwELvhx2e1yMCppeAZYBgoS0rpwAZBbRZS7/mLKhS2BTS+dVn7ivPxQ== Received: from DS7PR03CA0335.namprd03.prod.outlook.com (2603:10b6:8:55::34) by SN7PR12MB8436.namprd12.prod.outlook.com (2603:10b6:806:2e3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9298.12; Fri, 7 Nov 2025 04:16:34 +0000 Received: from DS3PEPF0000C380.namprd04.prod.outlook.com (2603:10b6:8:55:cafe::42) by DS7PR03CA0335.outlook.office365.com (2603:10b6:8:55::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9298.12 via Frontend Transport; Fri, 7 Nov 2025 04:16:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DS3PEPF0000C380.mail.protection.outlook.com (10.167.23.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9298.6 via Frontend Transport; Fri, 7 Nov 2025 04:16:34 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 6 Nov 2025 20:16:21 -0800 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 6 Nov 2025 20:16:20 -0800 Received: from vdi.nvidia.com (10.127.8.14) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Thu, 6 Nov 2025 20:16:19 -0800 From: Daniel Jurgens To: , , , CC: , , , , , , , , , , , , Daniel Jurgens Subject: [PATCH net-next v9 05/12] virtio_net: Query and set flow filter caps Date: Thu, 6 Nov 2025 22:15:15 -0600 Message-ID: <20251107041523.1928-6-danielj@nvidia.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251107041523.1928-1-danielj@nvidia.com> References: <20251107041523.1928-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: DS3PEPF0000C380:EE_|SN7PR12MB8436:EE_ X-MS-Office365-Filtering-Correlation-Id: a35825a2-4516-4727-b674-08de1db47021 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|7416014|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?G7BMJzciWGcfZgcgC9vFeIMZrQa8kZAz371R+gmZqsvy/hA9dFP7kZ8i5RMK?= =?us-ascii?Q?Nig2Pgo+c3ezE+RdyMVtLjh6VFv+NHiozqF4cy7Jh3u+ezlprzVf40vAXhka?= =?us-ascii?Q?xd8DXtnf72yR41Y3h204rNEixd7Fx1enFGRlMwbOaEFboPRTygEOPVI0Mbwy?= =?us-ascii?Q?KvlCMQ/FpM3djE+mGcw5wZirEHr1zbWgTVvOExYvZYu7JJdZBab5et+imyeQ?= =?us-ascii?Q?kfEujp+3TuPSk3F0KbCBfvppR9rE/ikxJ+H+LO144nxTTqpPc7KK8RswvHQm?= =?us-ascii?Q?449txZrT5lJJ6d9CwS8wGHDMeCT1gHXmrzubnP/CYHB38hsikk7s+jopnvRp?= =?us-ascii?Q?K2nz2LC9bQ99OedRiJuGddkM+/4bkbT/cTnrq2UJx3t/fIHTMpifrtFBIfWH?= =?us-ascii?Q?eI1fc/eJR/+p0D9dtz1op7gmMhG2cik0aTz0nPD6dIoJsm5NHVdk44G2lKY0?= =?us-ascii?Q?oLb5IxBmqTZjlYpJB8WEdJno3XqKYQD478qAZPyp+mW2+cFCzgWKCoqJem8A?= =?us-ascii?Q?gz+bwKK14RXHd1HfJh347n5FOWEF6sjSYeco0Vvpc//t3WKExyStZ5rmoV6F?= =?us-ascii?Q?zGEemO3Gu3MoiUiMZSKP4Oyz/ixclIzyVPk69JgroE0FhM9OOKH6YbBKv890?= =?us-ascii?Q?nG7L/pqY7Mr/ub3xxGXoTLm3hgvOpLkdgYYt9H95O7wq5jzYKWETm8+9Ggm+?= =?us-ascii?Q?DsDveA7BHPKTfiuwDVTnB3F6apdBMpbxRf+NbkILCH4dL5mlKjcNg0Vpbm/C?= =?us-ascii?Q?/smpd0TaxHOAw9nU3ecgwVbHCsSLxXT3gNgnAcfHTVA0RoXF2NeUwRb7vTEe?= =?us-ascii?Q?eEHGUSMNbe5RDZPgLzLSENeUgT0uTdouvqWZRE2RGhXlLYV+iCsJAKTVMWH9?= =?us-ascii?Q?+pmsN/N0oRb704CcrHnRjzOOrAwsAGRvalr5haiEzRMu1DtswFSBPxRmGP/4?= =?us-ascii?Q?0LiDZ4dCtpKvfNwp0rpL9BhZg+Jm2lAVhPGaCbHC6JQB8WtpAC5GOjtG2jkM?= =?us-ascii?Q?0GEq+lqWhnCl6xG5MSJknqxiVCaBowhhbqyk5RDVxZJgm0qWKVGaTeysz8u8?= =?us-ascii?Q?KzxzsR2APcNrijzqrjhqjuxd6Sc6BZUWe9dFE+zKY5uPjz4nFsYo33s+AFvm?= =?us-ascii?Q?thd826dERgaIY4gVOMCZ57f4j4cO7rNQoZgRja7MF+03tq7bz8lKmzSix5Xe?= =?us-ascii?Q?uh9oscrZ/Q3EboKazlKgbLsE2TulCvPzAZ9bJyC/Rd626Tr3oRxhbU9Haq4C?= =?us-ascii?Q?Qz9DhktqcSizN0hV2+9RGL785fY6JPs3paWzu97oba7LOantCLYQ1mRCQG4F?= =?us-ascii?Q?Inbnis1nkbKOMOZrCJkU3gJUP45XpMsjwaRaczdD1s6feUE8IUhb4qDDubuZ?= =?us-ascii?Q?VRB7iimHk1xXqekOeV4FWvvM5LB5NEQ6FN12lv/MoIh1/PnMlXYDe8/wjI2a?= =?us-ascii?Q?ogl6rI7DaHnWCBfML1bFntndvvq7X6bHZZGQmXnfFCu2/uSWw4BkZ1fCfRYo?= =?us-ascii?Q?qE9JM+vpTJnfSdb0p81E17lxjsRyggxImJbPSc2i/Y9SkRagmyHeVrKRsjib?= =?us-ascii?Q?940tGWcsare71QBvcrQ=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(7416014)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2025 04:16:34.4681 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a35825a2-4516-4727-b674-08de1db47021 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.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF0000C380.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8436 When probing a virtnet device, attempt to read the flow filter capabilities. In order to use the feature the caps must also be set. For now setting what was read is sufficient. Signed-off-by: Daniel Jurgens Reviewed-by: Parav Pandit Reviewed-by: Shahar Shitrit --- v4: - Validate the length in the selector caps - Removed __free usage. - Removed for(int. v5: - Remove unneed () after MAX_SEL_LEN macro (test bot) v6: - Fix sparse warning "array of flexible structures" Jakub K/Simon H - Use new variable and validate ff_mask_size before set_cap. MST v7: - Set ff->ff_{caps, mask, actions} NULL in error path. Paolo Abeni - Return errors from virtnet_ff_init, -ENOTSUPP is not fatal. Xuan v8: - Use real_ff_mask_size when setting the selector caps. Jason Wang v9: - Set err after failed memory allocations. Simon Horman --- drivers/net/virtio_net.c | 191 +++++++++++++++++++++++++++++ include/linux/virtio_admin.h | 1 + include/uapi/linux/virtio_net_ff.h | 91 ++++++++++++++ 3 files changed, 283 insertions(+) create mode 100644 include/uapi/linux/virtio_net_ff.h diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 8e8a179aaa49..61f881334e24 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -26,6 +26,9 @@ #include #include #include +#include +#include +#include static int napi_weight = NAPI_POLL_WEIGHT; module_param(napi_weight, int, 0444); @@ -281,6 +284,14 @@ static const struct virtnet_stat_desc virtnet_stats_tx_speed_desc_qstat[] = { VIRTNET_STATS_DESC_TX_QSTAT(speed, ratelimit_packets, hw_drop_ratelimits), }; +struct virtnet_ff { + struct virtio_device *vdev; + bool ff_supported; + struct virtio_net_ff_cap_data *ff_caps; + struct virtio_net_ff_cap_mask_data *ff_mask; + struct virtio_net_ff_actions *ff_actions; +}; + #define VIRTNET_Q_TYPE_RX 0 #define VIRTNET_Q_TYPE_TX 1 #define VIRTNET_Q_TYPE_CQ 2 @@ -493,6 +504,8 @@ struct virtnet_info { struct failover *failover; u64 device_stats_cap; + + struct virtnet_ff ff; }; struct padded_vnet_hdr { @@ -6758,6 +6771,173 @@ static const struct xdp_metadata_ops virtnet_xdp_metadata_ops = { .xmo_rx_hash = virtnet_xdp_rx_hash, }; +static size_t get_mask_size(u16 type) +{ + switch (type) { + case VIRTIO_NET_FF_MASK_TYPE_ETH: + return sizeof(struct ethhdr); + case VIRTIO_NET_FF_MASK_TYPE_IPV4: + return sizeof(struct iphdr); + case VIRTIO_NET_FF_MASK_TYPE_IPV6: + return sizeof(struct ipv6hdr); + case VIRTIO_NET_FF_MASK_TYPE_TCP: + return sizeof(struct tcphdr); + case VIRTIO_NET_FF_MASK_TYPE_UDP: + return sizeof(struct udphdr); + } + + return 0; +} + +#define MAX_SEL_LEN (sizeof(struct ipv6hdr)) + +static int virtnet_ff_init(struct virtnet_ff *ff, struct virtio_device *vdev) +{ + size_t ff_mask_size = sizeof(struct virtio_net_ff_cap_mask_data) + + sizeof(struct virtio_net_ff_selector) * + VIRTIO_NET_FF_MASK_TYPE_MAX; + struct virtio_admin_cmd_query_cap_id_result *cap_id_list; + struct virtio_net_ff_selector *sel; + size_t real_ff_mask_size; + int err; + int i; + + cap_id_list = kzalloc(sizeof(*cap_id_list), GFP_KERNEL); + if (!cap_id_list) + return -ENOMEM; + + err = virtio_admin_cap_id_list_query(vdev, cap_id_list); + if (err) + goto err_cap_list; + + if (!(VIRTIO_CAP_IN_LIST(cap_id_list, + VIRTIO_NET_FF_RESOURCE_CAP) && + VIRTIO_CAP_IN_LIST(cap_id_list, + VIRTIO_NET_FF_SELECTOR_CAP) && + VIRTIO_CAP_IN_LIST(cap_id_list, + VIRTIO_NET_FF_ACTION_CAP))) { + err = -EOPNOTSUPP; + goto err_cap_list; + } + + ff->ff_caps = kzalloc(sizeof(*ff->ff_caps), GFP_KERNEL); + if (!ff->ff_caps) { + err = -ENOMEM; + goto err_cap_list; + } + + err = virtio_admin_cap_get(vdev, + VIRTIO_NET_FF_RESOURCE_CAP, + ff->ff_caps, + sizeof(*ff->ff_caps)); + + if (err) + goto err_ff; + + /* VIRTIO_NET_FF_MASK_TYPE start at 1 */ + for (i = 1; i <= VIRTIO_NET_FF_MASK_TYPE_MAX; i++) + ff_mask_size += get_mask_size(i); + + ff->ff_mask = kzalloc(ff_mask_size, GFP_KERNEL); + if (!ff->ff_mask) { + err = -ENOMEM; + goto err_ff; + } + + err = virtio_admin_cap_get(vdev, + VIRTIO_NET_FF_SELECTOR_CAP, + ff->ff_mask, + ff_mask_size); + + if (err) + goto err_ff_mask; + + ff->ff_actions = kzalloc(sizeof(*ff->ff_actions) + + VIRTIO_NET_FF_ACTION_MAX, + GFP_KERNEL); + if (!ff->ff_actions) { + err = -ENOMEM; + goto err_ff_mask; + } + + err = virtio_admin_cap_get(vdev, + VIRTIO_NET_FF_ACTION_CAP, + ff->ff_actions, + sizeof(*ff->ff_actions) + VIRTIO_NET_FF_ACTION_MAX); + + if (err) + goto err_ff_action; + + err = virtio_admin_cap_set(vdev, + VIRTIO_NET_FF_RESOURCE_CAP, + ff->ff_caps, + sizeof(*ff->ff_caps)); + if (err) + goto err_ff_action; + + real_ff_mask_size = sizeof(struct virtio_net_ff_cap_mask_data); + sel = (void *)&ff->ff_mask->selectors[0]; + + for (i = 0; i < ff->ff_mask->count; i++) { + if (sel->length > MAX_SEL_LEN) { + err = -EINVAL; + goto err_ff_action; + } + real_ff_mask_size += sizeof(struct virtio_net_ff_selector) + sel->length; + sel = (void *)sel + sizeof(*sel) + sel->length; + } + + if (real_ff_mask_size > ff_mask_size) { + err = -EINVAL; + goto err_ff_action; + } + + err = virtio_admin_cap_set(vdev, + VIRTIO_NET_FF_SELECTOR_CAP, + ff->ff_mask, + real_ff_mask_size); + if (err) + goto err_ff_action; + + err = virtio_admin_cap_set(vdev, + VIRTIO_NET_FF_ACTION_CAP, + ff->ff_actions, + sizeof(*ff->ff_actions) + VIRTIO_NET_FF_ACTION_MAX); + if (err) + goto err_ff_action; + + ff->vdev = vdev; + ff->ff_supported = true; + + kfree(cap_id_list); + + return 0; + +err_ff_action: + kfree(ff->ff_actions); + ff->ff_actions = NULL; +err_ff_mask: + kfree(ff->ff_mask); + ff->ff_mask = NULL; +err_ff: + kfree(ff->ff_caps); + ff->ff_caps = NULL; +err_cap_list: + kfree(cap_id_list); + + return err; +} + +static void virtnet_ff_cleanup(struct virtnet_ff *ff) +{ + if (!ff->ff_supported) + return; + + kfree(ff->ff_actions); + kfree(ff->ff_mask); + kfree(ff->ff_caps); +} + static int virtnet_probe(struct virtio_device *vdev) { int i, err = -ENOMEM; @@ -7121,6 +7301,15 @@ static int virtnet_probe(struct virtio_device *vdev) } vi->guest_offloads_capable = vi->guest_offloads; + /* Initialize flow filters. Not supported is an acceptable and common + * return code + */ + err = virtnet_ff_init(&vi->ff, vi->vdev); + if (err && err != -EOPNOTSUPP) { + rtnl_unlock(); + goto free_unregister_netdev; + } + rtnl_unlock(); err = virtnet_cpu_notif_add(vi); @@ -7136,6 +7325,7 @@ static int virtnet_probe(struct virtio_device *vdev) free_unregister_netdev: unregister_netdev(dev); + virtnet_ff_cleanup(&vi->ff); free_failover: net_failover_destroy(vi->failover); free_vqs: @@ -7185,6 +7375,7 @@ static void virtnet_remove(struct virtio_device *vdev) virtnet_free_irq_moder(vi); unregister_netdev(vi->dev); + virtnet_ff_cleanup(&vi->ff); net_failover_destroy(vi->failover); diff --git a/include/linux/virtio_admin.h b/include/linux/virtio_admin.h index 039b996f73ec..db0f42346ca9 100644 --- a/include/linux/virtio_admin.h +++ b/include/linux/virtio_admin.h @@ -3,6 +3,7 @@ * Header file for virtio admin operations */ #include +#include #ifndef _LINUX_VIRTIO_ADMIN_H #define _LINUX_VIRTIO_ADMIN_H diff --git a/include/uapi/linux/virtio_net_ff.h b/include/uapi/linux/virtio_net_ff.h new file mode 100644 index 000000000000..bd7a194a9959 --- /dev/null +++ b/include/uapi/linux/virtio_net_ff.h @@ -0,0 +1,91 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note + * + * Header file for virtio_net flow filters + */ +#ifndef _LINUX_VIRTIO_NET_FF_H +#define _LINUX_VIRTIO_NET_FF_H + +#include +#include + +#define VIRTIO_NET_FF_RESOURCE_CAP 0x800 +#define VIRTIO_NET_FF_SELECTOR_CAP 0x801 +#define VIRTIO_NET_FF_ACTION_CAP 0x802 + +/** + * struct virtio_net_ff_cap_data - Flow filter resource capability limits + * @groups_limit: maximum number of flow filter groups supported by the device + * @classifiers_limit: maximum number of classifiers supported by the device + * @rules_limit: maximum number of rules supported device-wide across all groups + * @rules_per_group_limit: maximum number of rules allowed in a single group + * @last_rule_priority: priority value associated with the lowest-priority rule + * @selectors_per_classifier_limit: maximum selectors allowed in one classifier + * + * The limits are reported by the device and describe resource capacities for + * flow filters. Multi-byte fields are little-endian. + */ +struct virtio_net_ff_cap_data { + __le32 groups_limit; + __le32 classifiers_limit; + __le32 rules_limit; + __le32 rules_per_group_limit; + __u8 last_rule_priority; + __u8 selectors_per_classifier_limit; +}; + +/** + * struct virtio_net_ff_selector - Selector mask descriptor + * @type: selector type, one of VIRTIO_NET_FF_MASK_TYPE_* constants + * @flags: selector flags, see VIRTIO_NET_FF_MASK_F_* constants + * @reserved: must be set to 0 by the driver and ignored by the device + * @length: size in bytes of @mask + * @reserved1: must be set to 0 by the driver and ignored by the device + * @mask: variable-length mask payload for @type, length given by @length + * + * A selector describes a header mask that a classifier can apply. The format + * of @mask depends on @type. + */ +struct virtio_net_ff_selector { + __u8 type; + __u8 flags; + __u8 reserved[2]; + __u8 length; + __u8 reserved1[3]; + __u8 mask[]; +}; + +#define VIRTIO_NET_FF_MASK_TYPE_ETH 1 +#define VIRTIO_NET_FF_MASK_TYPE_IPV4 2 +#define VIRTIO_NET_FF_MASK_TYPE_IPV6 3 +#define VIRTIO_NET_FF_MASK_TYPE_TCP 4 +#define VIRTIO_NET_FF_MASK_TYPE_UDP 5 +#define VIRTIO_NET_FF_MASK_TYPE_MAX VIRTIO_NET_FF_MASK_TYPE_UDP + +/** + * struct virtio_net_ff_cap_mask_data - Supported selector mask formats + * @count: number of entries in @selectors + * @reserved: must be set to 0 by the driver and ignored by the device + * @selectors: array of supported selector descriptors + */ +struct virtio_net_ff_cap_mask_data { + __u8 count; + __u8 reserved[7]; + __u8 selectors[]; +}; +#define VIRTIO_NET_FF_MASK_F_PARTIAL_MASK (1 << 0) + +#define VIRTIO_NET_FF_ACTION_DROP 1 +#define VIRTIO_NET_FF_ACTION_RX_VQ 2 +#define VIRTIO_NET_FF_ACTION_MAX VIRTIO_NET_FF_ACTION_RX_VQ +/** + * struct virtio_net_ff_actions - Supported flow actions + * @count: number of supported actions in @actions + * @reserved: must be set to 0 by the driver and ignored by the device + * @actions: array of action identifiers (VIRTIO_NET_FF_ACTION_*) + */ +struct virtio_net_ff_actions { + __u8 count; + __u8 reserved[7]; + __u8 actions[]; +}; +#endif -- 2.50.1