From patchwork Wed Jan 10 09:16:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahaf Shuler X-Patchwork-Id: 33384 X-Patchwork-Delegate: ferruh.yigit@amd.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 C756A1B1D2; Wed, 10 Jan 2018 10:17:32 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0062.outbound.protection.outlook.com [104.47.1.62]) by dpdk.org (Postfix) with ESMTP id E367E1B1B6 for ; Wed, 10 Jan 2018 10:17:27 +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; bh=DK/xAs4TKyrHg4t3AczTxX+k9ycFIU+l4TkHsrb3Kko=; b=eiV8DDut4st43MLncQ+BHmRje3nkxkMFMr5LF6xWgBMSFlWynFiPG6Ylj/keMomLzpZIwRwmiCVbj2B0S27pWUkUN2eT0+DL+WobS7EOXtwGPOw6TJrtM68LUyhz0CfNjxgd5XVfGS08ME78BESQmbABg/2P0iL7HK0xDxMzmHQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=shahafs@mellanox.com; Received: from mellanox.com (82.166.227.17) by AM4PR05MB3140.eurprd05.prod.outlook.com (2603:10a6:205:3::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Wed, 10 Jan 2018 09:17:25 +0000 From: Shahaf Shuler To: nelio.laranjeiro@6wind.com, adrien.mazarguil@6wind.com, yskoh@mellanox.com Cc: dev@dpdk.org Date: Wed, 10 Jan 2018 11:16:59 +0200 Message-Id: <0d8e4bb5c955d8ba5888f3ac2dba2d1b411109f5.1515575671.git.shahafs@mellanox.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [82.166.227.17] X-ClientProxiedBy: VI1PR0202CA0030.eurprd02.prod.outlook.com (2603:10a6:803:14::43) To AM4PR05MB3140.eurprd05.prod.outlook.com (2603:10a6:205:3::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2ec6891a-55e4-4960-f877-08d5580af753 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7153060)(7193020); SRVR:AM4PR05MB3140; X-Microsoft-Exchange-Diagnostics: 1; AM4PR05MB3140; 3:JkPgNywxgv6oGb/CukMfja9HldHewBhXL/PuW042ukwAXcUGbLOn2BxPVlatBx0rs+eecJAQl3UASgDYUzcLmh+OxUYLgX8wjZvDw1AGqQ9SigbquvYgWUaCXdg/oXk1/0o+fx+xVR/D+gz5DkSlg+nvIZg1ZQzbsToTlimhPmGahpUAZviwhNBTweQtTJRMb9h0XGdwP2VnsRdNhWsqbBgi9XN0ApWJNPV2XusIMylwTEJu9fhny6epUPjJVkyw; 25:wf1Nmo6MERAhVdtdb/m1jb+UamhBK91t2z9G5JaaKd/ZcGGKEkigxaEbMvSXOvrz8nKWuuG5bOLxQSbaUAKfY3LRTrtdCY8FEXU8SVnjoW9bcVEruDs2rs82uSSrNehMsNt8xeh/1a1QPo1dVAPJrtzQ3lL6XbuOU8pRHNDtwYr6t7gV5ng2cQulV3aRF47PG6O/lEUCs13KPGnKgFPER/3bOmPte+/43lugcci6qRA0ZGw0FPRkZd+89OSlaWHXhPsvqw7y3tkXZqeWJLrTAt6Tk+uYN2heCZd3ndu97g5UE35gySWD3hQs3pryMHinR2kiEjvFwrmZEIL77l1NXg==; 31:60k328Gl1g5osKPvp0k8xqkY/RAC14EVt1MWnBRRPuWKh45aRPtUEeCOpUgYr+nA31IOT3b8dlK0y5HIbf0vxPHOsMMdbSOLndeU1iu5HS2AMwWQr+WCKZ1Zg/1npDB9cbJKj/F1xlVPrJb7yVedtH496qbGnfXHvwvWbi31LH5YqN8FKt9b99Rq3Lbo+QF8KB/L/NJM68Z7GBsura7ja/2M3wXvSV0s6VeIKRB7IrU= X-MS-TrafficTypeDiagnostic: AM4PR05MB3140: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM4PR05MB3140; 20:MYthxp7Cq1+Vl9tdPi3nbx0giool/zPGtqSRf/UF0ETJLGUk1U+/8Sxp2WgCXXMWvME4/HwWqKj3Nce6GiILT8lQX4JqjprlAlw9iaZCvwDzsNEqIO/ZIq9s7bebV5na6uRNjuyuKjJfFD3UJC5TIfZ0qbcAcLBTGNJabnCuHEBxKBp9oLe16eZkknrCKdoEpPEFsJB90c45pn0GZJbZe8qDyXOsh97cgZ0nED02HuFSmg1ecZL+zCwcmoIHAwKt5oFyos4eOs9/L8D17u44lgocmhQdcCVdpNd0MKKI90zjyChKBjLQIFqdsrw4WGDKEqKNUldgXnQ98z4cmFZHOF9EKQ8LkaacQlhRpqw3qhYvGFIRDkVGvfBSKKAKBxyIyFN76u8GfLaglANUVGflfR1yz6h1zAi3MBLMH8JCGy9ISOI/xnMEaIwRvPWZo4JSFEibIvM3me012Pckx1MYFQN+UJbogmztBmdi+BfOE0te4i+5niw53Y05dy4NjJpg; 4:4S+WTCMiEKuyrSPDAFAmTVVY6rsoFEv5XM1IH9lrQha3AgDYIaLyFhLNqZslTsU7PU6SlBFsMydUnjVTftzxmrt5sZuCPay9/zTfgJFytQQ97qP6LbhvjzeCjkbqBTCtfERs575e9WOcOXZFKGXVyuXoPoWvoHaOdtAMv6+zi4xtHvEnTrsjhfNET+EM+x/L7xVff/eODbyWptBO54LIeHi44Iga611W3bmjmyVlQhIyQBBWMEhsCOFvbES2I5DlqYy+wmqdaAr6e/lhxX/RKQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231023)(944501119)(6055026)(6041268)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011); SRVR:AM4PR05MB3140; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM4PR05MB3140; X-Forefront-PRVS: 0548586081 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(346002)(376002)(39860400002)(39380400002)(366004)(189003)(199004)(105586002)(16586007)(118296001)(97736004)(47776003)(66066001)(48376002)(50466002)(478600001)(106356001)(81166006)(25786009)(8676002)(53936002)(68736007)(81156014)(386003)(50226002)(4326008)(8936002)(316002)(16526018)(7696005)(51416003)(7736002)(52116002)(5660300001)(305945005)(6666003)(6636002)(2950100002)(76176011)(55016002)(2906002)(6116002)(3846002)(36756003)(33026002)(21086003)(69596002)(86362001)(575784001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3140; H:mellanox.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR05MB3140; 23:PgOn21aB2A/l7Zmk2iXq8ALe4RTcOpCSEtQxKQt9O?= /TkX0+yFl6PJRLjiJFBENiAmTH4+eOJkHQ9wth3PiibE3foP2zgTF2VRJJQ2YYI/cLhPDqqPQHAbXlx5Qya7TMxpQxeMxPdFQX6b6Fm9biFV6oz4vFB6MPpZ1PfKXwEwzyV6PIzbuGqBet4KZKBB2VVLocRgoUzwiZeQYm3bAw5UBltohTYBVUhTXlF3QbeXe55muJly8UMZ6/M5yg8pXxfbunmZUfI9jV/BCBY0euhaWK79D2ztAZVInUYwiScbr5ymcJ3Ff3auqwuS1Nz3rfxvuj+C+ccVn1zb2thyokCaLs2R0xvFifTybaz6oopAC0Vf24ZGlztjeRqMz3Zdw8Jd5Q0Ehww7UvUdJxAz3rxp5ZJDZWM+Nx2t+re7z4Sl8rjGcCrR7a3/cbqHEXu9FFGNA2deDW/U00ZCapcUp3tuGPI2E3g2jSxCKwmszluPKhRCVajEoLbMhiUQDD0OiNjKP5tdY6p5qgK0jabDUC+CZmdtP7RfxadZd2EZQR57cDm2k7TvgtJdPgqosBq96aOg4xeTXez4rAmWJyAJ84or3ir88h3d5ah5C6F73RT2RFYHPtWQuXptvsZXRnDnxn8kuYiCHfxpeaDPAmXiYtb8I2Q3H9xFFwaW1JpJZkpitMgcvtD/NCgmj2ppSHUMwTvCZ+scH+vqh2cYsoMjozdvE8WR4Bfw8EIJbWxrrIzGcQ1ov13WHQls0SV3upzMjV6L0Uc1fTooJITHmIMKiEhbU5Fi96UHC0iZjh+4YwiRB01NPUKtsetl6S5DMMYRH5WwSKHMlFKrifxVLZGnyKFFgrlFaEufdlewtC109QHtgYjDT3oZFqfXaXfRryytk764LyilJRbtDRtnhq51QSkjsaUcGomWbwPUW9R1NLLSG6DdT4UxYgloYWmrsKbgpgTZpqmLWZoKlqSUQ5kiGDuIof2JJRPgK0bF0bjU+fhogeGGn8OpnczsUDJ3Z1u3FHahE8yNAquPprXMLxKrVrkQnGBSc8JsbbtgVpY1p7DMy1bwhldWpNub/6yDtUuEppHT5c2iR1RewPTMEzWe0Y0s7cJU3uixx5AGBrRxCJSIrN/3DDrpjoXeaMkx2fqImlny7W9OEhXWEr878u44WddYg== X-Microsoft-Exchange-Diagnostics: 1; AM4PR05MB3140; 6:lVLIOma5q7/+JaBydnKD45uPlA2PbI5b5g9m7AWOUIlrjHnwxmNoK6528hvkdWL72qZ8bDroXe6JLMpC/WjtL2vF9ifnnUvvgz1LpTwmvzW410U7ZrAZNzaQErIw54sBJgTI/TsV0rJ7+c7tQIxBQSuh2X7MaRP+mmRi08f5QBpeacRa8QP5LTzdpU7chiHMZnk58sv+W7Nj1AK1d1//g1wFVqd/p0s//KOEXTG+Ekuw0GLdnXUeg9cRuZG0XHhwJlXWzlpTWN+MLLtVQMTh5F4BZB7GoQjIO0nljKgjoLxMIF+RN2ozGeSvOX0ndvljlqgPkP9HCXtPEnw1jOYLgfF743nthTuOsMpYvbn6LkA=; 5:rhvs6gOReO8vw4B5a3Z5ZgRpgjEWVEZXK6vmfgT3UuBZQgqZU7jbQphY0xhUjkv6bBRY78y8oLmofvNTgvGTCt8vaC12bcOA15/3x5ktdcBnn7FnRrUxjGlWg/5l7qaUv0kVhcbrZh7PPAhsANwt6KbBpWBQuf+sWoqFFeJeTvk=; 24:caMNSd/FCbhmUjhMU3wst/j1D8Ls3Vwrw1YjUrHtXb1Pya+OG9QHXpayXmWka4hO3oabB1S2Z+gnP3AtkW/9a1ngBv5+JiIThnfR1cu1zvo=; 7:gKppLUKKVGN93UpQYnP89OElaA0ZG01+LuBs34R+wX1MK06jOvHQxXwjeSQdM3AnuujI4M+2WuziWRRydqmugClxvLbb0UrDwCaWEgkfzR89lvmx3E5gIMWpKPMf9iX6SoTI8kEnc3C2UDA/E4H4327w4wzjNPDEW4OWiQDUDmsYAooosXuYyWuY/XlUNfTKi+sgwugS5rKi+yI8E4xmZV5VeKFd+WyTCePcP7VdK8+t1BKEooNBRqZQmcbttoz4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2018 09:17:25.7998 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2ec6891a-55e4-4960-f877-08d5580af753 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR05MB3140 Subject: [dpdk-dev] [PATCH v3 3/7] net/mlx5: rename counter set in configuration 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" From: Nelio Laranjeiro Counter_set is a counter used for flows when its support is available. Renaming it to flow counter. Signed-off-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5.c | 3 +-- drivers/net/mlx5/mlx5.h | 2 +- drivers/net/mlx5/mlx5_flow.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index fdd4710f1..ca44a0a59 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -759,8 +759,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) (config.hw_csum_l2tun ? "" : "not ")); #ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT - config.counter_set_supported = - !!(device_attr.max_counter_sets); + config.flow_counter_en = !!(device_attr.max_counter_sets); ibv_describe_counter_set(ctx, 0, &cs_desc); DEBUG("counter type = %d, num of cs = %ld, attributes = %d", cs_desc.counter_type, cs_desc.num_of_cs, diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 04f0b2557..171b3a933 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -110,7 +110,7 @@ struct mlx5_dev_config { unsigned int sriov:1; /* This is a VF or PF with VF devices. */ unsigned int mps:2; /* Multi-packet send supported mode. */ unsigned int tunnel_en:1; /* Whether tunnel is supported. */ - unsigned int counter_set_supported:1; /* Counter set is supported. */ + unsigned int flow_counter_en:1; /* Whether flow counter is supported. */ unsigned int cqe_comp:1; /* CQE compression is enabled. */ unsigned int tso:1; /* Whether TSO is enabled. */ unsigned int tx_vec_en:1; /* Tx vector is enabled. */ diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index ec179bd30..305b2ec01 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -778,7 +778,7 @@ priv_flow_convert_actions(struct priv *priv, } else if (actions->type == RTE_FLOW_ACTION_TYPE_FLAG) { parser->mark = 1; } else if (actions->type == RTE_FLOW_ACTION_TYPE_COUNT && - priv->config.counter_set_supported) { + priv->config.flow_counter_en) { parser->count = 1; } else { goto exit_action_not_supported;