From patchwork Tue Mar 20 20:19:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 10297829 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 5F4DE600F6 for ; Tue, 20 Mar 2018 20:20:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4BCC028F5F for ; Tue, 20 Mar 2018 20:20:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40B2F294D4; Tue, 20 Mar 2018 20:20:25 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, 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 13D1728E1F for ; Tue, 20 Mar 2018 20:20:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751317AbeCTUUU (ORCPT ); Tue, 20 Mar 2018 16:20:20 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:36568 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751472AbeCTUUR (ORCPT ); Tue, 20 Mar 2018 16:20:17 -0400 Received: by mail-wr0-f193.google.com with SMTP id d10so3033423wrf.3 for ; Tue, 20 Mar 2018 13:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7j4p9fVPRidJjWd/F4ylg/HlcPabWgV9W7Un1AeUxo8=; b=Fab7wH7mQHpuSVpzzirKun49WT7aOKvTdTBIZqy66IlqVqgesikSD0CDoF8FXzjLXR Nv2+ON6gTm1nl7vjlmcDYAOZtUhWdB7Dzjxhd+y53dPEXb5POZMTPqU3cE9lLeBd+BVT XN/GwC+8Py53JTkIuMAYqFTxyCFa9gfIrOtkipesBHLAO8Pl0gbW1KEih3y0FrR7MkBb 527ir1jKF1Sfuqd7zNfsDQE8ybaD5LGtrT8lD3w2yk1MRFV7mmVoocn4/cqmEuKK7BMu wSiNgdoVIBqZfQslhmMXKWganfO8VpIi1miiltNXEOLtLDR6vI5Q/b8MphOCKhC+86Qt iQfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7j4p9fVPRidJjWd/F4ylg/HlcPabWgV9W7Un1AeUxo8=; b=LXiLLe+vBj5edU6NG8ZIVZeiIgyDCS7tQ4VRyB360jDNpBV+Cj8hmqzNDa4NojJX6m ObI8TNOPi1p9j3XKMQHmoLGSfzx/lrzwoZx+nJETX2lm7h8fDn9zfDdTrLDZQvDqWPFU u4AEMh40otroW25lC9XJwxZAIl6Gu7cRBBiUHpfd5E12FgxgWslFnisNomd3GiMqbmGH CYs2Z4c8aFiv0JV9AH0TfIKbgTIC0HjgPJnh0jgSfGRAAWpo9TPUmnZlqHW8oEqXrAr+ qjD81q93iT7HhfWL//m6uqeO0OL5A1wr6kU++dH/VfAhJcpe0R576A2bKdVM/AbJOs+t dkKg== X-Gm-Message-State: AElRT7GGVJ7uAIYghYfRe2c0sLGgdDjMQHfHF3KVM0gqwj3c2xLwyK1v K92TzR5Z7CvXU4K3YXJwjbyVWmD41f0= X-Google-Smtp-Source: AG47ELuwKKLvsf5xT7UztZ0Q4Q8fZZ+JlHH4AIPITdwPTmwhvUmypxzean8nLSi3PQIcH/5T2LRy+Q== X-Received: by 10.223.184.188 with SMTP id i57mr14094304wrf.105.1521577216062; Tue, 20 Mar 2018 13:20:16 -0700 (PDT) Received: from ziepe.ca (S010614cc2056d97f.ed.shawcable.net. [174.3.196.123]) by smtp.gmail.com with ESMTPSA id o12sm2575037wrf.93.2018.03.20.13.20.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 13:20:12 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.86_2) (envelope-from ) id 1eyNjt-0001NP-OG; Tue, 20 Mar 2018 14:20:09 -0600 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org, Moni Shoua , Adit Ranadive Cc: Jason Gunthorpe Subject: [PATCH 1/6] RDMA: Remove minor pahole differences between 32/64 Date: Tue, 20 Mar 2018 14:19:46 -0600 Message-Id: <20180320201951.4998-2-jgg@ziepe.ca> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180320201951.4998-1-jgg@ziepe.ca> References: <20180320201951.4998-1-jgg@ziepe.ca> 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 From: Jason Gunthorpe To help automatic detection we want pahole to report the same struct layouts for 32 and 64 bit compiles. These cases are all implicit padding added at the end of embedded structs as part of a union. The added reserved fields have no impact on the ABI. Signed-off-by: Jason Gunthorpe --- include/uapi/rdma/rdma_user_rxe.h | 2 ++ include/uapi/rdma/vmw_pvrdma-abi.h | 1 + 2 files changed, 3 insertions(+) diff --git a/include/uapi/rdma/rdma_user_rxe.h b/include/uapi/rdma/rdma_user_rxe.h index b3b1bfc8fa21af..231190b841c816 100644 --- a/include/uapi/rdma/rdma_user_rxe.h +++ b/include/uapi/rdma/rdma_user_rxe.h @@ -78,12 +78,14 @@ struct rxe_send_wr { struct { __u64 remote_addr; __u32 rkey; + __u32 reserved; } rdma; struct { __u64 remote_addr; __u64 compare_add; __u64 swap; __u32 rkey; + __u32 reserved; } atomic; struct { __u32 remote_qpn; diff --git a/include/uapi/rdma/vmw_pvrdma-abi.h b/include/uapi/rdma/vmw_pvrdma-abi.h index 02ca0d0f1eb7ea..edf5c722490189 100644 --- a/include/uapi/rdma/vmw_pvrdma-abi.h +++ b/include/uapi/rdma/vmw_pvrdma-abi.h @@ -262,6 +262,7 @@ struct pvrdma_sq_wqe_hdr { __u32 length; __u32 access_flags; __u32 rkey; + __u32 reserved; } fast_reg; struct { __u32 remote_qpn;