From patchwork Tue Mar 13 22:07:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 10281033 X-Patchwork-Delegate: sean.hefty@intel.com 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 86A4C6038F for ; Tue, 13 Mar 2018 22:07:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D01A2580E for ; Tue, 13 Mar 2018 22:07:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 61AD928484; Tue, 13 Mar 2018 22:07:53 +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 3A4432580E for ; Tue, 13 Mar 2018 22:07:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752555AbeCMWHu (ORCPT ); Tue, 13 Mar 2018 18:07:50 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:43360 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752402AbeCMWHs (ORCPT ); Tue, 13 Mar 2018 18:07:48 -0400 Received: by mail-pl0-f66.google.com with SMTP id f23-v6so598953plr.10 for ; Tue, 13 Mar 2018 15:07:48 -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=HQFMZaItEeiD3kJsW41zNm8p/dwjbRpEwAZZYF0Su+s=; b=mgpauCp+ZezULgPATckF/gZLlxebQx7j8Yva3PvlMQcF5/gOWalgg6CaD+g49COJIf zQ79uDdblkus62+Hb+U26lZ4A7b3hE4ktOo3XdrRI/LGSXqtfDB7p4OfDoJHgfxDMD0f CxTGOaMRXMHmewgn3exkqkPDQHwxky+NCbR3mDTmE4BuDjoqj1qycOQNi8AMwE5Jx1R8 HoU8FMv0w2gCew/5k/GvB5npoBvmTtpV+Bmm//+ZBmypdG81l0xnBRqEP+tttIm4o1m+ QNK0MQ4vPRLOVWRtrDkae1TdgTZtyrAiA9tuuqzxaJkuTgpxovBp9GtjPC1mghRs5V+V oX6g== 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=HQFMZaItEeiD3kJsW41zNm8p/dwjbRpEwAZZYF0Su+s=; b=jx/6VoDQgvzxJ7fH6KGObPwKceXRUstuTCRMWUjnJV71kqH/lQgoSriRkGV/EbrBEn 3qGq2Fz9XJtAXHkB9IcBBw4J4Dp/VyZhsSup1iyTA34KkfwNKrKzWyRWIBpa6ZPDBY3h pa0wdjvHBsSxBzOo2EsjwJjooqfjqzS6BQQ24pGADS6KnYjxnu76gEbb2QcRiahjhtdT AZmBXfEnEEz4HG10s0kZxe6OAWojNBHoMMqbJHfhrWPs0jqRLZ91qd7l1oyGAXRqVJnb uPU6LmI30rmhzUgcjg+yImJ2fYZjc9ichFibgS0oCpHziU/3Qulwbei+2AAItWy2b2k9 vzBw== X-Gm-Message-State: AElRT7GNyxBzNWvOJlVZbOrLn2dO+pUlU6Gi7FgAS48JGsHD+6iAhied Gu2uupa5iZCnZL71gBbMhErpWnaGIno= X-Google-Smtp-Source: AG47ELv1gHBiK893UmZ+Y1dn84NFZxMhLGvdmVoVX/Zyf9QO71WpKpmQHk0GZPa4saHAtNEkvXoAAw== X-Received: by 2002:a17:902:52a6:: with SMTP id a35-v6mr1949146pli.179.1520978868009; Tue, 13 Mar 2018 15:07:48 -0700 (PDT) Received: from ziepe.ca (S010614cc2056d97f.ed.shawcable.net. [174.3.196.123]) by smtp.gmail.com with ESMTPSA id c11sm2520575pfe.109.2018.03.13.15.07.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Mar 2018 15:07:44 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.86_2) (envelope-from ) id 1evs57-0001BE-8g; Tue, 13 Mar 2018 16:07:41 -0600 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 7/8] verbs: Replace more of kern-abi.h with kernel headers Date: Tue, 13 Mar 2018 16:07:36 -0600 Message-Id: <20180313220737.4336-8-jgg@ziepe.ca> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180313220737.4336-1-jgg@ziepe.ca> References: <20180313220737.4336-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 The DECLARE_CMD macros can construct the proper wrapper structures using the output from the preprocessing script to include the exact struct content from the kernel headers as an anonymous tagless embedded struct. This gives us one cannonical source of data for the kernel structures. Some mild code edits are required due to needless differences between the two headers. Signed-off-by: Jason Gunthorpe --- libibverbs/cmd.c | 4 +- libibverbs/kern-abi.h | 516 ++++++++++++++++---------------------------------- 2 files changed, 164 insertions(+), 356 deletions(-) diff --git a/libibverbs/cmd.c b/libibverbs/cmd.c index 5fd518d43ef232..e30603dd5d4194 100644 --- a/libibverbs/cmd.c +++ b/libibverbs/cmd.c @@ -538,7 +538,7 @@ int ibv_cmd_req_notify_cq(struct ibv_cq *ibcq, int solicited_only) IBV_INIT_CMD(&cmd, sizeof cmd, REQ_NOTIFY_CQ); cmd.cq_handle = ibcq->handle; - cmd.solicited = !!solicited_only; + cmd.solicited_only = !!solicited_only; if (write(ibcq->context->cmd_fd, &cmd, sizeof cmd) != sizeof cmd) return errno; @@ -1271,7 +1271,7 @@ int ibv_cmd_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr, IBV_INIT_CMD(cmd, cmd_size, MODIFY_QP); - copy_modify_qp_fields(qp, attr, attr_mask, &cmd->base); + copy_modify_qp_fields(qp, attr, attr_mask, &cmd->core_payload); if (write(qp->context->cmd_fd, cmd, cmd_size) != cmd_size) return errno; diff --git a/libibverbs/kern-abi.h b/libibverbs/kern-abi.h index 18563bfe38b427..26bdf19d616b5a 100644 --- a/libibverbs/kern-abi.h +++ b/libibverbs/kern-abi.h @@ -36,16 +36,10 @@ #define KERN_ABI_H #include +#include #include - -/* - * This file contains copied data from the kernel's include/uapi/rdma/ib_user_verbs.h, - * now included above. - * - * Whenever possible use the definition from the kernel header and avoid - * copying from that header into this file. - */ +#include /* * The minimum and maximum kernel ABI that we can handle. @@ -53,154 +47,176 @@ #define IB_USER_VERBS_MIN_ABI_VERSION 3 #define IB_USER_VERBS_MAX_ABI_VERSION 6 -/* - * Make sure that all structs defined in this file remain laid out so - * that they pack the same way on 32-bit and 64-bit architectures (to - * avoid incompatibility between 32-bit userspace and 64-bit kernels). - * Specifically: - * - Do not use pointer types -- pass pointers in __u64 instead. - * - Make sure that any structure larger than 4 bytes is padded to a - * multiple of 8 bytes. Otherwise the structure size will be - * different between 32-bit and 64-bit architectures. - */ - struct ex_hdr { struct ib_uverbs_cmd_hdr hdr; struct ib_uverbs_ex_cmd_hdr ex_hdr; }; /* - * All commands from userspace should start with a __u32 command field - * followed by __u16 in_words and out_words fields (which give the - * length of the command block and response buffer if any in 32-bit - * words). The kernel driver will read these fields first and read - * the rest of the command struct based on these value. + * These macros expand to type names that refer to the ABI structure type + * associated with the given enum string. */ +#define IBV_ABI_REQ(_enum) _ABI_REQ_STRUCT_##_enum +#define IBV_KABI_REQ(_enum) _KABI_REQ_STRUCT_##_enum +#define IBV_KABI_RESP(_enum) _KABI_RESP_STRUCT_##_enum -struct ibv_get_context { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; -}; - -struct ibv_query_device { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; -}; - -struct ibv_query_device_ex { - struct ex_hdr hdr; - __u32 comp_mask; - __u32 reserved; -}; - -struct ibv_query_port { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u8 port_num; - __u8 reserved[7]; -}; - -struct ibv_alloc_pd { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; -}; - -struct ibv_dealloc_pd { - struct ib_uverbs_cmd_hdr hdr; - __u32 pd_handle; -}; - -struct ibv_open_xrcd { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u32 fd; - __u32 oflags; -}; - -struct ibv_close_xrcd { - struct ib_uverbs_cmd_hdr hdr; - __u32 xrcd_handle; -}; - -struct ibv_reg_mr { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u64 start; - __u64 length; - __u64 hca_va; - __u32 pd_handle; - __u32 access_flags; -}; - -struct ibv_rereg_mr { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u32 mr_handle; - __u32 flags; - __u64 start; - __u64 length; - __u64 hca_va; - __u32 pd_handle; - __u32 access_flags; -}; - -struct ibv_dereg_mr { - struct ib_uverbs_cmd_hdr hdr; - __u32 mr_handle; -}; - -struct ibv_alloc_mw { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u32 pd_handle; - __u8 mw_type; - __u8 reserved[3]; -}; - -struct ibv_dealloc_mw { - struct ib_uverbs_cmd_hdr hdr; - __u32 mw_handle; -}; - -struct ibv_create_comp_channel { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; -}; - -struct ibv_create_cq { - struct ib_uverbs_cmd_hdr hdr; - struct ib_uverbs_create_cq core_payload; -}; - -struct ibv_create_cq_ex { - struct ex_hdr hdr; - struct ib_uverbs_ex_create_cq core_payload; -}; - -struct ibv_poll_cq { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u32 cq_handle; - __u32 ne; -}; - -struct ibv_req_notify_cq { - struct ib_uverbs_cmd_hdr hdr; - __u32 cq_handle; - __u32 solicited; -}; +/* + * Historically the code had copied the data in the kernel headers, modified + * it and placed them in structs. To avoid recoding eveything we continue to + * preserve the same struct layout, with the kernel struct 'loose' inside the + * modified userspace struct. + * + * This is automated with the make_abi_structs.py script which produces the + * _STRUCT_xx macro that produces a tagless version of the kernel struct. The + * tagless struct produces a layout that matches the original code. + */ +#define DECLARE_CMDX(_enum, _name, _kabi, _kabi_resp) \ + struct _name { \ + struct ib_uverbs_cmd_hdr hdr; \ + union { \ + _STRUCT_##_kabi; \ + struct _kabi core_payload; \ + }; \ + }; \ + typedef struct _name IBV_ABI_REQ(_enum); \ + typedef struct _kabi IBV_KABI_REQ(_enum); \ + typedef struct _kabi_resp IBV_KABI_RESP(_enum); \ + static_assert(sizeof(struct _kabi_resp) % 4 == 0, \ + "Bad resp alignment"); \ + static_assert(_enum != -1, "Bad enum"); \ + static_assert(sizeof(struct _name) == \ + sizeof(struct ib_uverbs_cmd_hdr) + \ + sizeof(struct _kabi), \ + "Bad size") + +#define DECLARE_CMD(_enum, _name, _kabi) \ + DECLARE_CMDX(_enum, _name, _kabi, _kabi##_resp) + +#define DECLARE_CMD_EXX(_enum, _name, _kabi, _kabi_resp) \ + struct _name { \ + struct ex_hdr hdr; \ + union { \ + _STRUCT_##_kabi; \ + struct _kabi core_payload; \ + }; \ + }; \ + typedef struct _name IBV_ABI_REQ(_enum); \ + typedef struct _kabi IBV_KABI_REQ(_enum); \ + typedef struct _kabi_resp IBV_KABI_RESP(_enum); \ + static_assert(_enum != -1, "Bad enum"); \ + static_assert(sizeof(struct _kabi) % 8 == 0, "Bad req alignment"); \ + static_assert(sizeof(struct _kabi_resp) % 8 == 0, \ + "Bad resp alignment"); \ + static_assert(sizeof(struct _name) == \ + sizeof(struct ex_hdr) + sizeof(struct _kabi), \ + "Bad size"); \ + static_assert(sizeof(struct _name) % 8 == 0, "Bad alignment") +#define DECLARE_CMD_EX(_enum, _name, _kabi) \ + DECLARE_CMD_EXX(_enum, _name, _kabi, _kabi##_resp) + +/* Drivers may use 'empty' for _kabi to signal no struct */ +struct empty {}; +#define _STRUCT_empty struct {} -struct ibv_resize_cq { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u32 cq_handle; - __u32 cqe; -}; +/* + * Define the ABI struct for use by the driver. The internal cmd APIs require + * this layout. The driver specifies the enum # they wish to define for and + * the base name, and the macros figure out the rest correctly. + * + * The static asserts check that the layout produced by the wrapper struct has + * no implicit padding in strange places, specifically between the core + * structure and the driver structure and between the driver structure and the + * end of the struct. + * + * Implicit padding can arise in various cases where the structs are not sizes + * to a multiple of 8 bytes. + */ +#define DECLARE_DRV_CMD(_name, _enum, _kabi_req, _kabi_resp) \ + struct _name { \ + IBV_ABI_REQ(_enum) ibv_cmd; \ + union { \ + _STRUCT_##_kabi_req; \ + struct _kabi_req drv_payload; \ + }; \ + }; \ + struct _name##_resp { \ + IBV_KABI_RESP(_enum) ibv_resp; \ + union { \ + _STRUCT_##_kabi_resp; \ + struct _kabi_resp drv_payload; \ + }; \ + }; \ + static_assert(sizeof(IBV_KABI_REQ(_enum)) % \ + __alignof__(struct _kabi_req) == \ + 0, \ + "Bad kabi req struct length"); \ + static_assert(sizeof(struct _name) == \ + sizeof(IBV_ABI_REQ(_enum)) + \ + sizeof(struct _kabi_req), \ + "Bad req size"); \ + static_assert(sizeof(IBV_KABI_RESP(_enum)) % \ + __alignof__(struct _kabi_resp) == \ + 0, \ + "Bad kabi req struct length"); \ + static_assert(sizeof(struct _name##_resp) == \ + sizeof(IBV_KABI_RESP(_enum)) + \ + sizeof(struct _kabi_resp), \ + "Bad resp size") + +DECLARE_CMD(IB_USER_VERBS_CMD_ALLOC_MW, ibv_alloc_mw, ib_uverbs_alloc_mw); +DECLARE_CMD(IB_USER_VERBS_CMD_ALLOC_PD, ibv_alloc_pd, ib_uverbs_alloc_pd); +DECLARE_CMDX(IB_USER_VERBS_CMD_ATTACH_MCAST, ibv_attach_mcast, ib_uverbs_attach_mcast, empty); +DECLARE_CMDX(IB_USER_VERBS_CMD_CLOSE_XRCD, ibv_close_xrcd, ib_uverbs_close_xrcd, empty); +DECLARE_CMD(IB_USER_VERBS_CMD_CREATE_AH, ibv_create_ah, ib_uverbs_create_ah); +DECLARE_CMD(IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL, ibv_create_comp_channel, ib_uverbs_create_comp_channel); +DECLARE_CMD(IB_USER_VERBS_CMD_CREATE_CQ, ibv_create_cq, ib_uverbs_create_cq); +DECLARE_CMD(IB_USER_VERBS_CMD_CREATE_SRQ, ibv_create_srq, ib_uverbs_create_srq); +DECLARE_CMDX(IB_USER_VERBS_CMD_CREATE_XSRQ, ibv_create_xsrq, ib_uverbs_create_xsrq, ib_uverbs_create_srq_resp); +DECLARE_CMDX(IB_USER_VERBS_CMD_DEALLOC_MW, ibv_dealloc_mw, ib_uverbs_dealloc_mw, empty); +DECLARE_CMDX(IB_USER_VERBS_CMD_DEALLOC_PD, ibv_dealloc_pd, ib_uverbs_dealloc_pd, empty); +DECLARE_CMDX(IB_USER_VERBS_CMD_DEREG_MR, ibv_dereg_mr, ib_uverbs_dereg_mr, empty); +DECLARE_CMDX(IB_USER_VERBS_CMD_DESTROY_AH, ibv_destroy_ah, ib_uverbs_destroy_ah, empty); +DECLARE_CMD(IB_USER_VERBS_CMD_DESTROY_CQ, ibv_destroy_cq, ib_uverbs_destroy_cq); +DECLARE_CMD(IB_USER_VERBS_CMD_DESTROY_QP, ibv_destroy_qp, ib_uverbs_destroy_qp); +DECLARE_CMD(IB_USER_VERBS_CMD_DESTROY_SRQ, ibv_destroy_srq, ib_uverbs_destroy_srq); +DECLARE_CMDX(IB_USER_VERBS_CMD_DETACH_MCAST, ibv_detach_mcast, ib_uverbs_detach_mcast, empty); +DECLARE_CMD(IB_USER_VERBS_CMD_GET_CONTEXT, ibv_get_context, ib_uverbs_get_context); +DECLARE_CMD(IB_USER_VERBS_CMD_MODIFY_QP, ibv_modify_qp, ib_uverbs_modify_qp); +DECLARE_CMDX(IB_USER_VERBS_CMD_MODIFY_SRQ, ibv_modify_srq, ib_uverbs_modify_srq, empty); +DECLARE_CMDX(IB_USER_VERBS_CMD_OPEN_QP, ibv_open_qp, ib_uverbs_open_qp, empty); +DECLARE_CMD(IB_USER_VERBS_CMD_OPEN_XRCD, ibv_open_xrcd, ib_uverbs_open_xrcd); +DECLARE_CMD(IB_USER_VERBS_CMD_POLL_CQ, ibv_poll_cq, ib_uverbs_poll_cq); +DECLARE_CMD(IB_USER_VERBS_CMD_POST_RECV, ibv_post_recv, ib_uverbs_post_recv); +DECLARE_CMD(IB_USER_VERBS_CMD_POST_SEND, ibv_post_send, ib_uverbs_post_send); +DECLARE_CMD(IB_USER_VERBS_CMD_POST_SRQ_RECV, ibv_post_srq_recv, ib_uverbs_post_srq_recv); +DECLARE_CMD(IB_USER_VERBS_CMD_QUERY_DEVICE, ibv_query_device, ib_uverbs_query_device); +DECLARE_CMD(IB_USER_VERBS_CMD_QUERY_PORT, ibv_query_port, ib_uverbs_query_port); +DECLARE_CMD(IB_USER_VERBS_CMD_QUERY_QP, ibv_query_qp, ib_uverbs_query_qp); +DECLARE_CMD(IB_USER_VERBS_CMD_QUERY_SRQ, ibv_query_srq, ib_uverbs_query_srq); +DECLARE_CMD(IB_USER_VERBS_CMD_REG_MR, ibv_reg_mr, ib_uverbs_reg_mr); +DECLARE_CMDX(IB_USER_VERBS_CMD_REQ_NOTIFY_CQ, ibv_req_notify_cq, ib_uverbs_req_notify_cq, empty); +DECLARE_CMD(IB_USER_VERBS_CMD_REREG_MR, ibv_rereg_mr, ib_uverbs_rereg_mr); +DECLARE_CMD(IB_USER_VERBS_CMD_RESIZE_CQ, ibv_resize_cq, ib_uverbs_resize_cq); + +DECLARE_CMD_EX(IB_USER_VERBS_EX_CMD_CREATE_CQ, ibv_create_cq_ex, ib_uverbs_ex_create_cq); +DECLARE_CMD_EX(IB_USER_VERBS_EX_CMD_CREATE_FLOW, ibv_create_flow, ib_uverbs_create_flow); +DECLARE_CMD_EX(IB_USER_VERBS_EX_CMD_CREATE_RWQ_IND_TBL, ibv_create_rwq_ind_table, ib_uverbs_ex_create_rwq_ind_table); +DECLARE_CMD_EX(IB_USER_VERBS_EX_CMD_CREATE_WQ, ibv_create_wq, ib_uverbs_ex_create_wq); +DECLARE_CMD_EXX(IB_USER_VERBS_EX_CMD_DESTROY_FLOW, ibv_destroy_flow, ib_uverbs_destroy_flow, empty); +DECLARE_CMD_EXX(IB_USER_VERBS_EX_CMD_DESTROY_RWQ_IND_TBL, ibv_destroy_rwq_ind_table, ib_uverbs_ex_destroy_rwq_ind_table, empty); +DECLARE_CMD_EX(IB_USER_VERBS_EX_CMD_DESTROY_WQ, ibv_destroy_wq, ib_uverbs_ex_destroy_wq); +DECLARE_CMD_EXX(IB_USER_VERBS_EX_CMD_MODIFY_CQ, ibv_modify_cq, ib_uverbs_ex_modify_cq, empty); +DECLARE_CMD_EX(IB_USER_VERBS_EX_CMD_MODIFY_QP, ibv_modify_qp_ex, ib_uverbs_ex_modify_qp); +DECLARE_CMD_EXX(IB_USER_VERBS_EX_CMD_MODIFY_WQ, ibv_modify_wq, ib_uverbs_ex_modify_wq, empty); +DECLARE_CMD_EX(IB_USER_VERBS_EX_CMD_QUERY_DEVICE, ibv_query_device_ex, ib_uverbs_ex_query_device); -struct ibv_destroy_cq { - struct ib_uverbs_cmd_hdr hdr; - struct ib_uverbs_destroy_cq core_payload; -}; +/* + * This file contains copied data from the kernel's include/uapi/rdma/ib_user_verbs.h, + * now included above. + * + * Whenever possible use the definition from the kernel header and avoid + * copying from that header into this file. + */ #define IBV_CREATE_QP_COMMON \ __u64 user_handle; \ @@ -228,16 +244,6 @@ struct ibv_create_qp_common { IBV_CREATE_QP_COMMON; }; -struct ibv_open_qp { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u64 user_handle; - __u32 pd_handle; - __u32 qpn; - __u8 qp_type; - __u8 reserved[7]; -}; - struct ibv_create_qp_ex { struct ex_hdr hdr; struct ibv_create_qp_common base; @@ -247,32 +253,6 @@ struct ibv_create_qp_ex { __u32 source_qpn; }; -struct ibv_query_qp { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u32 qp_handle; - __u32 attr_mask; -}; - -struct ibv_modify_qp { - struct ib_uverbs_cmd_hdr hdr; - struct ib_uverbs_modify_qp base; -}; - -struct ibv_modify_qp_ex { - struct ex_hdr hdr; - struct ib_uverbs_modify_qp base; - __u32 rate_limit; - __u32 reserved; -}; - -struct ibv_destroy_qp { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u32 qp_handle; - __u32 reserved; -}; - struct ibv_kern_ipv4_filter { __u32 src_ip; __u32 dst_ip; @@ -300,125 +280,6 @@ struct ibv_kern_spec { }; }; -struct ibv_post_send { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u32 qp_handle; - __u32 wr_count; - __u32 sge_count; - __u32 wqe_size; - struct ib_uverbs_send_wr send_wr[0]; -}; - -struct ibv_post_recv { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u32 qp_handle; - __u32 wr_count; - __u32 sge_count; - __u32 wqe_size; - struct ib_uverbs_recv_wr recv_wr[0]; -}; - -struct ibv_post_srq_recv { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u32 srq_handle; - __u32 wr_count; - __u32 sge_count; - __u32 wqe_size; - struct ib_uverbs_recv_wr recv_wr[0]; -}; - -struct ibv_create_ah { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u64 user_handle; - __u32 pd_handle; - __u32 reserved; - struct ib_uverbs_ah_attr attr; -}; - -struct ibv_destroy_ah { - struct ib_uverbs_cmd_hdr hdr; - __u32 ah_handle; -}; - -struct ibv_attach_mcast { - struct ib_uverbs_cmd_hdr hdr; - __u8 gid[16]; - __u32 qp_handle; - __u16 mlid; - __u16 reserved; -}; - -struct ibv_create_flow { - struct ex_hdr hdr; - __u32 comp_mask; - __u32 qp_handle; - struct ib_uverbs_flow_attr flow_attr; -}; - -struct ibv_destroy_flow { - struct ex_hdr hdr; - __u32 comp_mask; - __u32 flow_handle; -}; - -struct ibv_detach_mcast { - struct ib_uverbs_cmd_hdr hdr; - __u8 gid[16]; - __u32 qp_handle; - __u16 mlid; - __u16 reserved; -}; - -struct ibv_create_srq { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u64 user_handle; - __u32 pd_handle; - __u32 max_wr; - __u32 max_sge; - __u32 srq_limit; -}; - -struct ibv_create_xsrq { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u64 user_handle; - __u32 srq_type; - __u32 pd_handle; - __u32 max_wr; - __u32 max_sge; - __u32 srq_limit; - __u32 max_num_tags; - __u32 xrcd_handle; - __u32 cq_handle; -}; - -struct ibv_modify_srq { - struct ib_uverbs_cmd_hdr hdr; - __u32 srq_handle; - __u32 attr_mask; - __u32 max_wr; - __u32 srq_limit; -}; - -struct ibv_query_srq { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u32 srq_handle; - __u32 reserved; -}; - -struct ibv_destroy_srq { - struct ib_uverbs_cmd_hdr hdr; - __u64 response; - __u32 srq_handle; - __u32 reserved; -}; - struct ibv_modify_srq_v3 { struct ib_uverbs_cmd_hdr hdr; __u32 srq_handle; @@ -448,57 +309,4 @@ struct ibv_create_srq_resp_v5 { __u32 srq_handle; }; -struct ibv_create_wq { - struct ex_hdr hdr; - __u32 comp_mask; - __u32 wq_type; - __u64 user_handle; - __u32 pd_handle; - __u32 cq_handle; - __u32 max_wr; - __u32 max_sge; - __u32 create_flags; - __u32 reserved; -}; - -struct ibv_destroy_wq { - struct ex_hdr hdr; - __u32 comp_mask; - __u32 wq_handle; -}; - -struct ibv_modify_wq { - struct ex_hdr hdr; - __u32 attr_mask; - __u32 wq_handle; - __u32 wq_state; - __u32 curr_wq_state; - __u32 flags; - __u32 flags_mask; -}; - -struct ibv_create_rwq_ind_table { - struct ex_hdr hdr; - __u32 comp_mask; - __u32 log_ind_tbl_size; - /* Following are wq handles based on log_ind_tbl_size, must be 64 bytes aligned. - * __u32 wq_handle1 - * __u32 wq_handle2 - */ -}; - -struct ibv_destroy_rwq_ind_table { - struct ex_hdr hdr; - __u32 comp_mask; - __u32 ind_tbl_handle; -}; - -struct ibv_modify_cq { - struct ex_hdr hdr; - __u32 cq_handle; - __u32 attr_mask; - struct ib_uverbs_cq_moderation attr; - __u32 reserved; -}; - #endif /* KERN_ABI_H */