From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0040.outbound.protection.outlook.com [104.47.1.40]) by dpdk.org (Postfix) with ESMTP id 29285AAA4 for ; Tue, 5 Jun 2018 02:11:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LtdO+qzHquwj3H1gcbPcLWlUgHCoJ9R3+8D91/uC8vI=; b=v3+76xbJEW2ycCW2ExK9/Na1Xea1pwtjewJ04dCxV7N7054AjfhBXdc4IREK9eGKy/p2kSX3Q+rMv7NiYwk1xHExIm02ZvJlJgsjyy5cVzBj+aUg2VYTVAQymEsJUQMV4hiHlST5cIKCApp4FomFcGWkktE2KVuLja389PwcnIg= Received: from mellanox.com (209.116.155.178) by AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Tue, 5 Jun 2018 00:11:52 +0000 From: Yongseok Koh To: yliu@fridaylinux.org Cc: stable@dpdk.org, shahafs@mellanox.com, adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com Date: Mon, 4 Jun 2018 17:10:23 -0700 Message-Id: <20180605001129.13184-2-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605001129.13184-1-yskoh@mellanox.com> References: <20180605001129.13184-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: CO1PR15CA0060.namprd15.prod.outlook.com (2603:10b6:101:1f::28) To AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR0501MB2036; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 3:0Pjxwwc7ncZO9iZWQvy4v5F6Y4ngythpeu/KMGRlHNR+FOt8tf90MZJSiMhwWwJw5CqERY+UfcT7AqsDtS7F2KVGWBP8g3QYktSFe24+egKoiW8QvoJ1ju+J6KFOtyxFckH4cYqcrCWmxlSJjCc9UF3ZtWpyCjfeKRdXzFznKb2hCOChE6pcwqhW/Mc7p2pqJr34guFesQEbojuLrG+Db+GEW8aUjlxP5DAcZX+qin0TuQSO2ZXM79zBwvLysz+u; 25:kgqPHkxe/Xy5ESWe+SxSd4F8UO8cHEuMchFedHmwc4oUs/v2SevEB/dZ5/phMKqjT2vWZlqV5WIfnF9QmlrqQwoSiEpqOEd8LeEKeNwsR7f0aPFulWkD1ErmNjMzBS3Lm+EOZKN2qtMe4gu2L2CE0LirNMErjKLd7ntbbIqDPN5CtAPEbiobXnLLZ/e7qkWXdomQ9w43IlXKdpqp95/Voc9cQl3Y+i2qC7magGo+rdzlKH/9aUwxQ85nvvo6ydR389Rhr5rC3BximAiRuQsok9UyWDfkC2+5FhDdJqdJMhMTXS7ZgKAr6ImlO0se61tRe/M+rS8d9Ypjo+l8hgpufQ==; 31:8SH+uVqzJHsW0lXSP6Mg7dcSPqn6KS2hoEqXaZlf3+7dqJXBvl595PaIrQB7n6aF1fBOLOTGzt7o41epPlGkBVTECegfEzg41OYvfT0Rjn/sv3RJTQkyE0prkorX2ZEb0jbnZmGK0+aJ9wAgUBelwI7v3LFD0mrR0Qqr5kNfDx76SRbQLi4nvaYeE8rQ5n2y6rUBLNp7Dmu5iUciw7WodaTvLyB9Jg+kgfS9q1kmcDc= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2036: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 20:/LKllr6aSpMpLMeI+BGIaJJTJuRIn6h3+PQH3E4luM3u71e+Mqn8HBeqGBHHEsaEyXo+ooMJz9xVUgHBJB3tHpGXJYuSIru+q9CoZQEskuYTsCdjhUJJytMdIv0VhHdrOQhJtK0hRuVLxS3YK6shJUPti23ow9YKxhEUqRJpE6JhfA3vN65k/+iAg3wv6FDmVuCFtvEZhv8N4HJBGG205hIQuft2F1r8RP9ZAIS/xDNustlCWt7Lb54UVwD20+OHOMYhMTCl43CjUhqG5zkcAgplJUVzAV2axjVYUKXygHp0J962x9CgR2vgeE6eennduJd76JhNeGmJfugoIBgSXr1nrkZJt6kZxCdoVVKznG555UhZxD1hCTh0DZARou3KGnldmolcPjJVFrFEnZLVH42oxAmBCkePPHwP4wEcClrK8q7iXCdTGuTSGvzRrRkyqLdF8BXTKzkaui3tfS3hcOh1uZEomD0MegoFH0heeKyygQMEkHYYuV8rlH4vHCC4; 4:/jOG0Zk3gC3F3rPbrr2bO5dZp4R9K/UQLXvJ9uwwyxhrz0PZqjq3+rqt/EfifWv4oYFr0/yt3MpWOy488RUfGeQp8iRZ6d7ybFZpxMMGiCq5ISb25dGLxpjU0xYgAMA1N6fVRK+iOf3ZSVGtcJwmsyqrFm5Zvrtw6hB3gd5/02mCJFEu4+DOqXALo+SbcjEmfrbx31C4NbjlSAyMTWoP6ckciZlhKlXTdqPweu0f7q6feiM/pyaTwvXf6yxfYQlfGDXCvWTrja8IcKKh7NuHeA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:AM5PR0501MB2036; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0501MB2036; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(366004)(396003)(39860400002)(346002)(376002)(189003)(199004)(478600001)(81156014)(76176011)(7696005)(956004)(2361001)(50226002)(305945005)(2616005)(50466002)(47776003)(486006)(97736004)(5660300001)(6666003)(2351001)(106356001)(8936002)(186003)(81166006)(52116002)(6116002)(476003)(6916009)(23676004)(386003)(446003)(11346002)(59450400001)(66066001)(26005)(3846002)(8676002)(16526019)(1076002)(25786009)(21086003)(86362001)(2870700001)(575784001)(53936002)(4326008)(2906002)(316002)(55016002)(36756003)(105586002)(69596002)(68736007)(7736002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0501MB2036; H:mellanox.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-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTTVQUjA1MDFNQjIwMzY7MjM6aXZ5NHAyQ0hXRktNeDh1UXF1Si9VeHVw?= =?utf-8?B?cnZ3TklTcDYvTGRHbWVnNmZiN1NyWVNoUjFSM1lLRGZIa1FqYzZndXNjSHgx?= =?utf-8?B?Sk84aVlEdlFPL0lpWWdqdFlIOGtIVnFRN2tteEVUdlRNc1VvakFxRGZ5UVhw?= =?utf-8?B?OXJkbFRPNE5RZ051SmN5elE4Q0MxYzhzc2MxQkVwc3l3UW9RMFdJaWoxck5Z?= =?utf-8?B?UkdKSmFhb3FGMVQ5Qlo1MjJIaEhrWnZKK2RwTVZrNWgrNW9sMnNsaThmVVpj?= =?utf-8?B?a1NwcG9VMTMxcnlCNzlwZHAwbWt1N1hNN0RZVUNTZlh1S3dnVjhWaXdoZkJK?= =?utf-8?B?czdmb01DY1dlQlhPb0N4ZlJlSUNIbzFnZDR3ZzkxdGFLZHpyL2VYNFJNRXJv?= =?utf-8?B?L0tkUWtaNWZyMEhPZmNaR04wdnVVQytLVlNlbHJqWUNNczFVUXVvSjJ2b1pR?= =?utf-8?B?QUhteGRKbnNFRDE0OEN4VjNnc2w1cndWZzdDOWlmWlpmRHAyYVdOcWRKSnhH?= =?utf-8?B?UllzV1liT0dNNjZkY2dQblNoaU5wS1Q3a29QOTV3THJ1L1RYRXFoVk1tQ1NL?= =?utf-8?B?REgxZ2JGZXVrd1ZYcFNwa2QzYWx5RWFma2lQR2lsOGNnSmM2TEZsdU8rQ3kv?= =?utf-8?B?TFVnT283cW9PNHErYmltK2J2bUU5YkFEcjBRWjExdVpsRHArZTVheEhEZlJm?= =?utf-8?B?WGpuNVlOOTFiNERrSGRQYzh4QmlEbDFjcW4xZ0crMk1IUi9qaTZFSlBEdTg4?= =?utf-8?B?VzBhTDdsemZBTG9NcmJLTVVmN1NuZ0pvRjlJL2MyOFJ2M0NmaUtUQXoyUDlM?= =?utf-8?B?cDhxYkxhOWRGV01UbHRoRFMvUHhGaEFmcFNvdmErNUx4NkU2eVQ2YUxSRDJX?= =?utf-8?B?aW95eUFaUFNWRGQrOEpRcytGNGhlbVo1R0tSamE2cmo5R2JBUGNvMlRjT2Ra?= =?utf-8?B?U05WeUk1eXcwMVJUL1EvcXZEWGdkUWQzcUNjYnRNWXFoKzF0VjhTZEk3R1pn?= =?utf-8?B?ejVaYy9FN2w4azltRGxqc0xHa245T3JZdnRVZHB3L2xTUG4vQWtBZGlHUEtZ?= =?utf-8?B?MnZyZjNHbUhLeUpqYUVJNlFLUysyNWFFdGRNZGtVbkl1UXA2bXA1emlma2NL?= =?utf-8?B?d0hmamY0dWxERUlzNWV1ZWJUVlRBVEZVL2UvalJjSDgxU0N0R0dqZStKTWtS?= =?utf-8?B?NVA3S3BXVWpLc2pFM011RFhwQnNldFJYalJnRFRqYnZZRTk4RlJUZGNkYlhW?= =?utf-8?B?TE5JWk1TaUJnbG55K3NlR05vOTFQTkVSZ1F4RStaRWJjdGsvdjFBY3ppMzV6?= =?utf-8?B?Qy93STNzQTZObUlCMW43M3NjMVhVblZ0YVJtTWJybUZndGs1QzNYbHJsbktz?= =?utf-8?B?VmlvUlNzeGs0dng2N083VE5OWm93Nkc5WHh4U3o2VnBub25CTkE1eER0YW5u?= =?utf-8?B?YVl3cDJ1Z0tuMWNIRGZJME1TSXFkZVNBUXBpNFZQV3ZhRG9WZThvbGRvbDh0?= =?utf-8?B?dWVHa1pTOGVpanVYRCt4TlliNTNUekdqSjVZL0VwdDRMTmRYank4S0FKaEZ2?= =?utf-8?B?Q1E2bzNHMWRwbGp3WkVuczdjTDVQZkx6bTMvMHJrQmxSMnhrOTFSWFV3OFlW?= =?utf-8?B?M0JGRWpFYmIrc3czR0kvSWZGRXlRWStGWDFFZ1JsYVZQdFdvS0U3VS9qRyt3?= =?utf-8?B?WFhXNlJuQjNIUEJRN0xsRldGcEg2ZGlqNXZrd0pHRDZtK0JMZjlwQUx3V1Jl?= =?utf-8?B?NlRTVy9rL2JmL1J5SkNKcjF3PT0=?= X-Microsoft-Antispam-Message-Info: 99BWZLQPS8z6EAPqPRhhdZe6dNwDDADmG3ptR4LSOTbMYExVVp8kgNWoh44qxdC9iz/S5gtWddqefg0LbULcCU2GTK2r1B+lQCpDUZVFjK8z45839cc4IuHNQuXbLkT6r/c/2L4fA6orwwE/HaiLHz1lqIyI0SeD3nZ8Aqy1G9+yK3gH4EvTsvokwvfob1Vn X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 6:E8Ao9pf8NpvWa1ln+dYmwdHahbDubOgvqa8E/WWAQi9vwTmRxYVGc5HYSB11qVjpDuA/auLPrqcMWUbUukt+hV7gyJixlgLSxD0HQM+vLtSUIfVWX3Veqo2bsEy1hg6kSVya79bFZrOOH2NhdJG68E4w5j7M7GFf0LaUVfO6EIyMZAKPlCaE9A7wu6m+xJbrrt+lkKfCWDqVclsfwk5n0I4qTRbcrG3WpyCe6g5RONrRrsXFcaysHK3rd0/a8xiFVJ52bcKRzjwKXyhKcQ4+PBANOi0D1rirmiPNwxe5gI93++arMkHsuo+KlmbE7qhv4XuiLqeNc2xKcLXBTDP6/c+SmE5cMwXZ8727PWNPB7E0D7n8FM+GaUkwxzvHGP4tD8dVY9RlR3+PRXL1HfRKgJvbYS5+7scWrNiH5y2LczIs00z3LBqgVosIu0xvRCX6zOZMurKCGScyb9yh6zd9ew==; 5:w9Y7xxZMGNa309ksHX/FtLUwht8EZCZ9XwRxWn+yfbh/vsbqrnKS0zELH5RVvKwtV0IFeM48A7VS65eKAlmU/FiJGa+uNObTowps2QWRL1uxuQeJtkanjpjpt+eBfVxWCNX8zt85DLnXpfhRb6BTMhKUoSTyTGwLR9vD86mzVFk=; 24:nJqpKadBKxd3ZSusJ461iH5I+RAYkCuEZcETuCDcG+8pd/yTAGuc7n90wAghpIeIslTGrutkVDair5AGT/3VSKxmaJxpSoOKU4kTiYHqJ80= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 7:8+bw6GQ7a/UAISQ01ftWxB2ACs1Wexwdh+nIp3wAtvgTSLq/vQkRNNU/ZjlJHRur9EOfhmRcpdRS0350Z0nnRud5eBQgMiL+d6jbuXpZDIjKJVOHoaSvyvTgspaSxEhL4JRgN7Got0s8WFVTygK8VAK522RbOkrYON9dGYfRKtGhTFkbKmudC6lhY0HadYWsesEvbaDJUcAAl3XyAB40FXciDykOnWXYDPrGkqskxQQNQX+rTm8zf+Ybj3ng8AWG X-MS-Office365-Filtering-Correlation-Id: eede58df-a601-47fb-77d8-08d5ca78f164 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:11:52.3821 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eede58df-a601-47fb-77d8-08d5ca78f164 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0501MB2036 Subject: [dpdk-stable] [PATCH 01/67] net/mlx5: remove get priv internal function X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2018 00:11:55 -0000 From: Nélio Laranjeiro [ backported from upstream commit 01d79216e68e5fa5f79ef09bfcb9344b9d56800e ] mlx5_get_priv() is barely use across the driver. To avoid mixing access, this function is definitely removed. Signed-off-by: Nelio Laranjeiro Acked-by: Yongseok Koh --- drivers/net/mlx5/mlx5.c | 2 +- drivers/net/mlx5/mlx5_ethdev.c | 21 +++------------------ drivers/net/mlx5/mlx5_rxq.c | 4 ++-- drivers/net/mlx5/mlx5_stats.c | 8 ++++---- 4 files changed, 10 insertions(+), 25 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 45e0e8dba..7f44bb169 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -191,7 +191,7 @@ mlx5_free_verbs_buf(void *ptr, void *data __rte_unused) static void mlx5_dev_close(struct rte_eth_dev *dev) { - struct priv *priv = mlx5_get_priv(dev); + struct priv *priv = dev->data->dev_private; unsigned int i; int ret; diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index ffe1cdd64..3e5a2922d 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -119,21 +119,6 @@ struct ethtool_link_settings { #endif /** - * Return private structure associated with an Ethernet device. - * - * @param dev - * Pointer to Ethernet device structure. - * - * @return - * Pointer to private structure. - */ -struct priv * -mlx5_get_priv(struct rte_eth_dev *dev) -{ - return dev->data->dev_private; -} - -/** * Get interface name from private structure. * * @param[in] priv @@ -655,7 +640,7 @@ mlx5_dev_configure(struct rte_eth_dev *dev) void mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) { - struct priv *priv = mlx5_get_priv(dev); + struct priv *priv = dev->data->dev_private; unsigned int max; char ifname[IF_NAMESIZE]; @@ -747,7 +732,7 @@ mlx5_dev_supported_ptypes_get(struct rte_eth_dev *dev) static int mlx5_link_update_unlocked_gset(struct rte_eth_dev *dev, int wait_to_complete) { - struct priv *priv = mlx5_get_priv(dev); + struct priv *priv = dev->data->dev_private; struct ethtool_cmd edata = { .cmd = ETHTOOL_GSET /* Deprecated since Linux v4.5. */ }; @@ -813,7 +798,7 @@ mlx5_link_update_unlocked_gset(struct rte_eth_dev *dev, int wait_to_complete) static int mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, int wait_to_complete) { - struct priv *priv = mlx5_get_priv(dev); + struct priv *priv = dev->data->dev_private; struct ethtool_link_settings gcmd = { .cmd = ETHTOOL_GLINKSETTINGS }; struct ifreq ifr; struct rte_eth_link dev_link; diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 20f3ec6c9..a4cdd374a 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -454,7 +454,7 @@ mlx5_arm_cq(struct mlx5_rxq_data *rxq, int sq_n_rxq) int mlx5_rx_intr_enable(struct rte_eth_dev *dev, uint16_t rx_queue_id) { - struct priv *priv = mlx5_get_priv(dev); + struct priv *priv = dev->data->dev_private; struct mlx5_rxq_data *rxq_data; struct mlx5_rxq_ctrl *rxq_ctrl; int ret = 0; @@ -498,7 +498,7 @@ mlx5_rx_intr_enable(struct rte_eth_dev *dev, uint16_t rx_queue_id) int mlx5_rx_intr_disable(struct rte_eth_dev *dev, uint16_t rx_queue_id) { - struct priv *priv = mlx5_get_priv(dev); + struct priv *priv = dev->data->dev_private; struct mlx5_rxq_data *rxq_data; struct mlx5_rxq_ctrl *rxq_ctrl; struct mlx5_rxq_ibv *rxq_ibv = NULL; diff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c index 2427585f7..c11ee57f0 100644 --- a/drivers/net/mlx5/mlx5_stats.c +++ b/drivers/net/mlx5/mlx5_stats.c @@ -319,7 +319,7 @@ priv_xstats_reset(struct priv *priv) int mlx5_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) { - struct priv *priv = mlx5_get_priv(dev); + struct priv *priv = dev->data->dev_private; struct rte_eth_stats tmp = {0}; unsigned int i; unsigned int idx; @@ -425,7 +425,7 @@ int mlx5_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats, unsigned int n) { - struct priv *priv = mlx5_get_priv(dev); + struct priv *priv = dev->data->dev_private; int ret = xstats_n; if (n >= xstats_n && stats) { @@ -455,7 +455,7 @@ mlx5_xstats_get(struct rte_eth_dev *dev, void mlx5_xstats_reset(struct rte_eth_dev *dev) { - struct priv *priv = mlx5_get_priv(dev); + struct priv *priv = dev->data->dev_private; struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl; int stats_n; @@ -487,7 +487,7 @@ int mlx5_xstats_get_names(struct rte_eth_dev *dev, struct rte_eth_xstat_name *xstats_names, unsigned int n) { - struct priv *priv = mlx5_get_priv(dev); + struct priv *priv = dev->data->dev_private; unsigned int i; if (n >= xstats_n && xstats_names) { -- 2.11.0