From patchwork Wed Jan 2 09:43:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moti Haimovsky X-Patchwork-Id: 49378 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 179701B200; Wed, 2 Jan 2019 10:43:21 +0100 (CET) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40072.outbound.protection.outlook.com [40.107.4.72]) by dpdk.org (Postfix) with ESMTP id D8CC31B1FB; Wed, 2 Jan 2019 10:43:19 +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=F6lV2XQolRqnQcsPgX6GgGiMHcvuwtycqplZDgMCC8g=; b=gplm/X29aSOSpIBZEFEmbAfwalB6XaE+4AXmiGfZXtAN7tUb3JlDmD1qTC8hPQXuJEcOKSigR6iVzlLbVtE5Ko9x2kfd26U/EzvGVH58jAabTzXdkbPsgSbwy6ZhFvTfWaOaO6qyO15bF1oJwGJCPpW4ZTfkV/BQ7yEHPUTZ4bU= Received: from DB7PR05MB4444.eurprd05.prod.outlook.com (52.134.109.21) by DB7PR05MB5415.eurprd05.prod.outlook.com (20.177.123.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1495.6; Wed, 2 Jan 2019 09:43:19 +0000 Received: from DB7PR05MB4444.eurprd05.prod.outlook.com ([fe80::6d18:42b9:26fe:ea2f]) by DB7PR05MB4444.eurprd05.prod.outlook.com ([fe80::6d18:42b9:26fe:ea2f%2]) with mapi id 15.20.1495.005; Wed, 2 Jan 2019 09:43:19 +0000 From: Mordechay Haimovsky To: "dev@dpdk.org" CC: Mordechay Haimovsky , "stable@dpdk.org" Thread-Topic: [PATCH v3 1/3] net/mlx5: fix shared counter allocation logic Thread-Index: AQHUon+XWaXPEY/1AU+qlVt237u0OQ== Date: Wed, 2 Jan 2019 09:43:19 +0000 Message-ID: <1546422185-30813-2-git-send-email-motih@mellanox.com> References: <1545949196-3355-4-git-send-email-motih@mellanox.com> In-Reply-To: <1545949196-3355-4-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: LO2P265CA0218.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:b::14) To DB7PR05MB4444.eurprd05.prod.outlook.com (2603:10a6:5:1b::21) 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; DB7PR05MB5415; 6:TFVGiw/n3kEUE5R1in/T2FvBi/6x/kolwR/ZKNXb7IUBd1GgYvDtZlyph40cPy4jywJNnWrIussnl0iLIQMZS5QapwzdmxahOpnVpm2/scj7BWuFv/CF29OXTVLIuW7frSnzZBdb/dgpGJNIuMfcIOMUmWSEoFxRz4r7IuxZNi4M/DucrlIzuo1QGDifX5xghft80SyryNdz97YKR1krTovjdzvKnjudm4IljwM5Zq+Jkp4jHAqMDhii+QDMYYwcgs8pOyIMggTfxHZCRlm3uXvajCaU9nhtsE+Ve2vMXAM2AI0gXwsVAeXroOu3Y1tdwibXIfgklwGRANDN2moU/N5gx9tMkO3DsRD2b8DOC7ssERZrxlGGFHy3JLTjn/7ovQ0rUwbrBIjcKWHkMorVn91vnrH4cjEst3RLkrrg8ybVoVUlaZbKidQXK9hrWua3NXdXKzwcLEWXlZVZlJ9BiQ==; 5:wxyzRcOEUVu7D5pmj+AYI3JgmnH/nmNMkEnp57W4de32gzC7n2B8bY2XVT2gx4RyLAvE2jcsPrIrKBuwh9dVnWBwvurd/V9JC3Z4GRInmD7aFKfqc98xZuyjn/Vqa5oIR5vmEqVptKUs7dJ79+CgofReTiJ9J6A4ZWZna77oaNvakGmGeVodcZF5kjib4E6iiKYQLJaxKmJS3n7nT1ALfg==; 7:+NpfkMVPKsSh7NR9Ra5EvzyFGog69ckXb7nt9wS1DEN8sCYe9Y8JdoJkXE0AzH1mgK0epv+b5yIjMFsas0mbCkIOH/NQ2yLCnq8nf7X/lWFBqF47vvAo5sVrsKLKehIMSezWm4tldEDPqVv6OHJJGA== x-ms-office365-filtering-correlation-id: 3e092210-be2a-4475-dced-08d67096b9f2 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB5415; x-ms-traffictypediagnostic: DB7PR05MB5415: x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(8220060)(2401047)(8121501046)(93006095)(93001095)(3231475)(944501520)(52105112)(3002001)(10201501046)(6055026)(6041310)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:DB7PR05MB5415; BCL:0; PCL:0; RULEID:; SRVR:DB7PR05MB5415; x-forefront-prvs: 0905A6B2C7 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(366004)(346002)(199004)(189003)(476003)(8676002)(6436002)(81156014)(8936002)(6116002)(3846002)(14454004)(2351001)(68736007)(6486002)(2906002)(5640700003)(81166006)(450100002)(4326008)(7736002)(305945005)(25786009)(1730700003)(6512007)(5660300001)(53936002)(6916009)(66066001)(99286004)(2501003)(36756003)(478600001)(86362001)(316002)(54906003)(256004)(386003)(6506007)(105586002)(26005)(102836004)(71200400001)(97736004)(106356001)(76176011)(52116002)(446003)(2616005)(11346002)(186003)(71190400001)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB5415; H:DB7PR05MB4444.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: QlJJI/tJhKx3QAxQ3r1GB6Gg4U3b+gYKFZdS/L4BTIgkBkIIzuu2zodXcpFxbfZt0Z5mJ4nzn4H9h5Yodt6dcFjcgdB9a9I8Kd+6T873j/AKrinSLZqcIUTepa1zcE3U2y2HPvubYo4Sauhtzh2/RAxYCTRU7ZHOyEtyT5NcqSXq4KGF7hRh6VTluynJjjP2GT38+Zi1cHGtlDHZ+nKIWm3mst+pe4mrUpw0Vqa0hTQ089lWha0PV+9e/K1xLXQQPjUFVD/Tg+hMSfgNgbRljwDJasXPFuOMgu/yG0q8QXnADI02TKdRJ48/6qrui1Iz spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e092210-be2a-4475-dced-08d67096b9f2 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jan 2019 09:43:19.0673 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB5415 Subject: [dpdk-dev] [PATCH v3 1/3] net/mlx5: fix 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 fixes the logic for searching and allocating a shared counter in mlx5_flow_verbs. Now only the shared counters in the counters list are checked for a match and not all the counters as before. Fixes: 84c406e74524 ("net/mlx5: add flow translate function") Cc: stable@dpdk.org Signed-off-by: Moti Haimovsky --- v2: * Modified commit header --- 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 Wed Jan 2 09:43:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moti Haimovsky X-Patchwork-Id: 49380 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 B71541B275; Wed, 2 Jan 2019 10:43:23 +0100 (CET) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40088.outbound.protection.outlook.com [40.107.4.88]) by dpdk.org (Postfix) with ESMTP id E938A1B1F8 for ; Wed, 2 Jan 2019 10:43:20 +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=J5nwu2z8lKc1auUloHwqqUIfSbiHGIWACTL7IqDJkFY=; b=Yt5HffqJR+4Oz/2Pxwpnp2Kt3Kd9/RAAOXsSaR29v/dpTJTYPYhxJfMraxSFGdDvAoAY9iOtTJNdg210GOquYwfcuGchDvVpe7I/uH68m40FlXTBZ3VWX3+QeNB84FTVB+Tet9dcE8JhulLt+LZwy1De1KevGbY2cc+LeUTQaOs= Received: from DB7PR05MB4444.eurprd05.prod.outlook.com (52.134.109.21) by DB7PR05MB5415.eurprd05.prod.outlook.com (20.177.123.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1495.6; Wed, 2 Jan 2019 09:43:19 +0000 Received: from DB7PR05MB4444.eurprd05.prod.outlook.com ([fe80::6d18:42b9:26fe:ea2f]) by DB7PR05MB4444.eurprd05.prod.outlook.com ([fe80::6d18:42b9:26fe:ea2f%2]) with mapi id 15.20.1495.005; Wed, 2 Jan 2019 09:43:19 +0000 From: Mordechay Haimovsky To: "dev@dpdk.org" CC: Mordechay Haimovsky Thread-Topic: [PATCH v3 2/3] net/mlx5: add devx functions to glue Thread-Index: AQHUon+Y9Z+lCqnpC0u6CpNSfBiAEA== Date: Wed, 2 Jan 2019 09:43:19 +0000 Message-ID: <1546422185-30813-3-git-send-email-motih@mellanox.com> References: <1545949196-3355-4-git-send-email-motih@mellanox.com> In-Reply-To: <1545949196-3355-4-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: LO2P265CA0218.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:b::14) To DB7PR05MB4444.eurprd05.prod.outlook.com (2603:10a6:5:1b::21) 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; DB7PR05MB5415; 6:dasNMG4tePP3AuMCOv3YEz8clbZXFF8X8fYp5rV8Jk3iui0+hdFGBO+TZbO35vzYeSw3vexZOoNwN4/FwRBgJY0xkARnGFb5JfaVpmB6yl0fThzHxwqTyAf1hqh3Sph9zdSo+aU/fCg9UM39oCvO0M9aCPNPAqLd8zezNC7pbm9l+YevxNWqN6+TB87AIyEHl194nG29iom4SWWYup6ErJe1OQ93BEQg5mPmemPPJHDsCjhrLwj0ILmJ81rjx9F32PKum3rE1D2j7vIvF6sAVR+T/sI6maxSeCBnHC+n7T04KJElDRgybSvVNa0RIZ/mAwBsAPC2oHfuU2AQ/w94N3x2g5fcIWabErvMKMBtgx1frsdxrAjGOHSGS9IjfhUCmecaQ1Th9tPQlm1NN0b7L3mAjPqezgzoGslWx8QzlWIFXCxTECPfjiTsdTu6iIHSsxHrfSd8ewTEEaGagwV27Q==; 5:tAE55X2az7fCcsujdFYgUd1zc6hhXz+DUUKY/GKb3A2LaunJwt66JCDEwuJ89W9okypMddVnpBIwb/daZJO7vIAAfoKw5RW4gqOHvnje1e8sepRSX/teM3S8lhqwJEazKTKD2eTvXyo2KUDK56z7/aPepCtn0xwbUEmai2wnAU6+y5cVSw6M7B3KICcf06/K8n2Lt8eVmtY2Bh2KsRJA4w==; 7:29GNwNQxEbiN862SQ2TF0N0y9u+mDz//rt04c/dsxW1XNLJ2iIt3+3UaewW8tKeyzObEy+4hnIf0HyoRBx3LvWPyEm/IjN0SRZerRZf1ezch5qV1kEt2yfs/jzQ28/ShNhMGdEZs/u+wZ3nD01FI+g== x-ms-office365-filtering-correlation-id: bea784c9-8a6b-4abd-1348-08d67096ba6a x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB5415; x-ms-traffictypediagnostic: DB7PR05MB5415: x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(8220060)(2401047)(8121501046)(93006095)(93001095)(3231475)(944501520)(52105112)(3002001)(10201501046)(6055026)(6041310)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:DB7PR05MB5415; BCL:0; PCL:0; RULEID:; SRVR:DB7PR05MB5415; x-forefront-prvs: 0905A6B2C7 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(366004)(346002)(199004)(189003)(476003)(8676002)(6436002)(81156014)(8936002)(6116002)(3846002)(14454004)(2351001)(68736007)(6486002)(2906002)(5640700003)(81166006)(107886003)(4326008)(7736002)(305945005)(25786009)(1730700003)(6512007)(5660300001)(53936002)(6916009)(66066001)(99286004)(2501003)(36756003)(478600001)(86362001)(316002)(256004)(386003)(6506007)(105586002)(26005)(102836004)(71200400001)(97736004)(106356001)(76176011)(52116002)(446003)(2616005)(11346002)(186003)(71190400001)(486006)(19627235002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB5415; H:DB7PR05MB4444.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: 9d0nkmxsPezbzsQpew0VPvop+6TGCKsiz9OfHXZOxIv4v3mK5VaWNAut4QTQX1ImIqXOENskVfFae/IiPkyE3ux0k1glQp2CjOkLJrikzO+sNix9duhggHp44CTMnNRYmczZSUYk0QSWLiyc1S1Unt6AGMdO+yHhVR3i+BXdT0TNU9oY7PGsbRds/uNfq4max4AUJLRHcyjGOMy1stpNBWed7c6hkNk8k7grD/nnXQQR0D80qGG8AXhVSfuCTI4wwE+wTw1FoVSDjcuHjor2lp5rJuqtG7bgudB55VGaavzBSznxemyGF8qovQV/i6RJ spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: bea784c9-8a6b-4abd-1348-08d67096ba6a X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jan 2019 09:43:19.8016 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB5415 Subject: [dpdk-dev] [PATCH v3 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 --- v2: * Modifications according to review inputs. see message Id: 1545748697-3385-3-git-send-email-motih@mellanox.com --- drivers/net/mlx5/Makefile | 5 +++ drivers/net/mlx5/meson.build | 2 + drivers/net/mlx5/mlx5_glue.c | 98 ++++++++++++++++++++++++++++++++++++++++++++ drivers/net/mlx5/mlx5_glue.h | 19 +++++++++ 4 files changed, 124 insertions(+) diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index 1353c18..8ddad1a 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 8ba19e8..e2fc4ea 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 a806d92..c817d86 100644 --- a/drivers/net/mlx5/mlx5_glue.c +++ b/drivers/net/mlx5/mlx5_glue.c @@ -498,6 +498,98 @@ #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){ @@ -557,4 +649,10 @@ mlx5_glue_dv_create_flow_action_packet_reformat, .dv_create_flow_action_modify_header = mlx5_glue_dv_create_flow_action_modify_header, + .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 9cfe836..b118960 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; @@ -169,6 +173,21 @@ struct mlx5_glue { size_t actions_sz, uint64_t actions[], 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 Wed Jan 2 09:43:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moti Haimovsky X-Patchwork-Id: 49381 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 C38331B296; Wed, 2 Jan 2019 10:43:24 +0100 (CET) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40076.outbound.protection.outlook.com [40.107.4.76]) by dpdk.org (Postfix) with ESMTP id DA8921B272 for ; Wed, 2 Jan 2019 10:43:22 +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=IgubYpFUj6qzesc/KWSo6lKymnR2iIVlTvAZ5S5YPM0=; b=ZoA9Mi84yTP9wtGM5rV5txb+4L8KvxtiVakTnlmQs6Np/fDK2WlacjRGKT6PQ0avfaCJiIQonIWntVJOG7pfsAvser3eDJFOhKJwKX3hB7hri36c9ZX/bB02SsyB0HlHZhxbBocsd1U5SUdrk/yQJM+54chM+t8UGuvzMuAJtFM= Received: from DB7PR05MB4444.eurprd05.prod.outlook.com (52.134.109.21) by DB7PR05MB5415.eurprd05.prod.outlook.com (20.177.123.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1495.6; Wed, 2 Jan 2019 09:43:20 +0000 Received: from DB7PR05MB4444.eurprd05.prod.outlook.com ([fe80::6d18:42b9:26fe:ea2f]) by DB7PR05MB4444.eurprd05.prod.outlook.com ([fe80::6d18:42b9:26fe:ea2f%2]) with mapi id 15.20.1495.005; Wed, 2 Jan 2019 09:43:20 +0000 From: Mordechay Haimovsky To: "dev@dpdk.org" CC: Mordechay Haimovsky Thread-Topic: [PATCH v3 3/3] net/mlx5: support flow counters using devx Thread-Index: AQHUon+YfXvaXbo0CEmbGgcDSKRFtg== Date: Wed, 2 Jan 2019 09:43:20 +0000 Message-ID: <1546422185-30813-4-git-send-email-motih@mellanox.com> References: <1545949196-3355-4-git-send-email-motih@mellanox.com> In-Reply-To: <1545949196-3355-4-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: LO2P265CA0218.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:b::14) To DB7PR05MB4444.eurprd05.prod.outlook.com (2603:10a6:5:1b::21) 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; DB7PR05MB5415; 6:aW/C53l4hrNxCYMleMHC8AyEzzzweH3Gb41d9QmeSEt5s/dLWuN1jzkUSfKQbxPbrinoGOSuoYQD5FivEsvTpd6O1eMRDoWknyL+ITMY0LBWZeQdiaj6/FgUGuL4C7N27ghmYAUAfWNNeugcCZQTsPgHIaJS3Saxp+TkDoS20h0vPzYmknij7bZKbHjfixLeS3+17iPwEFiZGQggW+TMl2sWr+UNIOVtQzzwFeYdeS/P5cWdi7Qxa4lHxMtlnxOh/eyIR3lgkL5RI3TGlVDkSbWRTjzl6qVpQX0L/UdJac9c7RWI4PxsGU2A/5Hj/yFh/pwFKo2IaseprVVk229uivvGVUtXp7z7o8y0eXBkdet/+Oi1OcE/dDpGP98VdTEciTM7ESf9V0b32AcggoZ5O/tX/4m9cu2AXq17BuiA4IJURkXlrgX3wChO+h13OSn15i4BE0ugY+s+5RKJAllUvg==; 5:3G44FvutKNCrcqvxD21oPp5NOdV7Rrsde0Db5o6evzB7lqOBy9ymR/pDiPKmaFCR5JIdBufU8jabO+ElidjHC3sg6NnIKWjzX3TSYFOlEwapXMfqDSkgcmceqB5K7hFcnl5yJjtLvKKPY3N7zRZg5o4el9taAX+AwPLVv7N7d8+fhRD9z8+ekuvUavgybGuSmyTOjmdxuapQTJRR92Lr0g==; 7:6qfg8aMRq2eCejeXxg+XziljPtnrpcu16SvEBMelRx2NfPhtXCYASNxOmyTbk0bwa4MjqMy5D2Ud66VTuYHIL3mmCf7kF6dYU9Z0er5kiV29K40kuZmqH5kcG3U+tGLJVm+YuqACVi2oKXxOkyxbLA== x-ms-office365-filtering-correlation-id: 3d8aefe1-d515-4975-0e6c-08d67096bae6 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB5415; x-ms-traffictypediagnostic: DB7PR05MB5415: x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(8220060)(2401047)(8121501046)(93006095)(93001095)(3231475)(944501520)(52105112)(3002001)(10201501046)(6055026)(6041310)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:DB7PR05MB5415; BCL:0; PCL:0; RULEID:; SRVR:DB7PR05MB5415; x-forefront-prvs: 0905A6B2C7 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(366004)(346002)(199004)(189003)(476003)(8676002)(6436002)(81156014)(8936002)(6116002)(3846002)(14454004)(2351001)(68736007)(6486002)(2906002)(5640700003)(81166006)(107886003)(4326008)(7736002)(305945005)(25786009)(53946003)(1730700003)(6512007)(5660300001)(53936002)(6916009)(66066001)(99286004)(2501003)(36756003)(478600001)(575784001)(86362001)(316002)(256004)(386003)(6506007)(105586002)(26005)(4744004)(102836004)(71200400001)(97736004)(106356001)(14444005)(76176011)(52116002)(446003)(2616005)(11346002)(186003)(71190400001)(486006)(19627235002)(579004); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB5415; H:DB7PR05MB4444.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: fQS15hEgWG5ONxNqWHq/mNnE84ZTNbY0OQRmoZjAkn3/y9fKoBM4/0yfMyS12o8QUzsIA4+AUb61M5tQg/Fh/Wpac8oREHjqnNBx48Z+UUcDiltwFihOfsErXQkSZlShxSmfdR/iCkXCef5Mo8f48R/UUgqiz4V2gLs4VnmVfMRZ05Zfz4NrQJbtV+zeQpenmYehI13K4OhPD3FsEjavIPbP+VoK6z7v7GumECmKOoeFsDayN2bSsSAMiE8l+Ppj86M5+9ca8gFg6aDGQFB26W4bXGSYZ+Xl0osbY3aGp7qzpz1Kr/9ULzfd6CrhHGQM spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d8aefe1-d515-4975-0e6c-08d67096bae6 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jan 2019 09:43:20.6298 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB5415 Subject: [dpdk-dev] [PATCH v3 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 --- v2: * Modifications according to code review, See message Id: 1545748697-3385-4-git-send-email-motih@mellanox.com v3: * Modified calls to devx routins to be done through the glue interface. See message Id: 1545949196-3355-4-git-send-email-motih@mellanox.com --- drivers/net/mlx5/Makefile | 6 + drivers/net/mlx5/meson.build | 3 + drivers/net/mlx5/mlx5.c | 16 ++- drivers/net/mlx5/mlx5.h | 15 +++ drivers/net/mlx5/mlx5_devx_cmds.c | 107 ++++++++++++++++++ drivers/net/mlx5/mlx5_flow.h | 10 +- drivers/net/mlx5/mlx5_flow_dv.c | 232 ++++++++++++++++++++++++++++++++++++-- drivers/net/mlx5/mlx5_prm.h | 71 ++++++++++++ 8 files changed, 445 insertions(+), 15 deletions(-) create mode 100644 drivers/net/mlx5/mlx5_devx_cmds.c diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index 8ddad1a..a1749e4 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 e2fc4ea..e9db36c 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') @@ -106,6 +107,8 @@ if build 'IBV_WQ_FLAG_RX_END_PADDING' ], [ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h', 'mlx5dv_devx_obj_create' ], + [ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h', + 'MLX5DV_FLOW_ACTION_COUNTER_DEVX' ], [ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h', 'SUPPORTED_40000baseKR4_Full' ], [ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h', diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 4521045..c5ed402 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,16 @@ /* 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 supported"); + } 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 b48cd94..45f0398 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -98,6 +98,12 @@ struct mlx5_stats_ctrl { uint64_t imissed_base; }; +/* devx counter object */ +struct mlx5_devx_counter_set { + struct mlx5dv_devx_obj *obj; + int id; /* Flow counter ID */ +}; + /* Flow list . */ TAILQ_HEAD(mlx5_flows, rte_flow); @@ -131,6 +137,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. */ @@ -412,4 +419,12 @@ int mlx5_nl_mac_addr_remove(struct rte_eth_dev *dev, struct ether_addr *mac, int mlx5_nl_switch_info(int nl, unsigned int ifindex, struct mlx5_switch_info *info); +/* 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_H_ */ diff --git a/drivers/net/mlx5/mlx5_devx_cmds.c b/drivers/net/mlx5/mlx5_devx_cmds.c new file mode 100644 index 0000000..a9dff58 --- /dev/null +++ b/drivers/net/mlx5/mlx5_devx_cmds.c @@ -0,0 +1,107 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* Copyright 2018 Mellanox Technologies, Ltd */ + +#include + +#include "mlx5.h" +#include "mlx5_glue.h" +#include "mlx5_prm.h" + +/** + * 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 cb1e6fd..ad9abb1 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) @@ -319,11 +322,14 @@ struct mlx5_flow_counter { uint32_t shared:1; /**< Share counter ID with other flow rules. */ uint32_t ref_cnt:31; /**< 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 4c0b7ed..0d35282 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -569,6 +569,36 @@ struct field_modify_info modify_tcp[] = { } /** + * 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 @@ -1456,6 +1486,87 @@ struct field_modify_info modify_tcp[] = { } /** + * 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. * @@ -1717,7 +1828,7 @@ struct field_modify_info modify_tcp[] = { ++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; @@ -2741,6 +2852,9 @@ struct field_modify_info modify_tcp[] = { 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) { @@ -2789,6 +2903,37 @@ struct field_modify_info modify_tcp[] = { 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, @@ -3279,8 +3424,6 @@ struct field_modify_info modify_tcp[] = { dv->hrxq = NULL; } } - if (flow->counter) - flow->counter = NULL; } /** @@ -3299,6 +3442,10 @@ struct field_modify_info modify_tcp[] = { 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); @@ -3313,22 +3460,91 @@ struct field_modify_info modify_tcp[] = { } /** + * 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_prm.h b/drivers/net/mlx5/mlx5_prm.h index 5c39036..da1219e 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