From patchwork Thu Jan 10 18:00:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 10756561 X-Patchwork-Delegate: jgg@ziepe.ca Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4F8246C2 for ; Thu, 10 Jan 2019 18:00:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41B4329CAA for ; Thu, 10 Jan 2019 18:00:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35C8029CD9; Thu, 10 Jan 2019 18:00:42 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 92A0E29DC9 for ; Thu, 10 Jan 2019 18:00:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730693AbfAJSAl (ORCPT ); Thu, 10 Jan 2019 13:00:41 -0500 Received: from mail-eopbgr20065.outbound.protection.outlook.com ([40.107.2.65]:23168 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729480AbfAJSAk (ORCPT ); Thu, 10 Jan 2019 13:00:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4NguL79TAZPyir6ovoIN8ajwWqyZxNhY6RYJWetny5U=; b=Cl0CrO6cEfD8FPIUPmNZym/wNJ+bD6IZPcF8WEnVpM+dUPBBJfnSbP/OvOTxq5VmKUWo5Nyyb78MSBcnXXasRN0luG7QN2TZUbwJvNDNr/mmHDRRe6wCtWuI+DOArwtOc7EZgJItuHurUrb05ZIXoIWHgk6DkB2uiqyQpKgdeV0= Received: from HE1PR05MB4601.eurprd05.prod.outlook.com (20.176.163.138) by HE1PR05MB4556.eurprd05.prod.outlook.com (20.176.163.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1495.7; Thu, 10 Jan 2019 18:00:34 +0000 Received: from HE1PR05MB4601.eurprd05.prod.outlook.com ([fe80::75a0:a89d:1227:7ed3]) by HE1PR05MB4601.eurprd05.prod.outlook.com ([fe80::75a0:a89d:1227:7ed3%5]) with mapi id 15.20.1495.011; Thu, 10 Jan 2019 18:00:34 +0000 From: Jason Gunthorpe To: "linux-rdma@vger.kernel.org" CC: Shamir Rabinovitch Subject: [PATCH] IB: Prevent drivers from being compiled-in if uverbs isn't Thread-Topic: [PATCH] IB: Prevent drivers from being compiled-in if uverbs isn't Thread-Index: AQHUqQ5i84k700aqs0StYuI8ze9miA== Date: Thu, 10 Jan 2019 18:00:34 +0000 Message-ID: <20190110180027.GA31078@ziepe.ca> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MWHPR14CA0055.namprd14.prod.outlook.com (2603:10b6:300:81::17) To HE1PR05MB4601.eurprd05.prod.outlook.com (2603:10a6:7:99::10) authentication-results: spf=none (sender IP is ) smtp.mailfrom=jgg@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [174.3.196.123] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;HE1PR05MB4556;6:DibAvAcSrHdOv/hUo6kibtLjHBeHp7fBNlKJdap2349hBIcErGCOKHSrfyBxHBuvSs/eSloc/wQCAvewevrAbC46kbQ+3JSFLGoY5tkZAlbr9mbcP1kNWUDJLJcSSd0P6vyxZLQ8BrmDtYwKDp8yJho3ofXnoOiGt55DOw4VagmQoLrGIcQP8J/AnB5jFBjs3gcOEtm5QqObtI0PeX3PeOqoWvSVfUnSMB/Ik+Nmu3vsTjqSWXykwsf4uZhEOA2kwqsSuaLTLKAqfCrdA4rDFhSBDz3acMRQXKiRPKWRcgPKSjBxQ82iAWF9T4BEQ3+4JzCFTI9UWZZtoPwPdLtES0yTr2PKkedg9pMeHUqV1JH7RQGcgx+NcyN9993LHXxDJlJaBEvJZeE+JtQCVQUhO16WNAwtYbZrAbf+IkVXr1pHWaBSj/H3Vy6aoVdQsAgJIrOpvZGwXCJiHExucZa2Ig==;5:AG9PwzBTKxhBAN6xiwH5cFcOTuwUBuUJPci4ytrNEM120ln6weJ+SFjNPRr/Ou/7GP2pqeOuSEnwPaTj6f93F4e+U8PU2sKgmrkNiTkeRfva4Pyju6M+c6LCDWFlHQI8j3TB+eXUi5pBovYZTexBtcv0rTw5CYKfAAmFihnh1d0B8x8APS8A3YUw8moB6jZm5k71pdDok5q+jmUXna/nlQ==;7:LfwUMBn8a2aylWWGfmD57C6ds/mEbs7Ty17OTW5YbzWRzPK0AvTAXlVB7D86hbOR5CCCiAU0EKoFhWBiy/FbCMPQc8Z3BrHkIyRzA45hKXxKDYZISu1AU7nr68LJwurrlKMh6gKgDrGHBH/A/yfBQg== x-ms-office365-filtering-correlation-id: 214de07f-ef1e-4999-6e34-08d67725849b x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:HE1PR05MB4556; x-ms-traffictypediagnostic: HE1PR05MB4556: x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(8220060)(2401047)(8121501046)(10201501046)(3002001)(3231475)(944501520)(52105112)(93006095)(93001095)(6055026)(6041310)(20161123562045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699051)(76991095);SRVR:HE1PR05MB4556;BCL:0;PCL:0;RULEID:;SRVR:HE1PR05MB4556; x-forefront-prvs: 0913EA1D60 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(346002)(396003)(366004)(376002)(136003)(189003)(199004)(3846002)(33656002)(36756003)(25786009)(9686003)(4326008)(68736007)(2906002)(476003)(5660300001)(7736002)(81156014)(6116002)(99286004)(8676002)(305945005)(81166006)(6512007)(8936002)(316002)(2351001)(66066001)(2501003)(6916009)(106356001)(6486002)(386003)(33896004)(5640700003)(478600001)(105586002)(6506007)(71200400001)(26005)(486006)(186003)(14444005)(102836004)(256004)(53936002)(52116002)(97736004)(14454004)(86362001)(575784001)(71190400001)(1076003)(6436002)(21314003);DIR:OUT;SFP:1101;SCL:1;SRVR:HE1PR05MB4556;H:HE1PR05MB4601.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: vr7G3B8ae/yOSpRH+cdh0ZlmSEVBc3X0fgX2Be6aoFjKnsSYAupZU3BRNTxo7X1jx9/nMUqjuaf3mCCNepLDw5cQU07XOBkFWlwhC4dsE9txydThB78YrwJJ/2DvTQAbKCerJBAZnv6kCwiBk7vHv1X+zF8VPdWngBG/3XPSeqTfe8gewe7WbSnnX4lnD8TWF+u0lRpAjDaH9Epixl1ZyB+sBUMVIBBhRZx3LPK+ZHKNCCcApYirR1hNRa121A6iYIwKOs7n1seMx0UXchAhu03NjJ2RvTcIsRsL6NxbvLuD12lh5zCIZA02Bof2EE+r spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: <80EEDF7AD45199459488B99B5757282A@eurprd05.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 214de07f-ef1e-4999-6e34-08d67725849b X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jan 2019 18:00:34.1767 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB4556 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 Now that the umem APIs are part of uverbs we get compilation failures with drivers that are missing this check. In general all the uverbs related APIs (including new attr_bundle ones) are in uverbs so all drivers should work this way. Conslidate the check into the top level kconfig so all drivers get it. To be squashed into "IB/{core,uverbs}: Move ib_umem_xxx functions from ib_core to ib_uverbs" Found by 0-day Signed-off-by: Jason Gunthorpe --- drivers/infiniband/Kconfig | 15 +++++++-------- drivers/infiniband/hw/hns/Kconfig | 1 - drivers/infiniband/hw/mlx4/Kconfig | 1 - drivers/infiniband/hw/mlx5/Kconfig | 1 - drivers/infiniband/hw/nes/Kconfig | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig index 0a3ec7c726ec20..a1fb840de45d7e 100644 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig @@ -89,6 +89,7 @@ config INFINIBAND_ADDR_TRANS_CONFIGFS This allows the user to config the default GID type that the CM uses for each device, when initiaing new connections. +if INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS source "drivers/infiniband/hw/mthca/Kconfig" source "drivers/infiniband/hw/qib/Kconfig" source "drivers/infiniband/hw/cxgb3/Kconfig" @@ -101,6 +102,12 @@ source "drivers/infiniband/hw/ocrdma/Kconfig" source "drivers/infiniband/hw/vmw_pvrdma/Kconfig" source "drivers/infiniband/hw/usnic/Kconfig" source "drivers/infiniband/hw/hns/Kconfig" +source "drivers/infiniband/hw/bnxt_re/Kconfig" +source "drivers/infiniband/hw/hfi1/Kconfig" +source "drivers/infiniband/hw/qedr/Kconfig" +source "drivers/infiniband/sw/rdmavt/Kconfig" +source "drivers/infiniband/sw/rxe/Kconfig" +endif source "drivers/infiniband/ulp/ipoib/Kconfig" @@ -111,13 +118,5 @@ source "drivers/infiniband/ulp/iser/Kconfig" source "drivers/infiniband/ulp/isert/Kconfig" source "drivers/infiniband/ulp/opa_vnic/Kconfig" -source "drivers/infiniband/sw/rdmavt/Kconfig" -source "drivers/infiniband/sw/rxe/Kconfig" - -source "drivers/infiniband/hw/hfi1/Kconfig" - -source "drivers/infiniband/hw/qedr/Kconfig" - -source "drivers/infiniband/hw/bnxt_re/Kconfig" endif # INFINIBAND diff --git a/drivers/infiniband/hw/hns/Kconfig b/drivers/infiniband/hw/hns/Kconfig index 21c2100b2ea98d..fddb5fdf92de86 100644 --- a/drivers/infiniband/hw/hns/Kconfig +++ b/drivers/infiniband/hw/hns/Kconfig @@ -1,7 +1,6 @@ config INFINIBAND_HNS tristate "HNS RoCE Driver" depends on NET_VENDOR_HISILICON - depends on INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS depends on ARM64 || (COMPILE_TEST && 64BIT) ---help--- This is a RoCE/RDMA driver for the Hisilicon RoCE engine. The engine diff --git a/drivers/infiniband/hw/mlx4/Kconfig b/drivers/infiniband/hw/mlx4/Kconfig index d1de3285fd8856..db4aa13ebae0c6 100644 --- a/drivers/infiniband/hw/mlx4/Kconfig +++ b/drivers/infiniband/hw/mlx4/Kconfig @@ -1,7 +1,6 @@ config MLX4_INFINIBAND tristate "Mellanox ConnectX HCA support" depends on NETDEVICES && ETHERNET && PCI && INET - depends on INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS depends on MAY_USE_DEVLINK select NET_VENDOR_MELLANOX select MLX4_CORE diff --git a/drivers/infiniband/hw/mlx5/Kconfig b/drivers/infiniband/hw/mlx5/Kconfig index 0440966bc6ec31..8d651c05de62eb 100644 --- a/drivers/infiniband/hw/mlx5/Kconfig +++ b/drivers/infiniband/hw/mlx5/Kconfig @@ -1,7 +1,6 @@ config MLX5_INFINIBAND tristate "Mellanox 5th generation network adapters (ConnectX series) support" depends on NETDEVICES && ETHERNET && PCI && MLX5_CORE - depends on INFINIBAND_USER_ACCESS || INFINIBAND_USER_ACCESS=n ---help--- This driver provides low-level InfiniBand support for Mellanox Connect-IB PCI Express host channel adapters (HCAs). diff --git a/drivers/infiniband/hw/nes/Kconfig b/drivers/infiniband/hw/nes/Kconfig index 7964eba8e7ede7..52caae954e4ae6 100644 --- a/drivers/infiniband/hw/nes/Kconfig +++ b/drivers/infiniband/hw/nes/Kconfig @@ -1,6 +1,6 @@ config INFINIBAND_NES tristate "NetEffect RNIC Driver" - depends on PCI && INET && INFINIBAND + depends on PCI && INET select LIBCRC32C ---help--- This is the RDMA Network Interface Card (RNIC) driver for