From patchwork Tue Jun 12 02:56:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 10459129 X-Patchwork-Delegate: jgg@ziepe.ca Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8BE3A60348 for ; Tue, 12 Jun 2018 02:57:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C2572846F for ; Tue, 12 Jun 2018 02:57:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F10C285DD; Tue, 12 Jun 2018 02:57:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C79AF2846F for ; Tue, 12 Jun 2018 02:57:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935135AbeFLC5G (ORCPT ); Mon, 11 Jun 2018 22:57:06 -0400 Received: from mail-ve1eur01on0078.outbound.protection.outlook.com ([104.47.1.78]:42336 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935134AbeFLC5F (ORCPT ); Mon, 11 Jun 2018 22:57:05 -0400 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=L4HuVB+MG85U/ghq6nNkCVz1Wfgo4nnse5B0Zp/sFng=; b=BXrEReSXIz3fFwmwzfgXB7GIcvwKb9F97L/cX+YByjkKW4flQgmdoOOAmrSNu3mtjwzE7sOEHsG4WX21mpULD8ODc1SdFcozX0AJVu7wCbdtpNSbaCirLGvR4KT4HAm40gPKNNBE0DE5L5GzzQ3u5dXCg2RxEyPjLeSr57ny85A= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=jgg@mellanox.com; Received: from mlx.ziepe.ca (174.3.196.123) by AM6PR05MB4456.eurprd05.prod.outlook.com (2603:10a6:209:43::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.841.14; Tue, 12 Jun 2018 02:57:02 +0000 Received: from jgg by mlx.ziepe.ca with local (Exim 4.86_2) (envelope-from ) id 1fSZUI-0007ZQ-Kk; Mon, 11 Jun 2018 20:56:50 -0600 Date: Mon, 11 Jun 2018 20:56:50 -0600 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Parav Pandit , Leon Romanovsky Subject: [PATCH] IB/rxe: Do not hide uABI stuff in memcpy Message-ID: <20180612025650.GA29025@ziepe.ca> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-Originating-IP: [174.3.196.123] X-ClientProxiedBy: MWHPR19CA0086.namprd19.prod.outlook.com (2603:10b6:320:1f::24) To AM6PR05MB4456.eurprd05.prod.outlook.com (2603:10a6:209:43::25) 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:AM6PR05MB4456; X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4456; 3:p3eDTmjRpK4bJKaUbls6ZpKXCE5Tx7lwNuI83trrc4GCkFyNfRlWbniidaAdfGEE/2cyvB5qPU6x2ENEa2ZMPX5TOogkSvcyom6vjs/sPBqbAB4w26kQRvseVZlzXkQ3BCoYL61+m9OuT+FHlGHBSK5iUQpDX+aEjxtjGURm4M659+cWRzuCmy4A8IjODDpcdhlZiJgE0UHPME/BflAenCAEapRSoOcDH/TZR/2JIpcuq1Qxm3hUvDpJqn6LtRmV; 25:j2O2SkRZ5sDjdZyJzatuNYQAzQjR6lfRzuLYYoCZNel+KWhzr39sAy7h7pmHmzC5/ymFRXEa51dr1diBufKoTQvgDzTVZB1F+J8+Dn2I9usVYu1CXqgOPBWM7PFT36VgYVAUzxvQSc+nc6q/Xbe6Gaaa8v9K/aA81Ffw31wf65zYHBT+aByUYYyZaQJaapLoOHClHPd4syDt9LXWR9g/IlII6C+CaMybL42/c9vzfnICYHhaqi67mPSZQdoAYmD/YtLKsdZ4uNk8qM65VZldBYVFKRULpMMn0W2gr1000uPcw5YGBymaUrrJSWX+jXZdV0g6k/+B+Pmt2THYkXeCMw==; 31:Qhlc/u9kV1Jq/TGAK+JzaJzGP14yC+2R2OAyG4eD2Yuf3NSLqsgCGRiSY49VzUeKqEBY6j9DUF0TzwitYZtnaw3PGLNtEn9SyLho35ILdBV7pkUF9z3AUTAqa2hGR2FTqKrNDR90xyg8SysEZeGBkxKnP65AiYZ1fcUQEdvwr+Db1g/L1a4I+WlJUCUR/voL+aKUWMJ0JRiMpE4zmTnZ5xBTNSh+gYCOxnVD82WKybo= X-MS-TrafficTypeDiagnostic: AM6PR05MB4456: X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4456; 20:WpGj/XweXLj5iV6S0bzqwE/wA497fmQHs5o28F6nAgLcAx8H1e8DO83poxRWX4POQWUMxvpu7TsapwZ0R4lHl+AgR/P7HTqHsBWBIm26kBkSWNjxq0gQS848N1AQ16o+bhJqHCpiDCh+qAq9gQIboXddHRZQHFTCN1JtobLfzJjqSYUwbyVvyUlJgDOphri7uDsWJwYgV1cZO8wJ/REhuLngxxMsN5vDuIHW4aV2aQFVV0kmYD1ZMJ0XvQZpnE3ND6OsTHibhB0YlH3VU8Yaj9vAnHAd3NxjP5BDL/lR8XDYfkNATbJPKcKHRCadQ1jfDe3K76qyTLFFd8SZ3u/WNxBbDWMPFKLlFyn5lT7vjl3QQCSTOd/iZ8vck+1jMWTIdycCvDwNMrIimvpBTxGqMtM62LDEA0jF/UEEpFVdfx0cCYA+rLP7cOBfBOh1LekACIAhuylc8GuUz+Dc4BaxOOTGvl+/V5VCOSgge6naxp96GCiqFfY9BuyiHVMwumbc; 4:wu4U2TUW+BSbmDp3MMPFrj5pNmnBORMlEmuBisxuusWVKImGskHjQ6HalLksKM8VdUzMw+lWq+C7O8RjdQEC4Vl9XWcS7FRSE07kt6htfeQKYZoSZMTIs0Hf6QKLq6UAruZXsTyXcAva/Yls9ulwu3S4a1+/TB2xgYkALSwn1C3sbGW1dPwApxRoDe49HvCKpxQp3YFuaTXjTCHCtYnV89q4pw0cNU0dAkwK+/Cb67Fl87ZpRbpo5ZFHtN/JpGjLuZQm5BSnjfMbeODO4bqITA== 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)(3002001)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:AM6PR05MB4456; BCL:0; PCL:0; RULEID:; SRVR:AM6PR05MB4456; X-Forefront-PRVS: 07013D7479 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(39380400002)(376002)(346002)(39860400002)(396003)(199004)(189003)(26005)(2906002)(386003)(59450400001)(33896004)(68736007)(186003)(47776003)(476003)(486006)(81156014)(8676002)(81166006)(8936002)(6116002)(3846002)(50466002)(69596002)(23726003)(1076002)(66066001)(305945005)(9786002)(7736002)(9746002)(46656002)(54906003)(52116002)(316002)(58126008)(16586007)(2351001)(33656002)(2361001)(9686003)(86362001)(4326008)(122856001)(5660300001)(107886003)(36756003)(97736004)(1857600001)(105586002)(57986006)(106356001)(83796002)(53936002)(478600001)(6916009)(18370500001)(24400500001)(42262002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB4456; H:mlx.ziepe.ca; 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-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM6PR05MB4456; 23:nrQIlBqU28hWG2pXC1Z1o3pof4URIP11bWie+lo5Q?= =?us-ascii?Q?qbFo0N023Etdo6IeTXlclOo+qLpz986PjyQhd/LnIDhncHKWSszVCpDQGCOm?= =?us-ascii?Q?Rpj4SA943AcNloqdGNC/CMbr4xPgmluPD8Ac8/LdzEIrveAY1A55tW9PgZQ3?= =?us-ascii?Q?TYzEx2e6D0ghVu2iCjvJCzE5zPVB/CA1QU/vOyW6va9NTmhMKE0mfp4S1RB3?= =?us-ascii?Q?pI9QVXRP2dHvWmvCIvOWwVK38teyFMDSWa7b+Cvpju2UD7dUz8ktlPqKIQX7?= =?us-ascii?Q?JE+qNd3j3iNquE6jaU6uJ0iaio2roZ0qqDTNZfbmCk6SCJO1Cr/I6KOBSWrs?= =?us-ascii?Q?8mVueGbXFkuU6jia1qeVNJGjTzdMXD2Cpjwp58CzOEXosd3Ft9LPp6vmCYQe?= =?us-ascii?Q?ik7GTXmyuBDQqY+fjfS300S0Rnc/vWM1RBoFGhVxqYqp1AFEPDeu7jCr6E8v?= =?us-ascii?Q?O7MXpk8p8Xnd/4f+txiiJVLeVKUwtzDLnu6L4ubA1R8XmwwUldV6i8kDNs4e?= =?us-ascii?Q?Qo6Eh8Vi6S1HUFJO+md/v8ryQvvQKThIYLzHsrzfToKr1rssE3hep5ebtbjc?= =?us-ascii?Q?9doNgvzNHFoY4nlQ83Gy+SYrKn/s9W5TUQf2pX8eg6bEX9WAm/+z6cYjgp/0?= =?us-ascii?Q?nns2eRf0AKaIZuYZ9baNRe9xYNp2CkCKh40SM7TTS3L37hLCgmz8Lml6eq0E?= =?us-ascii?Q?rlolbwGG/V0FZHBRAIn+zb0AmNsUjajRVTG2a8QMhcqmhEGzL1PL8Xu36E66?= =?us-ascii?Q?wIdq/qRd+qxJZl/58NL8oBbPUABQoykbpz4BOriNlLXAAzWZ9pZIMjNrNBRh?= =?us-ascii?Q?jzP7CZnp1RjIIHEIlg29ArTN59z9k44icv+HMZztCy/0yws+HlvpD4xUl3hR?= =?us-ascii?Q?M1EXmHUcm5DpXMh+74CKvA8rFi8hQ7qiaCqmPPUivVAu02juwWrsPSsHCXLD?= =?us-ascii?Q?MjREkpuNXe1OpAWveS3y0X9LB+h4NUSrS81GtYbQtOzELYgQAfAaW9UpRnAN?= =?us-ascii?Q?zkR4igxRcPFsCJRrWv6dRobYwt1cNthyo1Gj4YuW/V24ogL+/jwKGXfkKEh3?= =?us-ascii?Q?D94FPd893JnA0WpUdimSLj3sR3ZJjzTsgpoBox3Dwbd97p3YCVMAVXVgppAk?= =?us-ascii?Q?X0b6Dbw/PFCZl/aYXMHuVarIycODStn/fXp3FmtPmM9zSqkvQjRUFr41opy5?= =?us-ascii?Q?G1mZ7VqyOmfd0sAIhHYmtzDi3Nx06bZWXgScFu1+3DAxPHQkb8M+qEbwxdEp?= =?us-ascii?Q?lH1J6AWykzhzhIjMc1vs26utIcd4e6287ba9nQgEXNLFEvESrxXv/R1Mhkh1?= =?us-ascii?Q?snBysIs7h/Ou6O0/bzUF24zDtvzR9L2ljMmZetgPWZ8L8zWs/z6UF819OE6W?= =?us-ascii?Q?tX6RuzgQkjcg6ZpmCCw4wNToJA=3D?= X-Microsoft-Antispam-Message-Info: Ftb2aUFY70KwDaqQieijX0o+llHPSp/thRYB39kY9IeEamTi26hTZ39FsK8p/fhOg2D8JJR30cRqqgJsitQ1J8cBhPgmFK5R8Zy4a3SFyvzxJkOPGEV0eYEawVP1G2h3+U62JdQXdqSwe4JrgFAN/STvo2ZsIaNcGb/2BM8Xp/WfnwCkjfcXPp77i+FfgrIk X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4456; 6:iyt3zJTH9dDs/gCbhazcxWYxCMYqcNy1ksi+VupNGMrRow8v44+jM/aBOO7MiLaMKrsHmPJixDGKvGNwtZ/Jz96KprPPmDQCkrEY5aIyvDRfMlAQ9kydrN4z5RsMEMX9nGGx1mZ9bLUKGNwiGHjI1sOM+bFJatCIG6g4/hojyvmXMU0xiPyR6ndgHKIw6TKmSBVFU77TuAqPfLDrr5vYt3zg4r95t7xHw8OH9xwDBsAjNvArVfday3yzDZBnYpCJ+LkOFVwxWaQJQvyGcP6gWf0lYWej/qCk1RFJzEAyXYlstscXLMsbHnM+FDdD0sEoHwUY626othcIlOapJuARXh1KbR+rYeVgcU15TdsflwzbF4oTT4nn5IT75wJMk3qCQKLo8Jzxf/GhVge/9Qy69tR7L0qpmUDSeQ0jbGI944TpPQBdzYA9ixnPqTrSAGmbOP/fj7+by/G33mq0E6dn7w==; 5:Otw4TeYAOlBn1SnRUyCi45acrU/SYz4aSoysqexA8z5SOhMSUkM5WSaHA38gl84rh15c+ba4OyVzHmiYczgBBGDkYNKvHmz9/MuvLdZfiLrhbnhkwaNaz3nQrL3oWvi4DmkUk55578xRTxwkYUcMGmBbiDH7RNHaUc5Vwp4zVK8=; 24:WRVBmm3IWXAX32wWjB/t/lgrWzO4w83vZECEcTUkIoE6JFcrayPYUwO0TDXDyd17bPFlMRPxE877bmshcB7xZG8K4OORghEyWMd075wBRac= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4456; 7:N3lzn27VYrsZEwiMIsBMF4DtkGPhY1bIyJ3qTyX+Jk6W4Avh6bfXOjDiaWyhAIxDJRNxhl8ty6m39dfwqr3aiKTsg48LPwPz6GZZr3bQinHqkwvF0u8VhlmL3f2REVya1kwkQ4XKUwnPwuSBVz3Ldo2asmjnKCF47btl4eDrW7eQt5HztY5JmQSur5Kwvjm8XcDyOVwO+gLLyTJA8FFRJNByRAJOVjb9mI+fCtzr4Q+ym4S87ireN3Ohp5MEWRbL X-MS-Office365-Filtering-Correlation-Id: 2679bf64-0ad1-4d4f-df36-08d5d0102c97 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2018 02:57:02.7122 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2679bf64-0ad1-4d4f-df36-08d5d0102c97 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4456 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP struct rxe_global_route and struct ib_global_route are not the same thing and should not be memcpy'd over each other, do a member by member copy instead. This allows the layout of the in-kernel struct ib_global_route to be changed without breaking rxe. Signed-off-by: Jason Gunthorpe Reviewed-by: Zhu Yanjun Reviewed-by: Leon Romanovsky --- drivers/infiniband/sw/rxe/rxe_av.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/sw/rxe/rxe_av.c b/drivers/infiniband/sw/rxe/rxe_av.c index c6bce915df50bc..26fe8d7dbc55f3 100644 --- a/drivers/infiniband/sw/rxe/rxe_av.c +++ b/drivers/infiniband/sw/rxe/rxe_av.c @@ -55,16 +55,29 @@ int rxe_av_chk_attr(struct rxe_dev *rxe, struct rdma_ah_attr *attr) void rxe_av_from_attr(u8 port_num, struct rxe_av *av, struct rdma_ah_attr *attr) { + const struct ib_global_route *grh = rdma_ah_read_grh(attr); + memset(av, 0, sizeof(*av)); - memcpy(&av->grh, rdma_ah_read_grh(attr), - sizeof(*rdma_ah_read_grh(attr))); + memcpy(av->grh.dgid.raw, grh->dgid.raw, sizeof(grh->dgid.raw)); + av->grh.flow_label = grh->flow_label; + av->grh.sgid_index = grh->sgid_index; + av->grh.hop_limit = grh->hop_limit; + av->grh.traffic_class = grh->traffic_class; av->port_num = port_num; } void rxe_av_to_attr(struct rxe_av *av, struct rdma_ah_attr *attr) { + struct ib_global_route *grh = rdma_ah_retrieve_grh(attr); + attr->type = RDMA_AH_ATTR_TYPE_ROCE; - memcpy(rdma_ah_retrieve_grh(attr), &av->grh, sizeof(av->grh)); + + memcpy(grh->dgid.raw, av->grh.dgid.raw, sizeof(av->grh.dgid.raw)); + grh->flow_label = av->grh.flow_label; + grh->sgid_index = av->grh.sgid_index; + grh->hop_limit = av->grh.hop_limit; + grh->traffic_class = av->grh.traffic_class; + rdma_ah_set_ah_flags(attr, IB_AH_GRH); rdma_ah_set_port_num(attr, av->port_num); }