From patchwork Mon Feb 12 10:44:32 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: 20241 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp2382773dyd; Mon, 12 Feb 2024 04:06:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IE+xY4L3Kkk8eGTPSiflejWsY4cVRnP4SgLYwW8abk/R69m+T4yG0xkk0nZBrwdasgS+7jd X-Received: by 2002:a17:906:d11a:b0:a36:f811:1050 with SMTP id b26-20020a170906d11a00b00a36f8111050mr4126980ejz.45.1707739582817; Mon, 12 Feb 2024 04:06:22 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707739582; cv=pass; d=google.com; s=arc-20160816; b=TFgFxaCUpE8vBZQkvDWNUmpJn/tTL/1D22n0sCmp8Q7obLA5AjnNHivLtKyk8VyJFt 8fc3h/vaQnaa7DONXErRv2x0Z5puroPPMW+AOgaioNQVbu3kc7j9qKusmhMpumRWBp8/ K4S/zXystQXCQgQ4qFqpsbGygFy4NoUtAaYMZa5FocIU0YOLF2+b9GsS7CkNet6OUE52 mKXYBx3wOXupomw/YF3+AvguXr8Dp4YpfESQpBH8/n6KhHxHmCOwktkNWCc+4+RlwE2S zgnOGzPnian3POMN/qw0kectxKnufLGwjfFcKiagv3YY7Vy7HjX+/xFbkIT5qCsAQ8m9 CaIA== 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=YJTmVUo31zF0vw1TUMde7ELWEtKmJk4Cn+9c8p6pmg4=; fh=Kwu1bv8zBndVMIA61MfGrwHurMfjDWdqVlthBq+xRLo=; b=w6qztzAxxGaoQlWpsP9+eitSPYrrIy7UDuBDWLWP3hUbOnovCj/ZN03J6Tf2CWS16A oL3UO20s57cVUHVkQCeopEZLy+2Qp4xeH6AMyTrwlr0nJWGIQgNxfpp7xjR4BBTkHflG b1NaMELk0WPv7mo4JO/SKnWStkXWMH1mCLFwdyJgtLIDbz3lukaf5gKLUluftwkV7KKD 16FNXm4uPp5sTUhaprwGHTJnvNxGT9hcNW9hNI7RATFCwN38x/gsYbafhlKWi8M/rJIp 46xK8hJ4fBdzpCwTF5fvuZt8N8hWDx5i7CcbF8voDwxqNaO5g522azg/LPOvbQkBP84U Gqmw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OqtJBxHw; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-61352-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-61352-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Forwarded-Encrypted: i=2; AJvYcCUqcx9cljy89HWgVY88x5IF2+KvF6ByRPu61O3569GksWGNUTAt41R3RYLyRZ6hzKR3loUHQG6bRnq8DjjWc4Ga++mtgA== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id hq32-20020a1709073f2000b00a3bacd5a868si140235ejc.598.2024.02.12.04.06.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 04:06:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-61352-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OqtJBxHw; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-61352-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-61352-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 am.mirrors.kernel.org (Postfix) with ESMTPS id A45841F229AB for ; Mon, 12 Feb 2024 10:47:42 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B2AB83B28F; Mon, 12 Feb 2024 10:45:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="OqtJBxHw" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (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 F0F8C38F91 for ; Mon, 12 Feb 2024 10:45:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707734704; cv=none; b=ZLX8sEa5X1AT0dFSkyzJ5V2kF4XtW4sIQFLqYnqQCI1R9M5jQG/wNlJt25vBeeVG/dvuKeUup7uTgaWI2VvjT+vLUf04dX5Jct3atkaQMx8DikSG5jh2C3S/shs7vZndd8+AVnuGm4UeKOU2Ra0hilxq0qR1WvkRiQq/soM1qQ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707734704; c=relaxed/simple; bh=hT40oV660qArpOwjmgURKdSsYJl+4AmdYejanQ+egCY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=R3rBzQVOG+a7VLoIlzKhGa1yS0A00XAO0MQNfS494JAKhpyjtRVoYAPTg63XOigZgBlZnRyNu2I9OY1WOrCrdfFS3WWCZX/JjnMSMcTlM4yQNcRlKyjzK9QbCiFc1jUhHLxzJGg+NwfHRKiSiX6HTzjFjbJT+ANKF92uLOrm6H8= 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=OqtJBxHw; arc=none smtp.client-ip=192.198.163.17 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=1707734702; x=1739270702; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=hT40oV660qArpOwjmgURKdSsYJl+4AmdYejanQ+egCY=; b=OqtJBxHwchi4HLmzdb8U5BM/JWWi5IQAAoiH4UCVsVqPDZMXNDUDhWR7 o8PUB6/0sVpx43FADIGvw7D+txiY6tHVjQjjWNagyxrAPNcTKSkCDYqtV G+11op5cSw1HjKzmSeYILqiVXHyK+u95SD/ex+WPI6RJ7bk/BK6cs7qJT 1pvFYMEVBt6hXYS+Z9FJLOboemIS2H/CDO2EkRmsn7tWIidLuahG7/ChG uIeFFdV+BHqQkFzkDexFlxhY2gNV274uJJhV2rucp97j2IBBJgLb1+Uit 4EGWWga36MQznscuL5qHlHTnvfLTZ1J5cfx+cYeeH9ITHNSkmsxIJ5nWd g==; X-IronPort-AV: E=McAfee;i="6600,9927,10981"; a="1585005" X-IronPort-AV: E=Sophos;i="6.05,263,1701158400"; d="scan'208";a="1585005" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Feb 2024 02:44:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10981"; a="935035574" X-IronPort-AV: E=Sophos;i="6.05,262,1701158400"; d="scan'208";a="935035574" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 12 Feb 2024 02:44:54 -0800 Received: by black.fi.intel.com (Postfix, from userid 1000) id DAFE730E; Mon, 12 Feb 2024 12:44:52 +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: [PATCHv7 00/16] x86/tdx: Add kexec support Date: Mon, 12 Feb 2024 12:44:32 +0200 Message-ID: <20240212104448.2589568-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: 1790694740730201722 X-GMAIL-MSGID: 1790694740730201722 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 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 (16): 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 arch/x86/Kconfig | 7 + arch/x86/coco/core.c | 1 - arch/x86/coco/tdx/tdx.c | 209 ++++++++++++++++++- 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_types.h | 1 + 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 | 17 +- include/acpi/actbl2.h | 19 +- include/linux/cc_platform.h | 10 - include/linux/cpu.h | 2 + kernel/cpu.c | 12 +- 26 files changed, 715 insertions(+), 140 deletions(-) create mode 100644 arch/x86/kernel/acpi/madt_playdead.S create mode 100644 arch/x86/kernel/acpi/madt_wakeup.c