[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <42a1a90b-ae3e-47df-ad6c-500055e69218@linux.microsoft.com>
Date: Thu, 20 Mar 2025 11:47:18 -0700
From: Roman Kisel <romank@...ux.microsoft.com>
To: Michael Kelley <mhklinux@...look.com>, Mark Rutland <mark.rutland@....com>
Cc: "arnd@...db.de" <arnd@...db.de>, "bhelgaas@...gle.com"
<bhelgaas@...gle.com>, "bp@...en8.de" <bp@...en8.de>,
"catalin.marinas@....com" <catalin.marinas@....com>,
"conor+dt@...nel.org" <conor+dt@...nel.org>,
"dan.carpenter@...aro.org" <dan.carpenter@...aro.org>,
"dave.hansen@...ux.intel.com" <dave.hansen@...ux.intel.com>,
"decui@...rosoft.com" <decui@...rosoft.com>,
"haiyangz@...rosoft.com" <haiyangz@...rosoft.com>,
"hpa@...or.com" <hpa@...or.com>, "joey.gouly@....com" <joey.gouly@....com>,
"krzk+dt@...nel.org" <krzk+dt@...nel.org>, "kw@...ux.com" <kw@...ux.com>,
"kys@...rosoft.com" <kys@...rosoft.com>, "lenb@...nel.org"
<lenb@...nel.org>, "lpieralisi@...nel.org" <lpieralisi@...nel.org>,
"manivannan.sadhasivam@...aro.org" <manivannan.sadhasivam@...aro.org>,
"maz@...nel.org" <maz@...nel.org>, "mingo@...hat.com" <mingo@...hat.com>,
"oliver.upton@...ux.dev" <oliver.upton@...ux.dev>,
"rafael@...nel.org" <rafael@...nel.org>, "robh@...nel.org"
<robh@...nel.org>, "ssengar@...ux.microsoft.com"
<ssengar@...ux.microsoft.com>, "sudeep.holla@....com"
<sudeep.holla@....com>, "suzuki.poulose@....com" <suzuki.poulose@....com>,
"tglx@...utronix.de" <tglx@...utronix.de>,
"wei.liu@...nel.org" <wei.liu@...nel.org>, "will@...nel.org"
<will@...nel.org>, "yuzenghui@...wei.com" <yuzenghui@...wei.com>,
"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
"kvmarm@...ts.linux.dev" <kvmarm@...ts.linux.dev>,
"linux-acpi@...r.kernel.org" <linux-acpi@...r.kernel.org>,
"linux-arch@...r.kernel.org" <linux-arch@...r.kernel.org>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"linux-hyperv@...r.kernel.org" <linux-hyperv@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-pci@...r.kernel.org" <linux-pci@...r.kernel.org>,
"x86@...nel.org" <x86@...nel.org>, "apais@...rosoft.com"
<apais@...rosoft.com>, "benhill@...rosoft.com" <benhill@...rosoft.com>,
"bperkins@...rosoft.com" <bperkins@...rosoft.com>,
"sunilmut@...rosoft.com" <sunilmut@...rosoft.com>
Subject: Re: [PATCH hyperv-next v6 02/11] arm64: hyperv: Use SMCCC to detect
hypervisor presence
On 3/19/2025 3:11 PM, Michael Kelley wrote:
> From: Mark Rutland <mark.rutland@....com> Sent: Monday, March 17, 2025 4:38 AM
>>
>> The 'acpi_disabled' variable doesn't exist for !CONFIG_ACPI, so its use
>> prior to the ifdeffery looks misplaced.
>
> FWIW, include/linux/acpi.h has
>
> #define acpi_disabled 1
>
> when !CONFIG_ACPI. But I agree that using a stub is better.
Thanks, Michael! I didn't "fact-checked" what was suggested indeed.
Agreed that the stub makes the code look better.
>
> Michael
>
>>
>> Usual codestyle is to avoid ifdeffery if possible, using IS_ENABLED().
>> Otherwise, use a stub, e.g.
>>
>> | #ifdef CONFIG_ACPI
>> | static bool __init hyperv_detect_via_acpi(void)
>> | {
>> | if (acpi_disabled)
>> | return false;
>> |
>> | if (acpi_gbl_FADT.header.revision < 6)
>> | return false;
>> |
>> | return strncmp((char *)&acpi_gbl_FADT.hypervisor_id, "MsHyperV", 8) == 0;
>> | }
>> | #else
>> | static inline bool hyperv_detect_via_acpi(void) { return false; }
>> | #endif
>>
>> Mark.
>>
>>> +static bool __init hyperv_detect_via_smccc(void)
>>> +{
>>> + uuid_t hyperv_uuid = UUID_INIT(
>>> + 0x4d32ba58, 0x4764, 0xcd24,
>>> + 0x75, 0x6c, 0xef, 0x8e,
>>> + 0x24, 0x70, 0x59, 0x16);
>>> +
>>> + return arm_smccc_hyp_present(&hyperv_uuid);
>>> +}
>>> +
>>> static int __init hyperv_init(void)
>>> {
>>> struct hv_get_vp_registers_output result;
>>> @@ -35,13 +70,11 @@ static int __init hyperv_init(void)
>>>
>>> /*
>>> * Allow for a kernel built with CONFIG_HYPERV to be running in
>>> - * a non-Hyper-V environment, including on DT instead of ACPI.
>>> + * a non-Hyper-V environment.
>>> + *
>>> * In such cases, do nothing and return success.
>>> */
>>> - if (acpi_disabled)
>>> - return 0;
>>> -
>>> - if (strncmp((char *)&acpi_gbl_FADT.hypervisor_id, "MsHyperV", 8))
>>> + if (!hyperv_detect_via_acpi() && !hyperv_detect_via_smccc())
>>> return 0;
>>>
>>> /* Setup the guest ID */
>>> --
>>> 2.43.0
>>>
>
--
Thank you,
Roman
Powered by blists - more mailing lists