From patchwork Tue Dec 25 14:38:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moti Haimovsky X-Patchwork-Id: 49268 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 4D8251B21A; Tue, 25 Dec 2018 15:38:46 +0100 (CET) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20050.outbound.protection.outlook.com [40.107.2.50]) by dpdk.org (Postfix) with ESMTP id B961F1B201 for ; Tue, 25 Dec 2018 15:38:43 +0100 (CET) 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=bOj8HLnL8a0+UAsgMuRNiDPHWjxm73W+dqZG8VEEBd0=; b=H5Mh6Dm8Fs0t3HLfGPTycC+enQ9MYoiLEJIYu4zNNnI4RkXRPKTM3NQoziSOrB74X0zgqgd8BRjHbVo0pdMGg/LMp9KGpHSfWosTKVCoAzJ5TIWWzKczEiyMBfIg5Zl9R3MzxHdBHfDQPNe4dThb0zshFIXCSAgP5/xF3O1qwGc= Received: from AM0PR05MB4435.eurprd05.prod.outlook.com (52.134.92.20) by AM0PR05MB5169.eurprd05.prod.outlook.com (20.178.18.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1471.20; Tue, 25 Dec 2018 14:38:43 +0000 Received: from AM0PR05MB4435.eurprd05.prod.outlook.com ([fe80::c860:9e3d:3158:8ea]) by AM0PR05MB4435.eurprd05.prod.outlook.com ([fe80::c860:9e3d:3158:8ea%4]) with mapi id 15.20.1446.027; Tue, 25 Dec 2018 14:38:43 +0000 From: Mordechay Haimovsky To: "dev@dpdk.org" CC: Mordechay Haimovsky Thread-Topic: [PATCH v1 1/3] net/mlx5: modify shared counter allocation logic Thread-Index: AQHUnF+IeusPm/YkiEOgJu50gYWoRA== Date: Tue, 25 Dec 2018 14:38:43 +0000 Message-ID: <1545748697-3385-2-git-send-email-motih@mellanox.com> References: <1545748697-3385-1-git-send-email-motih@mellanox.com> In-Reply-To: <1545748697-3385-1-git-send-email-motih@mellanox.com> Accept-Language: he-IL, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: CWLP265CA0157.GBRP265.PROD.OUTLOOK.COM (2603:10a6:401:52::25) To AM0PR05MB4435.eurprd05.prod.outlook.com (2603:10a6:208:5a::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=motih@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR05MB5169; 6:85Ocfo5U878eOk8ypsu40bG6F6VsV6k/+1JZfNBfcssvERzTWeCEZyr2G8KuVKDGcxKEfnvmnzPTEcXobeRv4t6L9ZJja9R6gRWR8Xxro5zvyOgqRi3MO2SiH9kZ8HisJoy6+F03o8uAhq4NMjBwMvK+OjzGgOVvqGvezNQ/zr8oKRYM3JuCWBUMa+AjGeP9MsB+iT/wpboIgKKeE0TcRpl4XjxNkZDpomnJknuP+FLgNDcyAxnrn/Ct8HXTbExSPbQRR392qSa2LRNqIexpMEVVlo6P6T27FYtpmb+6PlWS3dFsAEYK6PMCo4NS9RKZ2F/gS2EdiRkfgp1Lbk1xUWgmnrQNRFoy3xbxKYFGwUF0w/Ab80qXK7AUeFFoFVED7KbmoIKktnGvNBVDej1ZHbPs5WCz7DaViiNThboiSzv9v7vFrgzmU/ewpcUDd3SDYL1yuo8Qeb6aDfEZbt31tg==; 5:bJ/sIr6fSUHL0rUqps0uBXCKoMsw4gqtLvF6VBXkSEg3oxP8sRZvHxFbOGAf18Na1kGSx4Pubfgn43ZhXah6urnXi/rfErNJtGkmQzvWgcX/Osk6kyjltRDJzpn+Hz9dn/v/1quPv/XwrGLj0t1dnrC0FKLD94VTN8t7l1s1f4A=; 7:dt/Nc/vuzzbiTIulXaUm4I9/1Ug99BEOYruPM32V5mXkpmTC+XXmL7+ytb/IDqVEhsWJ7fKfLrd9T9l8GzC9UstzTJ/rDQQxR9Lnf3sW2ZdTVxwruS/4kRVAcjUXJ4nPzEHB1CRq7mhzn32Q5060Qw== x-ms-office365-filtering-correlation-id: 29dea76d-7e33-44d3-0ffc-08d66a76aaec x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR05MB5169; x-ms-traffictypediagnostic: AM0PR05MB5169: x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(2401047)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231475)(944501520)(52105112)(6055026)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:AM0PR05MB5169; BCL:0; PCL:0; RULEID:; SRVR:AM0PR05MB5169; x-forefront-prvs: 08978A8F5C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(346002)(366004)(376002)(39860400002)(396003)(189003)(199004)(6916009)(2906002)(102836004)(8936002)(8676002)(81166006)(1730700003)(81156014)(11346002)(386003)(36756003)(71200400001)(446003)(6506007)(6436002)(2616005)(476003)(66066001)(106356001)(105586002)(316002)(71190400001)(3846002)(486006)(2351001)(6116002)(6486002)(186003)(2501003)(5660300001)(26005)(99286004)(256004)(14454004)(6512007)(76176011)(5640700003)(107886003)(25786009)(86362001)(4326008)(52116002)(53936002)(305945005)(97736004)(478600001)(68736007)(7736002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB5169; H:AM0PR05MB4435.eurprd05.prod.outlook.com; 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-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: qkyomMwYwMd5qUnuNFpPhRfmT757c/GGk7TwaIw8VMgaLpIF3S7waO2wFEqh5cCTntw9CQX51oxZYBO+W8BjGofg7XgPwhoCzDEuc2BFXgyS6IwypNauwNhQ5v9G2DI80d8xTvE9ll+2GdaRl7F/5ma+q8p0pJbTpcCa//cC8QGyLve0CJJ7OpfJxPPeRCQ632n7UAaPykAmKJ2YdqdbhmKD58RGN0R8f4rMLqXolxprC6qnCBo7nPPpEUv4SFQXP2AyPjwLrec/7N2RRcqeV2wVdtqpCyQdOptJONWyp88CjUnUWo4ujklFiBhgnvvY spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 29dea76d-7e33-44d3-0ffc-08d66a76aaec X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Dec 2018 14:38:43.0473 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5169 Subject: [dpdk-dev] [PATCH v1 1/3] net/mlx5: modify shared counter allocation logic 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 modifies the logic for searching an allocating a shared counter in mlx5_flow_verbs. modifies commit 84c406e74524 ("net/mlx5: add flow translate function") Signed-off-by: Moti Haimovsky --- drivers/net/mlx5/mlx5_flow_verbs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c index 81ec59d..409e1cd 100644 --- a/drivers/net/mlx5/mlx5_flow_verbs.c +++ b/drivers/net/mlx5/mlx5_flow_verbs.c @@ -121,13 +121,13 @@ struct mlx5_flow_counter *cnt; int ret; - LIST_FOREACH(cnt, &priv->flow_counters, next) { - if (!cnt->shared || cnt->shared != shared) - continue; - if (cnt->id != id) - continue; - cnt->ref_cnt++; - return cnt; + if (shared) { + LIST_FOREACH(cnt, &priv->flow_counters, next) { + if (cnt->shared && cnt->id == id) { + cnt->ref_cnt++; + return cnt; + } + } } cnt = rte_calloc(__func__, 1, sizeof(*cnt), 0); if (!cnt) { From patchwork Tue Dec 25 14:38:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moti Haimovsky X-Patchwork-Id: 49269 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 BA7431B296; Tue, 25 Dec 2018 15:38:50 +0100 (CET) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20057.outbound.protection.outlook.com [40.107.2.57]) by dpdk.org (Postfix) with ESMTP id BDF5E1B200 for ; Tue, 25 Dec 2018 15:38:44 +0100 (CET) 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=viLrQocMj8diQct/ZHKs2tGACoCm1FNMcxm6ACTaJHw=; b=Q6GIrOYSv/sR/onndfMK38ED8e45QjN3QkZk+WnNHy2R4hFL0wJZMblo5tepqkmjgYSCOoYPQo+h/t+qPojLLNDp8WDVxBr3l6oMEfdr/cbS8ZTuwmwBFJ9xHb6ZPZIc6WD2szPjzqSfY6la34RH6ML4E6UYhxA8g2vzRqsxbCs= Received: from AM0PR05MB4435.eurprd05.prod.outlook.com (52.134.92.20) by AM0PR05MB5169.eurprd05.prod.outlook.com (20.178.18.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1471.20; Tue, 25 Dec 2018 14:38:43 +0000 Received: from AM0PR05MB4435.eurprd05.prod.outlook.com ([fe80::c860:9e3d:3158:8ea]) by AM0PR05MB4435.eurprd05.prod.outlook.com ([fe80::c860:9e3d:3158:8ea%4]) with mapi id 15.20.1446.027; Tue, 25 Dec 2018 14:38:43 +0000 From: Mordechay Haimovsky To: "dev@dpdk.org" CC: Mordechay Haimovsky Thread-Topic: [PATCH v1 2/3] net/mlx5: add devx functions to glue Thread-Index: AQHUnF+J8WVmoKxUJUyn9O/JPwxxQg== Date: Tue, 25 Dec 2018 14:38:43 +0000 Message-ID: <1545748697-3385-3-git-send-email-motih@mellanox.com> References: <1545748697-3385-1-git-send-email-motih@mellanox.com> In-Reply-To: <1545748697-3385-1-git-send-email-motih@mellanox.com> Accept-Language: he-IL, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: CWLP265CA0157.GBRP265.PROD.OUTLOOK.COM (2603:10a6:401:52::25) To AM0PR05MB4435.eurprd05.prod.outlook.com (2603:10a6:208:5a::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=motih@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR05MB5169; 6:OG3bmxsUF1lR2nvWrmIo3HWAhu2hZCg4Vm3IJ99dHiOWWxsPAGaLT+ZGWGZzCti7Jj155CiQugnfnc7J3SbXQyr1VH+529RsMLrCQOGgJT1Z5RlX+aPzv5vJNLJBGQo30c8TDFfFqM5fLuH9nkX8XQwZM+YYIQPpaPxy+biZI/gstuhKzmiNyOC9tvUtbrkMpi716DBhfVFiqKeiFvM8+lvYCtXc0UxGzfKTl9eZMzjL2rkxAzDIoNlsiUL2y91NUBTBhAnUrnGaOvNGG5crQG6RuD8GCAfsMWOYZvnQH9Wpfrkshb5O5/OjfnORknWzKbzp5SgSAL93xPXunPUsIXb3EkniT1ZV/ntrvyVkL4NF5my0aZhOjOmRQZ+/J3TrPA7FMVDniEsH1eAI/0C3SgjmWV9gno9akOU7HO/oQiOrH0Yw/fGGUvgBd+VIPyOnOMUbFY0u+qQbMLD78myytg==; 5:jbDAcSQf5x+Wr9rTtEDjMAYpGH/6Uo5TH6Yu2TAd5MCuQofaPfUgfgzKJZ3S93uvv6n6YJbUKmkl4ka7QBn+xh9O2/tOdy9rPo6OPoGsXbRp8n3d8TBZkeo0AosOpC38d56KGv95oXtslTrjgaM6ojk2lqA6kT1mm8JV0P6kEtg=; 7:jjvnTENsC8/wXgxKNF8dC4KY6FtghKed6MUMPj387YNg+gOUb3NojUbFzKcsUSUHoiEc4t/VB9V9GO5QnNn4M9DAv3uf14LB+ZooURvAUh19PDAIVgyv9HOf/BRMbVcqee5TsAADgCsxYBS0uM8QzA== x-ms-office365-filtering-correlation-id: ccf67272-75d1-4c7c-9467-08d66a76ab71 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR05MB5169; x-ms-traffictypediagnostic: AM0PR05MB5169: x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(2401047)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231475)(944501520)(52105112)(6055026)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:AM0PR05MB5169; BCL:0; PCL:0; RULEID:; SRVR:AM0PR05MB5169; x-forefront-prvs: 08978A8F5C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(346002)(366004)(376002)(39860400002)(396003)(189003)(199004)(6916009)(2906002)(102836004)(8936002)(8676002)(81166006)(1730700003)(81156014)(11346002)(386003)(36756003)(71200400001)(446003)(6506007)(6436002)(2616005)(476003)(66066001)(106356001)(105586002)(316002)(71190400001)(3846002)(486006)(2351001)(6116002)(6486002)(186003)(2501003)(5660300001)(26005)(99286004)(256004)(19627235002)(14454004)(6512007)(76176011)(5640700003)(107886003)(25786009)(86362001)(4326008)(52116002)(53936002)(305945005)(97736004)(478600001)(68736007)(7736002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB5169; H:AM0PR05MB4435.eurprd05.prod.outlook.com; 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-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: IKBnPPI9ntrMKPmtvHcLnVqwjP7Kc4yoezG9BxJnKI5tdpNzdCv5qdCENe+DPxCg3THHy6IWCN6ducJusTmMnDAYsFI8n8BbYHp/3ge1dvWgs6odgY4IoSJU9pa/BLEMdLfL75evGOFHswgsL49HmszOQmFuLIgxsjHxXto0RBpkDJMV6nuoLAXZEKZefk8HwilgNtHJHJIjs9hj1+LiK+vUhWR+RUcJVMJsgSTnOvIC73M02woCOqe2XtYH/ZtQ0YH3QniJC6JBj4w3ywhm+qbDFp1nNr6Hjh57zM0+xE/sLMGZKkAStVIwARHZU9CP spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: ccf67272-75d1-4c7c-9467-08d66a76ab71 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Dec 2018 14:38:43.7974 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5169 Subject: [dpdk-dev] [PATCH v1 2/3] net/mlx5: add devx functions to glue 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 patch adds glue functions for operations: - dv_open_device. - devx object create, destroy, query and modify. - devx general command The new operations depend on HAVE_IBV_DEVX_OBJ. Signed-off-by: Moti Haimovsky Acked-by: Shahaf Shuler --- drivers/net/mlx5/Makefile | 5 +++ drivers/net/mlx5/meson.build | 2 + drivers/net/mlx5/mlx5_glue.c | 99 ++++++++++++++++++++++++++++++++++++++++++++ drivers/net/mlx5/mlx5_glue.h | 19 +++++++++ 4 files changed, 125 insertions(+) diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index 895cdfe..58e2d15 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -148,6 +148,11 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh func mlx5dv_create_flow_action_packet_reformat \ $(AUTOCONF_OUTPUT) $Q sh -- '$<' '$@' \ + HAVE_IBV_DEVX_OBJ \ + infiniband/mlx5dv.h \ + func mlx5dv_devx_obj_create \ + $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ HAVE_ETHTOOL_LINK_MODE_25G \ /usr/include/linux/ethtool.h \ enum ETHTOOL_LINK_MODE_25000baseCR_Full_BIT \ diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index 28938db..e323c3a 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -104,6 +104,8 @@ if build 'IBV_FLOW_SPEC_MPLS' ], [ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h', 'IBV_WQ_FLAG_RX_END_PADDING' ], + [ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h', + 'mlx5dv_devx_obj_create' ], [ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h', 'SUPPORTED_40000baseKR4_Full' ], [ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h', diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c index dd10ad6..7d3d9d3 100644 --- a/drivers/net/mlx5/mlx5_glue.c +++ b/drivers/net/mlx5/mlx5_glue.c @@ -479,6 +479,99 @@ #endif } +static struct ibv_context * +mlx5_glue_dv_open_device(struct ibv_device *device) +{ +#ifdef HAVE_IBV_DEVX_OBJ + return mlx5dv_open_device(device, + &(struct mlx5dv_context_attr){ + .flags = MLX5DV_CONTEXT_FLAGS_DEVX, + }); +#else + (void)device; + return NULL; +#endif +} + +static struct mlx5dv_devx_obj * +mlx5_glue_devx_obj_create(struct ibv_context *ctx, + const void *in, size_t inlen, + void *out, size_t outlen) +{ +#ifdef HAVE_IBV_DEVX_OBJ + return mlx5dv_devx_obj_create(ctx, in, inlen, out, outlen); +#else + (void)ctx; + (void)in; + (void)inlen; + (void)out; + (void)outlen; + return NULL; +#endif +} + +static int +mlx5_glue_devx_obj_destroy(struct mlx5dv_devx_obj *obj) +{ +#ifdef HAVE_IBV_DEVX_OBJ + return mlx5dv_devx_obj_destroy(obj); +#else + (void)obj; + return -ENOTSUP; +#endif +} + +static int +mlx5_glue_devx_obj_query(struct mlx5dv_devx_obj *obj, + const void *in, size_t inlen, + void *out, size_t outlen) +{ +#ifdef HAVE_IBV_DEVX_OBJ + return mlx5dv_devx_obj_query(obj, in, inlen, out, outlen); +#else + (void)obj; + (void)in; + (void)inlen; + (void)out; + (void)outlen; + return -ENOTSUP; +#endif +} + +static int +mlx5_glue_devx_obj_modify(struct mlx5dv_devx_obj *obj, + const void *in, size_t inlen, + void *out, size_t outlen) +{ +#ifdef HAVE_IBV_DEVX_OBJ + return mlx5dv_devx_obj_modify(obj, in, inlen, out, outlen); +#else + (void)obj; + (void)in; + (void)inlen; + (void)out; + (void)outlen; + return -ENOTSUP; +#endif +} + +static int +mlx5_glue_devx_general_cmd(struct ibv_context *ctx, + const void *in, size_t inlen, + void *out, size_t outlen) +{ +#ifdef HAVE_IBV_DEVX_OBJ + return mlx5dv_devx_general_cmd(ctx, in, inlen, out, outlen); +#else + (void)ctx; + (void)in; + (void)inlen; + (void)out; + (void)outlen; + return -ENOTSUP; +#endif +} + alignas(RTE_CACHE_LINE_SIZE) const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue){ .version = MLX5_GLUE_VERSION, @@ -535,4 +628,10 @@ .dv_create_flow = mlx5_glue_dv_create_flow, .dv_create_flow_action_packet_reformat = mlx5_glue_dv_create_flow_action_packet_reformat, + .dv_open_device = mlx5_glue_dv_open_device, + .devx_obj_create = mlx5_glue_devx_obj_create, + .devx_obj_destroy = mlx5_glue_devx_obj_destroy, + .devx_obj_query = mlx5_glue_devx_obj_query, + .devx_obj_modify = mlx5_glue_devx_obj_modify, + .devx_general_cmd = mlx5_glue_devx_general_cmd, }; diff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h index 2d92ba8..a6cd2cd 100644 --- a/drivers/net/mlx5/mlx5_glue.h +++ b/drivers/net/mlx5/mlx5_glue.h @@ -55,6 +55,10 @@ enum mlx5dv_flow_table_type { flow_table_type = 0, }; #endif +#ifndef HAVE_IBV_DEVX_OBJ +struct mlx5dv_devx_obj; +#endif + /* LIB_GLUE_VERSION must be updated every time this structure is modified. */ struct mlx5_glue { const char *version; @@ -164,6 +168,21 @@ struct mlx5_glue { void *data, enum mlx5dv_flow_action_packet_reformat_type reformat_type, enum mlx5dv_flow_table_type ft_type); + struct ibv_context *(*dv_open_device)(struct ibv_device *device); + struct mlx5dv_devx_obj *(*devx_obj_create) + (struct ibv_context *ctx, + const void *in, size_t inlen, + void *out, size_t outlen); + int (*devx_obj_destroy)(struct mlx5dv_devx_obj *obj); + int (*devx_obj_query)(struct mlx5dv_devx_obj *obj, + const void *in, size_t inlen, + void *out, size_t outlen); + int (*devx_obj_modify)(struct mlx5dv_devx_obj *obj, + const void *in, size_t inlen, + void *out, size_t outlen); + int (*devx_general_cmd)(struct ibv_context *context, + const void *in, size_t inlen, + void *out, size_t outlen); }; const struct mlx5_glue *mlx5_glue; From patchwork Tue Dec 25 14:38:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moti Haimovsky X-Patchwork-Id: 49270 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 3B6651B277; Tue, 25 Dec 2018 15:38:53 +0100 (CET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60051.outbound.protection.outlook.com [40.107.6.51]) by dpdk.org (Postfix) with ESMTP id 98D271B274 for ; Tue, 25 Dec 2018 15:38:46 +0100 (CET) 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=1vAZEGHNRlEjWEjTgW1pqt9AYxLxz+QtgBmqxMmz/3E=; b=NXtPl8DifAHXexYy3puwjaOchKGL+2toW0SVdjAv7g3kB/OeHxSvve1I0KD2NdQgYzy7lT06R/hJf3TxRCF2Lq1Wi61rggkqWQYB5x7OqQVG2aY3tvHU/+NVgzt0So0Hc3n/kJpj66DhHs4H7Lk7/uY1w7rNufbaOOSQXJCRiNI= Received: from AM0PR05MB4435.eurprd05.prod.outlook.com (52.134.92.20) by AM0PR05MB5202.eurprd05.prod.outlook.com (20.178.18.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1471.20; Tue, 25 Dec 2018 14:38:44 +0000 Received: from AM0PR05MB4435.eurprd05.prod.outlook.com ([fe80::c860:9e3d:3158:8ea]) by AM0PR05MB4435.eurprd05.prod.outlook.com ([fe80::c860:9e3d:3158:8ea%4]) with mapi id 15.20.1446.027; Tue, 25 Dec 2018 14:38:44 +0000 From: Mordechay Haimovsky To: "dev@dpdk.org" CC: Mordechay Haimovsky Thread-Topic: [PATCH v1 3/3] net/mlx5: support flow counters using devx Thread-Index: AQHUnF+JDo4dy4KzzUWsD9wuGfNETA== Date: Tue, 25 Dec 2018 14:38:44 +0000 Message-ID: <1545748697-3385-4-git-send-email-motih@mellanox.com> References: <1545748697-3385-1-git-send-email-motih@mellanox.com> In-Reply-To: <1545748697-3385-1-git-send-email-motih@mellanox.com> Accept-Language: he-IL, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: CWLP265CA0157.GBRP265.PROD.OUTLOOK.COM (2603:10a6:401:52::25) To AM0PR05MB4435.eurprd05.prod.outlook.com (2603:10a6:208:5a::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=motih@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR05MB5202; 6:/rgsRhJig0p80oDzxNuKecQ+TUeJje/5hyRCOFuRP9AsKBPsCU1ApgElfQkOE1jLP+Ff4xsezDv4x/7vSqtIeg4wxWa2S8CImkWmhnUpunNyoqFRV25axVcXb0L84Y9qpwQ9yABUxAMNQIS2iWMxuyY+gC3SPlaB9qhgJPNZTCSJ2wItBjJRy50qFFw+i6ix923+bNtT2Bxywf0sPlOqjlZu+aRFIUYi1eBInobM6gMBBGTKP9irGmkfvNWOMp6nByD/ph2zaDVlgqyaTQ8YP0hYWrWTvMo0cPRVWrqmUwIAXhQ/IY2sA/hILAIHzUTxRiF+hKBGtBZw1nOadxrChCNkmpzChfph1J3il3KogtmW1XWRDq9eDyz+We237Zfj6Dyebv9N8w36lEcoddhqfirIHrLSn3MjDR6IwtyMw+lz44xBt5O3R2Id2/OH5aH232fXBZoXmG313VwzoAI2Yw==; 5:xsg+90K3TuFHYyuNGziRShML8ZK7n+DATcVCzZ/FXg+vQtSQROPqUISMVXP/+rch/nvGD4HqNczoCWymXcBySiNASeAH9lILCoxc/bV9iFn1yO7JqD2nPj3JTfJ78/QyIE9Sywh18oe2uycNpxqO1GCGDdjRYQA4S95gbpwkTIk=; 7:yGqst/g9i2JFsaqW8rdr/JiyXrMwSNtfFm4QfNX51LZdaPJRBoLlAtVTB43XNC/RGNjuoNxUlQB+tbsPZJXufBGEDhLDofbovZ9mbl8I6xqYV3inEHJrVA5w9btnbsf3L6H6h2UD5UeBRKzEqC82CA== x-ms-office365-filtering-correlation-id: 4d9b8352-b70f-4967-8f62-08d66a76abed x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:AM0PR05MB5202; x-ms-traffictypediagnostic: AM0PR05MB5202: x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(2401047)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231475)(944501520)(52105112)(6055026)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123560045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:AM0PR05MB5202; BCL:0; PCL:0; RULEID:; SRVR:AM0PR05MB5202; x-forefront-prvs: 08978A8F5C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(346002)(366004)(39860400002)(376002)(396003)(189003)(199004)(97736004)(2616005)(71190400001)(4744004)(14454004)(386003)(6506007)(6512007)(2906002)(476003)(8936002)(66066001)(99286004)(81156014)(7736002)(8676002)(81166006)(486006)(71200400001)(6916009)(478600001)(11346002)(6116002)(3846002)(305945005)(1730700003)(86362001)(446003)(5660300001)(14444005)(256004)(316002)(2351001)(6486002)(26005)(6436002)(186003)(19627235002)(105586002)(106356001)(36756003)(107886003)(52116002)(5640700003)(102836004)(53946003)(68736007)(76176011)(4326008)(53936002)(2501003)(25786009)(579004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB5202; H:AM0PR05MB4435.eurprd05.prod.outlook.com; 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-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Oy0/abxX2pN3dfPyVkYciZ5wnptQJvkpJja766DGvtjVNytcrMrqJGoDxSsLZAa82bDFUl3Eg8GMWxf3+O1XHCq5AQxeznQf08/wS9QyZIxi6o9Hcq+J2GEZKGwkCvpYl3bgF3Btlfw3JnYisgzhMHFcQEMSn55dv0jOSHNKICFWeHyxzCjHtVnSoqgZQ1eDpparLsLRWzrXHp4v61hcA9uF5k6ETJbDmDmHHU69GjuAh0jaSY/HfQuHVU0o++9JHxSDYEPUTnR8B67fQrqwsqg3eo4N+oDZll0joUz2Pvh9u+gjTL6LSKTrW57dKo6i spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d9b8352-b70f-4967-8f62-08d66a76abed X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Dec 2018 14:38:44.6411 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5202 Subject: [dpdk-dev] [PATCH v1 3/3] net/mlx5: support flow counters using devx 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 counters support when creating flows via direct verbs. The implementation uses devx interface in order to create query and delete the counters. This support requires MLNX_OFED_LINUX-4.5-0.1.0.1 installation. Signed-off-by: Moti Haimovsky --- drivers/net/mlx5/Makefile | 6 + drivers/net/mlx5/meson.build | 5 + drivers/net/mlx5/mlx5.c | 17 ++- drivers/net/mlx5/mlx5.h | 1 + drivers/net/mlx5/mlx5_devx_cmds.c | 117 +++++++++++++++++++ drivers/net/mlx5/mlx5_flow.h | 12 +- drivers/net/mlx5/mlx5_flow_dv.c | 232 ++++++++++++++++++++++++++++++++++++-- drivers/net/mlx5/mlx5_glue.c | 1 + drivers/net/mlx5/mlx5_prm.h | 86 ++++++++++++++ 9 files changed, 461 insertions(+), 16 deletions(-) create mode 100644 drivers/net/mlx5/mlx5_devx_cmds.c diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index 58e2d15..bd96706 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -36,6 +36,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_tcf.c SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_verbs.c SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_socket.c SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_nl.c +SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_devx_cmds.c ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS),y) INSTALL-$(CONFIG_RTE_LIBRTE_MLX5_PMD)-lib += $(LIB_GLUE) @@ -153,6 +154,11 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh func mlx5dv_devx_obj_create \ $(AUTOCONF_OUTPUT) $Q sh -- '$<' '$@' \ + HAVE_IBV_FLOW_DEVX_COUNTERS \ + infiniband/mlx5dv.h \ + enum MLX5DV_FLOW_ACTION_COUNTER_DEVX \ + $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ HAVE_ETHTOOL_LINK_MODE_25G \ /usr/include/linux/ethtool.h \ enum ETHTOOL_LINK_MODE_25000baseCR_Full_BIT \ diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index e323c3a..9a5077d 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -46,6 +46,7 @@ if build 'mlx5_trigger.c', 'mlx5_txq.c', 'mlx5_vlan.c', + 'mlx5_devx_cmds.c', ) if dpdk_conf.has('RTE_ARCH_X86_64') or dpdk_conf.has('RTE_ARCH_ARM64') sources += files('mlx5_rxtx_vec.c') @@ -100,6 +101,10 @@ if build 'MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD' ], [ 'HAVE_IBV_FLOW_DV_SUPPORT', 'infiniband/mlx5dv.h', 'mlx5dv_create_flow_action_packet_reformat' ], + [ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h', + 'MLX5DV_FLOW_ACTION_COUNTER_DEVX' ], + [ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h', + 'MLX5DV_CONTEXT_FLAGS_DEVX' ], [ 'HAVE_IBV_DEVICE_MPLS_SUPPORT', 'infiniband/verbs.h', 'IBV_FLOW_SPEC_MPLS' ], [ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h', diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 9e5cab1..1e00b8b 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -727,7 +727,7 @@ struct mlx5_dev_config config, const struct mlx5_switch_info *switch_info) { - struct ibv_context *ctx; + struct ibv_context *ctx = NULL; struct ibv_device_attr_ex attr; struct ibv_port_attr port_attr; struct ibv_pd *pd = NULL; @@ -786,10 +786,17 @@ /* Prepare shared data between primary and secondary process. */ mlx5_prepare_shared_data(); errno = 0; - ctx = mlx5_glue->open_device(ibv_dev); - if (!ctx) { - rte_errno = errno ? errno : ENODEV; - return NULL; + ctx = mlx5_glue->dv_open_device(ibv_dev); + if (ctx) { + config.devx = 1; + DRV_LOG(DEBUG, "DEVX is %ssupported", + config.devx ? "" : "not "); + } else { + ctx = mlx5_glue->open_device(ibv_dev); + if (!ctx) { + rte_errno = errno ? errno : ENODEV; + return NULL; + } } #ifdef HAVE_IBV_MLX5_MOD_SWP dv_attr.comp_mask |= MLX5DV_CONTEXT_MASK_SWP; diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 75aeeb2..1fcdb71 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -129,6 +129,7 @@ struct mlx5_dev_config { unsigned int vf_nl_en:1; /* Enable Netlink requests in VF mode. */ unsigned int dv_flow_en:1; /* Enable DV flow. */ unsigned int swp:1; /* Tx generic tunnel checksum and TSO offload. */ + unsigned int devx:1; /* Whether devx interface is available or not. */ struct { unsigned int enabled:1; /* Whether MPRQ is enabled. */ unsigned int stride_num_n; /* Number of strides. */ diff --git a/drivers/net/mlx5/mlx5_devx_cmds.c b/drivers/net/mlx5/mlx5_devx_cmds.c new file mode 100644 index 0000000..a3f421e --- /dev/null +++ b/drivers/net/mlx5/mlx5_devx_cmds.c @@ -0,0 +1,117 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* Copyright 2018 Mellanox Technologies, Ltd */ + +#include + +#include "mlx5.h" +#include "mlx5_glue.h" +#include "mlx5_prm.h" + +/* + * Dummy struct to prevent compilation errors when + * mlx5dv_devx_obj is not defined in mlx5dv.h + */ +#ifndef HAVE_IBV_DEVX_OBJ +struct mlx5dv_devx_obj { + void *ctx; +}; +#endif /* HAVE_IBV_DEVX_OBJ */ + +/** + * Allocate flow counters via devx interface. + * + * @param[in] ctx + * ibv contexts returned from mlx5dv_open_device. + * @param dcs + * Pointer to counters properties structure to be filled by the routine. + * + * @return + * 0 on success, a negative value otherwise. + */ +int mlx5_devx_cmd_flow_counter_alloc(struct ibv_context *ctx, + struct mlx5_devx_counter_set *dcs) +{ + uint32_t in[MLX5_ST_SZ_DW(alloc_flow_counter_in)] = {0}; + uint32_t out[MLX5_ST_SZ_DW(alloc_flow_counter_out)] = {0}; + int status, syndrome; + + MLX5_SET(alloc_flow_counter_in, in, opcode, + MLX5_CMD_OP_ALLOC_FLOW_COUNTER); + dcs->obj = mlx5_glue->devx_obj_create(ctx, in, + sizeof(in), out, sizeof(out)); + if (!dcs->obj) + return -errno; + status = MLX5_GET(query_flow_counter_out, out, status); + syndrome = MLX5_GET(query_flow_counter_out, out, syndrome); + if (status) { + DRV_LOG(DEBUG, "Failed to create devx counters, " + "status %x, syndrome %x", status, syndrome); + return -1; + } + dcs->id = MLX5_GET(alloc_flow_counter_out, + out, flow_counter_id); + return 0; +} + +/** + * Free flow counters obtained via devx interface. + * + * @param[in] obj + * devx object that was obtained from mlx5_devx_cmd_fc_alloc. + * + * @return + * 0 on success, a negative value otherwise. + */ +int mlx5_devx_cmd_flow_counter_free(struct mlx5dv_devx_obj *obj) +{ + return mlx5_glue->devx_obj_destroy(obj); +} + +/** + * Query flow counters values. + * + * @param[in] dcs + * devx object that was obtained from mlx5_devx_cmd_fc_alloc. + * @param[in] clear + * Whether hardware should clear the counters after the query or not. + * @param pkts + * The number of packets that matched the flow. + * @param bytes + * The number of bytes that matched the flow. + * + * @return + * 0 on success, a negative value otherwise. + */ +int +mlx5_devx_cmd_flow_counter_query(struct mlx5_devx_counter_set *dcs, + int clear __rte_unused, + uint64_t *pkts, uint64_t *bytes) +{ + uint32_t out[MLX5_ST_SZ_BYTES(query_flow_counter_out) + + MLX5_ST_SZ_BYTES(traffic_counter)] = {0}; + uint32_t in[MLX5_ST_SZ_DW(query_flow_counter_in)] = {0}; + void *stats; + int status, syndrome, rc; + + MLX5_SET(query_flow_counter_in, in, opcode, + MLX5_CMD_OP_QUERY_FLOW_COUNTER); + MLX5_SET(query_flow_counter_in, in, op_mod, 0); + MLX5_SET(query_flow_counter_in, in, flow_counter_id, dcs->id); + rc = mlx5_glue->devx_obj_query(dcs->obj, + in, sizeof(in), out, sizeof(out)); + if (rc) + return rc; + status = MLX5_GET(query_flow_counter_out, out, status); + syndrome = MLX5_GET(query_flow_counter_out, out, syndrome); + if (status) { + DRV_LOG(DEBUG, "Failed to query devx counters, " + "id %d, status %x, syndrome = %x", + status, syndrome, dcs->id); + return -1; + } + stats = MLX5_ADDR_OF(query_flow_counter_out, + out, flow_statistics); + *pkts = MLX5_GET64(traffic_counter, stats, packets); + *bytes = MLX5_GET64(traffic_counter, stats, octets); + return 0; +} diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 4a7c052..838c85a 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -21,6 +21,9 @@ #pragma GCC diagnostic error "-Wpedantic" #endif +#include "mlx5.h" +#include "mlx5_prm.h" + /* Pattern outer Layer bits. */ #define MLX5_FLOW_LAYER_OUTER_L2 (1u << 0) #define MLX5_FLOW_LAYER_OUTER_L3_IPV4 (1u << 1) @@ -273,13 +276,16 @@ struct mlx5_flow { struct mlx5_flow_counter { LIST_ENTRY(mlx5_flow_counter) next; /**< Pointer to the next counter. */ uint32_t shared:1; /**< Share counter ID with other flow rules. */ - uint32_t ref_cnt:31; /**< Reference counter. */ + uint32_t ref_cnt:30; /**< Reference counter. */ uint32_t id; /**< Counter ID. */ + union { /**< Holds the counters for the rule. */ #if defined(HAVE_IBV_DEVICE_COUNTERS_SET_V42) - struct ibv_counter_set *cs; /**< Holds the counters for the rule. */ + struct ibv_counter_set *cs; #elif defined(HAVE_IBV_DEVICE_COUNTERS_SET_V45) - struct ibv_counters *cs; /**< Holds the counters for the rule. */ + struct ibv_counters *cs; #endif + struct mlx5_devx_counter_set *dcs; + }; uint64_t hits; /**< Number of packets matched by the rule. */ uint64_t bytes; /**< Number of bytes matched by the rule. */ }; diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 1f31874..14dadce 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -97,6 +97,36 @@ } /** + * Validate count action. + * + * @param[in] dev + * device otr. + * @param[out] error + * Pointer to error structure. + * + * @return + * 0 on success, a negative errno value otherwise and rte_errno is set. + */ +static int +flow_dv_validate_action_count(struct rte_eth_dev *dev, + struct rte_flow_error *error) +{ + struct priv *priv = dev->data->dev_private; + + if (!priv->config.devx) + goto notsup_err; +#ifdef HAVE_IBV_FLOW_DEVX_COUNTERS + return 0; +#endif +notsup_err: + return rte_flow_error_set + (error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "count action not supported"); +} + +/** * Validate the L2 encap action. * * @param[in] action_flags @@ -704,6 +734,87 @@ } /** + * Get or create a flow counter. + * + * @param[in] dev + * Pointer to the Ethernet device structure. + * @param[in] shared + * Indicate if this counter is shared with other flows. + * @param[in] id + * Counter identifier. + * + * @return + * pointer to flow counter on success, NULL otherwise and rte_errno is set. + */ +static struct mlx5_flow_counter * +flow_dv_counter_new(struct rte_eth_dev *dev, uint32_t shared, uint32_t id) +{ + struct priv *priv = dev->data->dev_private; + struct mlx5_flow_counter *cnt = NULL; + struct mlx5_devx_counter_set *dcs = NULL; + int ret; + + if (!priv->config.devx) { + ret = -ENOTSUP; + goto error_exit; + } + if (shared) { + LIST_FOREACH(cnt, &priv->flow_counters, next) { + if (cnt->shared && cnt->id == id) { + cnt->ref_cnt++; + return cnt; + } + } + } + cnt = rte_calloc(__func__, 1, sizeof(*cnt), 0); + dcs = rte_calloc(__func__, 1, sizeof(*dcs), 0); + if (!dcs || !cnt) { + ret = -ENOMEM; + goto error_exit; + } + ret = mlx5_devx_cmd_flow_counter_alloc(priv->ctx, dcs); + if (ret) + goto error_exit; + struct mlx5_flow_counter tmpl = { + .shared = shared, + .ref_cnt = 1, + .id = id, + .dcs = dcs, + }; + *cnt = tmpl; + LIST_INSERT_HEAD(&priv->flow_counters, cnt, next); + return cnt; +error_exit: + rte_free(cnt); + rte_free(dcs); + rte_errno = -ret; + return NULL; +} + +/** + * Release a flow counter. + * + * @param[in] counter + * Pointer to the counter handler. + */ +static void +flow_dv_counter_release(struct mlx5_flow_counter *counter) +{ + int ret; + + if (!counter) + return; + if (--counter->ref_cnt == 0) { + ret = mlx5_devx_cmd_flow_counter_free(counter->dcs->obj); + if (ret) + DRV_LOG(ERR, "Failed to free devx counters, %d", ret); + LIST_REMOVE(counter, next); + rte_free(counter->dcs); + rte_free(counter); + } +} + +/** * Verify the @p attributes will be correctly understood by the NIC and store * them in the @p flow if everything is correct. * @@ -965,7 +1076,7 @@ ++actions_n; break; case RTE_FLOW_ACTION_TYPE_COUNT: - ret = mlx5_flow_validate_action_count(dev, attr, error); + ret = flow_dv_validate_action_count(dev, error); if (ret < 0) return ret; action_flags |= MLX5_FLOW_ACTION_COUNT; @@ -1902,6 +2013,9 @@ const struct rte_flow_action_queue *queue; const struct rte_flow_action_rss *rss; const struct rte_flow_action *action = actions; +#ifdef HAVE_IBV_FLOW_DEVX_COUNTERS + const struct rte_flow_action_count *count = action->conf; +#endif const uint8_t *rss_key; switch (actions->type) { @@ -1950,6 +2064,37 @@ flow->rss.level = rss->level; action_flags |= MLX5_FLOW_ACTION_RSS; break; + case RTE_FLOW_ACTION_TYPE_COUNT: + if (!priv->config.devx) { + rte_errno = ENOTSUP; + goto cnt_err; + } + flow->counter = + flow_dv_counter_new(dev, + count->shared, count->id); + if (flow->counter == NULL) + goto cnt_err; + dev_flow->dv.actions[actions_n].type = + MLX5DV_FLOW_ACTION_COUNTER_DEVX; + dev_flow->dv.actions[actions_n].obj = + flow->counter->dcs->obj; + action_flags |= MLX5_FLOW_ACTION_COUNT; + ++actions_n; + break; +cnt_err: + if (rte_errno == ENOTSUP) + return rte_flow_error_set + (error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "count action not supported"); + else + return rte_flow_error_set + (error, rte_errno, + RTE_FLOW_ERROR_TYPE_ACTION, + action, + "cannot create counter" + " object."); case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP: case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP: if (flow_dv_create_action_l2_encap(dev, actions, @@ -2338,8 +2483,6 @@ dv->hrxq = NULL; } } - if (flow->counter) - flow->counter = NULL; } /** @@ -2358,6 +2501,10 @@ if (!flow) return; flow_dv_remove(dev, flow); + if (flow->counter) { + flow_dv_counter_release(flow->counter); + flow->counter = NULL; + } while (!LIST_EMPTY(&flow->dev_flows)) { dev_flow = LIST_FIRST(&flow->dev_flows); LIST_REMOVE(dev_flow, next); @@ -2370,22 +2517,91 @@ } /** + * Query a dv flow rule for its statistics via devx. + * + * @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_dv_query_count(struct rte_eth_dev *dev, struct rte_flow *flow, + void *data, struct rte_flow_error *error) +{ + struct priv *priv = dev->data->dev_private; + struct rte_flow_query_count *qc = data; + uint64_t pkts = 0; + uint64_t bytes = 0; + int err; + + if (!priv->config.devx) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "counters are not supported"); + if (flow->counter) { + err = mlx5_devx_cmd_flow_counter_query + (flow->counter->dcs, + qc->reset, &pkts, &bytes); + if (err) + return rte_flow_error_set + (error, err, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "cannot read counters"); + qc->hits_set = 1; + qc->bytes_set = 1; + qc->hits = pkts - flow->counter->hits; + qc->bytes = bytes - flow->counter->bytes; + if (qc->reset) { + flow->counter->hits = pkts; + flow->counter->bytes = bytes; + } + return 0; + } + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "counters are not available"); +} + +/** * Query a flow. * * @see rte_flow_query() * @see rte_flow_ops */ static int -flow_dv_query(struct rte_eth_dev *dev __rte_unused, +flow_dv_query(struct rte_eth_dev *dev, 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) { - return rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, - NULL, - "flow query with DV is not supported"); + 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_dv_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; } diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c index 7d3d9d3..4078b54 100644 --- a/drivers/net/mlx5/mlx5_glue.c +++ b/drivers/net/mlx5/mlx5_glue.c @@ -65,6 +65,7 @@ return ibv_open_device(device); } + static int mlx5_glue_close_device(struct ibv_context *context) { diff --git a/drivers/net/mlx5/mlx5_prm.h b/drivers/net/mlx5/mlx5_prm.h index 29742b1..812b4bf 100644 --- a/drivers/net/mlx5/mlx5_prm.h +++ b/drivers/net/mlx5/mlx5_prm.h @@ -368,6 +368,7 @@ struct mlx5_modification_cmd { #define __mlx5_dw_bit_off(typ, fld) (32 - __mlx5_bit_sz(typ, fld) - \ (__mlx5_bit_off(typ, fld) & 0x1f)) #define __mlx5_dw_off(typ, fld) (__mlx5_bit_off(typ, fld) / 32) +#define __mlx5_64_off(typ, fld) (__mlx5_bit_off(typ, fld) / 64) #define __mlx5_dw_mask(typ, fld) (__mlx5_mask(typ, fld) << \ __mlx5_dw_bit_off(typ, fld)) #define __mlx5_mask(typ, fld) ((u32)((1ull << __mlx5_bit_sz(typ, fld)) - 1)) @@ -375,6 +376,7 @@ struct mlx5_modification_cmd { #define __mlx5_16_bit_off(typ, fld) (16 - __mlx5_bit_sz(typ, fld) - \ (__mlx5_bit_off(typ, fld) & 0xf)) #define __mlx5_mask16(typ, fld) ((u16)((1ull << __mlx5_bit_sz(typ, fld)) - 1)) +#define MLX5_ST_SZ_BYTES(typ) (sizeof(struct mlx5_ifc_##typ##_bits) / 8) #define MLX5_ST_SZ_DW(typ) (sizeof(struct mlx5_ifc_##typ##_bits) / 32) #define MLX5_ST_SZ_DB(typ) (sizeof(struct mlx5_ifc_##typ##_bits) / 8) #define MLX5_BYTE_OFF(typ, fld) (__mlx5_bit_off(typ, fld) / 8) @@ -391,10 +393,16 @@ struct mlx5_modification_cmd { (((_v) & __mlx5_mask(typ, fld)) << \ __mlx5_dw_bit_off(typ, fld))); \ } while (0) +#define MLX5_GET(typ, p, fld) \ + ((rte_be_to_cpu_32(*((__be32 *)(p) +\ + __mlx5_dw_off(typ, fld))) >> __mlx5_dw_bit_off(typ, fld)) & \ + __mlx5_mask(typ, fld)) #define MLX5_GET16(typ, p, fld) \ ((rte_be_to_cpu_16(*((__be16 *)(p) + \ __mlx5_16_off(typ, fld))) >> __mlx5_16_bit_off(typ, fld)) & \ __mlx5_mask16(typ, fld)) +#define MLX5_GET64(typ, p, fld) rte_be_to_cpu_64(*((__be64 *)(p) + \ + __mlx5_64_off(typ, fld))) #define MLX5_FLD_SZ_BYTES(typ, fld) (__mlx5_bit_sz(typ, fld) / 8) struct mlx5_ifc_fte_match_set_misc_bits { @@ -500,6 +508,69 @@ enum { MLX5_MATCH_CRITERIA_ENABLE_MISC2_BIT }; +enum { + MLX5_CMD_OP_ALLOC_FLOW_COUNTER = 0x939, + MLX5_CMD_OP_QUERY_FLOW_COUNTER = 0x93b, +}; + +/* Flow counters. */ +struct mlx5_ifc_alloc_flow_counter_out_bits { + u8 status[0x8]; + u8 reserved_at_8[0x18]; + u8 syndrome[0x20]; + u8 flow_counter_id[0x20]; + u8 reserved_at_60[0x20]; +}; + +struct mlx5_ifc_alloc_flow_counter_in_bits { + u8 opcode[0x10]; + u8 reserved_at_10[0x10]; + u8 reserved_at_20[0x10]; + u8 op_mod[0x10]; + u8 reserved_at_40[0x40]; +}; + +struct mlx5_ifc_dealloc_flow_counter_out_bits { + u8 status[0x8]; + u8 reserved_at_8[0x18]; + u8 syndrome[0x20]; + u8 reserved_at_40[0x40]; +}; + +struct mlx5_ifc_dealloc_flow_counter_in_bits { + u8 opcode[0x10]; + u8 reserved_at_10[0x10]; + u8 reserved_at_20[0x10]; + u8 op_mod[0x10]; + u8 flow_counter_id[0x20]; + u8 reserved_at_60[0x20]; +}; + +struct mlx5_ifc_traffic_counter_bits { + u8 packets[0x40]; + u8 octets[0x40]; +}; + +struct mlx5_ifc_query_flow_counter_out_bits { + u8 status[0x8]; + u8 reserved_at_8[0x18]; + u8 syndrome[0x20]; + u8 reserved_at_40[0x40]; + struct mlx5_ifc_traffic_counter_bits flow_statistics[]; +}; + +struct mlx5_ifc_query_flow_counter_in_bits { + u8 opcode[0x10]; + u8 reserved_at_10[0x10]; + u8 reserved_at_20[0x10]; + u8 op_mod[0x10]; + u8 reserved_at_40[0x80]; + u8 clear[0x1]; + u8 reserved_at_c1[0xf]; + u8 num_of_counters[0x10]; + u8 flow_counter_id[0x20]; +}; + /* CQE format mask. */ #define MLX5E_CQE_FORMAT_MASK 0xc @@ -581,4 +652,19 @@ struct mlx5_mini_cqe8 { #endif } + +/* devx counyter object */ +struct mlx5_devx_counter_set { + struct mlx5dv_devx_obj *obj; + int id; /* Flow counter ID */ +}; + +/* mlx5_devx_cmds.c */ + +int mlx5_devx_cmd_flow_counter_alloc(struct ibv_context *ctx, + struct mlx5_devx_counter_set *dcx); +int mlx5_devx_cmd_flow_counter_free(struct mlx5dv_devx_obj *obj); +int mlx5_devx_cmd_flow_counter_query(struct mlx5_devx_counter_set *dcx, + int clear, + uint64_t *pkts, uint64_t *bytes); #endif /* RTE_PMD_MLX5_PRM_H_ */