From patchwork Thu Jan 26 21:08:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 48903 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp498665wrn; Thu, 26 Jan 2023 13:36:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXukLook42Rwmns85Ej6k7occW148yXQHccPPlbwdVk1vP/7cwR9JsK4O3PfOnTiG7+wDeLn X-Received: by 2002:a05:6a00:1887:b0:58c:b0a:e504 with SMTP id x7-20020a056a00188700b0058c0b0ae504mr47823543pfh.18.1674768996274; Thu, 26 Jan 2023 13:36:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674768996; cv=none; d=google.com; s=arc-20160816; b=JmKudp46appvEdNWsgfftXRe+D1gimVfFOV9imO522XbSGALqwT4q1foq69xbQjh1E whMoAvwgcsQBsKYz/x7sDAPw43FbWhkW4bRaEV2X5qXCOcOkueLL1GqpKP7OMQFIyZQu L+mPdr0cHaFY6en70RAdvt5X6y4xH1OO7DYtwKrpCWcl1RFqCjFZ8Qq4oS52xYUgJeto ODhwmDOfz6wul0l8jb/6F3TdOirQYa+9gmK8qYQ9XkCkMwZSdk+ekUW91aPikTZbBKoB vRzT4i0CH2ay9YENNWKvVXkvgDE/Fc+wtN1luB01CNbYcAlHMzgaOXEciYqFgPs86JcC TrBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=IZ4FiEl66tco67xBvUrUx4s9yOcmD899Py/EDsw7VTg=; b=jeft4suJFYLO9qbxaJ0l4oLzv8H8MCeWP9PTo6hQ5j3yg8rn4Mw80+drf+9yPEHG54 Sd2B0JcvvcEQ+g/R3Vv5DzXdYAFBXVoTT35Oka0IAcAym7AqJ7Hf5gqO13BE0kh5Oout WGR/lEpkSKxYEaqSM97qVB7n/LdBY9Tbui0jPBsZbvHD0oWH3vb7OV7h0W6y6AqtFoKO PyrYR8HaKRuXSDjRXdrDoinxJqdB3foZByMtb+XdiWiYdCZiTigYYcmvxl2i4/2Zjlfi nz5qk/uIdUs2ztVGcBpAPWMyvkDSrN6TdmxDq+do35OcgI43RYiLyXLBZs8Td2Ffgrxh 7aeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MZIYwYDx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p187-20020a62d0c4000000b0058b93b15acfsi2369280pfg.137.2023.01.26.13.36.23; Thu, 26 Jan 2023 13:36:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MZIYwYDx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231572AbjAZVPw (ORCPT + 99 others); Thu, 26 Jan 2023 16:15:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232430AbjAZVPl (ORCPT ); Thu, 26 Jan 2023 16:15:41 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3127B6D5D1; Thu, 26 Jan 2023 13:15:40 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B6F306192C; Thu, 26 Jan 2023 21:15:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 834FEC433D2; Thu, 26 Jan 2023 21:15:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674767739; bh=kDoN7lRtkiguVPMIrt2hz2XvkeOAxA8ec5u0EoQ2oZU=; h=From:To:Cc:Subject:Date:From; b=MZIYwYDxGRui5ufSSQCI03NAPZNsVz2pa74E1a6S835vWtFU/TqegK/BdgJZHyn3D fq1l4NeIEbkMq2GODsWzDFq1+sS3yYiFuCJ/uaZgVEkaK24VxjPzZQwou2YhYlZ169 hF/LiP5B7rK2WENUAK9rtuvNnnxQIyv3jaiQNnIgPJXtIN2giNjB3gt0KGgOIbkJsR 786k4VnAtaA+AkLvo1AhU2QySPMZAx1+MAUBG240zIV6BQS6XbUNMnsB2UpzTM9imk RnpHu4KDinDlB6hjS4AHJ/XNrolgE5CC/4m39TtoPEUFcvf1pQRdBl5HjsPe3kS7pn mtx6dg/QdCdoA== From: Arnd Bergmann To: Jason Gunthorpe , Tony Krowiak , Alex Williamson Cc: Arnd Bergmann , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Tomas Winkler , "Steven Rostedt (Google)" , Masami Hiramatsu , Miguel Ojeda , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH] [v2] vfio-mdev: add back CONFIG_VFIO dependency Date: Thu, 26 Jan 2023 22:08:31 +0100 Message-Id: <20230126211211.1762319-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756122574771259820?= X-GMAIL-MSGID: =?utf-8?q?1756122574771259820?= From: Arnd Bergmann CONFIG_VFIO_MDEV cannot be selected when VFIO itself is disabled, otherwise we get a link failure: WARNING: unmet direct dependencies detected for VFIO_MDEV Depends on [n]: VFIO [=n] Selected by [y]: - SAMPLE_VFIO_MDEV_MTTY [=y] && SAMPLES [=y] - SAMPLE_VFIO_MDEV_MDPY [=y] && SAMPLES [=y] - SAMPLE_VFIO_MDEV_MBOCHS [=y] && SAMPLES [=y] /home/arnd/cross/arm64/gcc-13.0.1-nolibc/x86_64-linux/bin/x86_64-linux-ld: samples/vfio-mdev/mdpy.o: in function `mdpy_remove': mdpy.c:(.text+0x1e1): undefined reference to `vfio_unregister_group_dev' /home/arnd/cross/arm64/gcc-13.0.1-nolibc/x86_64-linux/bin/x86_64-linux-ld: samples/vfio-mdev/mdpy.o: in function `mdpy_probe': mdpy.c:(.text+0x149e): undefined reference to `_vfio_alloc_device' Fixes: 8bf8c5ee1f38 ("vfio-mdev: turn VFIO_MDEV into a selectable symbol") Signed-off-by: Arnd Bergmann --- v2: fix the s390 and drm drivers as well, in addition to the sample code. --- arch/s390/Kconfig | 4 +++- drivers/gpu/drm/i915/Kconfig | 1 + samples/Kconfig | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 045e681caa36..078cd1a773a3 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -715,6 +715,7 @@ config VFIO_CCW def_tristate n prompt "Support for VFIO-CCW subchannels" depends on S390_CCW_IOMMU + depends on VFIO select VFIO_MDEV help This driver allows usage of I/O subchannels via VFIO-CCW. @@ -726,8 +727,9 @@ config VFIO_AP def_tristate n prompt "VFIO support for AP devices" depends on S390_AP_IOMMU && KVM - select VFIO_MDEV + depends on VFIO depends on ZCRYPT + select VFIO_MDEV help This driver grants access to Adjunct Processor (AP) devices via the VFIO mediated device interface. diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig index a14f68730d6d..b84c16933bbd 100644 --- a/drivers/gpu/drm/i915/Kconfig +++ b/drivers/gpu/drm/i915/Kconfig @@ -120,6 +120,7 @@ config DRM_I915_GVT_KVMGT depends on X86 depends on 64BIT depends on KVM + depends on VFIO select DRM_I915_GVT select KVM_EXTERNAL_WRITE_TRACKING select VFIO_MDEV diff --git a/samples/Kconfig b/samples/Kconfig index 56b191d128d8..44a09dfa8a0b 100644 --- a/samples/Kconfig +++ b/samples/Kconfig @@ -185,6 +185,7 @@ config SAMPLE_UHID config SAMPLE_VFIO_MDEV_MTTY tristate "Build VFIO mtty example mediated device sample code" + depends on VFIO select VFIO_MDEV help Build a virtual tty sample driver for use as a VFIO @@ -192,6 +193,7 @@ config SAMPLE_VFIO_MDEV_MTTY config SAMPLE_VFIO_MDEV_MDPY tristate "Build VFIO mdpy example mediated device sample code" + depends on VFIO select VFIO_MDEV help Build a virtual display sample driver for use as a VFIO @@ -209,6 +211,7 @@ config SAMPLE_VFIO_MDEV_MDPY_FB config SAMPLE_VFIO_MDEV_MBOCHS tristate "Build VFIO mdpy example mediated device sample code" + depends on VFIO select VFIO_MDEV select DMA_SHARED_BUFFER help