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=-14.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 10060C47082 for ; Wed, 26 May 2021 10:08:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E1A3C6124C for ; Wed, 26 May 2021 10:08:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233839AbhEZKJn (ORCPT ); Wed, 26 May 2021 06:09:43 -0400 Received: from mail-wr1-f42.google.com ([209.85.221.42]:33638 "EHLO mail-wr1-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233787AbhEZKJk (ORCPT ); Wed, 26 May 2021 06:09:40 -0400 Received: by mail-wr1-f42.google.com with SMTP id n2so540206wrm.0; Wed, 26 May 2021 03:08:07 -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:references :mime-version:content-disposition:in-reply-to; bh=3bo+c3S5QKp7gdHebx8LdhAWUc/HOzQNqyiFqhVHljE=; b=Nokw/GcI40kiAgn9bR+XmcEgIytbeQ9lkyqLwtknX4cImDKORZELPgR/UtDRc9a1EG Zg9KH4oL+TaZn+eFctTpi9zwFbBHkYeNTE9pKaAKeNiWsikK0TL28caT4pB6Y3k0ofjr LqwJIzzSknbU9YzkoLd/6mEcK3LPFIHe2EhrVNkuKDsBQv34ikQ9ZI1+zfdNSTe36mKr cujmhg0vD8Og0WwVkhecaB6Lo6CVThH0CL1/D9V1r/VV+vHYsRI75KdL4zDh23kOQt8B fJOIrNQXwmP10fnuBO35oxZlQMXWi7HDMxI8oNYjXjwBkO/ITzJpZcdtj1H5pcbPcSl0 +qVA== X-Gm-Message-State: AOAM530Z/WGuVFc4Isqd8D7XD520pikYayZAMi5UHFwtiSGaGMZHxlUg Edw/SW9hVQ2ZXu3Gh/w0+s8= X-Google-Smtp-Source: ABdhPJziSRsXB9sJDjgqH8qbMWPhdLxWYa+hc6oCcPa0qqVjdQIl6Nq3piyW+u6w0WVlc1k8AMtgWw== X-Received: by 2002:adf:fd81:: with SMTP id d1mr32269275wrr.37.1622023687273; Wed, 26 May 2021 03:08:07 -0700 (PDT) Received: from liuwe-devbox-debian-v2 ([51.145.34.42]) by smtp.gmail.com with ESMTPSA id v18sm23315208wro.18.2021.05.26.03.08.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 03:08:06 -0700 (PDT) Date: Wed, 26 May 2021 10:08:05 +0000 From: Wei Liu To: Haiyang Zhang Cc: bhelgaas@google.com, lorenzo.pieralisi@arm.com, wei.liu@kernel.org, linux-hyperv@vger.kernel.org, linux-pci@vger.kernel.org, kys@microsoft.com, olaf@aepfle.de, vkuznets@redhat.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH] pci-hyperv: Add check for hyperv_initialized in init_hv_pci_drv() Message-ID: <20210526100805.xpeen7td45cswqsw@liuwe-devbox-debian-v2> References: <1621984653-1210-1-git-send-email-haiyangz@microsoft.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1621984653-1210-1-git-send-email-haiyangz@microsoft.com> Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Tue, May 25, 2021 at 04:17:33PM -0700, Haiyang Zhang wrote: > Add check for hv_is_hyperv_initialized() at the top of init_hv_pci_drv(), > so if the pci-hyperv driver is force-loaded on non Hyper-V platforms, the > init_hv_pci_drv() will exit immediately, without any side effects, like > assignments to hvpci_block_ops, etc. > > Signed-off-by: Haiyang Zhang > Reported-and-tested-by: Mohammad Alqayeem Reviewed-by: Wei Liu > --- > drivers/pci/controller/pci-hyperv.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c > index 6511648271b2..bebe3eeebc4e 100644 > --- a/drivers/pci/controller/pci-hyperv.c > +++ b/drivers/pci/controller/pci-hyperv.c > @@ -3476,6 +3476,9 @@ static void __exit exit_hv_pci_drv(void) > > static int __init init_hv_pci_drv(void) > { > + if (!hv_is_hyperv_initialized()) > + return -ENODEV; > + > /* Set the invalid domain number's bit, so it will not be used */ > set_bit(HVPCI_DOM_INVALID, hvpci_dom_map); > > -- > 2.25.1 >