From patchwork Thu Jan 11 22:13:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 10158759 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 29CF0601A1 for ; Thu, 11 Jan 2018 22:14:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A0152850D for ; Thu, 11 Jan 2018 22:14:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0EA2B28565; Thu, 11 Jan 2018 22:14:02 +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 87D7D285C6 for ; Thu, 11 Jan 2018 22:14:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933428AbeAKWN6 (ORCPT ); Thu, 11 Jan 2018 17:13:58 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:39502 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933296AbeAKWN4 (ORCPT ); Thu, 11 Jan 2018 17:13:56 -0500 Received: by mail-wm0-f68.google.com with SMTP id i11so8211497wmf.4 for ; Thu, 11 Jan 2018 14:13:55 -0800 (PST) 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=yBbt2NMmy8XvY4DvaMdSD4fezXLFG8I2B6qh2N6NVUE=; b=nE1xUupcTGJgHIHGUsj8/BgySd4a3DbJTlbuMGaLXJLWYzHBnkEFOl+45S6r+BDpd5 e8blNEW1h3+1p1Fyv80pp3DV2a9NQHOMzvYXdsT2p4aiRlKvgOLf36tgpZIsgkYy/IRk O1xJz9iShyahOzWUmy5zCShTWbWEp6+ButHBnhCb5EzV5UKtFdQ0z7uPueKMh2y8ktAb I5BofyJCxfHmV6G4bBkwzlQ77LhRlP64DGNxDlXQf2WVJdW/eJWDIltNWAGCCb8C+qc+ 2MEkQ2Kdnj5fqf1SrwoeURxxgwXQWkCtEstbrS7qMXX+H8+UvjBMc2yLDLf3YWOi4Yu6 iVFg== 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=yBbt2NMmy8XvY4DvaMdSD4fezXLFG8I2B6qh2N6NVUE=; b=C48ayEI4/HPpSn0AuBJs+guXuRk2dbudrcsjO+JCJAgGd/Ms2Q1isP35ZI5wUBCq+i MbSzGmQkN42sBkgxJIZCRN2wcK05UXnJlIcLMGg2gT2neXomvOh+KmQEP5lVJIck4EMv f5TXhRPz16sDjUn2DjCAMePubPXEX2LsAiMCI10T5LGsEIF/h5xgNKnYDebc+17BAZ/d A030aTyWFyGk87qqedkxTHgjEFv0FpAynC4D0dyuGIjynSi5OAVnwT79nMaB1nZ3A5Qr iDR+2685MSuOY1nZw5Rj488pMPmEFmP6fXcr97lJtRE7rPc0O10mrmIoaRJMGIC8xcpT jx0Q== X-Gm-Message-State: AKwxytdQfqN7pMHmzzuCDWhDaY+4wOhPPiO7n9uAtnjB8CFlVhrnK8zk 0Li9zKn6EtYN1jMGoGlH7+hlxacA49Y= X-Google-Smtp-Source: ACJfBovknaKzuBRetxlKuts2bgS0Rr9ff7mst60OktDXkFJiOOpozqYykcQL2fj324xiKA1rJ3TAGg== X-Received: by 10.28.149.131 with SMTP id x125mr2326251wmd.129.1515708834192; Thu, 11 Jan 2018 14:13:54 -0800 (PST) Received: from ziepe.ca (S010614cc2056d97f.ed.shawcable.net. [70.74.179.152]) by smtp.gmail.com with ESMTPSA id q186sm3007083wmb.6.2018.01.11.14.13.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jan 2018 14:13:50 -0800 (PST) Received: from jgg by mlx.ziepe.ca with local (Exim 4.86_2) (envelope-from ) id 1eZl6Z-0000Jq-0p; Thu, 11 Jan 2018 15:13:47 -0700 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 11/17] verbs: Use kernel uapi header for ibv_create_ah_resp Date: Thu, 11 Jan 2018 15:13:34 -0700 Message-Id: <20180111221340.965-12-jgg@ziepe.ca> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180111221340.965-1-jgg@ziepe.ca> References: <20180111221340.965-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 kern-abi.h has a different spelling for 'ah_handle' Signed-off-by: Jason Gunthorpe --- libibverbs/cmd.c | 4 ++-- libibverbs/driver.h | 2 +- libibverbs/kern-abi.h | 4 ---- providers/bnxt_re/verbs.c | 2 +- providers/hfi1verbs/verbs.c | 2 +- providers/ipathverbs/verbs.c | 2 +- providers/mlx5/mlx5-abi.h | 2 +- providers/ocrdma/ocrdma_verbs.c | 2 +- providers/rxe/rxe.c | 2 +- 9 files changed, 9 insertions(+), 13 deletions(-) diff --git a/libibverbs/cmd.c b/libibverbs/cmd.c index 62ac7df0dfc57b..51366f05cfc9c5 100644 --- a/libibverbs/cmd.c +++ b/libibverbs/cmd.c @@ -1621,7 +1621,7 @@ int ibv_cmd_post_srq_recv(struct ibv_srq *srq, struct ibv_recv_wr *wr, int ibv_cmd_create_ah(struct ibv_pd *pd, struct ibv_ah *ah, struct ibv_ah_attr *attr, - struct ibv_create_ah_resp *resp, + struct ib_uverbs_create_ah_resp *resp, size_t resp_size) { struct ibv_create_ah cmd; @@ -1646,7 +1646,7 @@ int ibv_cmd_create_ah(struct ibv_pd *pd, struct ibv_ah *ah, (void) VALGRIND_MAKE_MEM_DEFINED(resp, resp_size); - ah->handle = resp->handle; + ah->handle = resp->ah_handle; ah->context = pd->context; return 0; diff --git a/libibverbs/driver.h b/libibverbs/driver.h index f9adf80df76cb0..7a26f7ed2d0e23 100644 --- a/libibverbs/driver.h +++ b/libibverbs/driver.h @@ -451,7 +451,7 @@ int ibv_cmd_post_srq_recv(struct ibv_srq *srq, struct ibv_recv_wr *wr, struct ibv_recv_wr **bad_wr); int ibv_cmd_create_ah(struct ibv_pd *pd, struct ibv_ah *ah, struct ibv_ah_attr *attr, - struct ibv_create_ah_resp *resp, + struct ib_uverbs_create_ah_resp *resp, size_t resp_size); int ibv_cmd_destroy_ah(struct ibv_ah *ah); int ibv_cmd_attach_mcast(struct ibv_qp *qp, const union ibv_gid *gid, uint16_t lid); diff --git a/libibverbs/kern-abi.h b/libibverbs/kern-abi.h index a9e6b5461abd83..5d332f7b22c3f7 100644 --- a/libibverbs/kern-abi.h +++ b/libibverbs/kern-abi.h @@ -560,10 +560,6 @@ struct ibv_create_ah { struct ib_uverbs_ah_attr attr; }; -struct ibv_create_ah_resp { - __u32 handle; -}; - struct ibv_destroy_ah { __u32 command; __u16 in_words; diff --git a/providers/bnxt_re/verbs.c b/providers/bnxt_re/verbs.c index bab2d732d71fa3..09ac33351db7e9 100644 --- a/providers/bnxt_re/verbs.c +++ b/providers/bnxt_re/verbs.c @@ -1390,7 +1390,7 @@ struct ibv_ah *bnxt_re_create_ah(struct ibv_pd *ibvpd, struct ibv_ah_attr *attr) { struct bnxt_re_context *uctx; struct bnxt_re_ah *ah; - struct ibv_create_ah_resp resp; + struct ib_uverbs_create_ah_resp resp; int status; uctx = to_bnxt_re_context(ibvpd->context); diff --git a/providers/hfi1verbs/verbs.c b/providers/hfi1verbs/verbs.c index 8e616b8b2198b8..957354b06b218c 100644 --- a/providers/hfi1verbs/verbs.c +++ b/providers/hfi1verbs/verbs.c @@ -678,7 +678,7 @@ int hfi1_post_srq_recv(struct ibv_srq *ibsrq, struct ibv_recv_wr *wr, struct ibv_ah *hfi1_create_ah(struct ibv_pd *pd, struct ibv_ah_attr *attr) { struct ibv_ah *ah; - struct ibv_create_ah_resp resp; + struct ib_uverbs_create_ah_resp resp; ah = malloc(sizeof *ah); if (ah == NULL) diff --git a/providers/ipathverbs/verbs.c b/providers/ipathverbs/verbs.c index e0b247bf337583..440e3dd622bad3 100644 --- a/providers/ipathverbs/verbs.c +++ b/providers/ipathverbs/verbs.c @@ -654,7 +654,7 @@ int ipath_post_srq_recv(struct ibv_srq *ibsrq, struct ibv_recv_wr *wr, struct ibv_ah *ipath_create_ah(struct ibv_pd *pd, struct ibv_ah_attr *attr) { struct ibv_ah *ah; - struct ibv_create_ah_resp resp; + struct ib_uverbs_create_ah_resp resp; ah = malloc(sizeof *ah); if (ah == NULL) diff --git a/providers/mlx5/mlx5-abi.h b/providers/mlx5/mlx5-abi.h index 661c774c7553ea..1205fe75c4d022 100644 --- a/providers/mlx5/mlx5-abi.h +++ b/providers/mlx5/mlx5-abi.h @@ -107,7 +107,7 @@ struct mlx5_alloc_ucontext_resp { }; struct mlx5_create_ah_resp { - struct ibv_create_ah_resp ibv_resp; + struct ib_uverbs_create_ah_resp ibv_resp; __u32 response_length; __u8 dmac[ETHERNET_LL_SIZE]; __u8 reserved[6]; diff --git a/providers/ocrdma/ocrdma_verbs.c b/providers/ocrdma/ocrdma_verbs.c index 5b8da32b1bdcdd..dd7035ddc28d86 100644 --- a/providers/ocrdma/ocrdma_verbs.c +++ b/providers/ocrdma/ocrdma_verbs.c @@ -2099,7 +2099,7 @@ struct ibv_ah *ocrdma_create_ah(struct ibv_pd *ibpd, struct ibv_ah_attr *attr) int ahtbl_idx; struct ocrdma_pd *pd; struct ocrdma_ah *ah; - struct ibv_create_ah_resp resp; + struct ib_uverbs_create_ah_resp resp; pd = get_ocrdma_pd(ibpd); ah = malloc(sizeof *ah); diff --git a/providers/rxe/rxe.c b/providers/rxe/rxe.c index ebdef7a73e83a6..c6ec95c2bcf80d 100644 --- a/providers/rxe/rxe.c +++ b/providers/rxe/rxe.c @@ -783,7 +783,7 @@ static struct ibv_ah *rxe_create_ah(struct ibv_pd *pd, struct ibv_ah_attr *attr) struct rxe_ah *ah; struct rxe_av *av; union ibv_gid sgid; - struct ibv_create_ah_resp resp; + struct ib_uverbs_create_ah_resp resp; err = ibv_query_gid(pd->context, attr->port_num, attr->grh.sgid_index, &sgid);