From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0078.outbound.protection.outlook.com [104.47.1.78]) by dpdk.org (Postfix) with ESMTP id 8E64AA84C for ; Tue, 5 Jun 2018 02:13:16 +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=eClBa55K9UMRmpqhUpebceKOMEkcW/iBPmuvUfguAAk=; b=wg2OS6JrvUjeDFUFUcAAB/sFIkcsro510p+Q75ozpYPuGjjGce0es3XMfMlOovTKGzgLIvI/TiPS0Z64hu5FonpvlfxffSLKtF1hyn8iwrSud81Nc7FCaKnsy6BLCOwSn/b88KdUWkkJIpFDSKvEzK+yJamBrSlcv/rWSs5nxFg= 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:13:14 +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:11:04 -0700 Message-Id: <20180605001129.13184-43-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:r1gbt+ciD8tM05dMgi4GRNJ1EmjK1/kU1kT3hXMsA0/7CzndBl4pBz5/5h+xjba9MNBXNDRXoLFGVEzi7NNEHUS5xVm1eSCPxjxu5DDJSawr9CYMBPTWNNhcJIO1bgUeRwSv/WZOEWEMWz9405+vz6wL9z08np4qmnEXSzuLbDc99VVChqnxkcz9fDYTu742rsoRxFIinb+ecgYeA+MnG4EGnKUljhCWZVR58S8hqTWJQqNkoBRJPZXVqErOsUWR; 25:IKYkS92LnFPFhbH8Si5UBs5UFRH9RYNS8dnk3o+M61c1n0FRQ423WgzIC0VGZF7+aMK2rsx4elBE9REBvdwq/pA9LDzWXNqAN1MkjuA/UnSYp9BLTgL/oLaOKFjaWseeVoHE0lWFxoLHVyP1aHEZmY+u8QfMz2c2WCdCvbgYbLsE9l312b/Hhs9Bt/w9N7er1oiaaFnpuhe4Mt8f9vHGIFwGLVDSsZaM8nGl+LHIIRgETn5iKMQurEyFllbeQdlUPVL27H1/ZAtUSrASU1HmgiIiazEsZDKonPvz/6081kXCkEHKTFXQkudcrDte2gaXevnPBvubaN6minESp4g0MA==; 31:4yrWiJNdN59tNCM/oaQAutNDd8zdJx/tA3icOEef3sIIiOymQLO7jVRnlm60mb6AGi/EpzZZWKExOLC89lDrOad3NkPzOtA77ShW/bpiXYRNY6+9M7vdu6xHmBE73NCuWC1qNmwC6bAukFSvghtzBvfMpx5vw8eSgGf9oKBpbo54jBVKK7SU5uOCMZxvSa/umDgLjEH2NNqmHulwNcwtbbbgVHRWGeEatXBW833PuSg= 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:NvOExLWyDjmHmoianNYnYKPauubhm8J1gU93CD63fiVsL5bZMImi/SG+bk8aK8EPQ3Sdbijyh3dwIOhH1QIYL2aSo0MPNEr0PBVD87fPd3EetMwc7fWx99h8N+0oWd2uTBzoEEid8O/UcY70RUiQ7ngDXmjtnWHA+B0wI30bVH+SsuOBvrVTAuG0AbHsOWla/e12P/UGeBPbVCnzekczC955CBG8cNdU9NAjPwEPlb8OSKlp2vdeo7DvNnX9c/Vx1Npp2DzCBfOUdiFd/Q7OYpZwuEfI7dFnI9bNC2aPIFmT+sQqJBYTYe9Khuh2b/7cCChVjFhpEsuVjFRk8/6jkW+yiI9C1FvM7lSjih3MHXM9H96clFM+QDENAvZhJ4pzY0fX5eklQDAdjQuSO0rvNundSRf8ekJAjsHPYPtO+YS+QrLBs0FU8sc1DzMLst/cHTURntTWDHj50QR71sTQ9f13UcQrjw+P3rADKw1CmmNqBHZN76ugXMs8/aSoQ5EA; 4:PhU0ZRS4LYJkMeYtel/m9QpyOjAh7ik4B5gTY1aJcEhvrD8gig2W9flf9YndOJe28egJBByFgldpWkzAThFd/1n4yUTSeJNeoIibDH7+eHV9gJDUgfC3jduP/e2JsfPPhp/+m3tt3rUYhIR8OirLnf7Lnb64hwoQVZEmu1LJcy4sNyODRKKv3kgPrGkI69S/4VF01Vnh/qZ4JFLFryMi+bkkqa9APyxyBFSEQWpFzAwLkp0xOpMiWoTb9A3qTnArsLkr4OJjBsOqZ5UdgJr6MQ== 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)(1496009)(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)(66066001)(26005)(3846002)(8676002)(16526019)(1076002)(25786009)(21086003)(86362001)(2870700001)(575784001)(5890100001)(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?MTtBTTVQUjA1MDFNQjIwMzY7MjM6aTFrQUFQTTlCak4zNVo1cllDUVpIT3V0?= =?utf-8?B?dm9VVzcxc3QvMjB2MkpXajdIRDMrcTNJQXZvL0w1bGpFZ05BZktaZzBla21x?= =?utf-8?B?WkdFbVl5YnNoTkZFK3RkTzdYREowM3I4VG56aDlIRUFjdndybHhIUmN2MnFn?= =?utf-8?B?SmNrQnBKSkxVZ0hmM1VtekZBK09pZVJ1SWRuZlhGOHdIQnBsdjJaOVdwZkIw?= =?utf-8?B?K2VqeDVhWGdSRzZkcHBiQWhyVEZ3aXRFRERFT3hjc0FJbit1citKdGlOV2lP?= =?utf-8?B?Y2ZRUjB5S1lud09OeUxpdWJlNnFrVHpET0pOcTdFZVpBVWJ0TnJrenUrR3E2?= =?utf-8?B?SjJXZlZnRGNuOTRoVFRkUTFFWTNpbE9WbmFBcXF0b04wZXFoczRUTnhkNmFa?= =?utf-8?B?QzRwRXJWa1VyZjFRU2ozd01kV3JLVGhCd25Fekg1MkgyOHp6OEp2WHBHVnRG?= =?utf-8?B?THVEd09MTGEzQkwydXBDVi9KemlvRW5YRzZlMDkyWER2WEI3V2wvYmcrcFBs?= =?utf-8?B?ZFM5VFlSaVZlSW1QdDJheDhGSjB5Mm8ya0Z1eUFURkxjOEozY0NBWDlyKzVK?= =?utf-8?B?RjR2SzlBckNHY3dPVTZGdXpMREVaNkJKM3FJZUJtUXBjaVA2M0xHcDJhVmxX?= =?utf-8?B?b3YwYnpvTmhXWGVKaGdqTVBNMW9MZUxpN3RHRisvWS9pQ2hRQ3N5ODNLcm1H?= =?utf-8?B?ekRhMDlEdVJ6NEYyTDBKTFQyeGthY3ZVK0NBa3JkS3BQaEZpOEFMODhNVVBo?= =?utf-8?B?TWwzYzlFdXVBeVBWN0tPbFJWN21YNTd5Vkk4cEtKK0cxUElFRnZLMnlMSTJs?= =?utf-8?B?djFtRTBrMUEwcFFvVkV3QUk3Vm1qQ083TWRXMzhMdVFBWExvS0tPMlZxVTRU?= =?utf-8?B?MU1xbjhERVBKemc4aVk2MGdPdEovRW9JREFoendSSURLZ29heCtNZUZDbE1I?= =?utf-8?B?dEdMVk91WVlielpvRDJ0U0xMd2NHYndwbnJaN1BCbURNMWxHS3JrbnMxa1ZX?= =?utf-8?B?SFNtYWtldnJjL083cGZCb2RXdGNZdUVWeXhTNkFRMUdadjd6bWZTNWM3bDRC?= =?utf-8?B?dHc3WUQveE9XRTJkVkZuSzlkQkxpVytnRFEwUkJic1hJSTFPVFdkTEd2bXQr?= =?utf-8?B?WXJXb0NHL1JCRGhUcS94cU5UZUdpUTlWN0N6MlVqblc5OGZ0NlcxWXh5U2N4?= =?utf-8?B?aFBhSTg2Z1pYQkQ4OGsvK2xWVkU0RXhuRHRLNGQ4VXlUSmVoQkVld25lSEFl?= =?utf-8?B?VDBRR0ZaUEFnaFIwYUVMNkhIU2F1ZlpqTWdxQUVHakYweENPbTlZQWNTNklH?= =?utf-8?B?dzJ0S2F1WnJ1YUQwdmhSdHNGaTR4b2Z4Lzl3SE9Rb2NFSFFrMkFuRGpIa2Vj?= =?utf-8?B?TTBuRWoxejJmQmJMT2ViZFcwUk1kc09LYmxrNUlFZ3c2RHhTTHJnMkliNkdn?= =?utf-8?B?QjcvWW1jR0xXSWl4L2tMNmZKWjFJNmIvck5JVTBzclluMDBDcU1nOGs0aUp3?= =?utf-8?B?bHZqTUwzRnc4eTZnUE1XY3RGeHZSbUJYbGc4bjBNL1BJbWxkWG1laDJPYjJ1?= =?utf-8?B?QVJsQUNKRTgyc1B1cmF5RTc1VE1RYythbnNYbU41c0xoM254WHNRT2hqcU84?= =?utf-8?B?UDBGWUdJVkNGRlU0SGNQYXZrZ3ZOVjRCRjd5bFRVSW15OXd1aVNRWGNwSkkw?= =?utf-8?B?WnN2WnlHb2xHN2xEc3hLTUxqS2h2TittWEZyaGNUMXUwL0IwV3oxT0w5YWFs?= =?utf-8?Q?Wb8nk/fmyCmkKoavV+x7uBEN7YVI+kwo45ejXJE=3D?= X-Microsoft-Antispam-Message-Info: 8D2QnKqHSjK4fx3gi77T0mcUyaPvMF0Uwrcpea+ZgvqilWcRglI4DN/4wkRp5F58hvzbyRgVSZ6mE131maADB9T+kghkeiAvnkgyrvovnjt78U4KUpQ6EfATFxu3+EY483zT4MK2OifK4hCawfADOieKbRvAHsOaqVUV0tXkczDALfaN8IgBxdnOLtCX/BE+ X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 6:r3/z3k7B8RNqACDwBCzMQiaPN9QwFF/fMXanTJl6DohsvhFbc9lEO33Jdog75q7t2NqZsYuzj4885p3eNdf3xcD1BP63w+aWM3d0A5xA9hseerwfr9JuVf7hMnyuPMSJxvaj4PAW2inKG7OJfDdepTg/i/LA2nh/Gd4xzX2vCr78UzrZ8pgYofVzOIjpkRpHsBn0/UpCNT9jb9O52s198P1C/EyckdHYcM71fUgu1aK2mbEZzfS4mRBVSE4A53sY1JZQdC6exLI5BvHv9YLmmQschyqKIMj3EH2M/xMi/3U9xWgfr3b5PaaJ29BH7EqZGaMlgS+iHwkC4JgUlplT/suUvG3BUoFIHCY9kmLUpALQhKbLXsGPy0EhmKohA0rJLv0C9M6hrguDYjLbUQ552KSBYubD/NGTRSGWUCxPlGH7Cr981Q3Qn6KnIvj5Xs8BJ9SHG+u5d0hAg0sOTLAdRQ==; 5:dQftERZ4RD/b01ZcRWZUmJAQiNQaF9tFfwCyZhJUpFp4QH5f+hE2wFMGH6lRlDLZE52Ko+NzFILHT2VAdzCaAnYAu4Ds4qSp/jt2fiAqgNiWQLz26zd9iTdv+fRzF9O0t2OQcokCawQaydbsm+u7MQSBNRbuK8nEZwwhC4gexLc=; 24:jZGsojxjoO8FieojE/rvA+TKJp7ei8RMBq1W5ZsHKLzRAIKF+6ZVcoNn3y/s4CJ+3hHprYL4Xg7uGcj6bvvrAKblfT+L8l/zvQPrUwrzSFs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 7:vZsjuPhjlhkyZF7tOBJgPwj8B7I2Z35jALkkyw8oOKvqsGwTbX/fnycGVeYVoGOevsF+66j8xEG/5uFcH3wjys3WuNb01sz3Ci3h3r5sTe2pEYNQWDsWmLChZudvCRbBvk/GSuJG0lRy/VR7O7Qo9FDG+vgwKP8YjnDIw6hvmyb5gtToCvRlfIGzvD4IOBt+NBW/BrkkjvIv/aJ7G7/moY9hTfzIOJks337AoU4o7/cepjlb14tNF7B9NbdhH9a8 X-MS-Office365-Filtering-Correlation-Id: 82662e72-fbdf-475b-fb49-08d5ca79221c X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:13:14.1064 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 82662e72-fbdf-475b-fb49-08d5ca79221c 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 42/67] net/mlx5: remove 32-bit support 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:13:16 -0000 From: Nélio Laranjeiro [ upstream commit ebbb81eb27daca0a89ee8f228fcf141d9eb6ef1c ] naddr variable was introduced in commit 9a7fa9f76d9e ("net/mlx5: use vector types to speed up processing") to avoid compilation errors on 32bits compilation, as x86_32 is no more supported by rdma-core nor by MLNX_OFED, this variable becomes useless and can be safely removed. Signed-off-by: Nelio Laranjeiro Acked-by: Yongseok Koh --- drivers/net/mlx5/mlx5_rxtx.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 62ff1a553..9c571f160 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -410,7 +410,6 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) unsigned int ds = 0; unsigned int sg = 0; /* counter of additional segs attached. */ uintptr_t addr; - uint64_t naddr; uint16_t pkt_inline_sz = MLX5_WQE_DWORD_SIZE + 2; uint16_t tso_header_sz = 0; uint16_t ehdr; @@ -634,12 +633,12 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) ds = 3; use_dseg: /* Add the remaining packet as a simple ds. */ - naddr = rte_cpu_to_be_64(addr); + addr = rte_cpu_to_be_64(addr); *dseg = (rte_v128u32_t){ rte_cpu_to_be_32(length), mlx5_tx_mb2mr(txq, buf), - naddr, - naddr >> 32, + addr, + addr >> 32, }; ++ds; if (!segs_n) @@ -673,12 +672,12 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) total_length += length; #endif /* Store segment information. */ - naddr = rte_cpu_to_be_64(rte_pktmbuf_mtod(buf, uintptr_t)); + addr = rte_cpu_to_be_64(rte_pktmbuf_mtod(buf, uintptr_t)); *dseg = (rte_v128u32_t){ rte_cpu_to_be_32(length), mlx5_tx_mb2mr(txq, buf), - naddr, - naddr >> 32, + addr, + addr >> 32, }; (*txq->elts)[++elts_head & elts_m] = buf; ++sg; @@ -1379,7 +1378,6 @@ mlx5_tx_burst_empw(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) do { struct rte_mbuf *buf = *(pkts++); uintptr_t addr; - uint64_t naddr; unsigned int n; unsigned int do_inline = 0; /* Whether inline is possible. */ uint32_t length; @@ -1561,12 +1559,12 @@ mlx5_tx_burst_empw(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) for (n = 0; n * RTE_CACHE_LINE_SIZE < length; n++) rte_prefetch2((void *)(addr + n * RTE_CACHE_LINE_SIZE)); - naddr = rte_cpu_to_be_64(addr); + addr = rte_cpu_to_be_64(addr); *dseg = (rte_v128u32_t) { rte_cpu_to_be_32(length), mlx5_tx_mb2mr(txq, buf), - naddr, - naddr >> 32, + addr, + addr >> 32, }; mpw.data.raw = (volatile void *)(dseg + 1); mpw.total_len += (inl_pad + sizeof(*dseg)); -- 2.11.0