From patchwork Tue Feb 27 21:24:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 21061 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp3050510dyb; Tue, 27 Feb 2024 16:30:28 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVD609UTZytJyZrwolP12H9ayIrvxTpGFNSTns2KKmHkWY4KnMC5AojnmOnFR0YSSKpfpa/0kWVbZ30YdvllCkeYVudnA== X-Google-Smtp-Source: AGHT+IGy7cBSy5Kg6gza0e9vlNiIGxtVeWWEoDYlhADvS7ZR7BMblhhGCUnSTgAyChX+Qq5s4YFF X-Received: by 2002:a62:b505:0:b0:6e3:3bd7:6f23 with SMTP id y5-20020a62b505000000b006e33bd76f23mr11563079pfe.8.1709080227890; Tue, 27 Feb 2024 16:30:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709080227; cv=pass; d=google.com; s=arc-20160816; b=XXt0VjzPuolYQfRLb+XKPLknF0P5zbQKmrP6cGJWmuR6GzZATpAblPVn6lPaiEAq85 pMzcZg8LiUh3IedSr4fNNiR6sLRsTs+JBcgJL+M1/PQB7BYCtjQFb9K+vuoK7DSYMbgE szUNr0rMLPuGclXDUgUd6pPXa2PGwPNWQ6CqNYrOOYUyPBNMCiQ3Hm6Y2LZBk6snWu14 MM8Z8OjHJzAD/XrihFZZu6alAwX+4O2G+DOUANj0sh+9UVoU50WdGOe4Ln1RxUUJkxaC mLV0/xTIoa3zJDD6OYcOjcTgF1ZUKTTKEo7Xm6BOZemWdDQJYUjyOKeRnZK6tqP/Oh9x USLQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=ExB83T8D8kNibKjWjzwazwVRBBEoI4LZfJ65vBP78c0=; fh=OvJRnOqsMTm9XoNmEwebcqh9Ud7yh1CTeKAP84ols98=; b=lk3zamv87VSg6mOWBVi5UkP2nOFRZCCLIth9tNdySPkpFombbJV8F6oRN6dPIshl7/ 9NZBCSoQZv2OZeyQVeN4WRbdqWtMjvqI0UaBHoz9HwmGAEa2lnXxoFzJPabv/3RmmGgE 7GFHUpiTT86pIayk8hJkzEprhzxm7AeEOfXF/6izL1l+O4hIXEAcF8dDbC0K4UnZkvPc XzKCbXQftmQzw0QH10ixUDe4qed9KLzbpyxc1rocxxNsbn6ZY0oqcnK60bm4RZKN3ksY Z7llwC5E8dbOx/vHdTqclaqo674Uw8nNBc7ZXjDNtAxpejiT5cLKBrOdMzJ4S7jPYUJ9 b2Ig==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=MFHGNTsP; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-84033-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84033-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id k2-20020aa79d02000000b006e1146f8e60si6265385pfp.96.2024.02.27.16.30.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 16:30:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-84033-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=MFHGNTsP; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-84033-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84033-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id A473C290A93 for ; Tue, 27 Feb 2024 21:25:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D84C7154C02; Tue, 27 Feb 2024 21:25:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="MFHGNTsP" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8A7614F967 for ; Tue, 27 Feb 2024 21:25:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709069106; cv=none; b=s6rexnzvxYLkPSyff7VzbgDKdRUcmb4gh7d8lnTVheqtWKql333P5+LrytJ+0yfXZa9C9w4VRd8Uk5WNwLwxAQlxKmiE0XYTiDDN1jrOmqT8aADADsuBZYGPXK02iBgv4kJxDES+0AXJYKZHVppLe4bZymGAjrb2fzvKxn0gu4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709069106; c=relaxed/simple; bh=64tis8o8RXufqu0cEuVboxG22Ht7TUb72IO1KzTcEvA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=rbvEN1FrpnCrWo2ck5S0gfXsf+JOFX0e69OnbYBhuVDOCxAyUNmgpVi1bW1BrMdZGMwab1HFTeekLRQ5GOs6PQFG7WNcUHpNWdxCxl0WV9c8gElCOJ2eWVtU8VQnGMdFaK6x6idiQa1deLh7qSwrms+QNmeieeBruz07EXyCg/8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.helo=mgamail.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=MFHGNTsP; arc=none smtp.client-ip=198.175.65.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.helo=mgamail.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709069105; x=1740605105; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=64tis8o8RXufqu0cEuVboxG22Ht7TUb72IO1KzTcEvA=; b=MFHGNTsPKxpoDwSvtLYhUu4V9RRDfpYcmX/nCmdIAh0pcm/Ht4P6zyu3 pun52bkXorFEYzpPvXsNeKrKLK6+F9GriZKe3jW4cT3tm6KiR7SdHQsUg DM9hXvuoGDJSLNgfWWYk9EJYJjOAwjjSyWj2OeInZQ3nX+/rUZQ8UPdEB CzXd7rri+5DYwjEL2O5pG92/hD0pLlFGfaARvObLkGryfoxvcuMibUNc6 Gc5wxLnFSxnXl+KOZJUJZlodiAcYI3Og8oEPTjASbzghyYIJ54hB0aFVc JjKnUi6ASQOj1nA/IQhjU+nS8xLlM5AreSuyaANHy1SCPHDJ/IaNJMbXr A==; X-IronPort-AV: E=McAfee;i="6600,9927,10996"; a="3566935" X-IronPort-AV: E=Sophos;i="6.06,188,1705392000"; d="scan'208";a="3566935" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2024 13:25:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10996"; a="937032890" X-IronPort-AV: E=Sophos;i="6.06,188,1705392000"; d="scan'208";a="937032890" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 27 Feb 2024 13:24:56 -0800 Received: by black.fi.intel.com (Postfix, from userid 1000) id C58B02E6; Tue, 27 Feb 2024 23:24:55 +0200 (EET) 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 , "Kalra, Ashish" , Sean Christopherson , "Huang, Kai" , Baoquan He , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv8 00/17, CORRECTED] x86/tdx: Add kexec support Date: Tue, 27 Feb 2024 23:24:35 +0200 Message-ID: <20240227212452.3228893-1-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792082004349307102 X-GMAIL-MSGID: 1792100509487257365 The patchset adds bits and pieces to get kexec (and crashkernel) work on TDX guest. The last patch implements CPU offlining according to the approved ACPI spec change poposal[1]. It unlocks kexec with all CPUs visible in the target kernel. It requires BIOS-side enabling. If it missing we fallback to booting 2nd kernel with single CPU. Please review. I would be glad for any feedback. [1] https://lore.kernel.org/all/13356251.uLZWGnKmhe@kreacher v8: - Rework serialization of around conversion memory back to private; - Print ACPI_MADT_TYPE_MULTIPROC_WAKEUP in acpi_table_print_madt_entry(); - Drop debugfs interface to dump info on shared memory; - Adjust comments and commit messages; - Reviewed-bys by Baoquan, Dave and Thomas; v7: - Call enc_kexec_stop_conversion() and enc_kexec_unshare_mem() after shutting down IO-APIC, lapic and hpet. It meets AMD requirements. - Minor style changes; - Add Acked/Reviewed-bys; v6: - Rebased to v6.8-rc1; - Provide default noop callbacks from .enc_kexec_stop_conversion and .enc_kexec_unshare_mem; - Split off patch that introduces .enc_kexec_* callbacks; - asm_acpi_mp_play_dead(): program CR3 directly from RSI, no MOV to RAX required; - Restructure how smp_ops.stop_this_cpu() hooked up in crash_nmi_callback(); - kvmclock patch got merged via KVM tree; v5: - Rename smp_ops.crash_play_dead to smp_ops.stop_this_cpu and use it in stop_this_cpu(); - Split off enc_kexec_stop_conversion() from enc_kexec_unshare_mem(); - Introduce kernel_ident_mapping_free(); - Add explicit include for alternatives and stringify. - Add barrier() after setting conversion_allowed to false; - Mark cpu_hotplug_offline_disabled __ro_after_init; - Print error if failed to hand over CPU to BIOS; - Update comments and commit messages; v4: - Fix build for !KEXEC_CORE; - Cleaner ATLERNATIVE use; - Update commit messages and comments; - Add Reviewed-bys; v3: - Rework acpi_mp_crash_stop_other_cpus() to avoid invoking hotplug state machine; - Free page tables if reset vector setup failed; - Change asm_acpi_mp_play_dead() to pass reset vector and PGD as arguments; - Mark acpi_mp_* variables as static and __ro_after_init; - Use u32 for apicid; - Disable CPU offlining if reset vector setup failed; - Rename madt.S -> madt_playdead.S; - Mark tdx_kexec_unshare_mem() as static; - Rebase onto up-to-date tip/master; - Whitespace fixes; - Reorder patches; - Add Reviewed-bys; - Update comments and commit messages; v2: - Rework how unsharing hook ups into kexec codepath; - Rework kvmclock_disable() fix based on Sean's; - s/cpu_hotplug_not_supported()/cpu_hotplug_disable_offlining()/; - use play_dead_common() to implement acpi_mp_play_dead(); - cond_resched() in tdx_shared_memory_show(); - s/target kernel/second kernel/; - Update commit messages and comments; Kirill A. Shutemov (17): x86/acpi: Extract ACPI MADT wakeup code into a separate file x86/apic: Mark acpi_mp_wake_* variables as __ro_after_init cpu/hotplug: Add support for declaring CPU offlining not supported cpu/hotplug, x86/acpi: Disable CPU offlining for ACPI MADT wakeup x86/kexec: Keep CR4.MCE set during kexec for TDX guest x86/mm: Make x86_platform.guest.enc_status_change_*() return errno x86/mm: Return correct level from lookup_address() if pte is none x86/tdx: Account shared memory x86/mm: Adding callbacks to prepare encrypted memory for kexec x86/tdx: Convert shared memory back to private on kexec x86/mm: Make e820_end_ram_pfn() cover E820_TYPE_ACPI ranges x86/acpi: Rename fields in acpi_madt_multiproc_wakeup structure x86/acpi: Do not attempt to bring up secondary CPUs in kexec case x86/smp: Add smp_ops.stop_this_cpu() callback x86/mm: Introduce kernel_ident_mapping_free() x86/acpi: Add support for CPU offlining for ACPI MADT wakeup method ACPI: tables: Print MULTIPROC_WAKEUP when MADT is parsed arch/x86/Kconfig | 7 + arch/x86/coco/core.c | 1 - arch/x86/coco/tdx/tdx.c | 99 ++++++++- arch/x86/hyperv/ivm.c | 9 +- arch/x86/include/asm/acpi.h | 7 + arch/x86/include/asm/init.h | 3 + arch/x86/include/asm/pgtable.h | 5 + arch/x86/include/asm/pgtable_types.h | 1 + arch/x86/include/asm/set_memory.h | 3 + arch/x86/include/asm/smp.h | 1 + arch/x86/include/asm/x86_init.h | 6 +- arch/x86/kernel/acpi/Makefile | 11 +- arch/x86/kernel/acpi/boot.c | 86 +------- arch/x86/kernel/acpi/madt_playdead.S | 28 +++ arch/x86/kernel/acpi/madt_wakeup.c | 292 +++++++++++++++++++++++++++ arch/x86/kernel/crash.c | 6 + arch/x86/kernel/e820.c | 9 +- arch/x86/kernel/process.c | 7 + arch/x86/kernel/reboot.c | 18 ++ arch/x86/kernel/relocate_kernel_64.S | 5 + arch/x86/kernel/x86_init.c | 8 +- arch/x86/mm/ident_map.c | 73 +++++++ arch/x86/mm/mem_encrypt_amd.c | 8 +- arch/x86/mm/pat/set_memory.c | 60 ++++-- drivers/acpi/tables.c | 14 ++ include/acpi/actbl2.h | 19 +- include/linux/cc_platform.h | 10 - include/linux/cpu.h | 2 + kernel/cpu.c | 12 +- 29 files changed, 663 insertions(+), 147 deletions(-) create mode 100644 arch/x86/kernel/acpi/madt_playdead.S create mode 100644 arch/x86/kernel/acpi/madt_wakeup.c