From patchwork Tue Oct 15 14:56:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ali Alnubani X-Patchwork-Id: 61277 X-Patchwork-Delegate: rasland@nvidia.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 9469D1EBCB; Tue, 15 Oct 2019 16:56:07 +0200 (CEST) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10067.outbound.protection.outlook.com [40.107.1.67]) by dpdk.org (Postfix) with ESMTP id 2ED211EBB5 for ; Tue, 15 Oct 2019 16:56:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hJ7FBz7uMsOHpjrT1BTtY3mTVgdt3Ps8wpgjLIHmlZdYE54Xvt/kDmA3tu/3FRj6ult7RzNZrso9jUlhcNsjEspMqdeaOk7Bcictu9I6A1T2ESQyraYHShiprYuVC04dMBsDgA1nbsQOfXyX0Biv9PNK13SmQ6fb8KTISGVkEm2bZ6a3z+cG/A5M6NxgKv/q27oyeUplRg1jR877wBb/IPzzt6V5E29U5n3TkofyUhDDL1bTyJssrypIw0a+asy2p+8L9dX5ib4MTwomGIX1DspmVlCb1aocIGadAZQmFyjFxv8XfCR5miPaG2z4qC2iSzQaH94WoR3pVFw3P+8pzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gmS55JcSEZhjjM2JxaKGV2ktwVuZY0MJVdz3WtNlHzE=; b=a2UjFsji2ZIk7Aej8a6vmebijrm0hV05pv1iFMtezqxdOgITxP5A0lKoeUSWoA+zu+YQU5K/lBiVysveUV+KCtsWcvHwSFcOawyrPwkqs+vhgs6ef0I6iR6zDpJFlKDtxQQZPOf2Y8CnhVWZGlkk3lKshTbZepH/bnSt/dv5IWaVjpN8MAJsBp+jUp8PxSodJodhixOcQ/ZFsLr7z9wLNNM/dityUk5WBocE9RNcO7XbRe9sGhKS77VTsBZeAfq0Hh4hOeBGq64THfkGfG8wanIU3v28ua4mAmLvHP5xoumalzHgFl0Y2FnLJqvhBavuEw0gVUamhQEE6SH4OPiWuA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gmS55JcSEZhjjM2JxaKGV2ktwVuZY0MJVdz3WtNlHzE=; b=ZLOtUx28fwvjjE6FwxXJZosc88N3nLiTtzrFdGZxBOogFlU/OmvfUOfTNWoeWseYT8YT5SeXBE6rt9rBbf/K9LQr0PD8MX6kzTsMoExkJ+DrYtVli7aWkXdjdcnP/l/2iRESU6FIsBjnGiHLLCyeGquJ/PrK9vJcd4KUXvNK1RI= Received: from AM0PR05MB4401.eurprd05.prod.outlook.com (52.134.124.20) by AM0PR05MB6596.eurprd05.prod.outlook.com (20.178.117.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2347.21; Tue, 15 Oct 2019 14:56:05 +0000 Received: from AM0PR05MB4401.eurprd05.prod.outlook.com ([fe80::6038:6339:d88e:e9d]) by AM0PR05MB4401.eurprd05.prod.outlook.com ([fe80::6038:6339:d88e:e9d%7]) with mapi id 15.20.2347.021; Tue, 15 Oct 2019 14:56:05 +0000 From: Ali Alnubani To: "dev@dpdk.org" CC: Slava Ovsiienko , Jeremy Plsek Thread-Topic: [PATCH] net/mlx5: fix build with strict alignment enabled Thread-Index: AQHVg2irJiDDU/81702mnUQxTknetA== Date: Tue, 15 Oct 2019 14:56:05 +0000 Message-ID: <20191015145508.19625-1-alialnu@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.23.0 x-clientproxiedby: LO2P265CA0388.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:f::16) To AM0PR05MB4401.eurprd05.prod.outlook.com (2603:10a6:208:62::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=alialnu@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0e8cbc00-8c29-46bd-9376-08d7517fcd99 x-ms-office365-filtering-ht: Tenant x-ms-traffictypediagnostic: AM0PR05MB6596:|AM0PR05MB6596: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5236; x-forefront-prvs: 01917B1794 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(366004)(396003)(39860400002)(136003)(376002)(199004)(189003)(66066001)(54906003)(36756003)(26005)(478600001)(7736002)(4326008)(5660300002)(8676002)(66946007)(71190400001)(71200400001)(6512007)(256004)(64756008)(66476007)(66446008)(386003)(66556008)(2906002)(6506007)(86362001)(6916009)(102836004)(25786009)(186003)(486006)(1076003)(14454004)(316002)(99286004)(6486002)(3846002)(2351001)(8936002)(5640700003)(2616005)(50226002)(305945005)(52116002)(6436002)(476003)(6116002)(81166006)(2501003)(1730700003)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB6596; H:AM0PR05MB4401.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: BCL:0; x-microsoft-antispam-message-info: n6DCJGGFF1Un0SyLVlRApIriyiMuXzQYqALoHshQvTRCQZ9XB0OUJ4WevoSmJGN1+5HAqBTJqGxfcX5L0ZIgZveTGPCTgGW6Lo5G8anmvdpWYkjxhZwxQvG6g49A5Opos1bSCkLYwGXO7GieyidAc+xYdkrcjheMFE7QrHsdjTGPCQKPd5OREi4OnZnOOjCWxAmXhl1B+MygUYTGc7w74GgvT0TtcWkQz6GMeBXZVVj5FH36AVMskYJHP/r6FG/DIKdmoDlp+7FrUh4KeW0c6CaaFg7RtbrY0bk23V2M0GLkF03SwwkBeAR1WJp3cEdKV+mJpqpd7Vgg6hk4AAMYi+PzyvMUj+R0z+/TaAo9BsfsKwCDIYCYXVFepsQbrEGmJPFcLKJFuPFoXnChaAALV6hVQ75Jxi4M7U+G1jBlE1M= Content-ID: <3C040A838E9E304BADAFDBD4693864CE@eurprd05.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e8cbc00-8c29-46bd-9376-08d7517fcd99 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Oct 2019 14:56:05.0733 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: i71dqDQFRIEvON/OjsWVdBJ5aLMGUCXUgQt0ipsFjL5+SGTVB7csqc1aqq55EXsswwerJwX8x6fiGSC1L9NgvA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB6596 Subject: [dpdk-dev] [PATCH] net/mlx5: fix build with strict alignment enabled 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 converts some of the casts to unaligned integer types. This fixes the following error, which is seen on x86, with gcc 7.4.0: drivers/net/mlx5/mlx5_rxtx.c: In function ‘mlx5_tx_dseg_iptr’: drivers/net/mlx5/mlx5_rxtx.c:2740:9: error: passing argument 1 of ‘memcpy’ makes pointer from integer without a cast [-Werror=int-conversion] memcpy(dst, src, len); ^~~ The memcpy call is replaced with 2 copies of uint32 for better performance on ARM. Fixes: 18a1c20044c0 ("net/mlx5: implement Tx burst template") Reported-by: Jeremy Plsek Signed-off-by: Ali Alnubani --- drivers/net/mlx5/mlx5_rxtx.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 10d0ca116..d6a5106c5 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -2747,27 +2747,33 @@ mlx5_tx_dseg_iptr(struct mlx5_txq_data *restrict txq, /* Unrolled implementation of generic rte_memcpy. */ dst = (uintptr_t)&dseg->inline_data[0]; src = (uintptr_t)buf; + if (len & 0x08) { #ifdef RTE_ARCH_STRICT_ALIGN - memcpy(dst, src, len); + assert(dst == RTE_PTR_ALIGN(dst, sizeof(uint32_t))); + *(uint32_t *)dst = *(unaligned_uint32_t *)src; + dst += sizeof(uint32_t); + src += sizeof(uint32_t); + *(uint32_t *)dst = *(unaligned_uint32_t *)src; + dst += sizeof(uint32_t); + src += sizeof(uint32_t); #else - if (len & 0x08) { - *(uint64_t *)dst = *(uint64_t *)src; + *(uint64_t *)dst = *(unaligned_uint64_t *)src; dst += sizeof(uint64_t); src += sizeof(uint64_t); +#endif } if (len & 0x04) { - *(uint32_t *)dst = *(uint32_t *)src; + *(uint32_t *)dst = *(unaligned_uint32_t *)src; dst += sizeof(uint32_t); src += sizeof(uint32_t); } if (len & 0x02) { - *(uint16_t *)dst = *(uint16_t *)src; + *(uint16_t *)dst = *(unaligned_uint16_t *)src; dst += sizeof(uint16_t); src += sizeof(uint16_t); } if (len & 0x01) *(uint8_t *)dst = *(uint8_t *)src; -#endif } /**