From patchwork Fri Dec 20 21:39:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Upinder Malhi (umalhi)" X-Patchwork-Id: 3392001 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 915FAC0D4A for ; Fri, 20 Dec 2013 21:39:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D181220604 for ; Fri, 20 Dec 2013 21:39:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C41452060E for ; Fri, 20 Dec 2013 21:39:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753519Ab3LTVje (ORCPT ); Fri, 20 Dec 2013 16:39:34 -0500 Received: from rcdn-iport-5.cisco.com ([173.37.86.76]:25985 "EHLO rcdn-iport-5.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753216Ab3LTVjd convert rfc822-to-8bit (ORCPT ); Fri, 20 Dec 2013 16:39:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=1108; q=dns/txt; s=iport; t=1387575573; x=1388785173; h=from:to:subject:date:message-id:content-id: content-transfer-encoding:mime-version; bh=K+UMl+4CLzMsAMyFNz7EsYI9pSAFT5NkSB61cxLf5WE=; b=lVKN8q7lLkt8hF7r0hRyL7XeQh/a02OsTYWVc/9dM9+wGIBNXeCB3UQK QS/Du7uYhq80lthgMlq4NJJvK9arelLeGDergESc8SmaO9kSZQ5GYlz05 uiq9zek0vOXOGLxvCdGL0jCkvW2Imx9ifv3CZW1KkSb/rHh3hxsTpPD1+ A=; X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgIFAE64tFKtJXG+/2dsb2JhbABZgws4VblEgR8WdIIoBAECN1EBPjgKJwQBEogEDcorF48UgyiBEwSVR4JPkhSDK4Iq X-IronPort-AV: E=Sophos;i="4.95,523,1384300800"; d="scan'208";a="293005615" Received: from rcdn-core2-3.cisco.com ([173.37.113.190]) by rcdn-iport-5.cisco.com with ESMTP; 20 Dec 2013 21:39:33 +0000 Received: from xhc-rcd-x07.cisco.com (xhc-rcd-x07.cisco.com [173.37.183.81]) by rcdn-core2-3.cisco.com (8.14.5/8.14.5) with ESMTP id rBKLdWWr026984 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Fri, 20 Dec 2013 21:39:32 GMT Received: from xmb-rcd-x09.cisco.com ([169.254.9.86]) by xhc-rcd-x07.cisco.com ([173.37.183.81]) with mapi id 14.03.0123.003; Fri, 20 Dec 2013 15:39:32 -0600 From: "Upinder Malhi (umalhi)" To: "linux-rdma@vger.kernel.org" , " Dreier" Subject: [PATCH for-next] IB/usnic: Fix userspace/kernel ABI alignement discrepancy Thread-Topic: [PATCH for-next] IB/usnic: Fix userspace/kernel ABI alignement discrepancy Thread-Index: AQHO/cv3w7uVyfop00y2UjzN1C7Ftg== Date: Fri, 20 Dec 2013 21:39:31 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.155.161.43] Content-ID: <7590DDC1AA6F7B41B16A753FEA5C6999@emea.cisco.com> MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch depends on http://www.spinics.net/lists/linux-rdma/msg18193.html. Change the type of the reserve field to u32 from u64 in usnic_ib_create_qp_resp bc u64 will align differently for 32 and 64 bit archs. And reserve even more space for future expansion. Signed-off-by: Upinder Malhi --- drivers/infiniband/hw/usnic/usnic_abi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/infiniband/hw/usnic/usnic_abi.h b/drivers/infiniband/hw/usnic/usnic_abi.h index 730a371..6c56fbf 100644 --- a/drivers/infiniband/hw/usnic/usnic_abi.h +++ b/drivers/infiniband/hw/usnic/usnic_abi.h @@ -21,7 +21,7 @@ #define USNIC_ABI_H /* ABI between userspace and kernel */ -#define USNIC_UVERBS_ABI_VERSION 3 +#define USNIC_UVERBS_ABI_VERSION 4 #define USNIC_QP_GRP_MAX_WQS 8 #define USNIC_QP_GRP_MAX_RQS 8 @@ -67,7 +67,7 @@ struct usnic_ib_create_qp_resp { u32 rq_idx[USNIC_QP_GRP_MAX_RQS]; u32 cq_idx[USNIC_QP_GRP_MAX_CQS]; u32 transport; - u64 reserved; + u32 reserved[8]; }; #endif /* USNIC_ABI_H */