From patchwork Tue Sep 20 06:22:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Knut Omang X-Patchwork-Id: 9341069 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 C99C36077A for ; Tue, 20 Sep 2016 06:22:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BAF1C29C43 for ; Tue, 20 Sep 2016 06:22:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF73F29C52; Tue, 20 Sep 2016 06:22:48 +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=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY 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 A348F29C43 for ; Tue, 20 Sep 2016 06:22:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753997AbcITGWn (ORCPT ); Tue, 20 Sep 2016 02:22:43 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:21934 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751437AbcITGWm (ORCPT ); Tue, 20 Sep 2016 02:22:42 -0400 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u8K6MdO8014313 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 20 Sep 2016 06:22:39 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u8K6MdBS015092 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 20 Sep 2016 06:22:39 GMT Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u8K6Mc77023071; Tue, 20 Sep 2016 06:22:39 GMT Received: from abi.no.oracle.com (/10.172.144.123) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 19 Sep 2016 23:22:38 -0700 From: Knut Omang To: Doug Ledford Cc: linux-rdma@vger.kernel.org, Mukesh Kacker , Knut Omang Subject: [PATCH libibverbs v3 2/3] Add padding to get proper end alignment of ibv_reg_mr_resp Date: Tue, 20 Sep 2016 08:22:25 +0200 Message-Id: X-Mailer: git-send-email 2.5.5 In-Reply-To: References: X-Source-IP: userv0021.oracle.com [156.151.31.71] 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 The user/kernel level API requires all parameter blocks to be 64 bit end aligned. Also clean up some valgrind/memory initialization issues. Signed-off-by: Knut Omang Reviewed-by: Mukesh Kacker --- include/infiniband/kern-abi.h | 1 + src/cmd.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/infiniband/kern-abi.h b/include/infiniband/kern-abi.h index 381fd50..ddea393 100644 --- a/include/infiniband/kern-abi.h +++ b/include/infiniband/kern-abi.h @@ -382,6 +382,7 @@ struct ibv_reg_mr_resp { __u32 mr_handle; __u32 lkey; __u32 rkey; + __u32 reserved; }; struct ibv_rereg_mr { diff --git a/src/cmd.c b/src/cmd.c index 58b9dcd..381dcc7 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1500,6 +1500,7 @@ int ibv_cmd_create_ah_ex(struct ibv_pd *pd, struct ibv_ah *ah, struct ibv_ah_att IBV_INIT_CMD_RESP(cmd, cmd_size, CREATE_AH, resp, resp_size); cmd->user_handle = (uintptr_t) ah; cmd->pd_handle = pd->handle; + cmd->reserved = 0; cmd->attr.dlid = attr->dlid; cmd->attr.sl = attr->sl; cmd->attr.src_path_bits = attr->src_path_bits; @@ -1510,12 +1511,14 @@ int ibv_cmd_create_ah_ex(struct ibv_pd *pd, struct ibv_ah *ah, struct ibv_ah_att cmd->attr.grh.sgid_index = attr->grh.sgid_index; cmd->attr.grh.hop_limit = attr->grh.hop_limit; cmd->attr.grh.traffic_class = attr->grh.traffic_class; + cmd->attr.grh.reserved = 0; + cmd->attr.reserved = 0; memcpy(cmd->attr.grh.dgid, attr->grh.dgid.raw, 16); if (write(pd->context->cmd_fd, cmd, cmd_size) != cmd_size) return errno; - (void) VALGRIND_MAKE_MEM_DEFINED(resp, sizeof *resp); + (void) VALGRIND_MAKE_MEM_DEFINED(resp, resp_size); ah->handle = resp->handle; ah->context = pd->context;