From patchwork Wed Oct 17 17:24:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moti Haimovsky X-Patchwork-Id: 47002 X-Patchwork-Delegate: shahafs@mellanox.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 468631B145; Wed, 17 Oct 2018 19:25:23 +0200 (CEST) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40086.outbound.protection.outlook.com [40.107.4.86]) by dpdk.org (Postfix) with ESMTP id 397261B135 for ; Wed, 17 Oct 2018 19:25:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uT4YfBBxJmIduHA+lXkcRWjycUuVewuTnmInPxwA42s=; b=r+UQkAj+R/ANsbmk08q2AO87KzJagU4h6E4zUuqiTxzGALG5InH/V8RErznXuCagZOcvAo0E2t+56xPWVd0yjus7KR7zgJVELLHZHGq9N897/ElmfEIRJM71vXBze6DEPyYyrkidfURBdZwmop9Hy17Ch6qC7niBoH8TY/svEqE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=motih@mellanox.com; Received: from localhost.localdomain (37.142.13.130) by AM0PR05MB4436.eurprd05.prod.outlook.com (2603:10a6:208:5a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.23; Wed, 17 Oct 2018 17:25:17 +0000 From: Moti Haimovsky To: shahafs@mellanox.com Cc: dev@dpdk.org, Moti Haimovsky Date: Wed, 17 Oct 2018 20:24:50 +0300 Message-Id: <1539797092-2395-2-git-send-email-motih@mellanox.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1539733797-31468-3-git-send-email-motih@mellanox.com> References: <1539733797-31468-3-git-send-email-motih@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: LO2P265CA0117.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:c::33) To AM0PR05MB4436.eurprd05.prod.outlook.com (2603:10a6:208:5a::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4473ff64-e23e-4951-b6d0-08d634558231 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR05MB4436; X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4436; 3:K4Wz2jNBE4cGk33D4Th/Opk99lzVtwX/4obDJa/lQdCDW8pRw6NurBmj/H/wr0i2ZGmOYCV5i3QOgKefQjiI6r8lJ35OOs9ikE5TCpYEaT5OrfAzQFoSv4eFRFtP/UBIce48B0YW3WX0DNb3ySzoZlF/gtutE8BLFHn0p24cOAJjBfXITZXDmpK/GTpV2eEUGIRl4tLVpOuJ2ftJYpnz7LkSTHpPX4xTDXaczWBzs2q4QPaTlXWTMPSON0JVgI1z; 25:mcJeFDA9ziwhEl9IN20+4Ht6Q/CH/PbMOxxQaf9AKjEuzD+wRwZCh31lxAstrPe66w7W309K65e7Mvn6QC0WNW236tbjE6MBp5ggt+qc43VTVGxMKPjCs0aAjNZUMaA/gMGmAYiVIar1onPdZj2f9Sfzxml1QB6Bb3oOFCAXIEh4H/v5Muv7+z2ywDrVnEXnpzukSl61/XmdK42aqz9+40dvs5uDvnLICHVvnz4kNyNBXQ0uV9wSJe7ef42nwJQl9VNU5lUyI0/cd7ZXo54LwYdt3pWEMQ5kKMS+uxBmk970Oi56ib0QvZJ10odJukyrhlcKPIkQUVyOtx+/SpwMXg==; 31:8xb6e9jPjrh8GUdhsBUUmFlw5pLnJGhUtTuJ3Oy2PD9FHkIn+srT4BVFRj+mibEd8s3sFRdLNvUvTHIQUL2vIT5q9DNtbt8MHq6ICz1J4hfXm0qpgmlkP5YcCLvRCkgYmfdfs5WE7hnpb9VWhEyLsrV/ki6NnHkNBbE+5UF38l4ksVcO6lA+SN94Cecgyt/bcpdrigZQqBtqimM54j/p3HzH9WjdxB6wpzwZpbv58/4= X-MS-TrafficTypeDiagnostic: AM0PR05MB4436: X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4436; 20:Rckiz3hupp2iXyA5HkuQ5fsS6neZWVJ0rPO1L8tuYs/ddky+z30l3S2mhJRnqasE3V5ruWGOO5/2FxSujO4nbluQBx4Ncz0tRyx6TP/EJf2Mu2Zm4018wZlfNQQcOTg4dIEko0zI2hzKJLb5YoGkY96BECTXWqlAttU+DaBJEUqs8ifQn9f2uX3daIt4d1trRNxpfjuiBN8C991A7eIawahoV6/qbmi578E5rPEnv43OqX1f1x6ttJb/SQqJQDKk5VJtJVWYlERv6VmZMocilvBMRhsAxWCts1yGKIGFd8ubtbYkKwEJxPqdjkY3PEzGzf4NTs/vADJsPnUOn85dcFu5AGqKvzf21rTcjwUbX8WwhNN3qoYjL6Ywsp2yiATDCP4Ytr17rjzLMm71jZ+bpBLD6A8CKc98Gnkl0eG3YihnCE65j5Hzmq0ayZBoIE888R4Y0mEIrLlk1bRkNzvhj90PCkVg8exwe6Tcfcz61+jX3w7wnScCD1v+yKcS6Qkz; 4:Zv0RAausiQGE5MuWVe/A2ZsZtuG+dX0lPH6Pwd4JjkK6t59qRInRVpbxChS1MKyDclZGmCap+dr2Ig6NIDx6jsOmOq3M2CY9du+jaPx0H7+N6ypmNRji36Hc+Dim4YSswAA55cZ7L/Ut3wBcb0nmlIAWFlD6tK0Sz2/bP74KDlO5SuK7DAhpA0UFKzxHcKNFfOBRWpFnNRVggpCTsxnL7E6gsjDOeRyp4wLGZQkhO6Py6bDPKXz/6/79zhoK/JylD/U6cbDSWxHBgBaAnXJYE9ELTNA0BHMJArw96wXAVKsgQBChkWbFbTNFOPwEGh6s X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(269456686620040); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231355)(944501410)(52105095)(3002001)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:AM0PR05MB4436; BCL:0; PCL:0; RULEID:; SRVR:AM0PR05MB4436; X-Forefront-PRVS: 08286A0BE2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(366004)(39860400002)(396003)(346002)(376002)(136003)(189003)(199004)(6116002)(36756003)(486006)(6666004)(446003)(6512007)(37006003)(6486002)(86362001)(305945005)(2616005)(7736002)(16586007)(105586002)(11346002)(106356001)(956004)(2351001)(316002)(4326008)(8936002)(6506007)(478600001)(52116002)(53936002)(34206002)(2361001)(26005)(107886003)(386003)(476003)(47776003)(16526019)(97736004)(5660300001)(68736007)(76176011)(66066001)(6636002)(51416003)(14444005)(2906002)(186003)(50466002)(48376002)(25786009)(50226002)(81156014)(3846002)(8676002)(69590400006)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB4436; H:localhost.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR05MB4436; 23:JOvwWuHdQk+S586hSVQ72fi9dBZ1MqB5UsRFHj+ht?= CK1g+Q7YTIQnOZN1MIZ2754pSvTlh6F8CqOiuFDS23idWz1P+U61NKm+SI6WCY6sO9pbFwTA3DxRF04zBh3TrA/s18Pq2Olpe1//7pli+Y2Y7DIZjQoBPF9PUCrZvW4csj30a6pLqP8ESfOHF3uX4LABQD1GCWr+y1xKzYck1kNEL4PFBUxpTKDgZNJdS+ikcex5iuVEciajlPhTbUwhHX6yqWxnSkgSOgv7hfDen9fKrMxLw+D5hNXbVs2aLPfcU1hwLNLvYyrZ6MynT+O5HAdy6ojCH5TylpTgqFrNFIKRazdUbhlNiklDRcv7Vs/7WooEvrx8GLzHlGFX2yewJ/xYXfOmAMkquFB3U5A6waOaEzYLc8AOpNRYtaHAvUiteTIDRSJ5FPwdCrTe97Ld5hpynLRCrPSPjbyUXWcE5zJDLoMXG11wQOkvzOWnWFgzwP4iKHgVbTZvu/jNNCzyYFdn37BOADHWlFcRHB1v55YFrNvnI/0qGhVfAeHuaYeOgu24lmGypTuccyb8Khz93Ly0t4bSqgJXsnfVfGUqx1Fia1VYYMtH55xjxvzkvEfjwC0DxPYRhyD6wEKAHRGNWa6OIqcD536At+VaWYW30Pq3C1mONtVam0P+Q/ujaCKFo09Akco3Hl2OjuVOyYhDhd0j977ClSQjmeG4I+uvdLMy1Q1+AYtNa4F5v9qobkWV+3j4w6OzpVmtjZcX4EZ9744zDVAe0T4rxmaqTGVDUhmjkO2j5Ih+VsQR2XkP8kgKQPAn9/cHf7gjnzup6diNFHluNN1ddXrtAn53Bzy9dV0Gc5Q1x3ueuxTyz4JFsiefzHrOBoLO7cS+6Ya3ZtdqNxv/7u1RVNJevcgpCHpotalRixZrWeli7x2lqEKrAo82pAL8ZkDrsQoT/ePgbhNxDOXlFc80WdmQwRyjJmmf8iy2j8lgcBGtKko5sp5TLrmv95KgylJNCZiIj4mh551WcsHENvNwEbyUVpHXIqR5nFm4ulL4HBrk4gTga/KjUnNDz0WaBlbCIdR+9hwwHTH/pPQ4pjCmYGg1Szyu7alAhnV4c0ua2gGX87mV6yWwRLXBCwDDshztA531UeZStFPycr2J9/Mch47+5mXss7hG5RJyphnVk8bkad6tQmDDlt6OeQx/mM2+OVsSNV1VDxNP1eDYGwghRLE1ytw6wiBA1awTnzQwhBDiPDONSUqaS+F4WVfMmVPuX3VaeYyv48fcaE8K8NkWlGHdLdZYBBYmQQM+HGAbUKB64ZgpTdnUPo72JY4D5bSvQrUiBr+C3nalD7M X-Microsoft-Antispam-Message-Info: b1rKHijVfin+9aibVzlJxDtLPmb4czIW56Wl1/QptOGa/azo9lU6NHVMzM0Au5SsXEzOaQjLl0+P0UZdvzcV8XRgoX6cTBcqVhy4jy1gm0r7JJlbXV23HZ5xvl6HmF06DJRDK3x+jGJAd3FQHokgUoYAyzNyYWLS24yxJwYmgjK/SMDGGMaorSlTGFjqU5cbSsU8a0U1TXYC6g68bjF7t910nBj891O8RISlTLUUe/KOlECpmADHKdWR36WSK8HcodcjyLweFmFs985imj+/833xvbBsmoZx6rx7njU490BwelUN3uDzXrGIXBVeNGPmPsRgPS8MPRpG72JGucp1j8KXZ/G3QKiPv8GwYoV1cOw= X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4436; 6:QnYr/XvdxWfLjFVgDVIQ7n4UoAPDr5CaPGvMns9KyiZEZTMbjGsfus3UkqP9hSYUwiimGwVz/jFqOGwKMtX2z24aD8TFYJtvRaKZ/qj7J25BRe9B/Q8Cc+rWikmifJBu1Ag4NQ8jb1YAczflGEEjmeX4sA95cLWgVXMwV1tA6k82jOQZ4Y+e5g++kmiDIVMlMF+h9fE+bssQyvRjrNaTwtLjX53B1NdAnOaT0Ff2W/azWuJQE7EcPOrlc4ICdxr3EoCS+d2q+4SiEuPjSLdxUJOTNzyUG6y0HWOTh8eNi0aEf28OPZhjJIrr9AIQwH4/Ku6zJQfCO6tgbdf1TfASiUxIsH6hRme7eSyWJ3A/0SaELSokR6mEicFldZc/SfVesGImbwtV5ZUKBfI8eIM3LnIFaZL0eZLUVN27ZJ58kNJ+kxZ8GgbjxCNYhtN/tUHnz6u5Qqz9fH327UMrlXvSyA==; 5:DkoIR8EkV0SyZo7UyCP6T1yOaoH4S/zRwRpxe/s5Tf64Z2jZgAHVyaxMC7PFI1vH1rZmsP3D86nO3eOxMkPPYU8rV1hxALZHZO2juETNZ4MHEz1XdhoN7ryM/5Yek/cuYedVU9nPaOKRuHrIsHqWDf8i+npSna1P/31D1/Kguxk=; 7:XcJ4QAOk/YfAmL2qoVQyjOM9DsL8Bm7+T6Hnke5o9N/CLealSNPcmdiaU/qbNHrhL0hmHyxxmTqzryFIYz1T3HgFaK3fuaYbpIJ0geg6z7PWHtdc25p7Owps793MUAU7Q9T+QyenTAZQL2nNmFzd02Ja1aNZ5F3bzhelzsvo3vVftzHCS8PQ8xvJHXO6E1AQkazF9y6JWdja1ZP4vBVeFbhANQ8bcenE8UbobjMiv3mCvgT+W6odulZSWRoUNLhr SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2018 17:25:17.6991 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4473ff64-e23e-4951-b6d0-08d634558231 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4436 Subject: [dpdk-dev] [PATCH v4 1/3] net/mlx5: refactor TC-flow infrastructure X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This commit refactors tc_flow as a preparation to coming commits that sends different type of messages and expect differ type of replies while still using the same underlying routines. Signed-off-by: Moti Haimovsky --- v3: * Rebase on top of d80c8167c4fe ("net/mlx5: fix compilation issue on ARM SOC") v2: * Rebase on top of 3f4722ee01e7 ("net/mlx5: refactor TC-flow infrastructure") --- drivers/net/mlx5/mlx5.c | 18 +++---- drivers/net/mlx5/mlx5.h | 4 +- drivers/net/mlx5/mlx5_flow.h | 9 ++-- drivers/net/mlx5/mlx5_flow_tcf.c | 113 ++++++++++++++++++++++++++++++--------- 4 files changed, 102 insertions(+), 42 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 795a219..13f2fd4 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -286,8 +286,8 @@ close(priv->nl_socket_route); if (priv->nl_socket_rdma >= 0) close(priv->nl_socket_rdma); - if (priv->mnl_socket) - mlx5_flow_tcf_socket_destroy(priv->mnl_socket); + if (priv->tcf_context) + mlx5_flow_tcf_context_destroy(priv->tcf_context); ret = mlx5_hrxq_ibv_verify(dev); if (ret) DRV_LOG(WARNING, "port %u some hash Rx queue still remain", @@ -1139,8 +1139,8 @@ claim_zero(mlx5_mac_addr_add(eth_dev, &mac, 0, 0)); if (vf && config.vf_nl_en) mlx5_nl_mac_addr_sync(eth_dev); - priv->mnl_socket = mlx5_flow_tcf_socket_create(); - if (!priv->mnl_socket) { + priv->tcf_context = mlx5_flow_tcf_context_create(); + if (!priv->tcf_context) { err = -rte_errno; DRV_LOG(WARNING, "flow rules relying on switch offloads will not be" @@ -1155,7 +1155,7 @@ error.message = "cannot retrieve network interface index"; } else { - err = mlx5_flow_tcf_init(priv->mnl_socket, ifindex, + err = mlx5_flow_tcf_init(priv->tcf_context, ifindex, &error); } if (err) { @@ -1163,8 +1163,8 @@ "flow rules relying on switch offloads will" " not be supported: %s: %s", error.message, strerror(rte_errno)); - mlx5_flow_tcf_socket_destroy(priv->mnl_socket); - priv->mnl_socket = NULL; + mlx5_flow_tcf_context_destroy(priv->tcf_context); + priv->tcf_context = NULL; } } TAILQ_INIT(&priv->flows); @@ -1219,8 +1219,8 @@ close(priv->nl_socket_route); if (priv->nl_socket_rdma >= 0) close(priv->nl_socket_rdma); - if (priv->mnl_socket) - mlx5_flow_tcf_socket_destroy(priv->mnl_socket); + if (priv->tcf_context) + mlx5_flow_tcf_context_destroy(priv->tcf_context); if (own_domain_id) claim_zero(rte_eth_switch_domain_free(priv->domain_id)); rte_free(priv); diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 2dec88a..d14239c 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -169,7 +169,7 @@ struct mlx5_drop { struct mlx5_rxq_ibv *rxq; /* Verbs Rx queue. */ }; -struct mnl_socket; +struct mlx5_flow_tcf_context; struct priv { LIST_ENTRY(priv) mem_event_cb; /* Called by memory event callback. */ @@ -236,7 +236,7 @@ struct priv { rte_spinlock_t uar_lock[MLX5_UAR_PAGE_NUM_MAX]; /* UAR same-page access control required in 32bit implementations. */ #endif - struct mnl_socket *mnl_socket; /* Libmnl socket. */ + struct mlx5_flow_tcf_context *tcf_context; /* TC flower context. */ }; #define PORT_ID(priv) ((priv)->dev_data->port_id) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 094f666..bb5b5cc 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -239,7 +239,6 @@ struct rte_flow { struct rte_flow_action_rss rss;/**< RSS context. */ uint8_t key[MLX5_RSS_HASH_KEY_LEN]; /**< RSS hash key. */ uint16_t (*queue)[]; /**< Destination queues to redirect traffic to. */ - void *nl_flow; /**< Netlink flow buffer if relevant. */ LIST_HEAD(dev_flows, mlx5_flow) dev_flows; /**< Device flows that are part of the flow. */ uint32_t actions; /**< Bit-fields which mark all detected actions. */ @@ -346,9 +345,9 @@ int mlx5_flow_validate_item_vxlan_gpe(const struct rte_flow_item *item, /* mlx5_flow_tcf.c */ -int mlx5_flow_tcf_init(struct mnl_socket *nl, unsigned int ifindex, - struct rte_flow_error *error); -struct mnl_socket *mlx5_flow_tcf_socket_create(void); -void mlx5_flow_tcf_socket_destroy(struct mnl_socket *nl); +int mlx5_flow_tcf_init(struct mlx5_flow_tcf_context *ctx, + unsigned int ifindex, struct rte_flow_error *error); +struct mlx5_flow_tcf_context *mlx5_flow_tcf_context_create(void); +void mlx5_flow_tcf_context_destroy(struct mlx5_flow_tcf_context *ctx); #endif /* RTE_PMD_MLX5_FLOW_H_ */ diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c index 4b51a85..c9dbbc3 100644 --- a/drivers/net/mlx5/mlx5_flow_tcf.c +++ b/drivers/net/mlx5/mlx5_flow_tcf.c @@ -231,6 +231,19 @@ struct tc_pedit_sel { #define TP_PORT_LEN 2 /* Transport Port (UDP/TCP) Length */ #endif +/** + * Structure for holding netlink context. + * Note the size of the message buffer which is MNL_SOCKET_BUFFER_SIZE. + * Using this (8KB) buffer size ensures that netlink messages will never be + * truncated. + */ +struct mlx5_flow_tcf_context { + struct mnl_socket *nl; /* NETLINK_ROUTE libmnl socket. */ + uint32_t seq; /* Message sequence number. */ + uint32_t buf_size; /* Message buffer size. */ + uint8_t *buf; /* Message buffer. */ +}; + /** Empty masks for known item types. */ static const union { struct rte_flow_item_port_id port_id; @@ -1956,8 +1969,8 @@ struct pedit_parser { /** * Send Netlink message with acknowledgment. * - * @param nl - * Libmnl socket to use. + * @param ctx + * Flow context to use. * @param nlh * Message to send. This function always raises the NLM_F_ACK flag before * sending. @@ -1966,12 +1979,13 @@ struct pedit_parser { * 0 on success, a negative errno value otherwise and rte_errno is set. */ static int -flow_tcf_nl_ack(struct mnl_socket *nl, struct nlmsghdr *nlh) +flow_tcf_nl_ack(struct mlx5_flow_tcf_context *ctx, struct nlmsghdr *nlh) { alignas(struct nlmsghdr) uint8_t ans[mnl_nlmsg_size(sizeof(struct nlmsgerr)) + nlh->nlmsg_len - sizeof(*nlh)]; - uint32_t seq = random(); + uint32_t seq = ctx->seq++; + struct mnl_socket *nl = ctx->nl; int ret; nlh->nlmsg_flags |= NLM_F_ACK; @@ -2006,7 +2020,7 @@ struct pedit_parser { struct rte_flow_error *error) { struct priv *priv = dev->data->dev_private; - struct mnl_socket *nl = priv->mnl_socket; + struct mlx5_flow_tcf_context *nl = priv->tcf_context; struct mlx5_flow *dev_flow; struct nlmsghdr *nlh; @@ -2035,7 +2049,7 @@ struct pedit_parser { flow_tcf_remove(struct rte_eth_dev *dev, struct rte_flow *flow) { struct priv *priv = dev->data->dev_private; - struct mnl_socket *nl = priv->mnl_socket; + struct mlx5_flow_tcf_context *nl = priv->tcf_context; struct mlx5_flow *dev_flow; struct nlmsghdr *nlh; @@ -2087,10 +2101,47 @@ struct pedit_parser { }; /** - * Initialize ingress qdisc of a given network interface. + * Create and configure a libmnl socket for Netlink flow rules. + * + * @return + * A valid libmnl socket object pointer on success, NULL otherwise and + * rte_errno is set. + */ +static struct mnl_socket * +flow_tcf_mnl_socket_create(void) +{ + struct mnl_socket *nl = mnl_socket_open(NETLINK_ROUTE); + + if (nl) { + mnl_socket_setsockopt(nl, NETLINK_CAP_ACK, &(int){ 1 }, + sizeof(int)); + if (!mnl_socket_bind(nl, 0, MNL_SOCKET_AUTOPID)) + return nl; + } + rte_errno = errno; + if (nl) + mnl_socket_close(nl); + return NULL; +} + +/** + * Destroy a libmnl socket. * * @param nl * Libmnl socket of the @p NETLINK_ROUTE kind. + */ +static void +flow_tcf_mnl_socket_destroy(struct mnl_socket *nl) +{ + if (nl) + mnl_socket_close(nl); +} + +/** + * Initialize ingress qdisc of a given network interface. + * + * @param nl + * Pointer to tc-flower context to use. * @param ifindex * Index of network interface to initialize. * @param[out] error @@ -2100,8 +2151,8 @@ struct pedit_parser { * 0 on success, a negative errno value otherwise and rte_errno is set. */ int -mlx5_flow_tcf_init(struct mnl_socket *nl, unsigned int ifindex, - struct rte_flow_error *error) +mlx5_flow_tcf_init(struct mlx5_flow_tcf_context *nl, + unsigned int ifindex, struct rte_flow_error *error) { struct nlmsghdr *nlh; struct tcmsg *tcm; @@ -2143,37 +2194,47 @@ struct pedit_parser { } /** - * Create and configure a libmnl socket for Netlink flow rules. + * Create libmnl context for Netlink flow rules. * * @return * A valid libmnl socket object pointer on success, NULL otherwise and * rte_errno is set. */ -struct mnl_socket * -mlx5_flow_tcf_socket_create(void) +struct mlx5_flow_tcf_context * +mlx5_flow_tcf_context_create(void) { - struct mnl_socket *nl = mnl_socket_open(NETLINK_ROUTE); - - if (nl) { - mnl_socket_setsockopt(nl, NETLINK_CAP_ACK, &(int){ 1 }, - sizeof(int)); - if (!mnl_socket_bind(nl, 0, MNL_SOCKET_AUTOPID)) - return nl; - } - rte_errno = errno; - if (nl) - mnl_socket_close(nl); + struct mlx5_flow_tcf_context *ctx = rte_zmalloc(__func__, + sizeof(*ctx), + sizeof(uint32_t)); + if (!ctx) + goto error; + ctx->nl = flow_tcf_mnl_socket_create(); + if (!ctx->nl) + goto error; + ctx->buf_size = MNL_SOCKET_BUFFER_SIZE; + ctx->buf = rte_zmalloc(__func__, + ctx->buf_size, sizeof(uint32_t)); + if (!ctx->buf) + goto error; + ctx->seq = random(); + return ctx; +error: + mlx5_flow_tcf_context_destroy(ctx); return NULL; } /** - * Destroy a libmnl socket. + * Destroy a libmnl context. * * @param nl * Libmnl socket of the @p NETLINK_ROUTE kind. */ void -mlx5_flow_tcf_socket_destroy(struct mnl_socket *nl) +mlx5_flow_tcf_context_destroy(struct mlx5_flow_tcf_context *ctx) { - mnl_socket_close(nl); + if (!ctx) + return; + flow_tcf_mnl_socket_destroy(ctx->nl); + rte_free(ctx->buf); + rte_free(ctx); } From patchwork Wed Oct 17 17:24:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moti Haimovsky X-Patchwork-Id: 47003 X-Patchwork-Delegate: shahafs@mellanox.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 68CDB1B152; Wed, 17 Oct 2018 19:25:25 +0200 (CEST) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40061.outbound.protection.outlook.com [40.107.4.61]) by dpdk.org (Postfix) with ESMTP id CC3751B12C for ; Wed, 17 Oct 2018 19:25:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SjQqWv+MtPA1BeGQAcnFWL0V479BPLtDjdjXH3SHLJs=; b=DnGfKzgCxODplynpNV1zVk/zLZmNJmS6cEL8gcrsDiFi3MMIq9y0dxwTkafVmj4kN87CLvlVTiIBjwt/l0S3Ck2axEpR63fuC1KrV2puX8HKw7o5WbFm+lKR8vND+mh6/4mPj9bXBEnwb8fEw/hGSnD7N2XpdIQ/9+/vgNtkEpI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=motih@mellanox.com; Received: from localhost.localdomain (37.142.13.130) by AM0PR05MB4436.eurprd05.prod.outlook.com (2603:10a6:208:5a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.23; Wed, 17 Oct 2018 17:25:18 +0000 From: Moti Haimovsky To: shahafs@mellanox.com Cc: dev@dpdk.org, Moti Haimovsky Date: Wed, 17 Oct 2018 20:24:51 +0300 Message-Id: <1539797092-2395-3-git-send-email-motih@mellanox.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1539733797-31468-3-git-send-email-motih@mellanox.com> References: <1539733797-31468-3-git-send-email-motih@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: LO2P265CA0117.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:c::33) To AM0PR05MB4436.eurprd05.prod.outlook.com (2603:10a6:208:5a::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eaf85c71-09a7-447f-db72-08d6345582ad X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR05MB4436; X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4436; 3:IXTe9nexH1t0upXYtm4bR6jKrtHxNJSUqahrtqwMzBx/fq7NGgNzU6p+brelszi9FB0LBe19Qnn3p4/27TlxTOEz0PkNjZHIGJBVRrJ+D27WdEDuIGb2Nma50mheiwk0T8dJ+OnAPMrbe4MZHrUIJjsOHJq4CHzHqya5Fjbz8XAuoMgZ74Zz1X2pwha8+x32fDESgfGEti9jQzhQQ2UHjqY0C/b+jdxB8ApHxHq9eIAyxO0F7o8Lp/xSKO5E2eRL; 25:VF/eAmi1WsFtUf/qSPQHpf/Wek04v3MPcuz0Tg3rPr27nH8DhpN48ovzgQPvbic8R7yUMwdndKIa6Azpj9JgWENOCK+uqLxYLw1L+Dsg3N2iJrjI5rhrKmhgFwvrUHGItNoqCbpUWb4V3VxY/hwdOaD8YUKvWNNutjGDv/xzUNkZ7OiXyBPWSfOaQxWUzO90sENnDqnlFXHsBYM/79YCKrHlK1cU9ToAwyQHllOm53zpVxDiNMSbWUtoUZdE6EXPNplju7kRWr1MSaywWKlZJ9jmSz3o4qOkYmLlexTbbbQ5cyS7rCIQ9SATNC7csmYHbRh4E8T3YUis6O+hGY1Q2A==; 31:IvONkCwh8bREBglqIwLPiR/0CUOTr2fq5Nf4p63g0W4twV1lT7NWqSS1wZMBnEIU/yHd1exyMOqXY3WHiXPED9iVZPpRU+DsyKHeoxrMHRPQ1eczTRzOtBtFjWGlLb8MENSNS3+C8l6SWJlpCY88jhIkPqjxSibYbadvmcZ5R/z4jCihKgFGupeofhGTw7U93xU5wCRjR7Nj8NW0j/HQAMcJOLDp8xlSu/MYDl/mibk= X-MS-TrafficTypeDiagnostic: AM0PR05MB4436: X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4436; 20:BMASdbIKA9UTEr9T+1eP0FJtIUjVeqnvpGIpEWnNFPBa3P9FPhwyuw6IbtF0ye4Y6e9pflZOf9iXEUbtL/ihXDWdBKyCOqNlZ0mMSMFCpDxOIny4gPMMIKSfP9nR0wVkcSoz2fuQJV7CRg2gv9tl0rqDeR3qhuAB+n4A4UjSHUGQuVe18f/oXfmUPgQrSAhJ1ejqysJBr9cJGfOxuD0HKTcIYBau32TwXrK+XxCDU3TynZBXsA1+E63vAxGhhER+uyERt6tvyAJlh6imRHu2Wai059MxpjKJKGrJ4MEqImH8dSE1Vr4bVfuWgq8Wr7G3NOqcxIZMKkP9voXtnPZmqUYgMXnsWYqt0KNlCCve9RZQgS/9spWS9ANM5ZCdjz2vG9ZUWZt2vTJH48m73tPFnira1B5Qm0cc4oLbSQTcn9ATxC7lji0breHcJpIwiUB7gvqBvsvTvd9qizCrSl4M8kCw2AEI53vxHjLd/16O+V7z//z90tvPqBNVEzFCu2oL; 4:t+kf/MNjq187hkfLKyxziRbU0uc2WIJaN/jHxIpZl0IzY7PtzoEe8/9gy4uoVzm26UHWLtkQrsPR++YAi2QQE9r+sr2+tZ6cSpjd9GlniE5UKvIZ2topInUz//4WwJKjakNRWb5yTAGHhjhoEzxuT6FgyGbHwrCEiHFohYcWW3ur+UidYiVJIG3KapeAOd9zlge6cr1RNodsX+fd3HFODVlXxLro7UCbfcMmwEk2m9V9o2IVDtTAUO7Cb6OGxs/Fig7CJ3068Q+HsfJij7ON9Q== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231355)(944501410)(52105095)(3002001)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:AM0PR05MB4436; BCL:0; PCL:0; RULEID:; SRVR:AM0PR05MB4436; X-Forefront-PRVS: 08286A0BE2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(366004)(39860400002)(396003)(346002)(376002)(136003)(189003)(199004)(6116002)(36756003)(486006)(6666004)(446003)(6512007)(37006003)(6486002)(86362001)(305945005)(2616005)(7736002)(16586007)(105586002)(11346002)(106356001)(956004)(2351001)(316002)(4326008)(8936002)(6506007)(478600001)(52116002)(53936002)(34206002)(2361001)(26005)(107886003)(386003)(476003)(47776003)(16526019)(97736004)(5660300001)(68736007)(76176011)(66066001)(6636002)(51416003)(14444005)(2906002)(186003)(50466002)(48376002)(25786009)(50226002)(81156014)(3846002)(8676002)(69590400006)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB4436; H:localhost.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR05MB4436; 23:7yFQqoIp9ksMLmJ8krcQmBv2t99RpBCezXrVY2qs6?= 6Tt566nrMqy6SdKZc/sDLtwgrJYgZQryrGNDh2ww3Nk/OOkzwp217gQ6rlOaUTO459AdSerU/so1BnFBhFZ+Y8Z6KICLRH6GSN41Uhs/UV/dEWbS1osI/gdyE8wIfKByGQQzQvH2z08R8I5/amkeu/TRu1qbppMEAo8ONEvv4BLck3xvlPOOJZPZDurZcQUWgoyh0nxVhwe6PIQXnVIJuj+uheFbiEGDmox0QuqSbBt/BFgRqgHsuh10058ZBXYcVcVCpWKfFL/+Xm1MDfNUNAo9XvDZLQWbmn0H/GqZr7WWAh9mspvANvWQ2ooVcTMUnzov7vwfjkZWmNBnhxG4gpKCk7l/Uwg4sViB0S0ag4/MH485dn51xm6te8vgCBMpsYUY6k2U7GwQNJKNIdyafOXObIArDbIDhscwRrYFLfdWwact6CsZrvymYTzR2P9xR/Jnuv1w7BTwwRUzT0qRC0fTIVykbZ4O3/BUAk57VndekyHO/WnWQPIKc5n3bNYeCmGCyJ4/v2G8Lj7kUNZIt54cfVo/EM7P9vzmHDHAyKOG0w7qcK/oSjJJ79FZMftXY0dNqjnbZIRGFeVQOgkiJAzHaU5EbTGKdaYonnN3NdO4vXDsyS/Q34mhI++ta6JEWnm7JPYAOO9PQ1zxDTLHoytycaqbIlIsB4MlF99csTooLhb8G1fhLDSUxKwambOWC+GVE0B8s6k+i2Hb03HGXhXkTpD4miOPdQnfv3p4aoV/IGB2KGgcXCApOkEmoOcPRLFHm5PGOjGxJUnPetFa0UtJNuZSDghTUL0/j0t5cb6xXHS+Rh6J+fIIIFHVUrD1VW9wPbqs6tKi2iz/YISvawN8dErlfEVbmj/qfolvDR7pFPWcKNIiLVJgHr31eBygbn2R39wmDFrtY9o5DK6eRX7WLi4kck1wFPB6DYEIIcUjFyzklDu1Ve2qFCg16IEuU7rFlcXxUuzVhd4S1AGqCsm5BH8/cs4GaefmJ8hHpkA+AzATP2bhH4Nj6Co05/iNTI0JVfCu+qJE+7VQ8VdTAKIBFF1KGx1VS9VcWnnFxnwDp/kQcBzQ57whuf9RcUUAsKlboUkJU6sdOqhzA9ikkhst2KnBKnLSQSy41IfIX0WjMoDVdOY5+p2h1DrhBjOCyvieg2Qu1V5yMhiYnytEZkyXttm80slEolcjG3M+9ne6ejW2s9Eqq47u5mra+dh6sGLE9egmntJD9Q7FCJ073kumQh+leY1Ww5VPzWgoWg4/EkKPSWav0XK74Ss4JJJUJYulBp80/HiqkE7l3ZWR142 X-Microsoft-Antispam-Message-Info: MxvmFm2QMo3AczwtA+ooS7yNKl3A5jW7FgZRWQB/ee/hvoUVoDS9Lkcr+zX4WjpskZMgVljIKeZHjrhaltEQNbc6HfxGrrmAnbc0YtUkr0P1AFilc9qkVcVE0Y2O+ZWCy9LELS6J6cBH7IdCPLDHfvuFTjgOSwLLubo5pU1HRIciVbRIStcGW4yzCXrQEqfQmIKMtdV1a7km9xC9onY3QJKmWvFJSCqj8W6NL79Er6MS6Ah9Tkpx4gYSmJvvIYee64J9hoPpFTHPsJla7soCx374tPvjVSYn1z7zGZB62f4w6Ho3dv6PCBdNWCnUKcYKbplBDEtWI47DIPjrAuxauz/QgmxFXFvNOLgBRfdtoQ8= X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4436; 6:MaRkvFAdgpavvZNuFwlsnp9uWAfTCU7dpv2E8+3rXY0RclRe/i9j/jxiXoGzrXo2R2KhhAsdZ3lecmSxyOUbRdOq/UT1xGjZBFEbHPfcmlvzhq1Rg0uA5c5AZBDQgnZNIdCLrdSlAYIA8nUyJejxM6Wx7e77m7B6KE6V3yPOzvlwH2W+OZE5ulu6ZLfEQJYWFMXMX45vo9HitvmLOMaAN91cQzwhvIpOkmIvpeem3nDaVeDHhshSnCZPrzTcqcYzWgeEtDbExwEjVXbWcIye8vZXaFTENEoj4x6oFYqEwNP7xo2peBnJCoqR3A3LffKCogvBSkxK+41ACeMEd0EcV2Fu2Sw5rgCcn5A1ldorvCKNdfxUhdCl9THNCzQjI0lmj1BUwxYzM4aGuOHzBk4tYBjO1T3FY2cHh5Uw5Kp7Z3njoo94eVynPwDW6LWENeUtswiiWkNeB1SpjQqlijGQ2g==; 5:EnyR0vzIl5x38y+XVvgmg3+iOyKoDT7x67DtPq0Fc5+CZycVJHUisT8rkCv4pxJdHjV/gQKN0QmriQmSahXb5VjnUWQ2IF8hY0Xc317Droe9VqmoZQwP1v4C6GOzCPZ1AXZFqLwuBVEdg2Vx+Z6bKWVnkp2ZhyLJdNRWdJpEypc=; 7:tjElr+yueX/Co7cStMeypLDiHb69Vj/gJ5dCviDE5ZvcR7kfokkCiwU9MmkTGSLPvbcNmpInLnNLIoSnfNRAIBsb1whWWpy6omb2QqRb6q457nHEVybw/LWqYb0dBASI30D4kuuGTblzKBTSIaJr1cvYLjw4XQNp0ac1RjOxXDg+pe2k70TO7TR5zKhz6X9kAZh1K5FEco/Ph9cDuN8/9UbrvW7p4GrDBaA8UXjlRo43G3jRALmzAIPeAH4IrJpG SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2018 17:25:18.4096 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eaf85c71-09a7-447f-db72-08d6345582ad X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4436 Subject: [dpdk-dev] [PATCH v4 2/3] net/mlx5: add flow query abstraction interface X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Flow engine now supports multiple driver paths with each having its own flow query implantation routine. This patch adds an abstraction to the flow query routine in accordance to commit 0c76d1c9a18d ("net/mlx5: add abstraction for multiple flow drivers") done by Yongseok Koh. Signed-off-by: Moti Haimovsky --- v4: * First rlease of this patch. --- drivers/net/mlx5/mlx5_flow.c | 99 ++++++++++++-------------------------- drivers/net/mlx5/mlx5_flow.h | 6 +++ drivers/net/mlx5/mlx5_flow_dv.c | 19 ++++++++ drivers/net/mlx5/mlx5_flow_tcf.c | 18 +++++++ drivers/net/mlx5/mlx5_flow_verbs.c | 87 +++++++++++++++++++++++++++++++++ 5 files changed, 162 insertions(+), 67 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index bd70fce..fcabab0 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1653,6 +1653,17 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority, { } +static int +flow_null_query(struct rte_eth_dev *dev __rte_unused, + struct rte_flow *flow __rte_unused, + const struct rte_flow_action *actions __rte_unused, + void *data __rte_unused, + struct rte_flow_error *error __rte_unused) +{ + rte_errno = ENOTSUP; + return -rte_errno; +} + /* Void driver to protect from null pointer reference. */ const struct mlx5_flow_driver_ops mlx5_flow_null_drv_ops = { .validate = flow_null_validate, @@ -1661,6 +1672,7 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority, .apply = flow_null_apply, .remove = flow_null_remove, .destroy = flow_null_destroy, + .query = flow_null_query, }; /** @@ -2344,92 +2356,45 @@ struct rte_flow * } /** - * Query flow counter. - * - * @param flow - * Pointer to the flow. + * Query a flow. * - * @return - * 0 on success, a negative errno value otherwise and rte_errno is set. + * @see rte_flow_query() + * @see rte_flow_ops */ static int -mlx5_flow_query_count(struct rte_flow *flow __rte_unused, - void *data __rte_unused, - struct rte_flow_error *error) +flow_drv_query(struct rte_eth_dev *dev, + struct rte_flow *flow, + const struct rte_flow_action *actions, + void *data, + struct rte_flow_error *error) { -#ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT - if (flow->actions & MLX5_FLOW_ACTION_COUNT) { - struct rte_flow_query_count *qc = data; - uint64_t counters[2] = {0, 0}; - struct ibv_query_counter_set_attr query_cs_attr = { - .cs = flow->counter->cs, - .query_flags = IBV_COUNTER_SET_FORCE_UPDATE, - }; - struct ibv_counter_set_data query_out = { - .out = counters, - .outlen = 2 * sizeof(uint64_t), - }; - int err = mlx5_glue->query_counter_set(&query_cs_attr, - &query_out); + const struct mlx5_flow_driver_ops *fops; + enum mlx5_flow_drv_type ftype = flow->drv_type; - if (err) - return rte_flow_error_set - (error, err, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, - NULL, - "cannot read counter"); - qc->hits_set = 1; - qc->bytes_set = 1; - qc->hits = counters[0] - flow->counter->hits; - qc->bytes = counters[1] - flow->counter->bytes; - if (qc->reset) { - flow->counter->hits = counters[0]; - flow->counter->bytes = counters[1]; - } - return 0; - } - return rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, - NULL, - "flow does not have counter"); -#endif - return rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, - NULL, - "counters are not available"); + assert(ftype > MLX5_FLOW_TYPE_MIN && ftype < MLX5_FLOW_TYPE_MAX); + fops = flow_get_drv_ops(ftype); + + return fops->query(dev, flow, actions, data, error); } /** - * Query a flows. + * Query a flow. * * @see rte_flow_query() * @see rte_flow_ops */ int -mlx5_flow_query(struct rte_eth_dev *dev __rte_unused, +mlx5_flow_query(struct rte_eth_dev *dev, struct rte_flow *flow, const struct rte_flow_action *actions, void *data, struct rte_flow_error *error) { - int ret = 0; + int ret; - for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) { - switch (actions->type) { - case RTE_FLOW_ACTION_TYPE_VOID: - break; - case RTE_FLOW_ACTION_TYPE_COUNT: - ret = mlx5_flow_query_count(flow, data, error); - break; - default: - return rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ACTION, - actions, - "action not supported"); - } - if (ret < 0) - return ret; - } + ret = flow_drv_query(dev, flow, actions, data, error); + if (ret < 0) + return ret; return 0; } diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index bb5b5cc..69f55cf 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -264,6 +264,11 @@ typedef void (*mlx5_flow_remove_t)(struct rte_eth_dev *dev, struct rte_flow *flow); typedef void (*mlx5_flow_destroy_t)(struct rte_eth_dev *dev, struct rte_flow *flow); +typedef int (*mlx5_flow_query_t)(struct rte_eth_dev *dev, + struct rte_flow *flow, + const struct rte_flow_action *actions, + void *data, + struct rte_flow_error *error); struct mlx5_flow_driver_ops { mlx5_flow_validate_t validate; mlx5_flow_prepare_t prepare; @@ -271,6 +276,7 @@ struct mlx5_flow_driver_ops { mlx5_flow_apply_t apply; mlx5_flow_remove_t remove; mlx5_flow_destroy_t destroy; + mlx5_flow_query_t query; }; /* mlx5_flow.c */ diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index becbc57..58e3c33 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1363,6 +1363,24 @@ } } +/** + * Query a flow. + * + * @see rte_flow_query() + * @see rte_flow_ops + */ +static int +flow_dv_query(struct rte_eth_dev *dev __rte_unused, + struct rte_flow *flow __rte_unused, + const struct rte_flow_action *actions __rte_unused, + void *data __rte_unused, + struct rte_flow_error *error __rte_unused) +{ + rte_errno = ENOTSUP; + return -rte_errno; +} + + const struct mlx5_flow_driver_ops mlx5_flow_dv_drv_ops = { .validate = flow_dv_validate, .prepare = flow_dv_prepare, @@ -1370,6 +1388,7 @@ .apply = flow_dv_apply, .remove = flow_dv_remove, .destroy = flow_dv_destroy, + .query = flow_dv_query, }; #endif /* HAVE_IBV_FLOW_DV_SUPPORT */ diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c index c9dbbc3..db05750 100644 --- a/drivers/net/mlx5/mlx5_flow_tcf.c +++ b/drivers/net/mlx5/mlx5_flow_tcf.c @@ -2091,6 +2091,23 @@ struct pedit_parser { rte_free(dev_flow); } +/** + * Query a flow. + * + * @see rte_flow_query() + * @see rte_flow_ops + */ +static int +flow_tcf_query(struct rte_eth_dev *dev __rte_unused, + struct rte_flow *flow __rte_unused, + const struct rte_flow_action *actions __rte_unused, + void *data __rte_unused, + struct rte_flow_error *error __rte_unused) +{ + rte_errno = ENOTSUP; + return -rte_errno; +} + const struct mlx5_flow_driver_ops mlx5_flow_tcf_drv_ops = { .validate = flow_tcf_validate, .prepare = flow_tcf_prepare, @@ -2098,6 +2115,7 @@ struct pedit_parser { .apply = flow_tcf_apply, .remove = flow_tcf_remove, .destroy = flow_tcf_destroy, + .query = flow_tcf_query, }; /** diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c index 65c849c..4ae974b 100644 --- a/drivers/net/mlx5/mlx5_flow_verbs.c +++ b/drivers/net/mlx5/mlx5_flow_verbs.c @@ -1651,6 +1651,92 @@ return -rte_errno; } +/** + * Query a flows. + * + * @see rte_flow_query() + * @see rte_flow_ops + */ +static int +flow_verbs_query_count(struct rte_eth_dev *dev __rte_unused, + struct rte_flow *flow __rte_unused, + void *data __rte_unused, + struct rte_flow_error *error) +{ +#ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT + if (flow->actions & MLX5_FLOW_ACTION_COUNT) { + struct rte_flow_query_count *qc = data; + uint64_t counters[2] = {0, 0}; + struct ibv_query_counter_set_attr query_cs_attr = { + .cs = flow->counter->cs, + .query_flags = IBV_COUNTER_SET_FORCE_UPDATE, + }; + struct ibv_counter_set_data query_out = { + .out = counters, + .outlen = 2 * sizeof(uint64_t), + }; + int err = mlx5_glue->query_counter_set(&query_cs_attr, + &query_out); + + if (err) + return rte_flow_error_set + (error, err, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "cannot read counter"); + qc->hits_set = 1; + qc->bytes_set = 1; + qc->hits = counters[0] - flow->counter->hits; + qc->bytes = counters[1] - flow->counter->bytes; + if (qc->reset) { + flow->counter->hits = counters[0]; + flow->counter->bytes = counters[1]; + } + return 0; + } + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "flow does not have counter"); +#endif + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "counters are not available"); +} + +/** + * Query a flow. + * + * @see rte_flow_query() + * @see rte_flow_ops + */ +static int +flow_verbs_query(struct rte_eth_dev *dev, + struct rte_flow *flow, + const struct rte_flow_action *actions, + void *data, + struct rte_flow_error *error) +{ + int ret = -EINVAL; + + for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) { + switch (actions->type) { + case RTE_FLOW_ACTION_TYPE_VOID: + break; + case RTE_FLOW_ACTION_TYPE_COUNT: + ret = flow_verbs_query_count(dev, flow, data, error); + break; + default: + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "action not supported"); + } + } + return ret; +} + const struct mlx5_flow_driver_ops mlx5_flow_verbs_drv_ops = { .validate = flow_verbs_validate, .prepare = flow_verbs_prepare, @@ -1658,4 +1744,5 @@ .apply = flow_verbs_apply, .remove = flow_verbs_remove, .destroy = flow_verbs_destroy, + .query = flow_verbs_query, }; From patchwork Wed Oct 17 17:24:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moti Haimovsky X-Patchwork-Id: 47004 X-Patchwork-Delegate: shahafs@mellanox.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CDD1F1B176; Wed, 17 Oct 2018 19:25:28 +0200 (CEST) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40079.outbound.protection.outlook.com [40.107.4.79]) by dpdk.org (Postfix) with ESMTP id E740A1B13F for ; Wed, 17 Oct 2018 19:25:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8qW7i/R/K4uzVjhqhsy+en3WgXEPjnKsJhXlP6LUfsg=; b=vYarr96+J/Abi+fLvAmdvV5PDmHzwS1E4KiVhM3GoGyjHykD2DQ0pPPzrJJ12M9AeDQE4hG4uZSQiqq2+QVnNf4HG9m8b5mxTdmJXSYXOkem62Nlh9GsSZRFEDcKATDEF/gtxeSinuAo8oO9pdsRuAsRaTertl8xGK/8K3mDxEA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=motih@mellanox.com; Received: from localhost.localdomain (37.142.13.130) by AM0PR05MB4436.eurprd05.prod.outlook.com (2603:10a6:208:5a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.23; Wed, 17 Oct 2018 17:25:19 +0000 From: Moti Haimovsky To: shahafs@mellanox.com Cc: dev@dpdk.org, Moti Haimovsky Date: Wed, 17 Oct 2018 20:24:52 +0300 Message-Id: <1539797092-2395-4-git-send-email-motih@mellanox.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1539733797-31468-3-git-send-email-motih@mellanox.com> References: <1539733797-31468-3-git-send-email-motih@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: LO2P265CA0117.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:c::33) To AM0PR05MB4436.eurprd05.prod.outlook.com (2603:10a6:208:5a::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8790d75b-9e67-4ed6-a596-08d63455831b X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR05MB4436; X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4436; 3:TOLsJ4rSP8LxVwZuKet8xYUw2TUZQDbLmvUCMIBVzYBMAB4uU4jyujiE8JOENtgFIyW+XFWfKNbVlYLzJ2QNwcmve2bDF5wA/6jtwThQ1SGQZBRb64LPyHaw4Ojt59QYhW7NGs/wO42NYLfXak1pMngiXl+fgEji/GHCef8z/3eoJTPRGBm/34aXShMh5ghd6nP5v6u6TsoCMLgTbSJhVoJFcZViCLsPPN5Bcs7kkWJ514A4YmagAhInfef/sx3P; 25:ng8GmKxxTqFZ+a1kV/QHAFmkJCH9dMM/bal686TCm4eFVfGvW3fBzZjhMIeYzQw3bAZxKhu96dok+P2ZsyVx65S9dDC3WZxY4U7rnGmFVcedwsrHNCkj0nse7JMRx2JDJt6+qV/tmb/TiC2Nd+MWN2xlxSVellXcAGmy6VBY+2Q5gZ0m1+HskKPNGuBBViEvYnuvvejB0H0olP/r9P7GADSIBjR8B28IftzUyxnhTTnRgU2B3k0vDT0jf+ppTOmssRs9EwSa1pb4m9KQ1DEMpG5McKdtVuAZGkP53XpKupnBxk9QL9Z8pqWfta66CXzeIxeLUemNnLP/wA4yCeVTTw==; 31:IkLEe2F9mT0NAgoIvFeNnDhnUSgIpUVAKvAhz+ImpX2ZHmJeYc+YBvH3Ku7GrJveBU6rlac0NpOU3ypx15XL2EH+EpdNw7byB38rt3JyNHQvHqO3lWAwNrnOLRnQiSnuaBgmcKUsXkTgnP8wIxtztPNpbZs3fCHmQNwFOdYTGLmMNvlkOaJqyEK1aEGIoK3Xqa9fttjidpYkLyHIv3QrX8anZjeTiJuB2C5NWZ1XOs0= X-MS-TrafficTypeDiagnostic: AM0PR05MB4436: X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4436; 20:bNvu1wwBWowGsiM9Ecc1KwjS3RmnFmdzqhX4SWR0DEsqeCvq7aY8CqQdJj4oBwulJqqe1ZA8hQoBblzfw9anL0zLAd+14Nz96AoKbC4OoO2DCeM1e72Y0174XyKHsL+mg+N+FJYBIgrXFGjtll4+Q5ghOuGoRoBVmR4H6RlwP4at/5+TJlZjjxBw9sZzPHTAEozb8t3A0WhXG7FNT6PxERB/5wFtkma2lxxMr+Wv6hrr1Y0wIFgMx2eqrEMh1aGqqVVf1U8LtwTSMsF7jiJqG74xGCJnXaeYyYzvxYOGix9h2uKE7ph9jqyB1fzewoykLBsazBemQOAC564/majNPTh2KuLQfb4rkhVV6VDZ2CSPobIjzNf7Y8/2zhPGbbbAMK52mGlsW4KXxIoGruiOnOX0jqL7ENNV2okRKOqhm8zRjsn+uBF92811zO1o0gHTiG5EQPxZnzM/NwSUlmuKoqXZQxApcId7QaxeTTMfhNf3RgKeRb4kYrSnvGd9mNSN; 4:gWMYh7A3nycoTchWvd/0JX3Sc1ExrbOKUDZG5pLR7ZIQVn5zgModGI8EGghQgb4KowHnZEgD6RFTwkUUkR8SbPv5dZF/uTYP4/oqyHa77T2GVJDBM22C2rNfTj6M+9LJIYFvzCCZRFq1TVh0VV6aovaFODeKwgisbRHjrVq0Q9PXdH1s8KJ2LgRZ7/3Erp1B/7X7gVa/Ra9gTam+tINkfTDRcyDZbUvwU7jomSi3pLRd+fZQ2BYU7pbbC/E1qPo32s5RAh8dM1yb+6iutxr2EimQqC2mc+oPYk0WJl1meAt962I6jju6VmbDU3Hk2iJAanj0aKYzsMITqvkrxilbQfDYXtBBwc0cttEKuBwnXrA= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(131327999870524)(211171220733660); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231355)(944501410)(52105095)(3002001)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:AM0PR05MB4436; BCL:0; PCL:0; RULEID:; SRVR:AM0PR05MB4436; X-Forefront-PRVS: 08286A0BE2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(366004)(39860400002)(396003)(346002)(376002)(136003)(189003)(199004)(6116002)(36756003)(486006)(6666004)(446003)(6512007)(37006003)(6486002)(86362001)(305945005)(2616005)(7736002)(16586007)(105586002)(11346002)(106356001)(956004)(2351001)(316002)(4326008)(8936002)(6506007)(478600001)(52116002)(53936002)(34206002)(2361001)(26005)(107886003)(386003)(476003)(47776003)(16526019)(97736004)(5660300001)(68736007)(76176011)(66066001)(6636002)(51416003)(14444005)(2906002)(186003)(50466002)(48376002)(25786009)(50226002)(81156014)(3846002)(8676002)(69590400006)(81166006)(4744004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB4436; H:localhost.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR05MB4436; 23:Mz+n5yLvQuxMgz5Dfx9Ho0pMIZIG9NxIDpA2k39Ft?= VeI0qxTTBEZiQOWkISeS33F4sHFllcesEgHykqedlxkIbQw0qLKmVqkRgihK/NRyP30zxpltOL7EBHJFz/NEcdHpVdNLI1Hz/6rVLCXZFte5GGjL0k0zE+YsxBwC6zKPP59+mvdfcrOkVTFYeJO3hzTKK+D7nWF8p3+nsu2n1cpBcoXSqPOhpjELZb8oef+KbEM37/QGoiJ/zqmX3kU5mnLmBLfoc+BrHtZvXus6EcghTX7DwNuMNd8+LG8UXTF682WmrYQ407cuM+k3FsqQxu5KjIKekPwx3qiMGMG6M+gZhVc1DB92EtxPIvVhPvgJVCPX8Rbe0hfThW77e7WeZvdFoXa8Zsb4v7omb+9ZOBGJ/ZXltqXtsAFOqAnHUT5GyXYMuC4X5dYtX4FJTgkHDwnlfMuPAK6p2XpA9HssTvw31CM3KYSb8rnIpUW8J+rMIslWpadiUn8B4k4bJ2MVF7Oo+4RodcnyImLULyeORq2bw88diOcA2maDyq+GfcojumkWHoaiSBcJUHudeebwp1UlTnhNVaqqAm4Pmvcalw558MEvD7TGhBDIQ67l6lf7a+OkPQ8+k3tW4K30v4EJvRkG+8eccP7LVO4TMzs0Y59igdjWs+2gP4dh+fLz+w99yBUzq0C858l18gYWTvPDm4/A89jUYZ3+3oPyRwMtpOgsyyjCmXKfgoKygRundg4WbytBYYtPR315VvX+MCkNvgGqoSSGXrXw3zqYbmV448TYYnHMtugzJv4cIhvvSaVqOaCtS+ZeAuCN23h/39Z8CHUrsanXxvSPgkz9xq6yZ2qv1NykhG651OJqPrObZW3/F7eReJrrNDCUYQMsYYLvZ9x6NWuhn6B/8qClx/Shaxafb7iuxIYtZWgBgAo8nlqK6pZS/NV2CpQYYJujXznE1Cr/oqNNfg7VUyJrYEmmbdjcbS4bWZ2w7hKX2Zxv+63NV6hZqpkcoD8w6r43eNTMxifSYwj9ZTNozn/5PhW2fSTlXS7kNhi/BF1daUH5KVLeGqRwyerJv4Y4ZMm5VAo8eXcPifPnb9G7JxFfvCwr+YQpoBRxJ4WDZ801ogLKBt/6cyFdiN3gPzZz0/TKZtW+1W6z+VR0JvKXwGOjf8SQyh1jjq8Qdjm0Nmn4jneHZGa7bbz4cy8rYTP4jbxE64U/kBfQ/f01xTdqFGK/xrzuHCX7/CoYiaaqUhayA+V1ucglI9QcxbVLs+RvO4cdx93Gyhvr/9y47vzz+lOE/Xe6/NcR3HA0DuO6kESU7XjyBwyvtrqmFYg3ClrOd060ey26eVFGItaaQ7qXFVMb0QfsbNQ2w== X-Microsoft-Antispam-Message-Info: ZdhOkh6MYzKlpVAIbFsaI8anP/ndZtetcFjqVwTG+q6y6B79651fquIJoEcRVJEvuNzfh+sWXf2ZNx7tAVQu6xLsndC0Cl3oAmaxPwHwzssAWkmsFRbgGq1Mc7oIHh8/hRYANmcE86En0fq2BiCxfrnMX3V00FY2Lcz4K3Y+Kb7fs0HUhqgF51YR3aH03okYaxCxOHTWH6atrH0TCN8Cj+WmpvNHohNZGojRVsFdGJwgTRwy0LW7v19B2VmivWFcFidxK/R3WxCOaeYtBFg6LefS0tu+Ts0uKxmou9d5soFPkWc7POBodBqgzVcFG+ZoV4dIdT8+t0puUdLlfzyI1axyuKycvH0DioC/n/ppaiU= X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4436; 6:iotDa7rlgE0JTaazwsEuCwNZvbQ/yVl3cMHVq5svSLmSQjmZO+bnWveBrxmyT62++y9uqCL1z1Pcwar8rCMz6pOJsgWdEtyiVZnuCRcs6eJ8xaqAO9zEpnJ9hD0NK40K3xcWVblM2Vc0YnMmSofcFUSlTr7FXI5keOBU0hsrN8vUUYYthYDsj5qB/TGfmcImm8NGBt+/CGGFO85OBdY1SEgIvVLojow/+N72VR7IbusUAWL3ahK6NbqcoA2Qp1N7Mc9alOqnMpRWoCGj6+dugg2be6aosxUk908xpRH9MEqgvDZSk6AZYQxXeTGJTTs7VZkrRs6hdfETHpX8X9RFbC2BzoO4p3oX5B1/8239eT3k5qVu+iYVGAeU1m40rARLewQ2PpHy0gBlupqQpEyh83I7xxNZ7UPk7ZkscmHiO3QEER8ofKsLLpkiV7p0D0LuQyToSWyybBS7P51uLvhK1g==; 5:RhePcbRUW8J9WDJfoS3IC4aQOK9bn8VWH+gIaWQhFVnwY/Wophbg5Nu7/jRKrK055dHB9mC3fS+pQJr2n8Y2f8sJjJ9m6eHBlUNQ9cyg9NmE9LUmgPeQD6eFJHOkMdDoHOZe7yXwyA+nf4kf/w1fFP/SkenUUkryEqYm9sUABWs=; 7:4DnKCwz8lwSfaH75ztVqmwaMApF5R6o0MEa6M1UE7J29Kg2m4NmA4kdKigfJu+6UKvu/n4bkkIz/0mrI6yaUkdPgSAsjp+TvUfp1SnrQ//IUAcnfdhW3GplDQemKacr66HmuNgU4QZH9PO4cuq/vU6N6HcW+Jldd8Oa9kfRBWOfnSjrXID9aJPmuzZu9y25uD6/Wixkjitn2SiGhHm4uKLsx38tyiulhR1OfAYOB/ddI/9/AtlAGkoBDnMafp0LG SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2018 17:25:19.2202 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8790d75b-9e67-4ed6-a596-08d63455831b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4436 Subject: [dpdk-dev] [PATCH v4 3/3] net/mlx5: support e-switch flow count action X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This commit adds support for configuring flows destined to the mlx5 eswitch with 'count' action and for querying these counts at runtime. Each flow rule configured by the mlx5 driver is implicitly assigned with flow counters. These counters can be retrieved when querying the flow rule via Netlink, they can be found in each flow action section of the reply. Hence, supporting the 'count' action in the flow configuration command is straight-forward. When transposing the command to a tc Netlink message we just ignore it instead of rejecting it. In the 'flow query count' side, the command now uses tc Netlink query command in order to retrieve the values of the flow counters. Signed-off-by: Moti Haimovsky --- v4: * Split the patch in two. This patch now contains only the tcf implementation of count action and query. * Fixed compilation error found on "old" kernels. * Modifications according to inputs from Shahaf S. v3: * Rebase on top of d80c8167c4fe ("net/mlx5: fix compilation issue on ARM SOC") * Code modifications accordig to review by Shahaf S. see message ID: 1539263057-16678-3-git-send-email-motih@mellanox.com v2: * Rebase on top of 3f4722ee01e7 ("net/mlx5: refactor TC-flow infrastructure") --- drivers/net/mlx5/mlx5_flow_tcf.c | 503 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 496 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c index db05750..0dcea5a 100644 --- a/drivers/net/mlx5/mlx5_flow_tcf.c +++ b/drivers/net/mlx5/mlx5_flow_tcf.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -26,6 +27,7 @@ #include #include #include +#include #include "mlx5.h" #include "mlx5_flow.h" @@ -215,6 +217,15 @@ struct tc_pedit_sel { #ifndef HAVE_TCA_FLOWER_KEY_TCP_FLAGS_MASK #define TCA_FLOWER_KEY_TCP_FLAGS_MASK 72 #endif +/* TCA_FLOWER_MAX contains the value of the last element in the + * TC flower classifier enum list we use. Currently the last element we use + * is TCA_FLOWER_KEY_TCP_FLAGS_MASK. + * Change this definition if adding elements from that table that are beyond + * TCA_FLOWER_KEY_TCP_FLAGS_MASK. + */ +#ifndef TCA_FLOWER_MAX +#define TCA_FLOWER_MAX TCA_FLOWER_KEY_TCP_FLAGS_MASK +#endif #ifndef HAVE_TC_ACT_GOTO_CHAIN #define TC_ACT_GOTO_CHAIN 0x20000000 #endif @@ -244,6 +255,14 @@ struct mlx5_flow_tcf_context { uint8_t *buf; /* Message buffer. */ }; +/** Structure used when extracting the values of a flow counters + * from a netlink message. + */ +struct flow_tcf_stats_basic { + bool valid; + struct gnet_stats_basic counters; +}; + /** Empty masks for known item types. */ static const union { struct rte_flow_item_port_id port_id; @@ -356,6 +375,43 @@ struct pedit_parser { struct pedit_key_ex keys_ex[MAX_PEDIT_KEYS]; }; +/** + * Create space for using the implicitly created TC flow counter. + * + * @param[in] dev + * Pointer to the Ethernet device structure. + * + * @return + * A pointer to the counter data structure, NULL otherwise and + * rte_errno is set. + */ +static struct mlx5_flow_counter * +flow_tcf_counter_new(void) +{ + struct mlx5_flow_counter *cnt; + + /* + * eswitch counter cannot be shared and its id is unknown. + * currently returning all with id 0. + * in the future maybe better to switch to unique numbers. + */ + struct mlx5_flow_counter tmpl = { + .ref_cnt = 1, + .shared = 0, + .id = 0, + .cs = NULL, + .hits = 0, + .bytes = 0, + }; + cnt = rte_calloc(__func__, 1, sizeof(*cnt), 0); + if (!cnt) { + rte_errno = ENOMEM; + return NULL; + } + *cnt = tmpl; + /* Implicit counter, do not add to list. */ + return cnt; +} /** * Set pedit key of transport (TCP/UDP) port value @@ -1067,6 +1123,8 @@ struct pedit_parser { case RTE_FLOW_ACTION_TYPE_DROP: current_action_flag = MLX5_FLOW_ACTION_DROP; break; + case RTE_FLOW_ACTION_TYPE_COUNT: + break; case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN: current_action_flag = MLX5_FLOW_ACTION_OF_POP_VLAN; break; @@ -1342,6 +1400,8 @@ struct pedit_parser { SZ_NLATTR_TYPE_OF(struct tc_gact); flags |= MLX5_FLOW_ACTION_DROP; break; + case RTE_FLOW_ACTION_TYPE_COUNT: + break; case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN: flags |= MLX5_FLOW_ACTION_OF_POP_VLAN; goto action_of_vlan; @@ -1477,6 +1537,38 @@ struct pedit_parser { } /** + * Make adjustments for supporting count actions. + * + * @param[in] dev + * Pointer to the Ethernet device structure. + * @param[in] dev_flow + * Pointer to mlx5_flow. + * @param[out] error + * Pointer to error structure. + * + * @return + * 0 On success else a negative errno value is returned and rte_errno is set. + */ +static int +flow_tcf_translate_action_count(struct rte_eth_dev *dev __rte_unused, + struct mlx5_flow *dev_flow, + struct rte_flow_error *error) +{ + struct rte_flow *flow = dev_flow->flow; + + if (!flow->counter) { + flow->counter = flow_tcf_counter_new(); + if (!flow->counter) + return rte_flow_error_set(error, rte_errno, + RTE_FLOW_ERROR_TYPE_ACTION, + NULL, + "cannot get counter" + " context."); + } + return 0; +} + +/** * Translate flow for Linux TC flower and construct Netlink message. * * @param[in] priv @@ -1533,6 +1625,7 @@ struct pedit_parser { struct nlattr *na_vlan_id = NULL; struct nlattr *na_vlan_priority = NULL; uint64_t item_flags = 0; + int ret; claim_nonzero(flow_tcf_build_ptoi_table(dev, ptoi, PTOI_TABLE_SZ_MAX(dev))); @@ -1875,6 +1968,16 @@ struct pedit_parser { mnl_attr_nest_end(nlh, na_act); mnl_attr_nest_end(nlh, na_act_index); break; + case RTE_FLOW_ACTION_TYPE_COUNT: + /* + * Driver adds the count action implicitly for + * each rule it creates. + */ + ret = flow_tcf_translate_action_count(dev, + dev_flow, error); + if (ret < 0) + return ret; + break; case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN: conf.of_push_vlan = NULL; vlan_act = TCA_VLAN_ACT_POP; @@ -2055,6 +2158,12 @@ struct pedit_parser { if (!flow) return; + if (flow->counter) { + if (--flow->counter->ref_cnt == 0) { + rte_free(flow->counter); + flow->counter = NULL; + } + } dev_flow = LIST_FIRST(&flow->dev_flows); if (!dev_flow) return; @@ -2092,20 +2201,400 @@ struct pedit_parser { } /** + * Parse rtnetlink message attributes filling the attribute table with the info + * retrieved. + * + * @param tb + * Attribute table to be filled. + * @param[out] max + * Maxinum entry in the attribute table. + * @param rte + * The attributes section in the message to be parsed. + * @param len + * The length of the attributes section in the message. + */ +static void +flow_tcf_nl_parse_rtattr(struct rtattr *tb[], int max, + struct rtattr *rta, int len) +{ + unsigned short type; + memset(tb, 0, sizeof(struct rtattr *) * (max + 1)); + while (RTA_OK(rta, len)) { + type = rta->rta_type; + if (type <= max && !tb[type]) + tb[type] = rta; + rta = RTA_NEXT(rta, len); + } +} + +/** + * Extract flow counters from flower action. + * + * @param rta + * flower action stats properties in the Netlink message received. + * @param rta_type + * The backward sequence of rta_types, as written in the attribute table, + * we need to traverse in order to get to the requested object. + * @param idx + * Current location in rta_type table. + * @param[out] data + * data holding the count statistics of the rte_flow retrieved from + * the message. + * + * @return + * 0 if data was found and retrieved, -1 otherwise. + */ +static int +flow_tcf_nl_action_stats_parse_and_get(struct rtattr *rta, + uint16_t rta_type[], int idx, + struct gnet_stats_basic *data) +{ + struct rtattr *tbs[TCA_STATS_MAX + 1]; + + if (rta == NULL || idx < 0) + return -1; + flow_tcf_nl_parse_rtattr(tbs, TCA_STATS_MAX, + RTA_DATA(rta), RTA_PAYLOAD(rta)); + switch (rta_type[idx]) { + case TCA_STATS_BASIC: + if (tbs[TCA_STATS_BASIC]) { + memcpy(data, RTA_DATA(tbs[TCA_STATS_BASIC]), + RTE_MIN(RTA_PAYLOAD(tbs[TCA_STATS_BASIC]), + sizeof(*data))); + return 0; + } + break; + default: + break; + } + return -1; +} + +/** + * Parse flower single action retrieving the requested action attribute, + * if found. + * + * @param arg + * flower action properties in the Netlink message received. + * @param rta_type + * The backward sequence of rta_types, as written in the attribute table, + * we need to traverse in order to get to the requested object. + * @param idx + * Current location in rta_type table. + * @param[out] data + * Count statistics retrieved from the message query. + * + * @return + * 0 if data was found and retrieved, -1 otherwise. + */ +static int +flow_tcf_nl_parse_one_action_and_get(struct rtattr *arg, + uint16_t rta_type[], int idx, void *data) +{ + struct rtattr *tb[TCA_ACT_MAX + 1]; + + if (arg == NULL || idx < 0) + return -1; + flow_tcf_nl_parse_rtattr(tb, TCA_ACT_MAX, + RTA_DATA(arg), RTA_PAYLOAD(arg)); + if (tb[TCA_ACT_KIND] == NULL) + return -1; + switch (rta_type[idx]) { + case TCA_ACT_STATS: + if (tb[TCA_ACT_STATS]) + return flow_tcf_nl_action_stats_parse_and_get + (tb[TCA_ACT_STATS], + rta_type, --idx, + (struct gnet_stats_basic *)data); + break; + default: + break; + } + return -1; +} + +/** + * Parse flower action section in the message retrieving the requested + * attribute from the first action that provides it. + * + * @param opt + * flower section in the Netlink message received. + * @param rta_type + * The backward sequence of rta_types, as written in the attribute table, + * we need to traverse in order to get to the requested object. + * @param idx + * Current location in rta_type table. + * @param[out] data + * data retrieved from the message query. + * + * @return + * 0 if data was found and retrieved, -1 otherwise. + */ +static int +flow_tcf_nl_action_parse_and_get(const struct rtattr *arg, + uint16_t rta_type[], int idx, void *data) +{ + struct rtattr *tb[TCA_ACT_MAX_PRIO + 1]; + int i; + + if (arg == NULL || idx < 0) + return -1; + flow_tcf_nl_parse_rtattr(tb, TCA_ACT_MAX_PRIO, + RTA_DATA(arg), RTA_PAYLOAD(arg)); + switch (rta_type[idx]) { + /* + * flow counters are stored in the actions defined by the flow + * and not in the flow itself, therefore we need to traverse the + * flower chain of actions in search for them. + * + * Note that the index is not decremented here. + */ + case TCA_ACT_STATS: + for (i = 0; i <= TCA_ACT_MAX_PRIO; i++) { + if (tb[i] && + !flow_tcf_nl_parse_one_action_and_get(tb[i], + rta_type, + idx, data)) + return 0; + } + break; + default: + break; + } + return -1; +} + +/** + * Parse flower classifier options in the message, retrieving the requested + * attribute if found. + * + * @param opt + * flower section in the Netlink message received. + * @param rta_type + * The backward sequence of rta_types, as written in the attribute table, + * we need to traverse in order to get to the requested object. + * @param idx + * Current location in rta_type table. + * @param[out] data + * data retrieved from the message query. + * + * @return + * 0 if data was found and retrieved, -1 otherwise. + */ +static int +flow_tcf_nl_opts_parse_and_get(struct rtattr *opt, + uint16_t rta_type[], int idx, void *data) +{ + struct rtattr *tb[TCA_FLOWER_MAX + 1]; + + if (!opt || idx < 0) + return -1; + flow_tcf_nl_parse_rtattr(tb, TCA_FLOWER_MAX, + RTA_DATA(opt), RTA_PAYLOAD(opt)); + switch (rta_type[idx]) { + case TCA_FLOWER_ACT: + if (tb[TCA_FLOWER_ACT]) + return flow_tcf_nl_action_parse_and_get + (tb[TCA_FLOWER_ACT], + rta_type, --idx, data); + break; + default: + break; + } + return -1; +} + +/** + * Parse Netlink reply on filter query, retrieving the flow counters. + * + * @param nlh + * Message received from Netlink. + * @param rta_type + * The backward sequence of rta_types, as written in the attribute table, + * we need to traverse in order to get to the requested object. + * @param idx + * Current location in rta_type table. + * @param[out] data + * data retrieved from the message query. + * + * @return + * 0 if data was found and retrieved, -1 otherwise. + */ +static int +flow_tcf_nl_filter_parse_and_get(const struct nlmsghdr *nlh, + uint16_t rta_type[], int idx, void *data) +{ + struct tcmsg *t = NLMSG_DATA(nlh); + int len = nlh->nlmsg_len; + struct rtattr *tb[TCA_MAX + 1]; + + if (idx < 0) + return -1; + if (nlh->nlmsg_type != RTM_NEWTFILTER && + nlh->nlmsg_type != RTM_GETTFILTER && + nlh->nlmsg_type != RTM_DELTFILTER) + return -1; + len -= NLMSG_LENGTH(sizeof(*t)); + if (len < 0) + return -1; + flow_tcf_nl_parse_rtattr(tb, TCA_MAX, TCA_RTA(t), len); + /* Not a TC flower flow - bail out */ + if (!tb[TCA_KIND] || + strcmp(RTA_DATA(tb[TCA_KIND]), "flower")) + return -1; + switch (rta_type[idx]) { + case TCA_OPTIONS: + if (tb[TCA_OPTIONS]) + return flow_tcf_nl_opts_parse_and_get(tb[TCA_OPTIONS], + rta_type, + --idx, data); + break; + default: + break; + } + return -1; +} + +/** + * A callback to parse Netlink reply on TC flower query. + * + * @param nlh + * Message received from Netlink. + * @param[out] data + * Pointer to data area to be filled by the parsing routine. + * assumed to be a pinter to struct flow_tcf_stats_basic. + * + * @return + * MNL_CB_OK value. + */ +static int +flow_tcf_nl_message_get_stats_basic(const struct nlmsghdr *nlh, void *data) +{ + /* + * The backward sequence of rta_types to pass in order to get + * to the counters. + */ + uint16_t rta_type[] = { TCA_STATS_BASIC, TCA_ACT_STATS, + TCA_FLOWER_ACT, TCA_OPTIONS }; + struct flow_tcf_stats_basic *sb_data = data; + + if (!flow_tcf_nl_filter_parse_and_get(nlh, rta_type, + RTE_DIM(rta_type) - 1, + (void *)&sb_data->counters)) + sb_data->valid = true; + return MNL_CB_OK; +} + +/** + * Query a TC flower rule for its statistics via netlink. + * + * @param[in] dev + * Pointer to Ethernet device. + * @param[in] flow + * Pointer to the sub flow. + * @param[out] data + * data retrieved by the query. + * @param[out] error + * Perform verbose error reporting if not NULL. + * + * @return + * 0 on success, a negative errno value otherwise and rte_errno is set. + */ +static int +flow_tcf_query_count(struct rte_eth_dev *dev, + struct rte_flow *flow, + void *data, + struct rte_flow_error *error) +{ + struct flow_tcf_stats_basic sb_data = { 0 }; + struct rte_flow_query_count *qc = data; + struct priv *priv = dev->data->dev_private; + struct mlx5_flow_tcf_context *ctx = priv->tcf_context; + struct mnl_socket *nl = ctx->nl; + struct mlx5_flow *dev_flow; + struct nlmsghdr *nlh; + uint32_t seq = priv->tcf_context->seq++; + ssize_t ret; + assert(qc); + + dev_flow = LIST_FIRST(&flow->dev_flows); + /* E-Switch flow can't be expanded. */ + assert(!LIST_NEXT(dev_flow, next)); + if (!dev_flow->flow->counter) + goto notsup_exit; + nlh = dev_flow->tcf.nlh; + nlh->nlmsg_type = RTM_GETTFILTER; + nlh->nlmsg_flags = NLM_F_REQUEST | NLM_F_ECHO; + nlh->nlmsg_seq = seq; + if (mnl_socket_sendto(nl, nlh, nlh->nlmsg_len) == -1) + goto error_exit; + do { + ret = mnl_socket_recvfrom(nl, ctx->buf, ctx->buf_size); + if (ret <= 0) + break; + ret = mnl_cb_run(ctx->buf, ret, seq, + mnl_socket_get_portid(nl), + flow_tcf_nl_message_get_stats_basic, + (void *)&sb_data); + } while (ret > 0); + /* Return the delta from last reset. */ + if (sb_data.valid) { + /* Return the delta from last reset. */ + qc->hits_set = 1; + qc->bytes_set = 1; + qc->hits = sb_data.counters.packets; + qc->hits -= flow->counter->hits; + qc->bytes = sb_data.counters.bytes - flow->counter->bytes; + if (qc->reset) { + flow->counter->hits = sb_data.counters.packets; + flow->counter->bytes = sb_data.counters.bytes; + } + return 0; + } + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "flow does not have counter"); +error_exit: + return rte_flow_error_set + (error, errno, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "netlink: failed to read flow rule counters"); +notsup_exit: + return rte_flow_error_set + (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "counters are not available."); +} + +/** * Query a flow. * * @see rte_flow_query() * @see rte_flow_ops */ static int -flow_tcf_query(struct rte_eth_dev *dev __rte_unused, - struct rte_flow *flow __rte_unused, - const struct rte_flow_action *actions __rte_unused, - void *data __rte_unused, - struct rte_flow_error *error __rte_unused) +flow_tcf_query(struct rte_eth_dev *dev, + struct rte_flow *flow, + const struct rte_flow_action *actions, + void *data, + struct rte_flow_error *error) { - rte_errno = ENOTSUP; - return -rte_errno; + int ret = -EINVAL; + + for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) { + switch (actions->type) { + case RTE_FLOW_ACTION_TYPE_VOID: + break; + case RTE_FLOW_ACTION_TYPE_COUNT: + ret = flow_tcf_query_count(dev, flow, data, error); + break; + default: + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "action not supported"); + } + } + return ret; } const struct mlx5_flow_driver_ops mlx5_flow_tcf_drv_ops = {