From patchwork Tue Mar 20 21:18:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 10297937 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 7996760349 for ; Tue, 20 Mar 2018 21:19:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6334C2969F for ; Tue, 20 Mar 2018 21:19:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57733296A1; Tue, 20 Mar 2018 21:19:04 +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 BE7882969F for ; Tue, 20 Mar 2018 21:19:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751405AbeCTVTC (ORCPT ); Tue, 20 Mar 2018 17:19:02 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35165 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751319AbeCTVTB (ORCPT ); Tue, 20 Mar 2018 17:19:01 -0400 Received: by mail-wm0-f67.google.com with SMTP id r82so6244815wme.0 for ; Tue, 20 Mar 2018 14:19:01 -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=FRfr9je1+MM4lroz8mZXxbuoN3sXg7IOIgTPXqVrZRQ=; b=F3ee/9EmT2Wp54g8M4ZzRD0ospBmo4qkmHrhOATxeH/Bu7JZLh2U7ALbbwGaf0Dn2d HugoLRnrf1h5mA487JYNubi2R/9cs71ywZ0J/W9EgiXDSzibfSGYMGboa9kAj5XImJ/i L0WKoQTBxvsJpnzKeTRNdfgZYphgAJJLZ6jmxWthBJ755FSMNUkcGWCr2bL/NqmaZdga NhaCRvEB4ZY8EAfWLHofdBPQhuZG9Lq4uZNATrk40KDrhlSFR6ZvfbWx6WlXx8rE11K6 FjbHqxF4MN6b2gSouBimMIPL7qRdOyOSUG4cb36FEymG8qsnNnemrGOE3uNJ2DTfg6hh ez5g== 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=FRfr9je1+MM4lroz8mZXxbuoN3sXg7IOIgTPXqVrZRQ=; b=nEUHlGUdz7annRzNtrxxXvWSBBHR0RuNCNwIe/vdL8YcgE6rjUT97vU21yMgFOmqrg KNDNrI8urKQLC62ydWisGOwRJ8T7HThRG0IlOW9HfUp54YeRtc2caHYBPQ16u5NRBd6Y O0tWVVvfF1dixTAUGhwgwuzlIkR70PO/VNqFiASmjnsLOVXM0rVnjBCzJRfE2hSVQ1n8 PO5d2zf+MkScbs6MTcBgT0yqv/EQDo0W3SUaP7vwxmqkZ0ExhhaBROiQsMqTD8EvpCnr 79ejJH6XH848RIpv8ed0EilYJCXcm3Jl4FeRNzn3c4SCoTdw9G6+FCwKFCcU3xrVgJ2T WEew== X-Gm-Message-State: AElRT7F4WNatqrv+pF1PIWFnPyWqagNnDNBhiZP2JAcOEPnJ0+k6SYg5 etyXWYxGPBftHzkN5UbwCkTE++f8jsk= X-Google-Smtp-Source: AG47ELslB5jjVY4dCyjrLiJdSeQ8cMPXZl8ck9SOik7UrYNxSLLUFfbln/w3TNUqWQzYuVTCQzXtQg== X-Received: by 10.28.71.67 with SMTP id u64mr895978wma.76.1521580740404; Tue, 20 Mar 2018 14:19:00 -0700 (PDT) Received: from ziepe.ca (S010614cc2056d97f.ed.shawcable.net. [174.3.196.123]) by smtp.gmail.com with ESMTPSA id m135sm3655256wma.2.2018.03.20.14.18.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 14:19:00 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.86_2) (envelope-from ) id 1eyOen-0002fi-JE; Tue, 20 Mar 2018 15:18:57 -0600 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe , Vladimir Sokolovsky Subject: [PATCH rdma-core 13/20] mthca: Use kernel uapi headers Date: Tue, 20 Mar 2018 15:18:43 -0600 Message-Id: <20180320211850.10090-14-jgg@ziepe.ca> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180320211850.10090-1-jgg@ziepe.ca> References: <20180320211850.10090-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 mthca just had one define that trivially duplicates, but needed to have the structs renamed to avoid conflicts Signed-off-by: Jason Gunthorpe --- providers/mthca/mthca-abi.h | 26 ++++++++++---------------- providers/mthca/mthca.c | 2 +- providers/mthca/verbs.c | 16 ++++++++-------- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/providers/mthca/mthca-abi.h b/providers/mthca/mthca-abi.h index 396480f267d16a..e965d040e68b78 100644 --- a/providers/mthca/mthca-abi.h +++ b/providers/mthca/mthca-abi.h @@ -35,33 +35,27 @@ #define MTHCA_ABI_H #include +#include -#define MTHCA_UVERBS_ABI_VERSION 1 - -struct mthca_alloc_ucontext_resp { +struct umthca_alloc_ucontext_resp { struct ib_uverbs_get_context_resp ibv_resp; __u32 qp_tab_size; __u32 uarc_size; }; -struct mthca_alloc_pd_resp { +struct umthca_alloc_pd_resp { struct ib_uverbs_alloc_pd_resp ibv_resp; __u32 pdn; __u32 reserved; }; -struct mthca_reg_mr { +struct umthca_reg_mr { struct ibv_reg_mr ibv_cmd; -/* - * Mark the memory region with a DMA attribute that causes - * in-flight DMA to be flushed when the region is written to: - */ -#define MTHCA_MR_DMASYNC 0x1 __u32 mr_attrs; __u32 reserved; }; -struct mthca_create_cq { +struct umthca_create_cq { struct ibv_create_cq ibv_cmd; __u32 lkey; __u32 pdn; @@ -71,32 +65,32 @@ struct mthca_create_cq { __u32 set_db_index; }; -struct mthca_create_cq_resp { +struct umthca_create_cq_resp { struct ib_uverbs_create_cq_resp ibv_resp; __u32 cqn; __u32 reserved; }; -struct mthca_resize_cq { +struct umthca_resize_cq { struct ibv_resize_cq ibv_cmd; __u32 lkey; __u32 reserved; }; -struct mthca_create_srq { +struct umthca_create_srq { struct ibv_create_srq ibv_cmd; __u32 lkey; __u32 db_index; __u64 db_page; }; -struct mthca_create_srq_resp { +struct umthca_create_srq_resp { struct ib_uverbs_create_srq_resp ibv_resp; __u32 srqn; __u32 reserved; }; -struct mthca_create_qp { +struct umthca_create_qp { struct ibv_create_qp ibv_cmd; __u32 lkey; __u32 reserved; diff --git a/providers/mthca/mthca.c b/providers/mthca/mthca.c index d2a9330dd05ce6..9ffc9797603601 100644 --- a/providers/mthca/mthca.c +++ b/providers/mthca/mthca.c @@ -134,7 +134,7 @@ static struct verbs_context *mthca_alloc_context(struct ibv_device *ibdev, { struct mthca_context *context; struct ibv_get_context cmd; - struct mthca_alloc_ucontext_resp resp; + struct umthca_alloc_ucontext_resp resp; int i; context = verbs_init_and_alloc_context(ibdev, cmd_fd, context, ibv_ctx, diff --git a/providers/mthca/verbs.c b/providers/mthca/verbs.c index df132576865a05..ebe804ac44b418 100644 --- a/providers/mthca/verbs.c +++ b/providers/mthca/verbs.c @@ -74,7 +74,7 @@ int mthca_query_port(struct ibv_context *context, uint8_t port, struct ibv_pd *mthca_alloc_pd(struct ibv_context *context) { struct ibv_alloc_pd cmd; - struct mthca_alloc_pd_resp resp; + struct umthca_alloc_pd_resp resp; struct mthca_pd *pd; pd = malloc(sizeof *pd); @@ -118,7 +118,7 @@ static struct ibv_mr *__mthca_reg_mr(struct ibv_pd *pd, void *addr, int dma_sync) { struct ibv_mr *mr; - struct mthca_reg_mr cmd; + struct umthca_reg_mr cmd; struct ib_uverbs_reg_mr_resp resp; int ret; @@ -177,8 +177,8 @@ struct ibv_cq *mthca_create_cq(struct ibv_context *context, int cqe, struct ibv_comp_channel *channel, int comp_vector) { - struct mthca_create_cq cmd; - struct mthca_create_cq_resp resp; + struct umthca_create_cq cmd; + struct umthca_create_cq_resp resp; struct mthca_cq *cq; int ret; @@ -272,7 +272,7 @@ err: int mthca_resize_cq(struct ibv_cq *ibcq, int cqe) { struct mthca_cq *cq = to_mcq(ibcq); - struct mthca_resize_cq cmd; + struct umthca_resize_cq cmd; struct ibv_mr *mr; struct mthca_buf buf; struct ib_uverbs_resize_cq_resp resp; @@ -375,8 +375,8 @@ static int align_queue_size(struct ibv_context *context, int size, int spare) struct ibv_srq *mthca_create_srq(struct ibv_pd *pd, struct ibv_srq_init_attr *attr) { - struct mthca_create_srq cmd; - struct mthca_create_srq_resp resp; + struct umthca_create_srq cmd; + struct umthca_create_srq_resp resp; struct mthca_srq *srq; int ret; @@ -489,7 +489,7 @@ int mthca_destroy_srq(struct ibv_srq *srq) struct ibv_qp *mthca_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *attr) { - struct mthca_create_qp cmd; + struct umthca_create_qp cmd; struct ib_uverbs_create_qp_resp resp; struct mthca_qp *qp; int ret;