From patchwork Wed Jan 3 07:16:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahaf Shuler X-Patchwork-Id: 32840 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 1A9A31B171; Wed, 3 Jan 2018 08:17:12 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0063.outbound.protection.outlook.com [104.47.1.63]) by dpdk.org (Postfix) with ESMTP id 5F3471B16D for ; Wed, 3 Jan 2018 08:17:10 +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=OAwpKPviXDvGYqIp8NIhNrJjYyh+4iR4hTdu5bn/A54=; b=PSKFuKfV8kbjh1pO72A0VLF7DMciCR4E/BUiy8dsDD7CVe6uysuFVOW+zfssPQtQtsWMZqhH8dmF+ZzXDIyC8VqbOf4DLs+WSPfPjuSrs6sESTTq3dXJylI8W4w8+K9wbyrsaakOUfEPLISNUL2CwyMURDHvsyFI55cCZE6O61k= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=shahafs@mellanox.com; Received: from mellanox.com (82.166.227.17) by HE1PR05MB3148.eurprd05.prod.outlook.com (2603:10a6:7:36::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.366.8; Wed, 3 Jan 2018 07:17:08 +0000 From: Shahaf Shuler To: nelio.laranjeiro@6wind.com, yskoh@mellanox.com, adrien.mazarguil@6wind.com Cc: dev@dpdk.org Date: Wed, 3 Jan 2018 09:16:13 +0200 Message-Id: X-Mailer: git-send-email 2.12.0 In-Reply-To: References: <20171123120252.143695-1-shahafs@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [82.166.227.17] X-ClientProxiedBy: DB6P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:6:29::28) To HE1PR05MB3148.eurprd05.prod.outlook.com (2603:10a6:7:36::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7d4ba98b-88e1-424e-2fa3-08d5527a0089 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060); SRVR:HE1PR05MB3148; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3148; 3:lFF5INBcFSmIe0TG2ggP/EGCS+ThXcKkzRhtj5zP4LoT4PjE4rNQVlEEFajfXMge9HxIvy4hay4tvkEKuhwaRK/x4zagyWIMGWhUyaX2b9rH+q58/TrcEa6Qp5xpCPOc5sUjyojEgIiCpf/o8Xvp6Doqd+35sR9VaGTWI/tqW/uJo/wvHEQn+WPmkzL16bNjuldcHMLQfArohprr2kieM8Okp4AQcD7qJfvdLHcfLEPI1qs6EkJlZqEvJLw1OL79; 25:W0VlpyfeKIpWWPw7GQLQ6RcbVaLkUFo1zh1GjbGMqa+8n3aOQWn/j35DlXAvbqnLL6mq5lG9Y63OrUZAysxXb99UsPYfloRJuCQUdDDcAjm7K7M60xO0lj5aJQvAxOWBZkUgBj2zh5aDiq1VEvj4Vbm3lCtyJYyfHZnIRHvE4pAscTKz8iNTOknZS7VZzms5XAci2DyxIR+QSm1aHt4ivYDo26JQ3x1sVPrzXlP9D8WXYKdI2xMH4Zdl2BVaa06bAkcYvBbqRDvzx1oDqNEY2Uq0oVJXfhe4Ye5QOB2zJqbWXxAfkosAwl6KuUQa1RvjefTi7nA3UsPtqF4Vqj5Srw==; 31:i2mz7m87B4Ur8QQj5VfNr9NOo1kTnTDJSZRSk7BOv/Hjf73dODsOHH1NrGTfZQth39LKrwxBPJl9d09SGNbZ9kBDfQi6Kxu7AM274GspivAqW8+Ma8QbzvwbDNrOdOQgeqLntmwQO8c8+8RBR8JGlfw+tsiWhsWvsH/M5VsYyT0k2ScH8xyNNo71Kvx2JrcdE1fWOyF2vyyt9j296ASb/9YOiKOiQE7iRhQX7H+/yiU= X-MS-TrafficTypeDiagnostic: HE1PR05MB3148: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3148; 20:tehJImbGpTI/Nv1xdCzd9KDTNQ7aT7LR97tX1IEh2WN0FDnYhuZZfTkj5OaKNq8Z5TevMVtNoliF1ik6wDpzJ6HbL6icOhAxgX4R+o8KFDceR+52ZuEhVyE3edA5OoWxWmclad2vhG4NQ0b3DpXAyNYmo77IGsTEjjoutLm7M8TMwdUeKCnaOPkdVrjYZw25Ost1rlyJCCams9NDFGvpIFUTqgsBZCXCW/5W31/G5o8dKntAEuaQazMlikVrPsrUoX+I9oegW857Vt5uxd6/4ZYSMa9p3PKgg6zWQQpPIRKLLHDlaNNL8vdkiOG9lu9V0GY16r6oADx7GmVhBGSNzuVDlwp0t5sbDovQ6EaY0m7WV5Y5X+kHP038NWk4VXhN5WMlV00rMto298pKr68k8j9PafZKrz/utdmohaF/RSImG6fTRmZGH/SHmkhQoLvZ5ixVYZf/M5/w9QoXyK+QvIAs89LbLMv6JXAG8tIWBDstmhBwC9NGicnLJgJyFjit; 4:OIwxHUkMTbghRS6N/p4YoCPIvKvyWhFzQpaf9o2OBte9Ia4L4fZBqHOBIpzuMwWvSSqHmw6gupNaOyprNu01DZxLOvvrWj4grIfoltEUQsNMxMNsUOccVHSsiMjVg7QGEaMX3mQ27EbAD7AXKWm9cdDCnkY+/rAEcEQ2CYjM9dQiEO9dZa6+EbebVkIzhfckMpByZFYUEP+UYgIlE1c15XhFOAvMgwr1Jbq99/V+waWRygOcYoOXERNvJCESTdqexzqhYRFMimiXC0V8Z0rhXA== 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)(10201501046)(93006095)(93001095)(3231023)(944501075)(3002001)(6055026)(6041268)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:HE1PR05MB3148; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR05MB3148; X-Forefront-PRVS: 0541031FF6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(376002)(346002)(39860400002)(396003)(366004)(199004)(189003)(5660300001)(76176011)(51416003)(52116002)(4326008)(50226002)(7696005)(7736002)(8936002)(386003)(2950100002)(69596002)(6666003)(81166006)(118296001)(81156014)(55016002)(478600001)(68736007)(8676002)(33026002)(106356001)(105586002)(53936002)(50466002)(3846002)(48376002)(6116002)(25786009)(2906002)(97736004)(305945005)(21086003)(66066001)(575784001)(16586007)(36756003)(316002)(86362001)(16526018)(47776003); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR05MB3148; H:mellanox.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; HE1PR05MB3148; 23:CcHYusRV2OionafaDbZZdikRdYkOafSuYwzPaqkOk?= WO2FkCG+PHoTCeZY9Hgqx0pnoqO/xf8W5xh99iq8GH5ZI+Rbng6z0Hg2rM3F7W1/5rxW9BpWMBmSff8zyJXPMncfpKsodHU0acftoT3VzKAgohobJb66ZHTieISb/zd6EfBwLR1SzwoLg1Khb4Rw0IuHZFia3Z8Z0oNWOvkCYSNG9IEjbCb5cqr4Lf0ya4SdncTLunX7yr+y5paa4gdRWrF7RnNsAen5XRdnXxNXdySyat/yclK7mqgQK+bE2IFe/dMsSQR3an5NVyxqAOXbHo6xNhE4Lmix4RcVMYeYWR8Kfd2LtPg/bG+/N3so1EsQUdprKO0xPthpDzuUo6GsfucR+szOt4QbR4LuOSImVvvSWJIFxC4Medb+ZOgumWUCRk8KYXRA1t/37G0VsR8Nm7FXsJ4qjptthFZv0yf5W6VEM8gi+ZuRrhh1Iqo1LYH92+6sayV5LEgetRvzlsyZNc5oF0z249trfTYF7dI/f1w4pgwK1vfX2FeQAwtlGNFW6yzDwDK2Tg42LA6neL2RBeRRXLvaBtBvdzk3cFYoydgT5qLgm49Y6sD+Oz8TcJO2ei/XfURKtZxvcxCsQQrE7aybxC62HW2Qp1gkPql9Q7lnZLQeKzTF3tltlQlsY7Z6Cdp9COMuuXa1fNDyOgpqywwGU2DPEWrhRS3l/uRV1mIyeP0vtX72evnz/3IcCRJKAiDfw3PDVZqMYIgm+FAEG8SNexZ2TyeSD+Zgxw61d08nzLSkMAFjtc7KfkA8HM0DjcpRbpAHoBF10jeAUuj1pMivToHWWSfuOMC8IcPldBND04l+Mp8DMalu8q3O+gu8jjhc8zQveeQ4QMLSa0rW+qEN835+z8q+5PqSm+kI8so44QXAnp3xWzPS6F+7glTTB+HT6b4xkc3wG/0lQe+ZvHMtZqdbXnGiSmQkleqXRGVATN4aFsTvcd7oKaN26811uLeKzqsDoxk1r6kPdRm8HYi3HJP2f2mZgOJCVpw9h7DzKyaAN9iaRR2rBuiI1FHS+3pEFwG3YHWzPV/KNDmD6L37uSaSai0ZKuk2dHJnM1JA/0wVi5mzWNALx5uHxixLsF91Ycd9gDtf+c1+BSbWMy+ X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3148; 6:j+cIifyZzi8SAol2YMc0kpf2qCb7s1dCL2HnuD2UdxWcK+slbhVQLIAL9KsIWgH1dTM+JlAVYVZ8Z3ih/druyuOEB+9z1uuC0PIfoWtdZmG4Pkj9HRdhSFjdJpr0PAea9LQbkiKI7fvfLtGdMy2HYNgUuej+74X8HgMuA9CIeINMCntfCbnvAaQUKQkjpztFU+sy+CmYIYXdLfRuS1ZwdF+cnZdcmQlcsxzjLJ22j7ofmyd7vkeTy4yugfLLJEvfYXo5wH+djSPjlysIG/pCIaGFUtj1xOgLH04W4mz2fOnHKc6osl01GjwZgTGkK0F/wajFpYVpwTut+HANuIMHX1e9Fw7XXcr8zBCEBuMva+M=; 5:PbDB7Q9UyCg60cKeYMhyldHKAqLt1KR0q5gmyK8iF4Q6nqsCCQ0paMiWOYC2j0xFDJrnvc7i2h2kCdzjgpfz4ffuzLjiazpN6s1Y85fp6I/LzkycwTJ3G306ixoQ6rF7HEO8hp8q7fonahAj+sd24iK5fMagFOLO/MAgz1Uk2sw=; 24:C1nB7sZxijEPiW8QzMhh6YqfqPkbToZASmwsRPiPo+OV7tw+TBU/nkKjP7x7Q0Ze+hJ3LQ1mFH+CDuxK4pxWKrkMzA8nqiQ+F0oNEcvgxHg=; 7:0wufJL3UpG2laSeLJgftDUINvfQw4zJn4XnyvqOC0wMZTraJ8/9sDVR6NAp7TChwSuDQirh9QVeA0L6L5PB2f38UrN/O64fEgdpsiPIERl1tndkatGunp6gRTNKdP//SzmAPU2/L5+ZtkrohF9HgULRvPouZvDtz/TfQX/2OoXbHyphw/bepq4sEo0o5EmaftrLC5hvgjtBZT7LoZezVSNPjppJmXwpmX7KqxWL0oi9chrqG0/7n1MLoqscsZOGy SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2018 07:17:08.3146 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7d4ba98b-88e1-424e-2fa3-08d5527a0089 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB3148 Subject: [dpdk-dev] [PATCH v2 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 8ad07b839..334a4f4ba 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -771,7 +771,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;