Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp3005400lqp; Mon, 25 Mar 2024 16:35:29 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUxOwoAv1o1XjUFxwDauNF9Jc2jffE02oSn2mjHhkJxUATd5cylgr5jvQBFJUKiXBUSFA1tHsBiF06Qhie0ndRrOJAsAFY0y+NR9SwStA== X-Google-Smtp-Source: AGHT+IHyQIQxu+AsIHroUaNhAgsOB+GWc8BSzVagGQfNXqA6Yvfxr0vqoNW8ocJqWajljNlMO30d X-Received: by 2002:a17:90a:6fe1:b0:29b:bbde:8f19 with SMTP id e88-20020a17090a6fe100b0029bbbde8f19mr6900897pjk.33.1711409728851; Mon, 25 Mar 2024 16:35:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711409728; cv=pass; d=google.com; s=arc-20160816; b=WMA5kMcGozpnNrEc5l9qo8HLDGvETyGaZe5ZkktKCAsduYYUpAHALqrKmwsofO/lIa 7u3h5b/Uf2wUx2W1YGq3PCwwHLh+IGMV9UriFlr8yeSHyWzh/MsmMQPvAli2T1h1UEZu zSvSTS5s2kU6oIC/8IqBJKJf1IIMsC81g0c0OEgl2Cn3dPSMZAG0XAqnuLhBI3ZtLfRo wmWQ09l+sZ/Dm2oGnk/WPyNw5I3HUw3IVXBOLD7tFflC/zXioVXJGsM4L7HalmsnyNfX ygQnjrR/m1GR9g8LkdGIWMuK0kmZyMisfifrJRbqjYsXIrNw8G5ICZ7fMmK1QdHAHNh3 u7zw== 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=ypthwxETdHS6CZhw2W6dP7fXq0hmwQqRfLJMjNblIfA=; fh=OvJRnOqsMTm9XoNmEwebcqh9Ud7yh1CTeKAP84ols98=; b=ZMXGw/SctPjOSh3UM9P3QJCvozKJYWlUtfyGXCwTn3PCmWm4BAYdK1KxA+KC+DD1vl T4hhXTp7O5kVFUgHAMVX9SH7XwaNGVde+GtMhupUOeHc9EYGLcJIr3l1RFDDYHZ2cgSv zx9sIem8zlfXJRQGDod8yjofABH50UhMM7Etwjc4ulcA94SmHTwvRNvMalNoNMl1qJHe FEfTWCPp4EQ1g7k8YUZoXwc9ylalFftF2kU4Mqt0Qa74K0/AexAItROwPvx9r8Me666W t9jBzmeMcoCozqhrlVKlZoGV7E8kmX8MhL7sPpRGeCz+iq9hlc0HloHAQDgyE4VYhGZF m1wg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=W7hiHeBS; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-116853-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116853-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id x17-20020a17090a8a9100b002a038bbd178si8050584pjn.6.2024.03.25.16.35.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 16:35:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-116853-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=W7hiHeBS; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-116853-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116853-linux.lists.archive=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 sy.mirrors.kernel.org (Postfix) with ESMTPS id D04A6B34B20 for ; Mon, 25 Mar 2024 14:33:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9D8D617C64A; Mon, 25 Mar 2024 11:25:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="W7hiHeBS" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (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 E5140149C71 for ; Mon, 25 Mar 2024 10:40:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711363215; cv=none; b=e+lm0JPmzqhTCeTznDeB55z2B6ZNUJwJdABBWpnZ4HNVTc4M/uR0sJLkexV/TXyCwTMwcg1vOfeL5/7TsbFuRlxCi1raLXp+VwZYlBQQ7gze6sKhUzLKKHv4xRDloX956YU1HklHoaDI4eqWpfSieUDlBqP2gg2+sMe0tm2WcoY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711363215; c=relaxed/simple; bh=s7aZUNqRwppoTYX7ExnA6g6RaH+20n8MZhm6CbYHZRU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=lvNZnclU2sg9ldA6ZqV9yu1b3HSwBWtgeaOl+84PqWwZ3VK2swS3USb+9lLBKBZYz/gBDz/X32a6A1vwa/inOyUiNMStmqYFiZpNXFVFusTgCzCukV24c71sLhLhHMq84M5NHnasfG0CjRE7nOX2q3CkxSJ7vXU39esAAQRQRX8= 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=W7hiHeBS; arc=none smtp.client-ip=192.198.163.14 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=1711363214; x=1742899214; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=s7aZUNqRwppoTYX7ExnA6g6RaH+20n8MZhm6CbYHZRU=; b=W7hiHeBSwZUcWHYDyjVs9cAXo1QWEpeE5tvHL/Ei2tx+4lD1MfXf3UBQ ebS1sUHRdwEVyG7i/nPNCRbqO1RhLgrdhN3XSeKbyOmn7VIs+tPNJ8sNL ETnpk1+bJoajP+Ae7b+UbpvxNUsF3HjAYNwouw1SUl5suN42d0sD5RlfE 11e6MEqjOC/vhhBYN+5RYnU5v9kKIIOF+mVBRuvXEzjgECf5fbrmf7v/y M2LssxpKqdcInG+V3caLq6dIRgQmCPseV6EWFl29VBq/d+Fop/i0YwrpF ItBxM7fKt2KuLHNxlAjldA0hyYVCXPsap+3CmtsqQ+kxco1Tqs6C7brOR w==; X-IronPort-AV: E=McAfee;i="6600,9927,11023"; a="6561340" X-IronPort-AV: E=Sophos;i="6.07,152,1708416000"; d="scan'208";a="6561340" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2024 03:40:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,11023"; a="937070137" X-IronPort-AV: E=Sophos;i="6.07,152,1708416000"; d="scan'208";a="937070137" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 25 Mar 2024 03:40:05 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id C8A58228; Mon, 25 Mar 2024 12:40:04 +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: [PATCHv9 00/17] x86/tdx: Add kexec support Date: Mon, 25 Mar 2024 12:38:54 +0200 Message-ID: <20240325103911.2651793-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 Content-Transfer-Encoding: 8bit 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 v9: - Rebased; - Keep page tables that maps E820_TYPE_ACPI (Ashish); - Ack/Reviewed/Tested-bys from Sathya, Kai, Tao; - Minor printk() message adjustments; 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 | 59 ++++-- 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(+), 146 deletions(-) create mode 100644 arch/x86/kernel/acpi/madt_playdead.S create mode 100644 arch/x86/kernel/acpi/madt_wakeup.c -- 2.43.0