From patchwork Thu Jan 11 22:13:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 10158765 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 B288B601A1 for ; Thu, 11 Jan 2018 22:14:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A530F2850D for ; Thu, 11 Jan 2018 22:14:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A09428619; Thu, 11 Jan 2018 22:14:05 +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, UPPERCASE_50_75 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 39A472850D for ; Thu, 11 Jan 2018 22:14:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933147AbeAKWOA (ORCPT ); Thu, 11 Jan 2018 17:14:00 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:37501 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933390AbeAKWN5 (ORCPT ); Thu, 11 Jan 2018 17:13:57 -0500 Received: by mail-wm0-f66.google.com with SMTP id f140so8216697wmd.2 for ; Thu, 11 Jan 2018 14:13:57 -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=DD6wcQY/Ovuu4dlM5Skl36kt+xts8KoImF+j7nlNErQ=; b=CGTjYzaIA2JMrHBFA3v94AjLZ+MuERna3j3EbuAavg4Y//7joFt4E5VF/88DaQ3ZJq jEf9g7v/lvX8TFt445blGB0befMfC1QKaqihPdPYRfBBMaQoRZ5AthhAqT3sHpSJckSr mkIXm5n0U94+JB0s3DMtAs29bOGH68mTtHS8OzJdg/nkUxjLQLcVp2mg089K5l7Foqw6 GEODrnpxJjWcrl7IX/8PYUwoAi0Mnp+dKzCq4tZ3icBj5lICbAB+kKxiys5f4APJuBgD /8UjdTACiUJNe2/iYEPm8jRkBEOlfDkK7Mty/oC6Om3hr475nhxEBJMsUXQNRVFnS2Ts lL5A== 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=DD6wcQY/Ovuu4dlM5Skl36kt+xts8KoImF+j7nlNErQ=; b=QTxXajzOMKqLh2v4DQhdp1pccEzHhFuqS7KthzvrUHYPFFv1eHZGyq0GUHArEgBIw2 GlLxXF07Ad40zo8ZIVv714KDNmXjqVIuws2FZes8gHErFz33HI3erqwAIgsIoexoxSiT 9jAcWeiBtJ3DZFfvh+nWwQc6T6LJ2fdhfGH+1+nPalFMb/gOxyfNkKx+SE9vbzG8uKWn kQeUjXx6h0ipjWFzmio9wMWIlCSH5fQ+2WAXW0Cz2Y2LTgAzABx47S/lLbPVVqemD2wX 65/rz72er0jXQsqnuAXYP/U0KIVabw8GyNtCX8qpASbLG5kuu31+GduV2EE7CrUkj0J3 vkKw== X-Gm-Message-State: AKwxytdpA5vDfQOozQVjpHti060yiSO0V0gIbeNwhf00gAPQDy06yFAK EOkcyFZbJEkbZY6k3HTYzX4YfIgBu/0= X-Google-Smtp-Source: ACJfBotCqUUIec07ckUT5CpnLbgM6IwXO4fc2YTaUksXfBxhXlU9HqdDuXSLUG0kiVOjhU3PQQ0dXA== X-Received: by 10.28.127.132 with SMTP id a126mr2364132wmd.37.1515708836394; Thu, 11 Jan 2018 14:13:56 -0800 (PST) Received: from ziepe.ca (S010614cc2056d97f.ed.shawcable.net. [70.74.179.152]) by smtp.gmail.com with ESMTPSA id u194sm1897314wmd.6.2018.01.11.14.13.48 (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 1eZl6Y-0000If-Io; Thu, 11 Jan 2018 15:13:46 -0700 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 02/17] verbs: Include rdma/ib_user_verbs.h in kern-abi.h Date: Thu, 11 Jan 2018 15:13:25 -0700 Message-Id: <20180111221340.965-3-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 There are a few overlapping definitions that are identical in both headers, delete them from kern-abi.h to make them includable. Signed-off-by: Jason Gunthorpe --- libibverbs/kern-abi.h | 62 ++++++--------------------------------------------- 1 file changed, 7 insertions(+), 55 deletions(-) diff --git a/libibverbs/kern-abi.h b/libibverbs/kern-abi.h index f53e22fce5303b..d7acdaa9a4bca9 100644 --- a/libibverbs/kern-abi.h +++ b/libibverbs/kern-abi.h @@ -37,9 +37,14 @@ #include +#include + /* - * This file must be kept in sync with the kernel's version of - * drivers/infiniband/include/ib_user_verbs.h + * 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. */ /* @@ -48,59 +53,6 @@ #define IB_USER_VERBS_MIN_ABI_VERSION 3 #define IB_USER_VERBS_MAX_ABI_VERSION 6 -#define IB_USER_VERBS_CMD_THRESHOLD 50 - -enum { - IB_USER_VERBS_CMD_GET_CONTEXT, - IB_USER_VERBS_CMD_QUERY_DEVICE, - IB_USER_VERBS_CMD_QUERY_PORT, - IB_USER_VERBS_CMD_ALLOC_PD, - IB_USER_VERBS_CMD_DEALLOC_PD, - IB_USER_VERBS_CMD_CREATE_AH, - IB_USER_VERBS_CMD_MODIFY_AH, - IB_USER_VERBS_CMD_QUERY_AH, - IB_USER_VERBS_CMD_DESTROY_AH, - IB_USER_VERBS_CMD_REG_MR, - IB_USER_VERBS_CMD_REG_SMR, - IB_USER_VERBS_CMD_REREG_MR, - IB_USER_VERBS_CMD_QUERY_MR, - IB_USER_VERBS_CMD_DEREG_MR, - IB_USER_VERBS_CMD_ALLOC_MW, - IB_USER_VERBS_CMD_BIND_MW, - IB_USER_VERBS_CMD_DEALLOC_MW, - IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL, - IB_USER_VERBS_CMD_CREATE_CQ, - IB_USER_VERBS_CMD_RESIZE_CQ, - IB_USER_VERBS_CMD_DESTROY_CQ, - IB_USER_VERBS_CMD_POLL_CQ, - IB_USER_VERBS_CMD_PEEK_CQ, - IB_USER_VERBS_CMD_REQ_NOTIFY_CQ, - IB_USER_VERBS_CMD_CREATE_QP, - IB_USER_VERBS_CMD_QUERY_QP, - IB_USER_VERBS_CMD_MODIFY_QP, - IB_USER_VERBS_CMD_DESTROY_QP, - IB_USER_VERBS_CMD_POST_SEND, - IB_USER_VERBS_CMD_POST_RECV, - IB_USER_VERBS_CMD_ATTACH_MCAST, - IB_USER_VERBS_CMD_DETACH_MCAST, - IB_USER_VERBS_CMD_CREATE_SRQ, - IB_USER_VERBS_CMD_MODIFY_SRQ, - IB_USER_VERBS_CMD_QUERY_SRQ, - IB_USER_VERBS_CMD_DESTROY_SRQ, - IB_USER_VERBS_CMD_POST_SRQ_RECV, - IB_USER_VERBS_CMD_OPEN_XRCD, - IB_USER_VERBS_CMD_CLOSE_XRCD, - IB_USER_VERBS_CMD_CREATE_XSRQ, - IB_USER_VERBS_CMD_OPEN_QP -}; - -#define IB_USER_VERBS_CMD_COMMAND_MASK 0xff -#define IB_USER_VERBS_CMD_FLAGS_MASK 0xff000000u -#define IB_USER_VERBS_CMD_FLAGS_SHIFT 24 - - -#define IB_USER_VERBS_CMD_FLAG_EXTENDED 0x80ul - /* use this mask for creating extended commands */ #define IB_USER_VERBS_CMD_EXTENDED_MASK \ (IB_USER_VERBS_CMD_FLAG_EXTENDED << \