From patchwork Wed Nov 30 20:09:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 13060388 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4AD91C4708C for ; Wed, 30 Nov 2022 20:11:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230015AbiK3ULc (ORCPT ); Wed, 30 Nov 2022 15:11:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230013AbiK3ULE (ORCPT ); Wed, 30 Nov 2022 15:11:04 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4302498974; Wed, 30 Nov 2022 12:10:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:In-Reply-To:References; bh=NwdMiyCjs6mBb9kzRTViptsfgQPSjSYNBJwUO380cGY=; b=uxj1BF9/I/5pNSHmqGTJuYm1N3 tohajqYrPBHQV8fIjEsRWOBkskUeekGasvvjKuVZVYVoT+0KuVqGPtzWYQuhz/z5uqjJbI+kSkbv2 Pp55Z+uH8QXeGgIA88m3+VNQ/Oo1GpoVgXC7hXvitzpcVcVrk2zMMpARsbR/QjoIdvS4mvhIg71i2 Lc2CDfDoG/RMXultHOWY0LUyPfRxK5tarBXAq7HAQnx+c70DcvFuAK2jPChUo3Miu8Jp/V87a6VnG UyizTR2IPrz5b+EAO72nFY2W6SHIUsf3qpKkpx1pmOFJHHRH4Sco3JHinEGsiYPu8iLoluRpD5im1 A599fzTA==; Received: from [2601:1c2:d80:3110::a2e7] (helo=casper.infradead.org) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1p0TPG-00FGSf-4M; Wed, 30 Nov 2022 20:10:10 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Jason Gunthorpe , Leon Romanovsky , Dennis Dalessandro , linux-rdma@vger.kernel.org, Jeff Dike , Richard Weinberger , Anton Ivanov , Johannes Berg , linux-um@lists.infradead.org Subject: [PATCH 2/2] IB/rdmavt: don't use rdmavt for UML Date: Wed, 30 Nov 2022 12:09:58 -0800 Message-Id: <20221130200958.25305-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org When building rdmavt for ARCH=um, qp.c has a build error on a reference to the x86-specific cpuinfo field 'x86_cache_size'. Fix the build errors by making this driver depend on !UML. Prevents these build errors: ../drivers/infiniband/sw/rdmavt/qp.c: In function ‘rvt_wss_llc_size’: ../drivers/infiniband/sw/rdmavt/qp.c:88:29: error: ‘struct cpuinfo_um’ has no member named ‘x86_cache_size’ 88 | return boot_cpu_data.x86_cache_size; ../drivers/infiniband/sw/rdmavt/qp.c: In function ‘cacheless_memcpy’: ../drivers/infiniband/sw/rdmavt/qp.c:100:9: error: implicit declaration of function ‘__copy_user_nocache’; did you mean ‘copy_user_page’? [-Werror=implicit-function-declaration] 100 | __copy_user_nocache(dst, (void __user *)src, n, 0); ../drivers/infiniband/sw/rdmavt/qp.c: In function ‘rvt_wss_llc_size’: ../drivers/infiniband/sw/rdmavt/qp.c:89:1: error: control reaches end of non-void function [-Werror=return-type] 89 | } Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver") Signed-off-by: Randy Dunlap Cc: Jason Gunthorpe Cc: Leon Romanovsky Cc: Dennis Dalessandro Cc: linux-rdma@vger.kernel.org Cc: Jeff Dike Cc: Richard Weinberger Cc: Anton Ivanov Cc: Johannes Berg Cc: linux-um@lists.infradead.org --- v2: rebase & resend drivers/infiniband/sw/rdmavt/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -- a/drivers/infiniband/sw/rdmavt/Kconfig b/drivers/infiniband/sw/rdmavt/Kconfig --- a/drivers/infiniband/sw/rdmavt/Kconfig +++ b/drivers/infiniband/sw/rdmavt/Kconfig @@ -2,7 +2,7 @@ config INFINIBAND_RDMAVT tristate "RDMA verbs transport library" depends on INFINIBAND_VIRT_DMA - depends on X86_64 + depends on X86_64 && !UML depends on PCI help This is a common software verbs provider for RDMA networks.