From patchwork Thu Oct 5 13:13:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 148837 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp396659vqb; Thu, 5 Oct 2023 08:59:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFdRcb8H2scKAcev4MS8B8rJg5oWUoKq5ymUnJlBfVVESqQny8jndPiPutM0Y0nrgwhwW7f X-Received: by 2002:a05:6a21:338b:b0:159:beec:79d4 with SMTP id yy11-20020a056a21338b00b00159beec79d4mr6497847pzb.0.1696521581283; Thu, 05 Oct 2023 08:59:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696521581; cv=none; d=google.com; s=arc-20160816; b=zA7fVHGR8DUIfoFqSEPsXSV/fyLIXuZOtgcIhDrUsjonjNwUt+l0ZnVpdTi5NSAthk gJDUfKdlVNsIZeqI/W9xP9iaxu9RLJ9qkttyVNfwfDn5rgviWBdUM0IAo+krm/vQJ/jI I+yh2Rhrs3WmkzNFV1QkU6AUj4coKGcu+zrTgau7dMDrP587C9bYhkhLLzOjxcc6h4Ea DBBGKGhAG8/Cv9zbUYE4Bgjv/BknBEtjiyIJYa3qP9QtmmqwMIY4RY8PMtfk2V88dP+C nieeHvDwiE9j0uRtjaxis4loZweEGl6oaiOTbMse1MaA+rK4OtxnyDcICzTZc0zaDR81 Pbmw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=M7SVFyskHvn5DmUV/iTeMvjjlovLH8rGJB+QCsnTszE=; fh=F1gpqSS/HYttK+doOKuW4yrAifo5qykyq1MCI9SIQmQ=; b=c5jrZoPPk6Ih7qjtRFjMEA5fdLnD2bh41himgPEW0/rMuyxXuMhlutsX0d9DQPLkWo YeMEcp1Gxbks8qGg4FfeZffORllPPtzWGIrk+EKRX6Gr9BA6IjP2FcO2VKXV4rapdlrv jIcx9AXNQoAbiW4mSVPds2dc/gVvgEK2dnZSERqSWT/MIB7+dhbZDsUDFV5hxDW3Y7B5 7DC1IcVeE5rJrKrLsP6NwZqeLK8MYUXrwAdrHNivw7IlMhRdjtDy8qy4p2NrIjmrWMMP K40rdswebGgUC/0umbjlCKpsYN02FkDWGJfoG0snbIfRPsEcxRRSxwQavw40DfW/H2uf NR+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=QbJxWGd6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id d186-20020a6336c3000000b0057c3fe0131dsi1726060pga.30.2023.10.05.08.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 08:59:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=QbJxWGd6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 2563E82D1C09; Thu, 5 Oct 2023 08:59:24 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238124AbjJEP6U (ORCPT + 19 others); Thu, 5 Oct 2023 11:58:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234301AbjJEP4n (ORCPT ); Thu, 5 Oct 2023 11:56:43 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 404CC6622 for ; Thu, 5 Oct 2023 07:04:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696514684; x=1728050684; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0AvJbrB4m0g/z/AgtKD5CY34m5Bxb/WdkIUxbTGxdmQ=; b=QbJxWGd6k6OhCq9b2P8bPnplQxnJ82yTtb95V6PEZOP5ZiTH/wN1p4DG LP7DPmlmjX//0BRhI//daRPkKwcf39JCmzZIkx/Bff1lXQNBrWSytK49a JK2+8hh7uXt1rKBdeHWlc+en7VwC649ybVKh0sCHZEUZDYjx6BgWeLosU 39YMDKpbq4vmTQTw0gij86sZR76gdViPRSKGYxM39nB+jvpTiZytDVpdf /qO7ZJCr9QGZG+APYaZaWy9vx9gPTWvoxexKmCqFTQ/ujMQhSbeVLufOw /fQABH/MxF6oUI0Yf3CokDI9GWE3GQ8XNahjipg0hHm1+QAVlWSg+RssT A==; X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="380767073" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="380767073" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="728449207" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="728449207" Received: from skwasnia-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.251.222.71]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:16 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 1620B10A12E; Thu, 5 Oct 2023 16:14:14 +0300 (+03) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 01/13] x86/acpi: Extract ACPI MADT wakeup code into a separate file Date: Thu, 5 Oct 2023 16:13:50 +0300 Message-ID: <20231005131402.14611-2-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> References: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 05 Oct 2023 08:59:24 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778931813756675298 X-GMAIL-MSGID: 1778931813756675298 In order to prepare for the expansion of support for the ACPI MADT wakeup method, the relevant code has been moved into a separate file. A new configuration option has been introduced to clearly indicate dependencies without the use of ifdefs. There have been no functional changes. Signed-off-by: Kirill A. Shutemov --- arch/x86/Kconfig | 7 +++ arch/x86/include/asm/acpi.h | 5 ++ arch/x86/kernel/acpi/Makefile | 11 ++-- arch/x86/kernel/acpi/boot.c | 86 +----------------------------- arch/x86/kernel/acpi/madt_wakeup.c | 80 +++++++++++++++++++++++++++ 5 files changed, 99 insertions(+), 90 deletions(-) create mode 100644 arch/x86/kernel/acpi/madt_wakeup.c diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3154dbc49cf5..7368d254d01f 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1108,6 +1108,13 @@ config X86_LOCAL_APIC depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC || PCI_MSI select IRQ_DOMAIN_HIERARCHY +config X86_ACPI_MADT_WAKEUP + def_bool y + depends on X86_64 + depends on ACPI + depends on SMP + depends on X86_LOCAL_APIC + config X86_IO_APIC def_bool y depends on X86_LOCAL_APIC || X86_UP_IOAPIC diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index c8a7fc23f63c..b536b5a6a57b 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -73,6 +73,11 @@ static inline bool acpi_skip_set_wakeup_address(void) #define acpi_skip_set_wakeup_address acpi_skip_set_wakeup_address +union acpi_subtable_headers; + +int __init acpi_parse_mp_wake(union acpi_subtable_headers *header, + const unsigned long end); + /* * Check if the CPU can handle C2 and deeper */ diff --git a/arch/x86/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile index fc17b3f136fe..8c7329c88a75 100644 --- a/arch/x86/kernel/acpi/Makefile +++ b/arch/x86/kernel/acpi/Makefile @@ -1,11 +1,12 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_ACPI) += boot.o -obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup_$(BITS).o -obj-$(CONFIG_ACPI_APEI) += apei.o -obj-$(CONFIG_ACPI_CPPC_LIB) += cppc.o +obj-$(CONFIG_ACPI) += boot.o +obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup_$(BITS).o +obj-$(CONFIG_ACPI_APEI) += apei.o +obj-$(CONFIG_ACPI_CPPC_LIB) += cppc.o +obj-$(CONFIG_X86_ACPI_MADT_WAKEUP) += madt_wakeup.o ifneq ($(CONFIG_ACPI_PROCESSOR),) -obj-y += cstate.o +obj-y += cstate.o endif diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 2a0ea38955df..111bd226ad99 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -66,13 +66,6 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; static bool acpi_support_online_capable; #endif -#ifdef CONFIG_X86_64 -/* Physical address of the Multiprocessor Wakeup Structure mailbox */ -static u64 acpi_mp_wake_mailbox_paddr; -/* Virtual address of the Multiprocessor Wakeup Structure mailbox */ -static struct acpi_madt_multiproc_wakeup_mailbox *acpi_mp_wake_mailbox; -#endif - #ifdef CONFIG_X86_IO_APIC /* * Locks related to IOAPIC hotplug @@ -357,60 +350,6 @@ acpi_parse_lapic_nmi(union acpi_subtable_headers * header, const unsigned long e return 0; } - -#ifdef CONFIG_X86_64 -static int acpi_wakeup_cpu(int apicid, unsigned long start_ip) -{ - /* - * Remap mailbox memory only for the first call to acpi_wakeup_cpu(). - * - * Wakeup of secondary CPUs is fully serialized in the core code. - * No need to protect acpi_mp_wake_mailbox from concurrent accesses. - */ - if (!acpi_mp_wake_mailbox) { - acpi_mp_wake_mailbox = memremap(acpi_mp_wake_mailbox_paddr, - sizeof(*acpi_mp_wake_mailbox), - MEMREMAP_WB); - } - - /* - * Mailbox memory is shared between the firmware and OS. Firmware will - * listen on mailbox command address, and once it receives the wakeup - * command, the CPU associated with the given apicid will be booted. - * - * The value of 'apic_id' and 'wakeup_vector' must be visible to the - * firmware before the wakeup command is visible. smp_store_release() - * ensures ordering and visibility. - */ - acpi_mp_wake_mailbox->apic_id = apicid; - acpi_mp_wake_mailbox->wakeup_vector = start_ip; - smp_store_release(&acpi_mp_wake_mailbox->command, - ACPI_MP_WAKE_COMMAND_WAKEUP); - - /* - * Wait for the CPU to wake up. - * - * The CPU being woken up is essentially in a spin loop waiting to be - * woken up. It should not take long for it wake up and acknowledge by - * zeroing out ->command. - * - * ACPI specification doesn't provide any guidance on how long kernel - * has to wait for a wake up acknowledgement. It also doesn't provide - * a way to cancel a wake up request if it takes too long. - * - * In TDX environment, the VMM has control over how long it takes to - * wake up secondary. It can postpone scheduling secondary vCPU - * indefinitely. Giving up on wake up request and reporting error opens - * possible attack vector for VMM: it can wake up a secondary CPU when - * kernel doesn't expect it. Wait until positive result of the wake up - * request. - */ - while (READ_ONCE(acpi_mp_wake_mailbox->command)) - cpu_relax(); - - return 0; -} -#endif /* CONFIG_X86_64 */ #endif /* CONFIG_X86_LOCAL_APIC */ #ifdef CONFIG_X86_IO_APIC @@ -1160,29 +1099,6 @@ static int __init acpi_parse_madt_lapic_entries(void) } return 0; } - -#ifdef CONFIG_X86_64 -static int __init acpi_parse_mp_wake(union acpi_subtable_headers *header, - const unsigned long end) -{ - struct acpi_madt_multiproc_wakeup *mp_wake; - - if (!IS_ENABLED(CONFIG_SMP)) - return -ENODEV; - - mp_wake = (struct acpi_madt_multiproc_wakeup *)header; - if (BAD_MADT_ENTRY(mp_wake, end)) - return -EINVAL; - - acpi_table_print_madt_entry(&header->common); - - acpi_mp_wake_mailbox_paddr = mp_wake->base_address; - - apic_update_callback(wakeup_secondary_cpu_64, acpi_wakeup_cpu); - - return 0; -} -#endif /* CONFIG_X86_64 */ #endif /* CONFIG_X86_LOCAL_APIC */ #ifdef CONFIG_X86_IO_APIC @@ -1379,7 +1295,7 @@ static void __init acpi_process_madt(void) smp_found_config = 1; } -#ifdef CONFIG_X86_64 +#ifdef CONFIG_X86_ACPI_MADT_WAKEUP /* * Parse MADT MP Wake entry. */ diff --git a/arch/x86/kernel/acpi/madt_wakeup.c b/arch/x86/kernel/acpi/madt_wakeup.c new file mode 100644 index 000000000000..1b9747bfd5b9 --- /dev/null +++ b/arch/x86/kernel/acpi/madt_wakeup.c @@ -0,0 +1,80 @@ +#include +#include + +/* Physical address of the Multiprocessor Wakeup Structure mailbox */ +static u64 acpi_mp_wake_mailbox_paddr; +/* Virtual address of the Multiprocessor Wakeup Structure mailbox */ +static struct acpi_madt_multiproc_wakeup_mailbox *acpi_mp_wake_mailbox; + +static int acpi_wakeup_cpu(int apicid, unsigned long start_ip) +{ + /* + * Remap mailbox memory only for the first call to acpi_wakeup_cpu(). + * + * Wakeup of secondary CPUs is fully serialized in the core code. + * No need to protect acpi_mp_wake_mailbox from concurrent accesses. + */ + if (!acpi_mp_wake_mailbox) { + acpi_mp_wake_mailbox = memremap(acpi_mp_wake_mailbox_paddr, + sizeof(*acpi_mp_wake_mailbox), + MEMREMAP_WB); + } + + /* + * Mailbox memory is shared between the firmware and OS. Firmware will + * listen on mailbox command address, and once it receives the wakeup + * command, the CPU associated with the given apicid will be booted. + * + * The value of 'apic_id' and 'wakeup_vector' must be visible to the + * firmware before the wakeup command is visible. smp_store_release() + * ensures ordering and visibility. + */ + acpi_mp_wake_mailbox->apic_id = apicid; + acpi_mp_wake_mailbox->wakeup_vector = start_ip; + smp_store_release(&acpi_mp_wake_mailbox->command, + ACPI_MP_WAKE_COMMAND_WAKEUP); + + /* + * Wait for the CPU to wake up. + * + * The CPU being woken up is essentially in a spin loop waiting to be + * woken up. It should not take long for it wake up and acknowledge by + * zeroing out ->command. + * + * ACPI specification doesn't provide any guidance on how long kernel + * has to wait for a wake up acknowledgement. It also doesn't provide + * a way to cancel a wake up request if it takes too long. + * + * In TDX environment, the VMM has control over how long it takes to + * wake up secondary. It can postpone scheduling secondary vCPU + * indefinitely. Giving up on wake up request and reporting error opens + * possible attack vector for VMM: it can wake up a secondary CPU when + * kernel doesn't expect it. Wait until positive result of the wake up + * request. + */ + while (READ_ONCE(acpi_mp_wake_mailbox->command)) + cpu_relax(); + + return 0; +} + +int __init acpi_parse_mp_wake(union acpi_subtable_headers *header, + const unsigned long end) +{ + struct acpi_madt_multiproc_wakeup *mp_wake; + + if (!IS_ENABLED(CONFIG_SMP)) + return -ENODEV; + + mp_wake = (struct acpi_madt_multiproc_wakeup *)header; + if (BAD_MADT_ENTRY(mp_wake, end)) + return -EINVAL; + + acpi_table_print_madt_entry(&header->common); + + acpi_mp_wake_mailbox_paddr = mp_wake->base_address; + + apic_update_callback(wakeup_secondary_cpu_64, acpi_wakeup_cpu); + + return 0; +} From patchwork Thu Oct 5 13:13:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 148790 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp354852vqb; Thu, 5 Oct 2023 07:58:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFFkup9KIrxqh2V2VD/S6YFgNY3CFeB1xifv+SQxCiUrIcR4DS5s/BW2nBoNqwuqixLply9 X-Received: by 2002:a05:6a20:96d3:b0:15e:dc75:66a7 with SMTP id hq19-20020a056a2096d300b0015edc7566a7mr4761327pzc.24.1696517887562; Thu, 05 Oct 2023 07:58:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696517887; cv=none; d=google.com; s=arc-20160816; b=yTzzj98ZPzGWn5/LdXBgKLjh2wBuJ2VbcQ2l2S8/o5qeXOeca0G9YvOnlm/zXTgsDK ukjLhc2RBCyYaTzfOQwp1Wk1EmxC4V/z/WjbxEZPDt7LVOJVUSNXORTrjVIV1P/fgHBC Nc6rjF4RjxAzGIShXrWXYIOIj+CKBsZk6iS7zqpAIcYCwnYXWfcHH4Cbzp1a9IcpK5/s WOkCQTmzcezJEfRYzTAxDxVQkDVPDU3zT/catQcvoP2vJFREyDfgLCrwted4+NGqhp/1 XnXscpVVfhCe6nLsMmketB9pitSbjG3PtMXCnjt9ACjUvCafc2zCawZmMsBeykwAfuLp KyCw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=myNhEoa+bRas6E1ZYNgQNx/1M1cgiXXXXUFz20om+fk=; fh=F1gpqSS/HYttK+doOKuW4yrAifo5qykyq1MCI9SIQmQ=; b=N29w6lbbFCxsEJRwUkLXLoriotwOD78+I1fkHTz4R3tuuzgQX4We9P3WbEC1jxlCjz k6QiDI9bK89aWM/pNuXDXRHrdutbdK0pT0Jy2xIwunUwXHXlWzetKccM4pIul35e1g49 iPPoxMxoe8Z2yWbIOMsgXLvLFqm0GY++WOodARGiTLuW94FvFXETnyR0qKcIV6tyF2sc FkgBCMci0ArSxbNsOuwOq8Cga5euJDp93/QQf9cThWhQtw75ZFkz6uVgPF8TKucaCa6x 3zj2idM1BfSoPARsgO7ji7Hus/Ap2UssUq7aEY2vsct49J07tgllwqTVq5W4aGD45NDH iaWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JxUMQQWt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id d11-20020a63fd0b000000b00584b74b26e2si1642350pgh.497.2023.10.05.07.58.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 07:58:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JxUMQQWt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B4F8282F4E04; Thu, 5 Oct 2023 07:58:06 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238970AbjJEOoC (ORCPT + 19 others); Thu, 5 Oct 2023 10:44:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237266AbjJEOiw (ORCPT ); Thu, 5 Oct 2023 10:38:52 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D9926619 for ; Thu, 5 Oct 2023 07:04:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696514681; x=1728050681; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qwslEXpVpdjmSlqhv7KA+43haihOLBSreW4A7xlGLmo=; b=JxUMQQWtCYva/s2PcsHG1dRB9NgH5CismZtSLiIdtxcAR/zGte8T7QEF WPUZHB2USd9RQ1qdDdIhD2MTpjITgyEUczO7vIBAjbwKE6g7C9jodLzww A3jUeTmTRnYB0BcjZ3XhY/3Uy3WJ1Yeq0zmRO9cPK2Bufo9O965CvSA62 Ouf1SOJgZLdeeM9wXgJZSaR7LlaCaLXpjeO8WAConTcfsv+xeuBjR5Sdb fWoEFxuAVxcjgzskBuPZlIMcJGUshNFozkKuz/oH+6+FPw68m/MplyDUl vLgRGVRz5C75TCVSm37aXAcVPY0aOz4TCscS89YLqIo+lwMmm/9HIa90M w==; X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="380767064" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="380767064" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="728449205" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="728449205" Received: from skwasnia-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.251.222.71]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:16 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 2144510A12F; Thu, 5 Oct 2023 16:14:14 +0300 (+03) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 02/13] kernel/cpu: Add support for declaring CPU hotplug not supported Date: Thu, 5 Oct 2023 16:13:51 +0300 Message-ID: <20231005131402.14611-3-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> References: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 05 Oct 2023 07:58:06 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778927940439245681 X-GMAIL-MSGID: 1778927940439245681 The function cpu_hotplug_not_supported() can be called to indicate that CPU hotplug should be disabled. It does not prevent the initial bring up of the CPU, but it stops subsequent offlining. This function is intended to replace CC_ATTR_HOTPLUG_DISABLED. Signed-off-by: Kirill A. Shutemov Reviewed-by: Kuppuswamy Sathyanarayanan --- include/linux/cpu.h | 2 ++ kernel/cpu.c | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/include/linux/cpu.h b/include/linux/cpu.h index f19f56501809..aab3887cadbc 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -132,6 +132,7 @@ extern void cpus_read_lock(void); extern void cpus_read_unlock(void); extern int cpus_read_trylock(void); extern void lockdep_assert_cpus_held(void); +extern void cpu_hotplug_not_supported(void); extern void cpu_hotplug_disable(void); extern void cpu_hotplug_enable(void); void clear_tasks_mm_cpumask(int cpu); @@ -147,6 +148,7 @@ static inline void cpus_read_lock(void) { } static inline void cpus_read_unlock(void) { } static inline int cpus_read_trylock(void) { return true; } static inline void lockdep_assert_cpus_held(void) { } +static inline void cpu_hotplug_not_supported(void) { } static inline void cpu_hotplug_disable(void) { } static inline void cpu_hotplug_enable(void) { } static inline int remove_cpu(unsigned int cpu) { return -EPERM; } diff --git a/kernel/cpu.c b/kernel/cpu.c index 6de7c6bb74ee..cf536fe1a88a 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -484,6 +484,9 @@ static int cpu_hotplug_disabled; DEFINE_STATIC_PERCPU_RWSEM(cpu_hotplug_lock); +/* Cleared if platform declares CPU hotplug not supported */ +static bool cpu_hotplug_supported = true; + void cpus_read_lock(void) { percpu_down_read(&cpu_hotplug_lock); @@ -543,6 +546,18 @@ static void lockdep_release_cpus_lock(void) rwsem_release(&cpu_hotplug_lock.dep_map, _THIS_IP_); } +/* + * Declare CPU hotplug not supported. + * + * It doesn't prevent initial bring up of the CPU, but stops offlining. + */ +void cpu_hotplug_not_supported(void) +{ + cpu_maps_update_begin(); + cpu_hotplug_supported = false; + cpu_maps_update_done(); +} + /* * Wait for currently running CPU hotplug operations to complete (if any) and * disable future CPU hotplug (from sysfs). The 'cpu_add_remove_lock' protects @@ -1507,7 +1522,7 @@ static int cpu_down_maps_locked(unsigned int cpu, enum cpuhp_state target) * If the platform does not support hotplug, report it explicitly to * differentiate it from a transient offlining failure. */ - if (cc_platform_has(CC_ATTR_HOTPLUG_DISABLED)) + if (cc_platform_has(CC_ATTR_HOTPLUG_DISABLED) || !cpu_hotplug_supported) return -EOPNOTSUPP; if (cpu_hotplug_disabled) return -EBUSY; From patchwork Thu Oct 5 13:13:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 148766 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp347038vqb; Thu, 5 Oct 2023 07:43:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFEjAI6MbosRhpXuu19TvRafqnO3QJloeGA9VHYPwclkWuDebHcUssK/gH2u1oM3Cm/E8MP X-Received: by 2002:a05:6a20:918d:b0:14c:a2e1:65fd with SMTP id v13-20020a056a20918d00b0014ca2e165fdmr6670987pzd.9.1696517037718; Thu, 05 Oct 2023 07:43:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696517037; cv=none; d=google.com; s=arc-20160816; b=jpgzezTqDK+Jm8TL0mavNv1aNGjD0JfYL4jd67Io+wlKoZyN63IH1beL3VynYCufzl x9DCFDRudO3C12NYSmrcvddUgeYn/WDUKWfQ6iRHHqOpyGKbZtCRQotdP2/Rkdz84KS4 CWfJWwfrk2HzfhtYzlOvJw0GbpM8/8V7GdrVpqGh03GJDwiJ4cPBXDXMWIiCBHjGEl2H mVdgc/PBhhWyDsIKqZTTnjNoy263ACtO/UcTUvhKyqRknitji7k7XyMVHZo7QAIMmrnX 5RpxF0KHlHBeolbDJHH7u0TTeEXB3U2PXR/AGOzwdJ1cg4J+6eX/waxC5mbVkNj2S9Ke eKnQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ts6fwCrw/TilDmRh7VytWxNn3jjGIo0e+qTqpAkQALc=; fh=F1gpqSS/HYttK+doOKuW4yrAifo5qykyq1MCI9SIQmQ=; b=as4B7YuqJYNwgXjpmO/9YD1cPchuT+J0reUNgQ+OCodL7LgipnndQ3EWGP4O5QfrPu jEBJKDJndQEBnsG54YhE7jcqEJZMXs/bDqvv/5UdEzWlvf0UVGq9kBcOcfdqV2KcLGJw iPr5M5q4Jdz8nrWE38BIJSXOWhRpzyScfWbIhDIyUUmlc59XrXjXp8+ptAi+YxYIc2Oo tbJgOTjBohVPPs+SSTvuPa4YcPT3sOl/NCbYPNLvlTlT2ptqup8yZRY6Z5qJcnzNdDzs v3FaMHZEsWfdFXn9SgXONoQRk+z2aa1zJoZ4Xyl46GNXjDq8qm+5OsAP0FHvqQj+D4M7 Y2PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=XmucqGNR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id t185-20020a6381c2000000b005859fd484b5si1502352pgd.406.2023.10.05.07.43.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 07:43:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=XmucqGNR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B39C582F08E8; Thu, 5 Oct 2023 07:43:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238326AbjJEOnk (ORCPT + 19 others); Thu, 5 Oct 2023 10:43:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237204AbjJEOip (ORCPT ); Thu, 5 Oct 2023 10:38:45 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 870344E367 for ; Thu, 5 Oct 2023 07:04:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696514656; x=1728050656; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UutLKR1Vg2FeYITzS3ethN6UgzHw9Sr7YlTqsZDUwd0=; b=XmucqGNRRfm93DC4BT2r5OcHuuRUny0dk0lZC6N4/1ptOwWo7DDNtHyB AFhErLcTN2LUFBiIEJUeKF6Tpzk0bOk5dZg6AyYyskuIFoRHqBAW9EFBe dPRCa9fFcheFYK0hIdFOr2/6X65Gh6HfUWzwyqln1CjLouFrHFJAy5Qzo gZ7FOK/dlgwjAahMcwidpN6kwxXOyDQWdhZ5s1ROAYMWMSbNl14Gz91Ds T3xaKEsf08EmcKIp9Ajh3jQjooRF5lABuqZRaYKbzFnLNfhaweDMHiDpL C7S++Slmi2N+3zcVKcddn2hkUBv6R99l8JE02B1gR3YKB6nTa0Nc96FdF w==; X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="382357451" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="382357451" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="817564303" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="817564303" Received: from skwasnia-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.251.222.71]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:16 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 2BD9910A14A; Thu, 5 Oct 2023 16:14:14 +0300 (+03) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 03/13] cpu/hotplug, x86/acpi: Disable CPU hotplug for ACPI MADT wakeup Date: Thu, 5 Oct 2023 16:13:52 +0300 Message-ID: <20231005131402.14611-4-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> References: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 05 Oct 2023 07:43:56 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778927049312527359 X-GMAIL-MSGID: 1778927049312527359 ACPI MADT doesn't allow to offline CPU after it got woke up. Currently hotplug prevented based on the confidential computing attribute which is set for Intel TDX. But TDX is not the only possible user of the wake up method. Mark CPU hotplug as "not supported" on ACPI MADT wakeup enumeration. Signed-off-by: Kirill A. Shutemov Reviewed-by: Kuppuswamy Sathyanarayanan --- arch/x86/coco/core.c | 1 - arch/x86/kernel/acpi/madt_wakeup.c | 4 ++++ include/linux/cc_platform.h | 10 ---------- kernel/cpu.c | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/arch/x86/coco/core.c b/arch/x86/coco/core.c index eeec9986570e..f07c3bb7deab 100644 --- a/arch/x86/coco/core.c +++ b/arch/x86/coco/core.c @@ -20,7 +20,6 @@ static bool noinstr intel_cc_platform_has(enum cc_attr attr) { switch (attr) { case CC_ATTR_GUEST_UNROLL_STRING_IO: - case CC_ATTR_HOTPLUG_DISABLED: case CC_ATTR_GUEST_MEM_ENCRYPT: case CC_ATTR_MEM_ENCRYPT: return true; diff --git a/arch/x86/kernel/acpi/madt_wakeup.c b/arch/x86/kernel/acpi/madt_wakeup.c index 1b9747bfd5b9..15bdf10b1393 100644 --- a/arch/x86/kernel/acpi/madt_wakeup.c +++ b/arch/x86/kernel/acpi/madt_wakeup.c @@ -1,4 +1,5 @@ #include +#include #include /* Physical address of the Multiprocessor Wakeup Structure mailbox */ @@ -74,6 +75,9 @@ int __init acpi_parse_mp_wake(union acpi_subtable_headers *header, acpi_mp_wake_mailbox_paddr = mp_wake->base_address; + /* Disable CPU onlining/offlining */ + cpu_hotplug_not_supported(); + apic_update_callback(wakeup_secondary_cpu_64, acpi_wakeup_cpu); return 0; diff --git a/include/linux/cc_platform.h b/include/linux/cc_platform.h index cb0d6cd1c12f..d08dd65b5c43 100644 --- a/include/linux/cc_platform.h +++ b/include/linux/cc_platform.h @@ -80,16 +80,6 @@ enum cc_attr { * using AMD SEV-SNP features. */ CC_ATTR_GUEST_SEV_SNP, - - /** - * @CC_ATTR_HOTPLUG_DISABLED: Hotplug is not supported or disabled. - * - * The platform/OS is running as a guest/virtual machine does not - * support CPU hotplug feature. - * - * Examples include TDX Guest. - */ - CC_ATTR_HOTPLUG_DISABLED, }; #ifdef CONFIG_ARCH_HAS_CC_PLATFORM diff --git a/kernel/cpu.c b/kernel/cpu.c index cf536fe1a88a..9d4279476b40 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -1522,7 +1522,7 @@ static int cpu_down_maps_locked(unsigned int cpu, enum cpuhp_state target) * If the platform does not support hotplug, report it explicitly to * differentiate it from a transient offlining failure. */ - if (cc_platform_has(CC_ATTR_HOTPLUG_DISABLED) || !cpu_hotplug_supported) + if (!cpu_hotplug_supported) return -EOPNOTSUPP; if (cpu_hotplug_disabled) return -EBUSY; From patchwork Thu Oct 5 13:13:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 148765 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp347018vqb; Thu, 5 Oct 2023 07:43:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGJvAn/zD8UsCCqldbyZG4aK99hzFzfQq6Hr+u7/W1wI4FGQLBQTXYGEnFd6RTrWbfFddIy X-Received: by 2002:a17:90b:1c83:b0:274:616e:3fc4 with SMTP id oo3-20020a17090b1c8300b00274616e3fc4mr5108042pjb.34.1696517035251; Thu, 05 Oct 2023 07:43:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696517035; cv=none; d=google.com; s=arc-20160816; b=M1fsMjeScg/9zTxb+UrVyxTuWi/4gxLtmJ6BM4ZhWvKkDc4oKW51BiC0RlabXZw9uC UhmmFb6T+G2h8INggeh+6u6dImUJkeKzRtmb6NVt5HFUW+yN5IS7nMBViXuthnpGWKo4 UEArPy4yhap8fZqRB+hk32SP3qce5mztIdDtze4vq/d1Ss/i8Hs4fFBezZJg308n7t6u G93cMYsOWWCnQqHj/GsaCcwo5KWAtQi4SgRg62yVfJLIKiylB+CCsQvUvz4g4H0g9qxq RsXh6lQKOdVTuO37vubbgZkdugRUIU5UnqIPXfmtswSS0jAd1OLBTQpBsIlpga6CyFVs rZTQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XQmQyJ5xt0pQVoTwNJHZfJnSL6zlkQV0CETTN97MCXA=; fh=F1gpqSS/HYttK+doOKuW4yrAifo5qykyq1MCI9SIQmQ=; b=NDmQT58D4yKM5bLdi+O6+0E/j1ghaFnaxzbUzRnwmed4mfjT/18AMxGZX4qZcPxxAy pKI3282aER1yHsik7GoGxVwv8Q/bJAN9ZmTycPfxJKHMXS0RQiy+55y5cIaaPtY7NVI4 olhduWE2lLG067jlmuhu88brih0Fv7mBqSNqo+xB8gcbFzvaIVm7zLe3RWP5nIPxbznq WrmgmDgyRYgT9Wo9WT2LVfpE/ulUU/vojgJ6nAF4Z4R1GcIWd2p79l03AeRlYFJnusHw RryT0o+dPt9eB9+KPYzOeBaxoCoE58/YQpC2nZ1fjx7uU3fPlUfd2hw72pyGyvOKYGOq xevQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=GCWrkuOQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id ls11-20020a17090b350b00b002746ab58dfcsi1884684pjb.18.2023.10.05.07.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 07:43:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=GCWrkuOQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 7A9F0802FD36; Thu, 5 Oct 2023 07:43:54 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236627AbjJEOnd (ORCPT + 19 others); Thu, 5 Oct 2023 10:43:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237199AbjJEOip (ORCPT ); Thu, 5 Oct 2023 10:38:45 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C2DA4E366 for ; Thu, 5 Oct 2023 07:04:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696514656; x=1728050656; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6jCOPtPHdWrnAAWeulGySr3RPESjo4P/hViU3qiYp2Q=; b=GCWrkuOQt7HQCuvSqcn/iFX4EiuNrHJBa+8wAvElzWAkDqp0x7bfKt95 J/oSwZIX2BcUwaWo/+FSoaZ+izLJg4K/ITp7UPhx9bf88YOGSuisiEJcQ JYGhkd2l1r6Y3+kMfhxZKWDFHCxFn4sZRGFP8vy/fd9kZFpv9eA/Rcn2C Y+9RsSc+Pt6SPUT1qKqIzRqZVQyugtKlPd4feDHTzyGEmSQEbcrxPEt5n mIxMOZYJZaHTj5gn5WqdBlVBiFlbuF731WtVBD4u1Km0UNeJWOWALpsmt cOpEAwLRdmM5sPQuaLUz7nro+vzGrvU7ejaIfBbPLEbFgHK1WNV5bynJE g==; X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="382357442" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="382357442" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="817564301" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="817564301" Received: from skwasnia-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.251.222.71]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:16 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 35E2A10A14C; Thu, 5 Oct 2023 16:14:14 +0300 (+03) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 04/13] x86/kvm: Do not try to disable kvmclock if it was not enabled Date: Thu, 5 Oct 2023 16:13:53 +0300 Message-ID: <20231005131402.14611-5-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> References: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 05 Oct 2023 07:43:54 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778927046747235159 X-GMAIL-MSGID: 1778927046747235159 kvm_guest_cpu_offline() tries to disable kvmclock regardless if it is present in the VM. It leads to write to a MSR that doesn't exist on some configurations, namely in TDX guest: unchecked MSR access error: WRMSR to 0x12 (tried to write 0x0000000000000000) at rIP: 0xffffffff8110687c (kvmclock_disable+0x1c/0x30) kvmclock enabling is gated by CLOCKSOURCE and CLOCKSOURCE2 KVM paravirt features. Do not disable kvmclock if it was not enumerated or disabled by user from kernel command line. Signed-off-by: Kirill A. Shutemov Fixes: c02027b5742b ("x86/kvm: Disable kvmclock on all CPUs on shutdown") --- arch/x86/kernel/kvmclock.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index fb8f52149be9..cba2e732e53f 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -22,7 +22,7 @@ #include #include -static int kvmclock __initdata = 1; +static int kvmclock __ro_after_init = 1; static int kvmclock_vsyscall __initdata = 1; static int msr_kvm_system_time __ro_after_init = MSR_KVM_SYSTEM_TIME; static int msr_kvm_wall_clock __ro_after_init = MSR_KVM_WALL_CLOCK; @@ -195,7 +195,12 @@ static void kvm_setup_secondary_clock(void) void kvmclock_disable(void) { - native_write_msr(msr_kvm_system_time, 0, 0); + if (!kvm_para_available() || !kvmclock) + return; + + if (kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE) || + kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE2)) + native_write_msr(msr_kvm_system_time, 0, 0); } static void __init kvmclock_init_mem(void) From patchwork Thu Oct 5 13:13:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 148835 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp396403vqb; Thu, 5 Oct 2023 08:59:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFEt9bi07sriAsuH6GTb3ZwgqQl83VrPssmdSV0+lZwuZ19gHtGgr+mjC6yHcHCHyVLnQfe X-Received: by 2002:a05:6358:7252:b0:134:c859:d32a with SMTP id i18-20020a056358725200b00134c859d32amr6080454rwa.25.1696521554695; Thu, 05 Oct 2023 08:59:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696521554; cv=none; d=google.com; s=arc-20160816; b=BpvfOTbgr38iwFROfSB7eO/V7Aj6tu+PCOOT2hP97/JibpHuhW8E3aBb3EWws4PkBT wu7HPhYCWGNzQu6ROGNQ9wsByhnt/Bi/xlMBUGJINvugOidM2dUh96yMvt31XJ1D2pLY RvVB0IEXePc1U2YOOmeXEFfM4IMiGJE4JPY6xQddD/akoFNJFtYcyU40ltH42dm5QyI8 AGjuUFSAOs39tN2/x2GvgNt08MF1w0Fhx0Y3Fam33kuFNbkICt3hwqrUnljut9GtHZGX TfqkhL3Sf8ai/8ILF1XLx2MWLJXLdGCtOAyd8ZG8rLGJHbglfLSAnt7uDXXlyHgpFB7e H7Zg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=o5Y8doXVdKJk+1QaGPkIclZvAKJT41o2Q1akVoEM1r0=; fh=F1gpqSS/HYttK+doOKuW4yrAifo5qykyq1MCI9SIQmQ=; b=aPzYmmLEulU8KIjnpZFX/4dIeFhL28LltFi7ZP17aWibL9xA/ay0ydKXiPlXUy4MtP kgVfNRuJV9bjq0ZishGQYiS8HF+S5eR3U+MvIuLKkab/RtPde9ebH1hu0E2Wh4pThKqa fe4z9PlgN++HyEbSr/6Cp7NEGjr0h+KkNx1sYMq6IZq+gGkKKof9dBT1URBe1kqQt0mt ulMpSA7ZDBzV6Fv8WwXTGqqBx7bauKmYY5WgyLLiPUs3gj5Ih0qBc77tGfX2hIvcCKP/ ckvtqhoMwBprfuucZToIll8vy/PTmvKgvKa7K2Ol9IS4IDu0uUSW2luS5130187WJITh IKGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ILf+ujyD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id bt11-20020a056a00438b00b0068ace3816d7si1646741pfb.387.2023.10.05.08.59.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 08:59:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ILf+ujyD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 7A7A682D1C04; Thu, 5 Oct 2023 08:58:58 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237903AbjJEP56 (ORCPT + 19 others); Thu, 5 Oct 2023 11:57:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233396AbjJEP4n (ORCPT ); Thu, 5 Oct 2023 11:56:43 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A2B66620 for ; Thu, 5 Oct 2023 07:04:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696514684; x=1728050684; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2WU7kKiOy1VKJ5VS01o46StvhoI+3fSkV4NdlGG5HN8=; b=ILf+ujyDGQFTZ/JWQGF/IuxJRj9c2B3cRVH/yThZTCIvai3jd0BnON98 WpvuwH33ehUeNYnLpnOlTaXJ6+zbtnNWtW7O50Hvh4dn01uZMvOO90DUb NhuPkD2bBa6KM1dUGCsou8fxDlEYAFhiryQz0Fbs03R9xUYRdRFobOTGj Kcck4+YunlRspwl5ysV93KBaq0rbXcFNjihdAtwlK4ukOK5k7yAYYNi7H WEVYCnxeh5ByDK3YidMcfO/tWgN3OzHiAnuw9nTUAnZibhd4Kla+RhemE 9p5mGKHBtFpVCeZ5FcA7hEhUi9MPqE2cKMIb5v5dVkYAd094UNqN0vd2f g==; X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="380767178" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="380767178" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="728449267" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="728449267" Received: from skwasnia-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.251.222.71]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:23 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 3D69E10A14E; Thu, 5 Oct 2023 16:14:14 +0300 (+03) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 05/13] x86/kexec: Keep CR4.MCE set during kexec for TDX guest Date: Thu, 5 Oct 2023 16:13:54 +0300 Message-ID: <20231005131402.14611-6-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> References: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 05 Oct 2023 08:58:58 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778931785826847340 X-GMAIL-MSGID: 1778931785826847340 TDX guests are not allowed to clear CR4.MCE. Attempt to clear it leads to #VE. Use alternatives to keep the flag during kexec for TDX guests. The change doesn't affect non-TDX environments. Signed-off-by: Kirill A. Shutemov Reviewed-by: Kai Huang --- arch/x86/kernel/relocate_kernel_64.S | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S index 56cab1bb25f5..bea89814b48e 100644 --- a/arch/x86/kernel/relocate_kernel_64.S +++ b/arch/x86/kernel/relocate_kernel_64.S @@ -145,11 +145,16 @@ SYM_CODE_START_LOCAL_NOALIGN(identity_mapped) * Set cr4 to a known state: * - physical address extension enabled * - 5-level paging, if it was enabled before + * - Machine check exception on TDX guest. Clearing MCE is not allowed + * in TDX guests. */ movl $X86_CR4_PAE, %eax testq $X86_CR4_LA57, %r13 jz 1f orl $X86_CR4_LA57, %eax +1: + ALTERNATIVE "jmp 1f", "", X86_FEATURE_TDX_GUEST + orl $X86_CR4_MCE, %eax 1: movq %rax, %cr4 From patchwork Thu Oct 5 13:13:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 148847 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp401384vqb; Thu, 5 Oct 2023 09:04:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IELz3nB7uly9/fppJXdiBLJKtFv4N2OCl/iZ+prbczRDsM0TNc3XTOISNy2w7XuCEx7d8Tu X-Received: by 2002:a05:6a00:3915:b0:692:a727:1fdd with SMTP id fh21-20020a056a00391500b00692a7271fddmr6940990pfb.4.1696521873450; Thu, 05 Oct 2023 09:04:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696521873; cv=none; d=google.com; s=arc-20160816; b=UeNlNI/1+y6RQ7jR5Me3trKPoR8LFpgAGQkcCt/XCKY5kWFzH1F+5bKqsNNVpuwKWO CufuWHSeMeH4juW8B2EuLPjyOSy0YdwZ8ZrdXrOJi4bhPwydYVseJ0luMoU/Ta5lWPqZ F25yzzqbfl1InOE01cZFxMoBOfAh8bUOhqUDryIrJbpDF0fRCKgGYKh58dJTYzfW8rRi GKn1ycJ8KKmJJG2laFB1XL8vYTpkGHvlxjgxdFKBhHo9uMeMtWoo1tl7ay8FdgGDoKW9 WgO1mN1LuB5z99Woyh1hGaGHUdL4BhGbiiXOeCmdp8zH3iKQQOfo7PKqpecKjDjOQoFN XSQg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=IbgYQ53WmcWjYykNyBMbpy8pGPataJGBwFd9VuXUFZg=; fh=F1gpqSS/HYttK+doOKuW4yrAifo5qykyq1MCI9SIQmQ=; b=VfRVM/njbNweW06VmlyOPrONejZ2X08NPUvWPzIUR5oJJFHWL8xisP0VElynenffhf fuHLtVP4Rr9RVH1SyVIjf5pKJis5NLFEJkc8V6yQOJkFfQu2E7ZCLWd2n2nn2cR9pUBS GAz+sgizosYotsfrjk0INLtZERGekgpotd+Zqp+J7FMxscfllDMiuln+cXNcaFcQaiVA Kg9DbIZTyPx56jZRnzJjUhTCW63RRd2eNmNXCDAdpgqarRL2n1rVtYfTHRUuhnAzbd5m jweIFUti8iYm9Fd2l2wlAlWnZoUgj6AeJMGqcaS1U7/dvR3EtRZIL05+bmR4UIoQItQs sbNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fFh4KhUt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id d10-20020a056a0010ca00b0068ffe38c5ddsi1703029pfu.223.2023.10.05.09.04.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 09:04:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fFh4KhUt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 343E1806156D; Thu, 5 Oct 2023 09:04:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238558AbjJEP67 (ORCPT + 19 others); Thu, 5 Oct 2023 11:58:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231175AbjJEP4u (ORCPT ); Thu, 5 Oct 2023 11:56:50 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 722EE6631 for ; Thu, 5 Oct 2023 07:04:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696514688; x=1728050688; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LMwxvAOSNa1HhMCdKAJOcp6oaJ5EnRq2d2+hTjUyrmw=; b=fFh4KhUt3YOZ4o5SHI+nH6kwZzF5CjNLd4XVJJ5fuvNkST8ET/xs05tg QCpU+Z6HFBh8CiirIcTxId9X5XWfJ5U87tGhZ4+tr1PgVfsZWGXs+2NaV MSL0V8PJluZDcMogeFSzHz/kFnH1PwjTttr3GZE87sE5IBZqzjA1K1jSg WLHrlOPosRS/ZEO1HuzwPpJcAl6e3BfPMubCmxvfeYF3vbzDpQXJdcuz9 IvHkSObnBh40jClm7pT0iBYzqgXFYuddZANsnpX6K60vpRGkyQzlm8tiG AvhgfjH8FGY2Gl3ssi3aV0KOgCT7OKqp8Mow2DbDCUNl5WMEKygC6eX3k g==; X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="380767204" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="380767204" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="728449277" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="728449277" Received: from skwasnia-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.251.222.71]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:23 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 4865C10A14F; Thu, 5 Oct 2023 16:14:14 +0300 (+03) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 06/13] x86/mm: Make x86_platform.guest.enc_status_change_*() return errno Date: Thu, 5 Oct 2023 16:13:55 +0300 Message-ID: <20231005131402.14611-7-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> References: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 05 Oct 2023 09:04:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778932120045377809 X-GMAIL-MSGID: 1778932120045377809 TDX is going to have more than one reason to fail enc_status_change_prepare(). Change the callback to return errno instead of assuming -EIO; enc_status_change_finish() changed too to keep the interface symmetric. Signed-off-by: Kirill A. Shutemov --- arch/x86/coco/tdx/tdx.c | 20 +++++++++++--------- arch/x86/hyperv/ivm.c | 9 +++------ arch/x86/include/asm/x86_init.h | 4 ++-- arch/x86/kernel/x86_init.c | 4 ++-- arch/x86/mm/mem_encrypt_amd.c | 8 ++++---- arch/x86/mm/pat/set_memory.c | 9 +++++---- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c index 3e6dbd2199cf..46022283d955 100644 --- a/arch/x86/coco/tdx/tdx.c +++ b/arch/x86/coco/tdx/tdx.c @@ -776,28 +776,30 @@ static bool tdx_enc_status_changed(unsigned long vaddr, int numpages, bool enc) return true; } -static bool tdx_enc_status_change_prepare(unsigned long vaddr, int numpages, - bool enc) +static int tdx_enc_status_change_prepare(unsigned long vaddr, int numpages, + bool enc) { /* * Only handle shared->private conversion here. * See the comment in tdx_early_init(). */ - if (enc) - return tdx_enc_status_changed(vaddr, numpages, enc); - return true; + if (enc && !tdx_enc_status_changed(vaddr, numpages, enc)) + return -EIO; + + return 0; } -static bool tdx_enc_status_change_finish(unsigned long vaddr, int numpages, +static int tdx_enc_status_change_finish(unsigned long vaddr, int numpages, bool enc) { /* * Only handle private->shared conversion here. * See the comment in tdx_early_init(). */ - if (!enc) - return tdx_enc_status_changed(vaddr, numpages, enc); - return true; + if (!enc && !tdx_enc_status_changed(vaddr, numpages, enc)) + return -EIO; + + return 0; } void __init tdx_early_init(void) diff --git a/arch/x86/hyperv/ivm.c b/arch/x86/hyperv/ivm.c index c1088d3661d5..7d2241059d49 100644 --- a/arch/x86/hyperv/ivm.c +++ b/arch/x86/hyperv/ivm.c @@ -510,13 +510,12 @@ static int hv_mark_gpa_visibility(u16 count, const u64 pfn[], * with host. This function works as wrap of hv_mark_gpa_visibility() * with memory base and size. */ -static bool hv_vtom_set_host_visibility(unsigned long kbuffer, int pagecount, bool enc) +static int hv_vtom_set_host_visibility(unsigned long kbuffer, int pagecount, bool enc) { enum hv_mem_host_visibility visibility = enc ? VMBUS_PAGE_NOT_VISIBLE : VMBUS_PAGE_VISIBLE_READ_WRITE; u64 *pfn_array; int ret = 0; - bool result = true; int i, pfn; pfn_array = kmalloc(HV_HYP_PAGE_SIZE, GFP_KERNEL); @@ -530,17 +529,15 @@ static bool hv_vtom_set_host_visibility(unsigned long kbuffer, int pagecount, bo if (pfn == HV_MAX_MODIFY_GPA_REP_COUNT || i == pagecount - 1) { ret = hv_mark_gpa_visibility(pfn, pfn_array, visibility); - if (ret) { - result = false; + if (ret) goto err_free_pfn_array; - } pfn = 0; } } err_free_pfn_array: kfree(pfn_array); - return result; + return ret; } static bool hv_vtom_tlb_flush_required(bool private) diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h index 5240d88db52a..5031cbc6e211 100644 --- a/arch/x86/include/asm/x86_init.h +++ b/arch/x86/include/asm/x86_init.h @@ -150,8 +150,8 @@ struct x86_init_acpi { * @enc_cache_flush_required Returns true if a cache flush is needed before changing page encryption status */ struct x86_guest { - bool (*enc_status_change_prepare)(unsigned long vaddr, int npages, bool enc); - bool (*enc_status_change_finish)(unsigned long vaddr, int npages, bool enc); + int (*enc_status_change_prepare)(unsigned long vaddr, int npages, bool enc); + int (*enc_status_change_finish)(unsigned long vaddr, int npages, bool enc); bool (*enc_tlb_flush_required)(bool enc); bool (*enc_cache_flush_required)(void); }; diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c index a37ebd3b4773..f0f54e109eb9 100644 --- a/arch/x86/kernel/x86_init.c +++ b/arch/x86/kernel/x86_init.c @@ -131,8 +131,8 @@ struct x86_cpuinit_ops x86_cpuinit = { static void default_nmi_init(void) { }; -static bool enc_status_change_prepare_noop(unsigned long vaddr, int npages, bool enc) { return true; } -static bool enc_status_change_finish_noop(unsigned long vaddr, int npages, bool enc) { return true; } +static int enc_status_change_prepare_noop(unsigned long vaddr, int npages, bool enc) { return 0; } +static int enc_status_change_finish_noop(unsigned long vaddr, int npages, bool enc) { return 0; } static bool enc_tlb_flush_required_noop(bool enc) { return false; } static bool enc_cache_flush_required_noop(void) { return false; } static bool is_private_mmio_noop(u64 addr) {return false; } diff --git a/arch/x86/mm/mem_encrypt_amd.c b/arch/x86/mm/mem_encrypt_amd.c index 6faea41e99b6..9cbdfbf8cd45 100644 --- a/arch/x86/mm/mem_encrypt_amd.c +++ b/arch/x86/mm/mem_encrypt_amd.c @@ -318,7 +318,7 @@ static void enc_dec_hypercall(unsigned long vaddr, unsigned long size, bool enc) #endif } -static bool amd_enc_status_change_prepare(unsigned long vaddr, int npages, bool enc) +static int amd_enc_status_change_prepare(unsigned long vaddr, int npages, bool enc) { /* * To maintain the security guarantees of SEV-SNP guests, make sure @@ -327,11 +327,11 @@ static bool amd_enc_status_change_prepare(unsigned long vaddr, int npages, bool if (cc_platform_has(CC_ATTR_GUEST_SEV_SNP) && !enc) snp_set_memory_shared(vaddr, npages); - return true; + return 0; } /* Return true unconditionally: return value doesn't matter for the SEV side */ -static bool amd_enc_status_change_finish(unsigned long vaddr, int npages, bool enc) +static int amd_enc_status_change_finish(unsigned long vaddr, int npages, bool enc) { /* * After memory is mapped encrypted in the page table, validate it @@ -343,7 +343,7 @@ static bool amd_enc_status_change_finish(unsigned long vaddr, int npages, bool e if (!cc_platform_has(CC_ATTR_HOST_MEM_ENCRYPT)) enc_dec_hypercall(vaddr, npages << PAGE_SHIFT, enc); - return true; + return 0; } static void __init __set_clr_pte_enc(pte_t *kpte, int level, bool enc) diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index bda9f129835e..6fbf22d5fa56 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -2152,8 +2152,9 @@ static int __set_memory_enc_pgtable(unsigned long addr, int numpages, bool enc) cpa_flush(&cpa, x86_platform.guest.enc_cache_flush_required()); /* Notify hypervisor that we are about to set/clr encryption attribute. */ - if (!x86_platform.guest.enc_status_change_prepare(addr, numpages, enc)) - return -EIO; + ret = x86_platform.guest.enc_status_change_prepare(addr, numpages, enc); + if (ret) + return ret; ret = __change_page_attr_set_clr(&cpa, 1); @@ -2168,8 +2169,8 @@ static int __set_memory_enc_pgtable(unsigned long addr, int numpages, bool enc) /* Notify hypervisor that we have successfully set/clr encryption attribute. */ if (!ret) { - if (!x86_platform.guest.enc_status_change_finish(addr, numpages, enc)) - ret = -EIO; + ret = x86_platform.guest.enc_status_change_finish(addr, + numpages, enc); } return ret; From patchwork Thu Oct 5 13:13:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 148785 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp354549vqb; Thu, 5 Oct 2023 07:57:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFV9H0tMiSBseZH8CqfR9aGD/UhMt7/acZYBprHGgnaTR5Y7yDqB0ZMKDTkjgVQmRbieVD8 X-Received: by 2002:a05:6a20:938b:b0:156:851e:b167 with SMTP id x11-20020a056a20938b00b00156851eb167mr5781984pzh.44.1696517853404; Thu, 05 Oct 2023 07:57:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696517853; cv=none; d=google.com; s=arc-20160816; b=ZHIsMdfIdRe930S89QtLpsReYiZiHGhUMoIbdjNR+Ru+EsgVkTT9P4eQGwBuloEGMl isW8zPN7upw/5phIbNIm0YebIK1yR4Z+VYdY/9hwhmEEEOhxevJYReYRJaPUT8Sot5vS K2ar+MFwEKS1wPDwLxCbp+gnpbeqjoWb9EyfCzmiw8aVMQOjtkEqEmGOVN/C8uKkhZkh ywrjT6/e+1dSMWRo1LtDygIfyZtgXmaAF2jzABEY/mtODzK2cloRoyEW6llyGkucj62k lfj2TdBPWwsw2ZYiY+MOAVmq4YQooWAY4t3OHk7qHEcgnIqPeMxkw6DUbGslPEjxUlBv frcQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nRb9odYj0zuUgjn5mN2pRzKe6eite6Cnh5+z/pgqCLI=; fh=F1gpqSS/HYttK+doOKuW4yrAifo5qykyq1MCI9SIQmQ=; b=juAdyjApQfLNc4Ux6oSKDq7q9/B2SNyoG7YFkpcYIbarIYQAaTZOI561rqi72qaL2N g1V9gVLSXykw2sp2LfV37LqNG82fOs6KR6S0wRUemuA50M92RKYiBiKH5XbiZ1uLeH4w 8XYx3+ql7CBNyc9R3c3zaGAsNwkg+2kOmkbHekE1gIirrZ5V/sY5JmZ4M18yYQ78ggeg u3EPrylZ6Dg2F48olMFkrx1WXcDYNfwLoA+fnXXPxT7vMcZEsTxpGfD4/ur9DdUT0oYa /jsxUhpVyH2mFn4YLo1M2PKLkAetkMlDavwupPinsIL7pB3TVAmLTzFIOB6KUIz1b6QK GX4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KBQQ6DFC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id u62-20020a638541000000b0058934e72163si1613193pgd.746.2023.10.05.07.57.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 07:57:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KBQQ6DFC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id BD8E582F08DD; Thu, 5 Oct 2023 07:57:31 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238865AbjJEOnx (ORCPT + 19 others); Thu, 5 Oct 2023 10:43:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237218AbjJEOiu (ORCPT ); Thu, 5 Oct 2023 10:38:50 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0308C93C1 for ; Thu, 5 Oct 2023 07:04:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696514671; x=1728050671; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7MgS2tz+eXb3t+LyzYLE/xkq/zAhJTq68EvRtEFLASY=; b=KBQQ6DFCrx4+ZQd8zRMdkWnWGf4rhDeCaLqhsT/rjjgN7BJWMQek5rA9 f7MjB+0hO+QyYNGdlr54WWenJHJCslo/3dZNlX4vZ4zIaF0MNBiFqXDGJ OBuMJ9Wk3nlaZ7wkDFJcCSOcmc66P2S3ei7hdsMwRaSRvXt2dtFxO/EnB C3/hMQjpaCT+tdx/MAFtzCYelG/5qDgKmj9ES02QmRJq3xZoUQtP9kpCi Vptp0jQ/96SfnKSDRhnLXllcT4WukoyXd77AgITqnSX2aVi45Hyqlz2cf hqspXW9mvrp9TLXwRmrNdN1X+lyykRhHXJwN3AKJoiBMqHoD2DSmlaEof g==; X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="382357561" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="382357561" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="817564320" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="817564320" Received: from skwasnia-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.251.222.71]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:23 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 52B2510A150; Thu, 5 Oct 2023 16:14:14 +0300 (+03) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 07/13] x86/mm: Return correct level from lookup_address() if pte is none Date: Thu, 5 Oct 2023 16:13:56 +0300 Message-ID: <20231005131402.14611-8-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> References: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 05 Oct 2023 07:57:31 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778927904907301621 X-GMAIL-MSGID: 1778927904907301621 lookup_address() only returns correct page table level for the entry if the entry is not none. Make the helper to always return correct 'level'. It allows to implement iterator over kernel page tables using lookup_address(). Add one more entry into enum pg_level to indicate size of VA covered by one PGD entry in 5-level paging mode. Signed-off-by: Kirill A. Shutemov Reviewed-by: Rick Edgecombe --- arch/x86/include/asm/pgtable_types.h | 1 + arch/x86/mm/pat/set_memory.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h index 0b748ee16b3d..3f648ffdfbe5 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h @@ -548,6 +548,7 @@ enum pg_level { PG_LEVEL_2M, PG_LEVEL_1G, PG_LEVEL_512G, + PG_LEVEL_256T, PG_LEVEL_NUM }; diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index 6fbf22d5fa56..01f827eb8e80 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -666,32 +666,32 @@ pte_t *lookup_address_in_pgd(pgd_t *pgd, unsigned long address, pud_t *pud; pmd_t *pmd; - *level = PG_LEVEL_NONE; + *level = PG_LEVEL_256T; if (pgd_none(*pgd)) return NULL; + *level = PG_LEVEL_512G; p4d = p4d_offset(pgd, address); if (p4d_none(*p4d)) return NULL; - *level = PG_LEVEL_512G; if (p4d_large(*p4d) || !p4d_present(*p4d)) return (pte_t *)p4d; + *level = PG_LEVEL_1G; pud = pud_offset(p4d, address); if (pud_none(*pud)) return NULL; - *level = PG_LEVEL_1G; if (pud_large(*pud) || !pud_present(*pud)) return (pte_t *)pud; + *level = PG_LEVEL_2M; pmd = pmd_offset(pud, address); if (pmd_none(*pmd)) return NULL; - *level = PG_LEVEL_2M; if (pmd_large(*pmd) || !pmd_present(*pmd)) return (pte_t *)pmd; From patchwork Thu Oct 5 13:13:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 148768 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp347196vqb; Thu, 5 Oct 2023 07:44:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFz1FqUxozBfvUu8uGZl/bCyWKzf5VuBaq2Q5+3BgZNKUFuS9sch+eUqxVlhAlsJ83jtNR+ X-Received: by 2002:a05:6358:3406:b0:143:3845:e6fb with SMTP id h6-20020a056358340600b001433845e6fbmr5853067rwd.27.1696517053323; Thu, 05 Oct 2023 07:44:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696517053; cv=none; d=google.com; s=arc-20160816; b=EOzoZDeKa3kKfAHRaJFSXBlCmwpzcOK3Mn7PjAK1nwj/iOwweyuNEfxQhH39g3zrfQ n+xoWnmCAr1T2vorgH7hUtJLO8uAZazX3ScPKrJwHUUUIVqUCNvA1AnaRJcHN05cu+X+ eHthNRKO1zQWH1h7GmAE5cni3N+Zso5C9cRzUZxePc6DIZK5IDNljKvZNA5CNPlUUDq7 RIgJ3rkuXFjSDQMxZMXL4tx2nIEgCR6czQMUBo+ABcIZhYOzTHblfpjQEsoLjUMmb0/c 4Nf/je8LktnPyikcicqj0YULlUMjolkh5YgvXBtFdyDzagquoKhy7BvjQOL4uGZn7Ugc bQCQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EjXhEfE1OrJcKnhCJyxwAo8KiJx3bHJaCHUom/r3V6k=; fh=F1gpqSS/HYttK+doOKuW4yrAifo5qykyq1MCI9SIQmQ=; b=E+je1ebauKwt0DuYEMZl9/QICUK5inqFUlLHyXyYJLIfknOQzlFY1MpolUrnljIgUN NFl9EATpVckgWSYO9GR9sNopGCRjbEaf6SScpPmhzxsrK0HmQHB8sQszZAF6Y6cJ5Eil Pfzi3aP5vTJcrPFXQEndE5eGL3ibGhbz2wW8Z4wqzw8Kdl66L9K2/x4o1+0V0hGoNYoT FPl7R2f9mEFQNuD+TcddVHrq+hlDx1PQkpgMqToGPkrQqGIIaAx2a1CU9zD4ud9p7TaY hNffddAzRKNdkkomsGzjuJ8BhBPxPsbvIIqR3lvXTmoqmq9mTH9M06PGxOlQnxrkTpQv /7jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=QzVqYIAG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id z17-20020a631911000000b00577f4d736bbsi1534295pgl.373.2023.10.05.07.44.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 07:44:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=QzVqYIAG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 8634C85C6AA7; Thu, 5 Oct 2023 07:44:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238805AbjJEOnu (ORCPT + 19 others); Thu, 5 Oct 2023 10:43:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237224AbjJEOiu (ORCPT ); Thu, 5 Oct 2023 10:38:50 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27C424E348 for ; Thu, 5 Oct 2023 07:04:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696514675; x=1728050675; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dQGt0n5D7SP1i4kXyMIPUS/joI3SOgsexxI/o9/iCB0=; b=QzVqYIAGi50KufyVOrlk9yTxf0A68HiArsv2rW4ovU2NXTQdSeDF3c4a r35H/Fpdmz7ofbGANr6mk9hA6vhpb3fR6AnLFVPod3X9GD36MAt61tSUW NjGTWMIfbt0sDsX1S0X3JKDVWPCoPv5eQTGQFM1xDJRhy8qyuKG06PZ/z e1j/sfstqOYeF3Y5Nf/s8nM8Q2KI2qmVT6KD+c9yrtKteM9x1G/ShdwFO S49ZxR0mLPayn8+GNLqqmg6dC6S1YidS7U86SNSieJ/8RlJu78ShopC1X 48FDx4MsSvz++DDR5fRAlM0MK1heJfCR4QfD9jKAIufMH2ZNDYOqwDAYN w==; X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="382357595" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="382357595" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="817564325" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="817564325" Received: from skwasnia-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.251.222.71]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:23 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 5CDA710A152; Thu, 5 Oct 2023 16:14:14 +0300 (+03) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 08/13] KVM: x86: Add config option to gate emergency virt callback support Date: Thu, 5 Oct 2023 16:13:57 +0300 Message-ID: <20231005131402.14611-9-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> References: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 05 Oct 2023 07:44:12 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778927065783520859 X-GMAIL-MSGID: 1778927065783520859 KVM uses emergency virt call back to shutdown virtualization extension during crash, so the crash kernel can work correctly. So far the virt callback is only supported if KVM_INTEL or KVM_AMD is enabled. TDX guest has similar needs. Add a config option to gate virt emergency callback support. Signed-off-by: Kirill A. Shutemov --- arch/x86/include/asm/reboot.h | 4 ++-- arch/x86/kernel/reboot.c | 4 ++-- arch/x86/kvm/Kconfig | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h index 6536873f8fc0..f72bdd4abbe8 100644 --- a/arch/x86/include/asm/reboot.h +++ b/arch/x86/include/asm/reboot.h @@ -25,14 +25,14 @@ void __noreturn machine_real_restart(unsigned int type); #define MRR_BIOS 0 #define MRR_APM 1 -#if IS_ENABLED(CONFIG_KVM_INTEL) || IS_ENABLED(CONFIG_KVM_AMD) +#ifdef CONFIG_EMERGENCY_VIRT_CALLBACK typedef void (cpu_emergency_virt_cb)(void); void cpu_emergency_register_virt_callback(cpu_emergency_virt_cb *callback); void cpu_emergency_unregister_virt_callback(cpu_emergency_virt_cb *callback); void cpu_emergency_disable_virtualization(void); #else static inline void cpu_emergency_disable_virtualization(void) {} -#endif /* CONFIG_KVM_INTEL || CONFIG_KVM_AMD */ +#endif /* CONFIG_EMERGENCY_VIRT_CALLBACK */ typedef void (*nmi_shootdown_cb)(int, struct pt_regs*); void nmi_shootdown_cpus(nmi_shootdown_cb callback); diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 830425e6d38e..6a781f2f11c8 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -529,7 +529,7 @@ static inline void kb_wait(void) static inline void nmi_shootdown_cpus_on_restart(void); -#if IS_ENABLED(CONFIG_KVM_INTEL) || IS_ENABLED(CONFIG_KVM_AMD) +#ifdef CONFIG_EMERGENCY_VIRT_CALLBACK /* RCU-protected callback to disable virtualization prior to reboot. */ static cpu_emergency_virt_cb __rcu *cpu_emergency_virt_callback; @@ -599,7 +599,7 @@ static void emergency_reboot_disable_virtualization(void) } #else static void emergency_reboot_disable_virtualization(void) { } -#endif /* CONFIG_KVM_INTEL || CONFIG_KVM_AMD */ +#endif /* CONFIG_EMERGENCY_VIRT_CALLBACK */ void __attribute__((weak)) mach_reboot_fixups(void) { diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index ed90f148140d..7df3f0c45cfe 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig @@ -80,6 +80,7 @@ config KVM_WERROR config KVM_INTEL tristate "KVM for Intel (and compatible) processors support" depends on KVM && IA32_FEAT_CTL + select EMERGENCY_VIRT_CALLBACK help Provides support for KVM on processors equipped with Intel's VT extensions, a.k.a. Virtual Machine Extensions (VMX). @@ -102,6 +103,7 @@ config X86_SGX_KVM config KVM_AMD tristate "KVM for AMD processors support" depends on KVM && (CPU_SUP_AMD || CPU_SUP_HYGON) + select EMERGENCY_VIRT_CALLBACK help Provides support for KVM on AMD processors equipped with the AMD-V (SVM) extensions. @@ -155,3 +157,6 @@ config KVM_EXTERNAL_WRITE_TRACKING bool endif # VIRTUALIZATION + +config EMERGENCY_VIRT_CALLBACK + bool From patchwork Thu Oct 5 13:13:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 148767 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp347178vqb; Thu, 5 Oct 2023 07:44:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHT2EXRTQ+8CXxgSxEgxKlxbBqYOEVBylVavOiYLjFePr9b2YYWGHpB/8Uf4FsW4xFVrf7S X-Received: by 2002:a17:903:234f:b0:1c3:a4f2:7c84 with SMTP id c15-20020a170903234f00b001c3a4f27c84mr5894136plh.60.1696517051495; Thu, 05 Oct 2023 07:44:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696517051; cv=none; d=google.com; s=arc-20160816; b=cdne+qEn6+nnjeiE2QMmzUf4ON+oRUj+X5xxUcvZG8srmILf1i9ZiNCDvTPurjmusT n8mxWVBahr4xWfiGfmeg688GaA50ZsgSnl7ksiEEoXX2n9ZdWtgppIayA/CUFcOJee5L lA3T6BhOfVThTo50KYJDWjaiHWr8IhxktNBIKWdC94jHyiRE2hWnY8TtbeFNDRB6/WgJ tPYuFmV0P8X9NiO4+cVpVVg0kclTKNmRkVeM4tcD0+xe55K5xdLCaOuV/c8pqhA7R108 NF5iStUxW7Gk4r6pHZRgLkhOeKktg99c9sFasy86QlcIwJMjffDDhG7eg5kuMnv7zq+P wKWA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jHiamILBM6KlSfdzrVgbjC9434iu2/bUgSuoF9ZTY+g=; fh=F1gpqSS/HYttK+doOKuW4yrAifo5qykyq1MCI9SIQmQ=; b=Fcaj9nPjiM0K8haIHAmdWeJmkIWz3HumGIVolBLmvcWKFp++3aUcpsWpgrvf0SASD8 SrVkW+ORG2Jl32IsDlb/PbCRkaxau3XCSQjO+gSDMtpcft9P45gstPrk3S14Ae40+sd/ gQqYqINES6yceF4SyeH4NixFyRas8WgSoqJLXU8jeH0sdA57nqAIsd9/uR3Anw3VGKOs V2O5HX1Z3xQHeupZy79OAaY/XNn6YRCLWz2VX2Nfd7jZfpjArv2RXUMV6ruLf+VMabxa XHnvjnypdca43joJUCPYhSTOxyU2OM0CpgQTA/O+261+0qg0tQrbKtaSg83y8X1eWDvt ASDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=L1wO4vVp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id l5-20020a170903120500b001bdca6456c3si1752585plh.46.2023.10.05.07.44.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 07:44:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=L1wO4vVp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 2CDCD867F1C3; Thu, 5 Oct 2023 07:44:10 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238660AbjJEOnq (ORCPT + 19 others); Thu, 5 Oct 2023 10:43:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237219AbjJEOiu (ORCPT ); Thu, 5 Oct 2023 10:38:50 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F16FD7295 for ; Thu, 5 Oct 2023 07:04:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696514675; x=1728050675; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ja5J3yNUmltgYZsQ6ex9qPK0e1eU53KBqHupwbwonDY=; b=L1wO4vVprZSzdywwOp/YBzgs9eTrK8qx6VKQ8AOYWR6Bh56GFtN3Negw dboSAyDrWFejxKCWIPpKT+feM63Dyvz/RzUSE9XK/i8Fyu1rIs586R6NF c5B9nAzADeYoeTR+lG+q3tIPfh0NlVn/+VLvVJebDCdoEl0Njhbcqf3AX Cu9YpN+wfJ8DqpQ5SV9Ck35DqnqmFweFqQUmue+2CrTJ1IwoatTQqzfkL GEy8EG20evEiaCm1B8DkueFt+p3J9NBApsgIaSzYWkhZoKfqLKxzuzose LGUaxYPUewqF9hakOeEt5coJzhaKv8y8kIVsXbmky6N/LZvGVe/MMCcVs A==; X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="382357574" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="382357574" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="817564322" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="817564322" Received: from skwasnia-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.251.222.71]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:23 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 6748410A153; Thu, 5 Oct 2023 16:14:14 +0300 (+03) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 09/13] x86/tdx: Account shared memory Date: Thu, 5 Oct 2023 16:13:58 +0300 Message-ID: <20231005131402.14611-10-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> References: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 05 Oct 2023 07:44:10 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778927064119935909 X-GMAIL-MSGID: 1778927064119935909 The kernel will convert all shared memory back to private during kexec. The direct mapping page tables will provide information on which memory is shared. It is extremely important to convert all shared memory. If a page is missed, it will cause the target kernel to crash when it accesses it. Keep track of the number of shared pages. This will allow for cross-checking against the shared information in the direct mapping and reporting if the shared bit is lost. Include a debugfs interface that allows for the check to be performed at any point. Signed-off-by: Kirill A. Shutemov --- arch/x86/coco/tdx/tdx.c | 67 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c index 46022283d955..56e152126f20 100644 --- a/arch/x86/coco/tdx/tdx.c +++ b/arch/x86/coco/tdx/tdx.c @@ -5,6 +5,7 @@ #define pr_fmt(fmt) "tdx: " fmt #include +#include #include #include #include @@ -37,6 +38,13 @@ #define TDREPORT_SUBTYPE_0 0 +static atomic_long_t nr_shared; + +static inline bool pte_decrypted(pte_t pte) +{ + return cc_mkdec(pte_val(pte)) == pte_val(pte); +} + /* Called from __tdx_hypercall() for unrecoverable failure */ noinstr void __noreturn __tdx_hypercall_failed(void) { @@ -799,6 +807,11 @@ static int tdx_enc_status_change_finish(unsigned long vaddr, int numpages, if (!enc && !tdx_enc_status_changed(vaddr, numpages, enc)) return -EIO; + if (enc) + atomic_long_sub(numpages, &nr_shared); + else + atomic_long_add(numpages, &nr_shared); + return 0; } @@ -871,3 +884,57 @@ void __init tdx_early_init(void) pr_info("Guest detected\n"); } + +#ifdef CONFIG_DEBUG_FS +static int tdx_shared_memory_show(struct seq_file *m, void *p) +{ + unsigned long addr, end; + unsigned long found = 0; + + addr = PAGE_OFFSET; + end = PAGE_OFFSET + get_max_mapped(); + + while (addr < end) { + unsigned long size; + unsigned int level; + pte_t *pte; + + pte = lookup_address(addr, &level); + size = page_level_size(level); + + if (pte && pte_decrypted(*pte)) + found += size / PAGE_SIZE; + + addr += size; + } + + seq_printf(m, "Number of unshared pages in kernel page tables: %16lu\n", + found); + seq_printf(m, "Number of pages accounted as unshared: %16ld\n", + atomic_long_read(&nr_shared)); + return 0; +} + +static int tdx_shared_memory_open(struct inode *inode, struct file *file) +{ + return single_open(file, tdx_shared_memory_show, NULL); +} + +static const struct file_operations tdx_shared_memory_fops = { + .open = tdx_shared_memory_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + +static __init int debug_tdx_shared_memory(void) +{ + if (!cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) + return 0; + + debugfs_create_file("tdx_shared_memory", S_IRUSR, arch_debugfs_dir, + NULL, &tdx_shared_memory_fops); + return 0; +} +fs_initcall(debug_tdx_shared_memory); +#endif From patchwork Thu Oct 5 13:13:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 148846 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp401054vqb; Thu, 5 Oct 2023 09:04:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHOG7acV7gBMvSaDs+Uq+a7hqGJwCsgdI5fTc34KJlXW+z4YxrO8/RJmoJzxSuHHow2GRYj X-Received: by 2002:a17:90b:3843:b0:274:7b6a:4358 with SMTP id nl3-20020a17090b384300b002747b6a4358mr5354127pjb.6.1696521855257; Thu, 05 Oct 2023 09:04:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696521855; cv=none; d=google.com; s=arc-20160816; b=g7fdG98Ora1B1X297C2vYfmduKUk9x1wtDRlF1sGSgEra9I3ZjCis/qvC7QmXv6+J4 bDKjncSf0QHcv/lTDtFp2z5UWFdUzF2CqGdLXg0eszo6FJ4i3Q0Xzxfzbu6WJC9yFGUm oXwVp5r/I3D/ApLGe7y3tG75qaSzrxvaLUQX+gytPz14bAbW6AUYfWrix4GqPC35bIN7 1fMygvtqij53sjDO6XSAEtBlcuI5KMNWuHRiOCiyFrgBrsb21L42tv6iapoubMS6SWox 4kF6ES1Cfg1MkQg9dw2TiI+W4eim/VTfl9MarwyOiF2iKIIh29HXRq+d+67Z/1fSxnFK VLQA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CGmfcDjf2h4wlLjEJ8BEcInbus4xMMzF/kCtIqpochY=; fh=F1gpqSS/HYttK+doOKuW4yrAifo5qykyq1MCI9SIQmQ=; b=dew2hYz68xYpZ3HETmaOo1FP56ZPPdorvG1piZ/r4Ifafj5qv6oGAJqQKZjRgWTZTX BbyKj52BjvvjMgB6CVkL1Z7Rm+hoyfpBAG3yvAMFoFln387S997eRuXv5xKinoKtmwJ4 MHZJrJcLHjsxIwVHOPtz1Ke5hcm0c9JuRXZv4wAybepyF2n9lIOrWiLzGSrMD4eW/ko6 FtdPCDPZsKvHqkN8JyRrSuggmRYNET/SiLu4x/RIRXUKoVG01+EU4SkANNaciQ0xTmb5 nh0msWyPGVE2VE5CqNBerpYU5RJ7xcHsJxCFAUm5dFhGSuX+L5Z1IECCSeMEHNvFLzpj jABw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=aJCxXiWV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id lr17-20020a17090b4b9100b0026ce877b4cbsi4054016pjb.151.2023.10.05.09.04.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 09:04:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=aJCxXiWV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 538F883B827D; Thu, 5 Oct 2023 09:03:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238648AbjJEP7K (ORCPT + 19 others); Thu, 5 Oct 2023 11:59:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234733AbjJEP4v (ORCPT ); Thu, 5 Oct 2023 11:56:51 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 890CB6632 for ; Thu, 5 Oct 2023 07:04:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696514688; x=1728050688; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2nx+VfYqCoJBnge8h8wvBHlxzs9Z5VteiY85TeYVjzU=; b=aJCxXiWVzP04Sn6jemuvaucC3JJc36rwyzWb/uQJoI+LEO0CTFU0mvAj ZMzJtCHJz5LuAAJpmT9IOQEWtfAlaltYZ4QgwYMTVl9FjTNjr3RahKSEf WtpY7u4HHy+6uFRk/4rYc0bHGs9n3o7sm2Ga83YNaO+fpsTKa2wxLUcAU 5/tc5ZdxO0LKpPLv25y/Y5IQ4Y6Ci5Crkdk5rSKLi+DFLmZQvl/xIlAy2 XH+WpkavX8c7jiZvN05Xg6gb0QSzldqYs1Ni5lWIe4LrIjAGmHjr5OwuW NJ9ckevmHwLDyDQs9lUPSzaER9y7lOUzSZ3N429MnAJ6BRLNkVEUENA/H Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="380767213" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="380767213" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="728449276" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="728449276" Received: from skwasnia-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.251.222.71]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:23 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 7291D10A154; Thu, 5 Oct 2023 16:14:14 +0300 (+03) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 10/13] x86/tdx: Convert shared memory back to private on kexec Date: Thu, 5 Oct 2023 16:13:59 +0300 Message-ID: <20231005131402.14611-11-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> References: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 05 Oct 2023 09:03:50 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778932101014786726 X-GMAIL-MSGID: 1778932101014786726 TDX guests allocate shared buffers to perform I/O. It is done by allocating pages normally from the buddy allocator and converting them to shared with set_memory_decrypted(). The target kernel has no idea what memory is converted this way. It only sees E820_TYPE_RAM. Accessing shared memory via private mapping is fatal. It leads to unrecoverable TD exit. On TD shutdown (also covers kexec), walk direct mapping and convert all shared memory back to private. It makes all RAM private again and target kernel may use it normally. Signed-off-by: Kirill A. Shutemov --- arch/x86/Kconfig | 1 + arch/x86/coco/tdx/kexec.c | 0 arch/x86/coco/tdx/tdx.c | 137 +++++++++++++++++++++++++++++++++++++- 3 files changed, 136 insertions(+), 2 deletions(-) create mode 100644 arch/x86/coco/tdx/kexec.c diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 7368d254d01f..b5acf9fb4c70 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -884,6 +884,7 @@ config INTEL_TDX_GUEST select X86_MEM_ENCRYPT select X86_MCE select UNACCEPTED_MEMORY + select EMERGENCY_VIRT_CALLBACK help Support running as a guest under Intel TDX. Without this support, the guest kernel can not boot or run under TDX. diff --git a/arch/x86/coco/tdx/kexec.c b/arch/x86/coco/tdx/kexec.c new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c index 56e152126f20..ac0745303983 100644 --- a/arch/x86/coco/tdx/tdx.c +++ b/arch/x86/coco/tdx/tdx.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -14,6 +15,8 @@ #include #include #include +#include +#include /* MMIO direction */ #define EPT_READ 0 @@ -40,6 +43,9 @@ static atomic_long_t nr_shared; +static atomic_t conversions_in_progress; +static bool conversion_allowed = true; + static inline bool pte_decrypted(pte_t pte) { return cc_mkdec(pte_val(pte)) == pte_val(pte); @@ -704,6 +710,14 @@ static bool tdx_tlb_flush_required(bool private) static bool tdx_cache_flush_required(void) { + /* + * Avoid issuing CLFLUSH on set_memory_decrypted() if conversions + * stopped. Otherwise it can race with unshare_all_memory() and trigger + * implicit conversion to shared. + */ + if (!conversion_allowed) + return false; + /* * AMD SME/SEV can avoid cache flushing if HW enforces cache coherence. * TDX doesn't have such capability. @@ -787,12 +801,25 @@ static bool tdx_enc_status_changed(unsigned long vaddr, int numpages, bool enc) static int tdx_enc_status_change_prepare(unsigned long vaddr, int numpages, bool enc) { + atomic_inc(&conversions_in_progress); + + /* + * Check after bumping conversions_in_progress to serialize + * against tdx_shutdown(). + */ + if (!conversion_allowed) { + atomic_dec(&conversions_in_progress); + return -EBUSY; + } + /* * Only handle shared->private conversion here. * See the comment in tdx_early_init(). */ - if (enc && !tdx_enc_status_changed(vaddr, numpages, enc)) + if (enc && !tdx_enc_status_changed(vaddr, numpages, enc)) { + atomic_dec(&conversions_in_progress); return -EIO; + } return 0; } @@ -804,17 +831,115 @@ static int tdx_enc_status_change_finish(unsigned long vaddr, int numpages, * Only handle private->shared conversion here. * See the comment in tdx_early_init(). */ - if (!enc && !tdx_enc_status_changed(vaddr, numpages, enc)) + if (!enc && !tdx_enc_status_changed(vaddr, numpages, enc)) { + atomic_dec(&conversions_in_progress); return -EIO; + } if (enc) atomic_long_sub(numpages, &nr_shared); else atomic_long_add(numpages, &nr_shared); + atomic_dec(&conversions_in_progress); + return 0; } +static void unshare_all_memory(bool unmap) +{ + unsigned long addr, end; + long found = 0, shared; + + /* + * Walk direct mapping and convert all shared memory back to private, + */ + + addr = PAGE_OFFSET; + end = PAGE_OFFSET + get_max_mapped(); + + while (addr < end) { + unsigned long size; + unsigned int level; + pte_t *pte; + + pte = lookup_address(addr, &level); + size = page_level_size(level); + + if (pte && pte_decrypted(*pte)) { + int pages = size / PAGE_SIZE; + + /* + * Touching memory with shared bit set triggers implicit + * conversion to shared. + * + * Make sure nobody touches the shared range from + * now on. + * + * Bypass unmapping for crash scenario. Unmapping + * requires sleepable context, but in crash case kernel + * hits the code path with interrupts disabled. + * It shouldn't be a problem as all secondary CPUs are + * down and kernel runs with interrupts disabled, so + * there is no room for race. + */ + if (unmap) + set_memory_np(addr, pages); + + if (!tdx_enc_status_changed(addr, pages, true)) { + pr_err("Failed to unshare range %#lx-%#lx\n", + addr, addr + size); + } + + found += pages; + } + + addr += size; + } + + shared = atomic_long_read(&nr_shared); + if (shared != found) { + pr_err("shared page accounting is off\n"); + pr_err("nr_shared = %ld, nr_found = %ld\n", shared, found); + } +} + +static void tdx_shutdown(void) +{ + unsigned long timeout; + + /* + * Stop new private<->shared conversions and wait for in-flight + * conversions to complete. + * + * Do not wait more than 30 seconds. + */ + timeout = 30 * USEC_PER_SEC; + conversion_allowed = false; + while (atomic_read(&conversions_in_progress) && timeout--) + udelay(1); + + if (!timeout) + pr_warn("Failed to finish shared<->private conversions\n"); + + unshare_all_memory(true); + + native_machine_shutdown(); +} + +static void tdx_crash_shutdown(void) +{ + /* + * Crash can race with private<->shared conversion. + * + * There's no clean way out: report and proceed. + */ + if (atomic_read(&conversions_in_progress)) + pr_warn("Failed to finish shared<->private conversions\n"); + + unshare_all_memory(false); +} + void __init tdx_early_init(void) { struct tdx_module_args args = { @@ -882,6 +1007,14 @@ void __init tdx_early_init(void) */ x86_cpuinit.parallel_bringup = false; + machine_ops.shutdown = tdx_shutdown; + + /* + * KVM overrides machine_ops.crash_shutdown, use emergency + * virt callback instead. + */ + cpu_emergency_register_virt_callback(tdx_crash_shutdown); + pr_info("Guest detected\n"); } From patchwork Thu Oct 5 13:14:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 148772 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp349211vqb; Thu, 5 Oct 2023 07:47:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHZi5B5PDs7Gz9rYskfocMJnhmx/tz3SvNF8JsL6RoLvgxzwFvnczojBoCme6sCSBMk4s9j X-Received: by 2002:a05:6a20:12c9:b0:142:aced:c643 with SMTP id v9-20020a056a2012c900b00142acedc643mr6136120pzg.31.1696517252652; Thu, 05 Oct 2023 07:47:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696517252; cv=none; d=google.com; s=arc-20160816; b=0myVhvFG5lQnwjh3a8GwMm+IKQjE1eOc/BybgsDEtriovtVsV5phtWOZFn7SuSH4TC CSx7pNg3mV8OPcn9W/YcnPCjrJNQM6w/iQLL3bD69L/0X5GMWNA6KbSfyxhWrDk40Fr7 GhHsLB9e9BSA6Q8FXtxvOGQV7+6CPXi1nUNg6h8RDEVZVc2f7j3vLPi/zD8/l5MbF6iE WnkDh3AODGbm2QXa74qtbS4xyI2BGHWPS/RemZu6ZyPrdnUc7lYFRpKTUOtmXRTRKg6u FRgAZQGdu7a7CoYjDpXAkkYmBWDvC38crDZsBi7R72vIEKQsIkdRRnO4DEfsdD8PK6MF 4PEg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OGa5Sb5Yd3bKocaXY/zr64R6NWyKjWK7l9b5pyL/EV0=; fh=F1gpqSS/HYttK+doOKuW4yrAifo5qykyq1MCI9SIQmQ=; b=d2wJy/sP6/xJKXfkcOPyoQQsqZro08UrCo8Ym7GtH2GPNmeoToXxlNu/4hxHoPSbNM ba+bH+if65kph/ePFkeiL+LQF8VI0qZxRNMdy8qT/+YAv9PEfucRwydhusB5PlqUyi1X c2Wdvxa4gZzz89Os9F5FqLz9Pc7DmehDuYfcX+ES1zkFcxg6C+KUJX/bQ6tqYjAXD279 KxIz8C9cX5apZyvEOGBH2DxNaA5t5Kdu6ZP3gTGNoB6XUDWsyVui0YKU80rdLqi1WYKn 21+m+m+tO5WlF6kqoLiM8KG7jKfLKiCsfZVPB1uvdcROqL3pc7DG043L+ElXiSL6smkx YEUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Sl4v6HhS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id be13-20020a056a001f0d00b006930471d220si1463111pfb.397.2023.10.05.07.47.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 07:47:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Sl4v6HhS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 9A9C08023F0F; Thu, 5 Oct 2023 07:45:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238954AbjJEOn7 (ORCPT + 19 others); Thu, 5 Oct 2023 10:43:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237271AbjJEOiw (ORCPT ); Thu, 5 Oct 2023 10:38:52 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C56ED6615 for ; Thu, 5 Oct 2023 07:04:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696514680; x=1728050680; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YaJcwdfsbT/u6tJs5uRbj4NUFmy4HkVgm/EwY5jjC6U=; b=Sl4v6HhSg/Jw4mIs0rL82RT8qaeN/pOSa/we4w+XEU5AaI7ouAMRsej6 aBUP/l/ZJgHrtca0A6yFS37LkrH2GvloDlEQCF0mugqrhY14dUm2mlghB jHY2ZaTxOLjRAq8MWJD8Ocjxp3dfdOXoQIkQZbYf7u98ehEa+KbjSQsgd 2l6vdeQUATLE82oGeWqI64KD6pc+w9Y2ki0ZnqQCqW6nXTI4ARiEcAnue MuJBeawBjl6NKpfiKJi9FVe8rOFNyqsYEsj7UIirYp4Xp2pTGWozvZJD+ jYq2qSU8Vj7xNfPmG6vHMMqng1VFjxVQ4p/CJ/56JpngcDovh5WkrF3Bn Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="382357583" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="382357583" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="817564326" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="817564326" Received: from skwasnia-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.251.222.71]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:23 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 7D68910A155; Thu, 5 Oct 2023 16:14:14 +0300 (+03) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 11/13] x86/mm: Make e820_end_ram_pfn() cover E820_TYPE_ACPI ranges Date: Thu, 5 Oct 2023 16:14:00 +0300 Message-ID: <20231005131402.14611-12-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> References: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 05 Oct 2023 07:45:28 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778927275146669246 X-GMAIL-MSGID: 1778927275146669246 e820__end_of_ram_pfn() is used to calculate max_pfn which, among other things, guides where direct mapping ends. Any memory above max_pfn is not going to be present in the direct mapping. e820__end_of_ram_pfn() finds the end of the ram based on the highest E820_TYPE_RAM range. But it doesn't includes E820_TYPE_ACPI ranges into calculation. Despite the name, E820_TYPE_ACPI covers not only ACPI data, but also EFI tables and might be required by kernel to function properly. Usually the problem is hidden because there is some E820_TYPE_RAM memory above E820_TYPE_ACPI. But crashkernel only presents pre-allocated crash memory as E820_TYPE_RAM on boot. If the preallocated range is small, it can fit under the last E820_TYPE_ACPI range. Modify e820__end_of_ram_pfn() and e820__end_of_low_ram_pfn() to cover E820_TYPE_ACPI memory. The problem was discovered during debugging kexec for TDX guest. TDX guest uses E820_TYPE_ACPI to store the unaccepted memory bitmap and pass it between the kernels on kexec. Signed-off-by: Kirill A. Shutemov --- arch/x86/kernel/e820.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index fb8cf953380d..99c80680dc9e 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -827,7 +827,7 @@ u64 __init e820__memblock_alloc_reserved(u64 size, u64 align) /* * Find the highest page frame number we have available */ -static unsigned long __init e820_end_pfn(unsigned long limit_pfn, enum e820_type type) +static unsigned long __init e820_end_ram_pfn(unsigned long limit_pfn) { int i; unsigned long last_pfn = 0; @@ -838,7 +838,8 @@ static unsigned long __init e820_end_pfn(unsigned long limit_pfn, enum e820_type unsigned long start_pfn; unsigned long end_pfn; - if (entry->type != type) + if (entry->type != E820_TYPE_RAM && + entry->type != E820_TYPE_ACPI) continue; start_pfn = entry->addr >> PAGE_SHIFT; @@ -864,12 +865,12 @@ static unsigned long __init e820_end_pfn(unsigned long limit_pfn, enum e820_type unsigned long __init e820__end_of_ram_pfn(void) { - return e820_end_pfn(MAX_ARCH_PFN, E820_TYPE_RAM); + return e820_end_ram_pfn(MAX_ARCH_PFN); } unsigned long __init e820__end_of_low_ram_pfn(void) { - return e820_end_pfn(1UL << (32 - PAGE_SHIFT), E820_TYPE_RAM); + return e820_end_ram_pfn(1UL << (32 - PAGE_SHIFT)); } static void __init early_panic(char *msg) From patchwork Thu Oct 5 13:14:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 148770 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp348825vqb; Thu, 5 Oct 2023 07:46:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEmMcxDo+dseGW5y2i+QeWewbuZOzXeFs+m0lMSBplG9ny40CPDq3WGDaFGafkwaMXARRH5 X-Received: by 2002:a17:90b:374b:b0:26b:4a9e:3c7e with SMTP id ne11-20020a17090b374b00b0026b4a9e3c7emr5295139pjb.4.1696517216303; Thu, 05 Oct 2023 07:46:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696517216; cv=none; d=google.com; s=arc-20160816; b=OSaU9fft/DcHCZ/BcOo5FxwiRZn1jGnTzquL94dDsqWeRr/sFjfViMlwcgpfEKtEr9 rn/Otm+8ilNqt9qZTIvR21NSfHMVQoRmL9FSa9Bm0olm2JI79kMW9s7Yjv3aoeIzWxOm N4ZSXA1KNYsGBxUrTtDBD47roINNCWOFxo71ebbZTunCw45LXZAeCF41zBcJWDEXMVoB BSzdsOIDe7c58mERSMWh/T0P7X5SYDXdGUcoR4LzPldeW+gqzYO538sgKY7Dr/acdwnt /bYhn4cCpXvZ69+m0k04rZ7X5VVwyI5iWOeQpKcXQx2ERShRvOLPi26aWpUgcWZzc1g3 d9nA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JBfrCIdkqWX2LqffgrsjGbs9OlMRYEtcZoyqsZWyU6A=; fh=F1gpqSS/HYttK+doOKuW4yrAifo5qykyq1MCI9SIQmQ=; b=dySNvUsVwQlE5wzOBZP9ioM3af7RtmAI0/Qnb15Vp6ghsB5b8VoEq7CMcngvBKWup5 ybQkSUjB1DWB0sof5n5d+yWNG+4xU3+/D9iKugbAXQg03UdjIhc6gP4NAK3grSN6Blux Y+TFqyS33ux2/ay4m6rM0w5MtB1k32aZuUrw6JBaDoxZnPFwwmoEwYjJDaeCQDghOUJe ZS4JiscFRTeG4w4SmA4T63jp57idlMcm0rQJVxROsgFCKq1LvRubsijOmpWBydLl3DVT MSyThVJ8kjJRpg5sDY0iBy4hsKIBuVtpEWhoS6vDTdQe3Ccyc54HGVnYHUSkPMb5ZEFL JWyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OUxVtQKW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id o2-20020a17090a5b0200b0027909685905si1677025pji.149.2023.10.05.07.46.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 07:46:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OUxVtQKW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 511B182848E5; Thu, 5 Oct 2023 07:46:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231717AbjJEOoJ (ORCPT + 19 others); Thu, 5 Oct 2023 10:44:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237278AbjJEOiw (ORCPT ); Thu, 5 Oct 2023 10:38:52 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E9656621 for ; Thu, 5 Oct 2023 07:04:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696514684; x=1728050684; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nsB0LfqQYj2RZjcPwh1MZGMdJcZ9TNW2jF9KJqnidVg=; b=OUxVtQKWMIP+g0iMP+8oPId3F+iUQC87X6IfZeAjARd8yoUQBpNgyzlK 4AsTFlBdaGkqIGdttsMV6cEhLEPgeazCryncFxooaFRYqIjLQJNVaVjdX UXVdUK2xzCb/5lj0hSuP7OMlFzuwEL61yPrn5IiBgjbAvWqNADx3Yfus0 W0B4RIGLuuYWrRrNomoARfx/Ys6z1YUNSF9PlFtbHZ2v4vaNRrn2to6x4 gUFP5uTCmUO5vuTICuXuQsxwVDIS38ml2z/js9/t4R3iEwecJHN5E7rDr W4UW3o+noL2ZIdg3buBqrSumOAc50tjO9hRCSvfMyMyHmsqeAVabU76GB w==; X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="380767194" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="380767194" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="728449270" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="728449270" Received: from skwasnia-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.251.222.71]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:23 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 8835310A157; Thu, 5 Oct 2023 16:14:14 +0300 (+03) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 12/13] x86/acpi: Do not attempt to bring up secondary CPUs in kexec case Date: Thu, 5 Oct 2023 16:14:01 +0300 Message-ID: <20231005131402.14611-13-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> References: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 05 Oct 2023 07:46:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778927236771821880 X-GMAIL-MSGID: 1778927236771821880 ACPI MADT doesn't allow to offline CPU after it got woke up. It limits kexec: target kernel won't be able to use more than one CPU. Zero out mailbox address in the ACPI MADT wakeup structure to indicate that the mailbox is not usable. This is Linux-specific protocol and not reflected in ACPI spec. Booting the target kernel with signle CPU is enough to cover the most common case for kexec -- kdump. Signed-off-by: Kirill A. Shutemov --- arch/x86/kernel/acpi/madt_wakeup.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/x86/kernel/acpi/madt_wakeup.c b/arch/x86/kernel/acpi/madt_wakeup.c index 15bdf10b1393..4e92d1d4a5fa 100644 --- a/arch/x86/kernel/acpi/madt_wakeup.c +++ b/arch/x86/kernel/acpi/madt_wakeup.c @@ -9,6 +9,11 @@ static struct acpi_madt_multiproc_wakeup_mailbox *acpi_mp_wake_mailbox; static int acpi_wakeup_cpu(int apicid, unsigned long start_ip) { + if (!acpi_mp_wake_mailbox_paddr) { + pr_warn_once("No MADT mailbox: cannot bringup secondary CPUs. Booting with kexec?\n"); + return -EOPNOTSUPP; + } + /* * Remap mailbox memory only for the first call to acpi_wakeup_cpu(). * @@ -78,6 +83,18 @@ int __init acpi_parse_mp_wake(union acpi_subtable_headers *header, /* Disable CPU onlining/offlining */ cpu_hotplug_not_supported(); + /* + * ACPI MADT doesn't allow to offline CPU after it got woke up. + * It limits kexec: target kernel won't be able to use more than + * one CPU. + * + * Zero out mailbox address in the ACPI MADT wakeup structure to + * indicate that the mailbox is not usable. + * + * This is Linux-specific protocol and not reflected in ACPI spec. + */ + mp_wake->base_address = 0; + apic_update_callback(wakeup_secondary_cpu_64, acpi_wakeup_cpu); return 0; From patchwork Thu Oct 5 13:14:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 148839 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp397460vqb; Thu, 5 Oct 2023 09:00:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHUZxqtV0nyhcfthNcz0UYvxZZ8ZXMwG4S031JcDNQ5gZAw8bh91rM6u+DTfg7aiyGbaimo X-Received: by 2002:a05:6a21:328e:b0:15a:f4e:620e with SMTP id yt14-20020a056a21328e00b0015a0f4e620emr6445919pzb.59.1696521634718; Thu, 05 Oct 2023 09:00:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696521634; cv=none; d=google.com; s=arc-20160816; b=gu2q1sqSQeFiNxWXpoDugnakIFGiCwNWFlDm2oq2Z4W8+DJutCNfTYtR5efJdC1ZKo qWJbfOQUQegn3FchTKZ02SfgaQXN6M+/iH39X3P5iv2Dh9/77H0s7+h9xxNxTgz8uuim R6TYRuZbn9enkxIOLGD4AEIWQJRKXq5a4VQ6hsVLI4903E+qfnA2KCK8DQ/JZreZ0J8A 3ltJu23rnLqCGNgalBM5ed7KM4qawPhuCeZZJB+z0/S/brZm7Ss840d/FZx8VkB+luF7 e3IxnYBJNsPOsgymN9hu6YhSJNHCARZYawjNsnTkyHbmSsZB0X0BjPUrGJR8jN/CshfQ ZPxw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EeFT4/YQr33N66HhVO5Jpkr4y+/9Lh9lG7Gxp1zrhHI=; fh=F1gpqSS/HYttK+doOKuW4yrAifo5qykyq1MCI9SIQmQ=; b=l1Gru5fNxFVn3btoHqXexfs0IadussrfIKRoAuoiQbSeEknqvdLPBUhsHYhkiDvcXz RJMX+gO1P1j7CEIESCyEbr8vxkZ7Q/b09p+KdhR5TP8/YZzswRIWr756iPnCdQONvSkm /YX+IOJDuDJnKfhaK3pqmjNoO/wcbbH/MdcKdGNRRvEkDUUjjQbgJQA4BruiYbgJDr8Y 5E5O36CfPlgD6L8Npoh7pkK5qQxYboE3lU7NHG+ag0UmCtzJn0xHyDeskISDMAig/r5R B9rAscswTMsWOEW4OSBkbHcZfxVDrpZLFju14V9iqCf+rZfoEjK8Y/ScBwv2T2loe0fR f3oA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KffrlJSl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id n8-20020a170902d2c800b001b556b0d0b7si1768350plc.480.2023.10.05.09.00.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 09:00:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KffrlJSl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id EDED9803B2EE; Thu, 5 Oct 2023 09:00:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237938AbjJEP6n (ORCPT + 19 others); Thu, 5 Oct 2023 11:58:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232749AbjJEP4t (ORCPT ); Thu, 5 Oct 2023 11:56:49 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A319661C for ; Thu, 5 Oct 2023 07:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696514682; x=1728050682; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SohX38xQQECaiX8+/3oZg8Bf6GuEZrlKsCqNmGiGDxU=; b=KffrlJSl3epZ1MM2601LZ7dYxmf9TGEu7tNrePa4jaUh0d1Z0g0ajTXw piyS11ILdPO1wmkNlQx+D69MPbDHLPUCj2yzz+5S2fUEJA7guKvhP/DHj 3RxrCbSI7ud+Xs6+AWAUMlquNQIyJzQYvwGAb4OXvSWudh15YVBOiFrkM gKdXFB5zhliILJXxuPN6sBfa6mt9FlcCdXqLLGBe58slEiCJs83VvsQU2 CLFhjdYw3NSkaFpy13wMr/ZkPTFJDQbmpT9GI8XEK7EeVV6fbRSZaHPM8 9xvHQcWJnGzRTH7J1RP0jgNG7s8LW1d1oQe0Pl1/xHb7dLJA4k3o/rYsS A==; X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="382357606" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="382357606" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="817564328" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="817564328" Received: from skwasnia-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.251.222.71]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2023 06:14:23 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 931C210A159; Thu, 5 Oct 2023 16:14:14 +0300 (+03) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 13/13] x86/acpi: Add support for CPU offlining for ACPI MADT wakeup method Date: Thu, 5 Oct 2023 16:14:02 +0300 Message-ID: <20231005131402.14611-14-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> References: <20231005131402.14611-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 05 Oct 2023 09:00:21 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778931869528429070 X-GMAIL-MSGID: 1778931869528429070 MADT mailbox version 1 brings support of CPU offlining: BIOS provides a reset vector where the CPU has to jump to offline itself. The new TEST mailbox command can be used to test the CPU offlined successfully and BIOS has control over it. Add CPU offling support for ACPI MADT wakeup method by implementing custom cpu_die, play_dead and stop_other_cpus SMP operations. CPU offlining makes possible to hand over secondary CPUs over kexec, not limiting the target kernel with single CPU. The change conforms to the approved ACPI spec change proposal. See the Link. Signed-off-by: Kirill A. Shutemov Link: https://lore.kernel.org/all/13356251.uLZWGnKmhe@kreacher --- arch/x86/kernel/acpi/Makefile | 2 +- arch/x86/kernel/acpi/boot.c | 2 + arch/x86/kernel/acpi/madt.S | 28 +++++ arch/x86/kernel/acpi/madt_wakeup.c | 191 ++++++++++++++++++++++++++--- include/acpi/actbl2.h | 19 ++- 5 files changed, 223 insertions(+), 19 deletions(-) create mode 100644 arch/x86/kernel/acpi/madt.S diff --git a/arch/x86/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile index 8c7329c88a75..ccb8198dd8d1 100644 --- a/arch/x86/kernel/acpi/Makefile +++ b/arch/x86/kernel/acpi/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_ACPI) += boot.o obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup_$(BITS).o obj-$(CONFIG_ACPI_APEI) += apei.o obj-$(CONFIG_ACPI_CPPC_LIB) += cppc.o -obj-$(CONFIG_X86_ACPI_MADT_WAKEUP) += madt_wakeup.o +obj-$(CONFIG_X86_ACPI_MADT_WAKEUP) += madt_wakeup.o madt.o ifneq ($(CONFIG_ACPI_PROCESSOR),) obj-y += cstate.o diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 111bd226ad99..d537dbffa697 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -33,6 +34,7 @@ #include #include #include +#include #include "sleep.h" /* To include x86_acpi_suspend_lowlevel */ static int __initdata acpi_force = 0; diff --git a/arch/x86/kernel/acpi/madt.S b/arch/x86/kernel/acpi/madt.S new file mode 100644 index 000000000000..5d00d315e44e --- /dev/null +++ b/arch/x86/kernel/acpi/madt.S @@ -0,0 +1,28 @@ +#include +#include +#include +#include + + .text + .align PAGE_SIZE +SYM_FUNC_START(asm_acpi_mp_play_dead) + /* Load address of reset vector into RCX to jump when kernel is ready */ + movq acpi_mp_reset_vector_paddr(%rip), %rcx + + /* zero out flags, and disable interrupts */ + pushq $0 + popfq + + /* Turn off global entries. Following CR3 write will flush them. */ + movq %cr4, %rdx + andq $~(X86_CR4_PGE), %rdx + movq %rdx, %cr4 + + /* Switch to identity mapping */ + movq acpi_mp_pgd(%rip), %rax + movq %rax, %cr3 + + /* Jump to reset vector */ + ANNOTATE_RETPOLINE_SAFE + jmp *%rcx +SYM_FUNC_END(asm_acpi_mp_play_dead) diff --git a/arch/x86/kernel/acpi/madt_wakeup.c b/arch/x86/kernel/acpi/madt_wakeup.c index 4e92d1d4a5fa..2cc8590ec7a5 100644 --- a/arch/x86/kernel/acpi/madt_wakeup.c +++ b/arch/x86/kernel/acpi/madt_wakeup.c @@ -1,12 +1,162 @@ #include #include +#include +#include +#include +#include #include +#include /* Physical address of the Multiprocessor Wakeup Structure mailbox */ static u64 acpi_mp_wake_mailbox_paddr; /* Virtual address of the Multiprocessor Wakeup Structure mailbox */ static struct acpi_madt_multiproc_wakeup_mailbox *acpi_mp_wake_mailbox; +unsigned long acpi_mp_pgd; +u64 acpi_mp_reset_vector_paddr; + +void asm_acpi_mp_play_dead(void); + +static void __init *alloc_pgt_page(void *context) +{ + return memblock_alloc(PAGE_SIZE, PAGE_SIZE); +} + +/* + * Make sure asm_acpi_mp_play_dead() is present in the identity mapping at + * the same place as in the kernel page tables. The function switches to + * the identity mapping and has be present at the same spot in before and + * after transition. + */ +static int __init init_transition_pgtable(pgd_t *pgd) +{ + pgprot_t prot = PAGE_KERNEL_EXEC_NOENC; + unsigned long vaddr, paddr; + int result = -ENOMEM; + p4d_t *p4d; + pud_t *pud; + pmd_t *pmd; + pte_t *pte; + + vaddr = (unsigned long)asm_acpi_mp_play_dead; + pgd += pgd_index(vaddr); + if (!pgd_present(*pgd)) { + p4d = (p4d_t *)alloc_pgt_page(NULL); + if (!p4d) + goto err; + set_pgd(pgd, __pgd(__pa(p4d) | _KERNPG_TABLE)); + } + p4d = p4d_offset(pgd, vaddr); + if (!p4d_present(*p4d)) { + pud = (pud_t *)alloc_pgt_page(NULL); + if (!pud) + goto err; + set_p4d(p4d, __p4d(__pa(pud) | _KERNPG_TABLE)); + } + pud = pud_offset(p4d, vaddr); + if (!pud_present(*pud)) { + pmd = (pmd_t *)alloc_pgt_page(NULL); + if (!pmd) + goto err; + set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE)); + } + pmd = pmd_offset(pud, vaddr); + if (!pmd_present(*pmd)) { + pte = (pte_t *)alloc_pgt_page(NULL); + if (!pte) + goto err; + set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE)); + } + pte = pte_offset_kernel(pmd, vaddr); + + paddr = __pa(vaddr); + set_pte(pte, pfn_pte(paddr >> PAGE_SHIFT, prot)); + + return 0; +err: + return result; +} + +static void acpi_mp_play_dead(void) +{ + idle_task_exit(); + cpuhp_ap_report_dead(); + asm_acpi_mp_play_dead(); +} + +static void acpi_mp_cpu_die(unsigned int cpu) +{ + int apicid = per_cpu(x86_cpu_to_apicid, cpu); + unsigned long timeout; + + /* + * Use TEST mailbox command to prove that BIOS got control over + * the CPU before declaring it dead. + * + * BIOS has to clear 'command' field of the mailbox. + */ + acpi_mp_wake_mailbox->apic_id = apicid; + smp_store_release(&acpi_mp_wake_mailbox->command, + ACPI_MP_WAKE_COMMAND_TEST); + + /* Don't wait longer than a second. */ + timeout = USEC_PER_SEC; + while (READ_ONCE(acpi_mp_wake_mailbox->command) && timeout--) + udelay(1); +} + +static void acpi_mp_stop_other_cpus(int wait) +{ + smp_shutdown_nonboot_cpus(smp_processor_id()); +} + +static void acpi_mp_crash_stop_other_cpus(void) +{ + smp_shutdown_nonboot_cpus(smp_processor_id()); + + /* The kernel is broken so disable interrupts */ + local_irq_disable(); +} + +static int __init acpi_mp_setup_reset(u64 reset_vector) +{ + pgd_t *pgd; + struct x86_mapping_info info = { + .alloc_pgt_page = alloc_pgt_page, + .page_flag = __PAGE_KERNEL_LARGE_EXEC, + .kernpg_flag = _KERNPG_TABLE_NOENC, + }; + + pgd = alloc_pgt_page(NULL); + + for (int i = 0; i < nr_pfn_mapped; i++) { + unsigned long mstart, mend; + mstart = pfn_mapped[i].start << PAGE_SHIFT; + mend = pfn_mapped[i].end << PAGE_SHIFT; + if (kernel_ident_mapping_init(&info, pgd, mstart, mend)) + return -ENOMEM; + } + + if (kernel_ident_mapping_init(&info, pgd, + PAGE_ALIGN_DOWN(reset_vector), + PAGE_ALIGN(reset_vector + 1))) { + return -ENOMEM; + } + + if (init_transition_pgtable(pgd)) + return -ENOMEM; + + smp_ops.play_dead = acpi_mp_play_dead; + smp_ops.cpu_die = acpi_mp_cpu_die; + smp_ops.stop_other_cpus = acpi_mp_stop_other_cpus; + smp_ops.crash_stop_other_cpus = acpi_mp_crash_stop_other_cpus; + + acpi_mp_reset_vector_paddr = reset_vector; + acpi_mp_pgd = __pa(pgd); + + return 0; +} + static int acpi_wakeup_cpu(int apicid, unsigned long start_ip) { if (!acpi_mp_wake_mailbox_paddr) { @@ -73,27 +223,38 @@ int __init acpi_parse_mp_wake(union acpi_subtable_headers *header, return -ENODEV; mp_wake = (struct acpi_madt_multiproc_wakeup *)header; - if (BAD_MADT_ENTRY(mp_wake, end)) + if (!mp_wake) + return -EINVAL; + + if (end - (unsigned long)mp_wake < ACPI_MADT_MP_WAKEUP_SIZE_V0) + return -EINVAL; + if (mp_wake->header.length < ACPI_MADT_MP_WAKEUP_SIZE_V0) return -EINVAL; acpi_table_print_madt_entry(&header->common); - acpi_mp_wake_mailbox_paddr = mp_wake->base_address; + acpi_mp_wake_mailbox_paddr = mp_wake->mailbox_address; - /* Disable CPU onlining/offlining */ - cpu_hotplug_not_supported(); + if (mp_wake->version >= ACPI_MADT_MP_WAKEUP_VERSION_V1 && + mp_wake->header.length >= ACPI_MADT_MP_WAKEUP_SIZE_V1) { + acpi_mp_setup_reset(mp_wake->reset_vector); + } else { + /* Disable CPU onlining/offlining */ + cpu_hotplug_not_supported(); - /* - * ACPI MADT doesn't allow to offline CPU after it got woke up. - * It limits kexec: target kernel won't be able to use more than - * one CPU. - * - * Zero out mailbox address in the ACPI MADT wakeup structure to - * indicate that the mailbox is not usable. - * - * This is Linux-specific protocol and not reflected in ACPI spec. - */ - mp_wake->base_address = 0; + /* + * Without reset vector support, ACPI MADT doesn't allow to + * offline CPU after it got woke up. It limits kexec: target + * kernel won't be able to use more than one CPU. + * + * Zero out mailbox address in the ACPI MADT wakeup structure + * to indicate that the mailbox is not usable. + * + * This is Linux-specific protocol and not reflected in ACPI + * spec. + */ + mp_wake->mailbox_address = 0; + } apic_update_callback(wakeup_secondary_cpu_64, acpi_wakeup_cpu); diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h index 3751ae69432f..8348bf46a648 100644 --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h @@ -1109,11 +1109,23 @@ struct acpi_madt_generic_translator { struct acpi_madt_multiproc_wakeup { struct acpi_subtable_header header; - u16 mailbox_version; + u16 version; u32 reserved; /* reserved - must be zero */ - u64 base_address; + u64 mailbox_address; + u64 reset_vector; }; +/* Values for Version field above */ + +enum acpi_madt_multiproc_wakeup_version { + ACPI_MADT_MP_WAKEUP_VERSION_NONE = 0, + ACPI_MADT_MP_WAKEUP_VERSION_V1 = 1, + ACPI_MADT_MP_WAKEUP_VERSION_RESERVED = 2, /* 2 and greater are reserved */ +}; + +#define ACPI_MADT_MP_WAKEUP_SIZE_V0 16 +#define ACPI_MADT_MP_WAKEUP_SIZE_V1 24 + #define ACPI_MULTIPROC_WAKEUP_MB_OS_SIZE 2032 #define ACPI_MULTIPROC_WAKEUP_MB_FIRMWARE_SIZE 2048 @@ -1126,7 +1138,8 @@ struct acpi_madt_multiproc_wakeup_mailbox { u8 reserved_firmware[ACPI_MULTIPROC_WAKEUP_MB_FIRMWARE_SIZE]; /* reserved for firmware use */ }; -#define ACPI_MP_WAKE_COMMAND_WAKEUP 1 +#define ACPI_MP_WAKE_COMMAND_WAKEUP 1 +#define ACPI_MP_WAKE_COMMAND_TEST 2 /* 17: CPU Core Interrupt Controller (ACPI 6.5) */