From patchwork Tue Dec 28 06:38:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Mi X-Patchwork-Id: 1573605 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=bC+GaDUf; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (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) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JNPyK1Lz8z9sQt for ; Tue, 28 Dec 2021 17:39:04 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9113781A12; Tue, 28 Dec 2021 06:39:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HlqraU3T3Fb8; Tue, 28 Dec 2021 06:39:01 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id A37CA8190B; Tue, 28 Dec 2021 06:39:00 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 85F7DC001E; Tue, 28 Dec 2021 06:39:00 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id B4F7EC0012 for ; Tue, 28 Dec 2021 06:38:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 9F29E40273 for ; Tue, 28 Dec 2021 06:38:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=nvidia.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RSsaheW1l7gC for ; Tue, 28 Dec 2021 06:38:57 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2068.outbound.protection.outlook.com [40.107.223.68]) by smtp4.osuosl.org (Postfix) with ESMTPS id C74EC402F7 for ; Tue, 28 Dec 2021 06:38:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SJwjFOYa0gSOdDVA+3MbDCh3XUxP8gnZdz58+typRjQBicwQI98srPUgGu0VL0GVznBdMV9ixvU1EVLu8RBUqzXWo/12YlaBkaA1sRjuJZxDmNPd2FQllqD2RphpqxpJSL+dV9NW8GXSZOcSYDT9mSmwPTWJQy7rfK+tpS2jWuvek769tTVlw+pIUZUyIrdKlmGQLeXRj1Si6RUCRBhJDC9azRXKIm4qMzOeM5liUHvipXw9G835AATj+/KVy4apk5cGrc9/2pI+3HWX1T6iGJc8i36UaISSIhDoHA4oZuAPnIv5OjMblJvrHlUnAKaPNuaPjX4DF0HDnNl4JKFCcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=FDjG9Ys54GgpOMYBjd2I8xDldbxlZI0oVcYlpMWmr3U=; b=GGixyLxN4RBLldYSOOIZC94CnX0O+X9i1Hcvnk7hjTDMCLNj7ZNvX8raYdMnpsMFJKaG9hgl12e+1o8ZWgu7jfDSzzyKLlQPVgXMpLXYtKwfLPnoNp34FejAHJ7Bdjnb0MHBg2sYbMXto/GG0bhPQnJCsHVkxKXDZwxj4YElwLN1PVAnuMEblEt/R+iPagy0IXSr4ZnBg2iTibvA032zrss6l7Tl8w9l5Tg3gcUUtFuRptMReBlzRTF91dCME78L35h1j6D8tO0ujBzg7tGPpfGr3iY6o7zs4bo93HZMUSvMt+u5VfSty3XDfuEyidOrk3mPF7g9R11pu49jeeo1qQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=netronome.com 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 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=FDjG9Ys54GgpOMYBjd2I8xDldbxlZI0oVcYlpMWmr3U=; b=bC+GaDUf7DElrl7kOIevEPez+rx+rmzRTibVPjqHVxahL9RHSsJwFS6ISKLOmHLZMOBJgwUDjUwPd3lUnUHNv/4IdUrY8RZgJYUKGsplWCYqcZgavydkEJ2e1b6r9DV8QJObQ+SXYFmTdyCNE0lytgTtrvJLQnEqUbAhCvkPFVXVTsguirzA3b5eM3c/I1Obr3sI6YmihgpXUDGEpSqI2MVOrC0bUolQyLm+wkYEUKJvppQqxCdx8HCEKHGkYQ1D663urGi6A8BXbHJr/cxtxVx6Hi7YEjEzLVU1DHwCg9gy6Q50Xf0QzoA79EC1jbfqTEDSfpmU90hs6I0itsz4Pw== Received: from BN0PR04CA0080.namprd04.prod.outlook.com (2603:10b6:408:ea::25) by DM6PR12MB2731.namprd12.prod.outlook.com (2603:10b6:5:45::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.19; Tue, 28 Dec 2021 06:38:54 +0000 Received: from BN8NAM11FT065.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ea:cafe::f5) by BN0PR04CA0080.outlook.office365.com (2603:10b6:408:ea::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.19 via Frontend Transport; Tue, 28 Dec 2021 06:38:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) 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 12.22.5.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.235) by BN8NAM11FT065.mail.protection.outlook.com (10.13.177.63) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4823.18 via Frontend Transport; Tue, 28 Dec 2021 06:38:53 +0000 Received: from HQMAIL107.nvidia.com (172.20.187.13) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 28 Dec 2021 06:38:52 +0000 Received: from HQMAIL107.nvidia.com (172.20.187.13) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 28 Dec 2021 06:38:52 +0000 Received: from dev-r630-03.lab.mtl.com (172.20.187.5) by mail.nvidia.com (172.20.187.13) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Tue, 28 Dec 2021 06:38:51 +0000 To: Date: Tue, 28 Dec 2021 14:38:37 +0800 Message-ID: <20211228063844.195233-2-cmi@nvidia.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211228063844.195233-1-cmi@nvidia.com> References: <20211228063844.195233-1-cmi@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 62530da8-f1c7-48a0-3e14-08d9c9ccb79a X-MS-TrafficTypeDiagnostic: DM6PR12MB2731:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tLhcPeZGEQSgyT9/m/cPxTjpe2p3tTxkSPZNLaB5KYEWVPpwOE+4qdGLu5Euo1kF3WjNxe+OztUe4+Wx63WE3vDN5F5TMxunBXDBksrsfz3ToLSpXHNtMOZoDVQpqbKHcIw3S9uGCQtBzqI9NCF5AYxqIuE3MHRYj/REZay0poD72k7u4jMqoGluSut3LanG+suQNFhQ0hqqqoKxOiOyEgYoNTfj57Id8bln3/4nVe8poMx69T6DHopPZha3qdqHCnBzLydisW2wVzw7bsVZPwn6Sd7ogwCDgFDSrzERRulSyICuUqnYUkgX1qAlx1qRA79xamX/m1tlEvByNhw00iGaPm0gBFkxXoK5wLM+fJV0iZxkqRAlvSBsTe6FCIwW0I0fZX9ZrK8WQpRisBxdAvqdiN02wzEwJt38NFkftkQALeK6wQb/2yC/6xjZ4wZ5e6dnDUluNOLG9AGxi65UXG7tChWLHqCy8JbIE4e9J9RSfmW1PAWfSO47Kfr++GEgSDSJG3VEkQNJrWBo2mamYZgJQV1V0lq9208DdBCmc/mPXPIg8AwHX7uaettBPT3PozADcXgcjb77HlCfjY3pA3xtQJdYgCPtXV/tw9UBYLBiQcLCaQu3T3s9WnWZnF/R5RdHnHhfyO3oyTJQdDDo2qbkZYOoNytThQozUhsjiTvTVZ9DQ/Wdc6v6C+oCnyGxJPgmJfpPUXluIJSji/uMSyaDDEYY6NsHL/XfYWvH5Py/1kpG2x55IlysY8/n2+jU/1fdW3BeEJ/sOQ5ZVfErLtf8B0PF5DIXc7KHCJHEj68= X-Forefront-Antispam-Report: CIP:12.22.5.235; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(40470700002)(82310400004)(83380400001)(356005)(81166007)(40460700001)(36756003)(54906003)(47076005)(86362001)(1076003)(2616005)(5660300002)(107886003)(4326008)(6916009)(186003)(336012)(26005)(426003)(316002)(8936002)(8676002)(2906002)(70206006)(6666004)(36860700001)(508600001)(70586007)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Dec 2021 06:38:53.8767 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 62530da8-f1c7-48a0-3e14-08d9c9ccb79a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.235]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT065.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB2731 Cc: elibr@nvidia.com, simon.horman@netronome.com, roniba@nvidia.com, i.maximets@ovn.org Subject: [ovs-dev] [PATCH v19 1/8] compat: Add psample and tc sample action defines for older kernels X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Chris Mi via dev From: Chris Mi Reply-To: Chris Mi Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Update kernel UAPI to support psample and the tc sample action. Signed-off-by: Chris Mi Reviewed-by: Eli Britstein Acked-by: Eelco Chaudron --- include/linux/automake.mk | 4 ++- include/linux/psample.h | 62 ++++++++++++++++++++++++++++++++ include/linux/tc_act/tc_sample.h | 25 +++++++++++++ 3 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 include/linux/psample.h create mode 100644 include/linux/tc_act/tc_sample.h diff --git a/include/linux/automake.mk b/include/linux/automake.mk index 8f063f482..c48d9699a 100644 --- a/include/linux/automake.mk +++ b/include/linux/automake.mk @@ -7,4 +7,6 @@ noinst_HEADERS += \ include/linux/tc_act/tc_skbedit.h \ include/linux/tc_act/tc_tunnel_key.h \ include/linux/tc_act/tc_vlan.h \ - include/linux/tc_act/tc_ct.h + include/linux/tc_act/tc_ct.h \ + include/linux/tc_act/tc_sample.h \ + include/linux/psample.h diff --git a/include/linux/psample.h b/include/linux/psample.h new file mode 100644 index 000000000..e585db5bf --- /dev/null +++ b/include/linux/psample.h @@ -0,0 +1,62 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef __UAPI_PSAMPLE_H +#define __UAPI_PSAMPLE_H + +enum { + PSAMPLE_ATTR_IIFINDEX, + PSAMPLE_ATTR_OIFINDEX, + PSAMPLE_ATTR_ORIGSIZE, + PSAMPLE_ATTR_SAMPLE_GROUP, + PSAMPLE_ATTR_GROUP_SEQ, + PSAMPLE_ATTR_SAMPLE_RATE, + PSAMPLE_ATTR_DATA, + PSAMPLE_ATTR_GROUP_REFCOUNT, + PSAMPLE_ATTR_TUNNEL, + + PSAMPLE_ATTR_PAD, + PSAMPLE_ATTR_OUT_TC, /* u16 */ + PSAMPLE_ATTR_OUT_TC_OCC, /* u64, bytes */ + PSAMPLE_ATTR_LATENCY, /* u64, nanoseconds */ + PSAMPLE_ATTR_TIMESTAMP, /* u64, nanoseconds */ + PSAMPLE_ATTR_PROTO, /* u16 */ + + __PSAMPLE_ATTR_MAX +}; + +enum psample_command { + PSAMPLE_CMD_SAMPLE, + PSAMPLE_CMD_GET_GROUP, + PSAMPLE_CMD_NEW_GROUP, + PSAMPLE_CMD_DEL_GROUP, +}; + +enum psample_tunnel_key_attr { + PSAMPLE_TUNNEL_KEY_ATTR_ID, /* be64 Tunnel ID */ + PSAMPLE_TUNNEL_KEY_ATTR_IPV4_SRC, /* be32 src IP address. */ + PSAMPLE_TUNNEL_KEY_ATTR_IPV4_DST, /* be32 dst IP address. */ + PSAMPLE_TUNNEL_KEY_ATTR_TOS, /* u8 Tunnel IP ToS. */ + PSAMPLE_TUNNEL_KEY_ATTR_TTL, /* u8 Tunnel IP TTL. */ + PSAMPLE_TUNNEL_KEY_ATTR_DONT_FRAGMENT, /* No argument, set DF. */ + PSAMPLE_TUNNEL_KEY_ATTR_CSUM, /* No argument. CSUM packet. */ + PSAMPLE_TUNNEL_KEY_ATTR_OAM, /* No argument. OAM frame. */ + PSAMPLE_TUNNEL_KEY_ATTR_GENEVE_OPTS, /* Array of Geneve options. */ + PSAMPLE_TUNNEL_KEY_ATTR_TP_SRC, /* be16 src Transport Port. */ + PSAMPLE_TUNNEL_KEY_ATTR_TP_DST, /* be16 dst Transport Port. */ + PSAMPLE_TUNNEL_KEY_ATTR_VXLAN_OPTS, /* Nested VXLAN opts* */ + PSAMPLE_TUNNEL_KEY_ATTR_IPV6_SRC, /* struct in6_addr src IPv6 address. */ + PSAMPLE_TUNNEL_KEY_ATTR_IPV6_DST, /* struct in6_addr dst IPv6 address. */ + PSAMPLE_TUNNEL_KEY_ATTR_PAD, + PSAMPLE_TUNNEL_KEY_ATTR_ERSPAN_OPTS, /* struct erspan_metadata */ + PSAMPLE_TUNNEL_KEY_ATTR_IPV4_INFO_BRIDGE, /* No argument. IPV4_INFO_BRIDGE mode.*/ + __PSAMPLE_TUNNEL_KEY_ATTR_MAX +}; + +/* Can be overridden at runtime by module option */ +#define PSAMPLE_ATTR_MAX (__PSAMPLE_ATTR_MAX - 1) + +#define PSAMPLE_NL_MCGRP_CONFIG_NAME "config" +#define PSAMPLE_NL_MCGRP_SAMPLE_NAME "packets" +#define PSAMPLE_GENL_NAME "psample" +#define PSAMPLE_GENL_VERSION 1 + +#endif diff --git a/include/linux/tc_act/tc_sample.h b/include/linux/tc_act/tc_sample.h new file mode 100644 index 000000000..fee1bcc20 --- /dev/null +++ b/include/linux/tc_act/tc_sample.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef __LINUX_TC_SAMPLE_H +#define __LINUX_TC_SAMPLE_H + +#include +#include +#include + +struct tc_sample { + tc_gen; +}; + +enum { + TCA_SAMPLE_UNSPEC, + TCA_SAMPLE_TM, + TCA_SAMPLE_PARMS, + TCA_SAMPLE_RATE, + TCA_SAMPLE_TRUNC_SIZE, + TCA_SAMPLE_PSAMPLE_GROUP, + TCA_SAMPLE_PAD, + __TCA_SAMPLE_MAX +}; +#define TCA_SAMPLE_MAX (__TCA_SAMPLE_MAX - 1) + +#endif