From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32BA8C2BBFD for ; Sun, 12 Apr 2020 12:51:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 039A020656 for ; Sun, 12 Apr 2020 12:51:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ap0yem7d" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727015AbgDLMvC (ORCPT ); Sun, 12 Apr 2020 08:51:02 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:50599 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725903AbgDLMvB (ORCPT ); Sun, 12 Apr 2020 08:51:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586695858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=J+P6WFvAHjtNNYxSujhikQ/SLnkXm6oAjgZY+UpbQI8=; b=Ap0yem7dKRMmgtVx4dpm7w5mb8Jk8A0NEeVKyXzUQu1Jvjiakhm0Ce5LMBvenuhza+DBtv P3PIPRZ3YqahgxWkJAeOcWP9mZtKXYe9zrmp1uAgr328g3/lMClEpNTnB3cQW50nviYLcX zdaHI1BjjmiLoFRN/DR4kqe1Wjmiik0= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-194-CZzZArRhPRWnMG7ms4Ougg-1; Sun, 12 Apr 2020 08:50:56 -0400 X-MC-Unique: CZzZArRhPRWnMG7ms4Ougg-1 Received: by mail-wr1-f71.google.com with SMTP id v14so4931672wrq.13 for ; Sun, 12 Apr 2020 05:50:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=J+P6WFvAHjtNNYxSujhikQ/SLnkXm6oAjgZY+UpbQI8=; b=UbIOb5oIEWfr4EvF9q2HEFxb+qenJMnmHtoYuuyA3hrdCCECOdtorrYDDA2tjZXTKH tGjSUbE+fzg9qAQPam7Qq9naDqwZF0yPKLn4BMQAlxpobiyso09GS2dm+9g0AijaAG+3 f0uC2w5JLCBIUlYfLVe+r7adXuDwdRhzhl2CMwFXuc8/isQRZfjFmzQOnLNrdvj3oWvp 4BKy/tUZOkrhhuRQNZwul6olLnKEotXMUEvt9yEMoMrWacahtlfLm+COheoepsqo2cpP UqmM7vg1uxoutc4S6NLz1fOUdspd1ObNpgA9Y5UaOwWYzQ1p0rKYjNNykVS2o/RJuL1U WYqg== X-Gm-Message-State: AGi0PubpP4SEJOO3o8AtW9NVzhlsA+Y3GKlfVip4ZMTykwE6l0kqMOTs oM9ZxL9wjcCVXyKaez53kahoXB4vaeYabnxdchdup1l/2as+UXSVW7fRBENJuj1bBVE15p6IwJ8 QJpIWJqaduo5yjdks X-Received: by 2002:adf:ed01:: with SMTP id a1mr14380002wro.18.1586695855351; Sun, 12 Apr 2020 05:50:55 -0700 (PDT) X-Google-Smtp-Source: APiQypIUhlFj+KOcSj2QR37FIgHBt0IwiNyC4XwCoIuZzbiBL5BykeS8EPIx8I2HyZxUPmIjnjTv0Q== X-Received: by 2002:adf:ed01:: with SMTP id a1mr14379984wro.18.1586695855098; Sun, 12 Apr 2020 05:50:55 -0700 (PDT) Received: from redhat.com (bzq-79-183-51-3.red.bezeqint.net. [79.183.51.3]) by smtp.gmail.com with ESMTPSA id b11sm10866184wrq.26.2020.04.12.05.50.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Apr 2020 05:50:54 -0700 (PDT) Date: Sun, 12 Apr 2020 08:50:52 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Jason Wang , virtualization@lists.linux-foundation.org, kvm@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v2] vdpa: make vhost, virtio depend on menu Message-ID: <20200412125018.74964-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If user did not configure any vdpa drivers, neither vhost nor virtio vdpa are going to be useful. So there's no point in prompting for these and selecting vdpa core automatically. Simplify configuration by making virtio and vhost vdpa drivers depend on vdpa menu entry. Once done, we no longer need a separate menu entry, so also get rid of this. While at it, fix up the IFC entry: VDPA->vDPA for consistency with other places. Signed-off-by: Michael S. Tsirkin --- changes from v1: fix up virtio vdpa Kconfig drivers/vdpa/Kconfig | 16 +++++----------- drivers/vhost/Kconfig | 2 +- drivers/virtio/Kconfig | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/vdpa/Kconfig b/drivers/vdpa/Kconfig index d0cb0e583a5d..71d9a64f2c7d 100644 --- a/drivers/vdpa/Kconfig +++ b/drivers/vdpa/Kconfig @@ -1,21 +1,16 @@ # SPDX-License-Identifier: GPL-2.0-only -config VDPA - tristate +menuconfig VDPA + tristate "vDPA drivers" help Enable this module to support vDPA device that uses a datapath which complies with virtio specifications with vendor specific control path. -menuconfig VDPA_MENU - bool "VDPA drivers" - default n - -if VDPA_MENU +if VDPA config VDPA_SIM tristate "vDPA device simulator" depends on RUNTIME_TESTING_MENU && HAS_DMA - select VDPA select VHOST_RING select VHOST_IOTLB default n @@ -25,9 +20,8 @@ config VDPA_SIM development of vDPA. config IFCVF - tristate "Intel IFC VF VDPA driver" + tristate "Intel IFC VF vDPA driver" depends on PCI_MSI - select VDPA default n help This kernel module can drive Intel IFC VF NIC to offload @@ -35,4 +29,4 @@ config IFCVF To compile this driver as a module, choose M here: the module will be called ifcvf. -endif # VDPA_MENU +endif # VDPA diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig index cb6b17323eb2..e79cbbdfea45 100644 --- a/drivers/vhost/Kconfig +++ b/drivers/vhost/Kconfig @@ -64,7 +64,7 @@ config VHOST_VDPA tristate "Vhost driver for vDPA-based backend" depends on EVENTFD select VHOST - select VDPA + depends on VDPA help This kernel module can be loaded in host kernel to accelerate guest virtio devices with the vDPA-based backends. diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig index 2aadf398d8cc..395c3f4d49cb 100644 --- a/drivers/virtio/Kconfig +++ b/drivers/virtio/Kconfig @@ -45,7 +45,7 @@ config VIRTIO_PCI_LEGACY config VIRTIO_VDPA tristate "vDPA driver for virtio devices" - select VDPA + depends on VDPA select VIRTIO help This driver provides support for virtio based paravirtual -- MST