From nobody Thu Nov 28 18:46:52 2024 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (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 BC75B1509AF for ; Mon, 30 Sep 2024 05:51:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727675511; cv=none; b=IzwSlQUbYE1Q8a7Zw3O3ro1h+JHyq8ZijFYLlxvihh0CfijzoQONaIr43RurAydHSpMOmTuo++0scZQ89nZ4gUWcPcD8P7roMyghbbUnWbeZEL8r2+1bixU7StEsqRE8SnhkImJ/yujwPr1V3BBOYavEUbYG2vrZPAufWbS6rLw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727675511; c=relaxed/simple; bh=D7qgt/re79b94z4qKj4/hVxF8hx2+DoYj0YpC+nDoLk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=uiN+MHxFuISnd+bpGKBSBi71SE+veJ9SMcIgKka2/wzV/tN3h4aYhjfp3p601mulUaP93n2cQb8pbYTAcrsM9fn0yfJWryxfbMY/SkbK3rwfvxJo2UoCDj6xtJ84Ni/zWkYfp/Injc8O2NPT6UuIi6hsyaOSzaVSbGcLN8ijzGg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=WOlEI/kR; arc=none smtp.client-ip=198.175.65.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="WOlEI/kR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727675510; x=1759211510; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=D7qgt/re79b94z4qKj4/hVxF8hx2+DoYj0YpC+nDoLk=; b=WOlEI/kRlOQgDxz7q7lf4qJIZ2UuaxJSYKrgOVzf/Pc+sW/xrgkrFBxo Y0i4sLlxFbDp38PgsA4ElZqIigGcN6L8APULhKt184AXMTPUxnCElol78 8Rcj1LE1y8+ffGqLVMxQfcZgwAmn7N3+2C991B7Mbc6m51704K9acoyQx W8KHUKDOTsiQwtsv06jjyKS5cU+auyVl3+rMuqqjXq3B0mgDmrJKwvLGw p9jDssGn/6eXd0qb/qDRGM1c4eymiU4E/vFS1w9/HOexJP+xN37dXoXwv LGrIMuYgrv9rCP1Ha66sj2zsmh3o2V8RGFhZA+o7QUunF2Eqs52Bs3dps w==; X-CSE-ConnectionGUID: +8KhM+oRR2GpH1frMAjWlw== X-CSE-MsgGUID: AinE83IGQn6EExmAdkCWWQ== X-IronPort-AV: E=McAfee;i="6700,10204,11210"; a="26698447" X-IronPort-AV: E=Sophos;i="6.11,164,1725346800"; d="scan'208";a="26698447" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2024 22:51:49 -0700 X-CSE-ConnectionGUID: 5zR1OpmOSyywRCtLL0caCQ== X-CSE-MsgGUID: fDaLogJbR0WCZoFMTV148w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,164,1725346800"; d="scan'208";a="73497045" Received: from lhan1x-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.124.238.64]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2024 22:51:45 -0700 From: Huang Ying To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "Kirill A . Shutemov" Cc: x86@kernel.org, David Hildenbrand , Andrew Morton , Oscar Salvador , linux-coco@lists.linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Dan Williams , Kai Huang , "H. Peter Anvin" , Andy Lutomirski Subject: [PATCH] tdx, memory hotplug: Check whole hot-adding memory range for TDX Date: Mon, 30 Sep 2024 13:51:12 +0800 Message-Id: <20240930055112.344206-1-ying.huang@intel.com> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" On systems with TDX (Trust Domain eXtensions) enabled, memory ranges hot-added must be checked for compatibility by TDX. This is currently implemented through memory hotplug notifiers for each memory_block. If a memory range which isn't TDX compatible is hot-added, for example, some CXL memory, the command line as follows, $ echo 1 > /sys/devices/system/node/nodeX/memoryY/online will report something like, bash: echo: write error: Operation not permitted If pr_debug() is enabled, the error message like below will be shown in the kernel log, online_pages [mem 0xXXXXXXXXXX-0xXXXXXXXXXX] failed Both are too general to root cause the problem. This will confuse users. One solution is to print some error messages in the TDX memory hotplug notifier. However, memory hotplug notifiers are called for each memory block, so this may lead to a large volume of messages in the kernel log if a large number of memory blocks are onlined with a script or automatically. For example, the typical size of memory block is 128MB on x86_64, when online 64GB CXL memory, 512 messages will be logged. Therefore, in this patch, the whole hot-adding memory range is checked for TDX compatibility through a newly added architecture specific function (arch_check_hotplug_memory_range()). If rejected, the memory hot-adding will be aborted with a proper kernel log message. Which looks like something as below, virt/tdx: Reject hot-adding memory range: 0xXXXXXXXX-0xXXXXXXXX for TDX c= ompatibility. The target use case is to support CXL memory on TDX enabled systems. If the CXL memory isn't compatible with TDX, the whole CXL memory range hot-adding will be rejected. While the CXL memory can still be used via devdax interface. This also makes the original TDX memory hotplug notifier useless, so delete it. Signed-off-by: "Huang, Ying" Suggested-by: Dan Williams Reviewed-by: Dan Williams Acked-by: Kai Huang Cc: Thomas Gleixner Cc: Dave Hansen Cc: "H. Peter Anvin" Cc: Andy Lutomirski Cc: Kirill A. Shutemov Cc: David Hildenbrand Cc: Oscar Salvador Acked-by: David Hildenbrand --- arch/x86/include/asm/tdx.h | 2 ++ arch/x86/mm/init_64.c | 6 ++++++ arch/x86/virt/vmx/tdx/tdx.c | 35 ++++++++++++---------------------- include/linux/memory_hotplug.h | 3 +++ mm/memory_hotplug.c | 7 ++++++- 5 files changed, 29 insertions(+), 24 deletions(-) diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h index eba178996d84..6db5da34e4ba 100644 --- a/arch/x86/include/asm/tdx.h +++ b/arch/x86/include/asm/tdx.h @@ -116,11 +116,13 @@ static inline u64 sc_retry(sc_func_t func, u64 fn, int tdx_cpu_enable(void); int tdx_enable(void); const char *tdx_dump_mce_info(struct mce *m); +int tdx_check_hotplug_memory_range(u64 start, u64 size); #else static inline void tdx_init(void) { } static inline int tdx_cpu_enable(void) { return -ENODEV; } static inline int tdx_enable(void) { return -ENODEV; } static inline const char *tdx_dump_mce_info(struct mce *m) { return NULL; } +static inline int tdx_check_hotplug_memory_range(u64 start, u64 size) { re= turn 0; } #endif /* CONFIG_INTEL_TDX_HOST */ =20 #endif /* !__ASSEMBLY__ */ diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index ff253648706f..30a4ad4272ce 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -55,6 +55,7 @@ #include #include #include +#include =20 #include "mm_internal.h" =20 @@ -974,6 +975,11 @@ int add_pages(int nid, unsigned long start_pfn, unsign= ed long nr_pages, return ret; } =20 +int arch_check_hotplug_memory_range(u64 start, u64 size) +{ + return tdx_check_hotplug_memory_range(start, size); +} + int arch_add_memory(int nid, u64 start, u64 size, struct mhp_params *params) { diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c index 4e2b2e2ac9f9..c477b04c5548 100644 --- a/arch/x86/virt/vmx/tdx/tdx.c +++ b/arch/x86/virt/vmx/tdx/tdx.c @@ -1388,36 +1388,32 @@ static bool is_tdx_memory(unsigned long start_pfn, = unsigned long end_pfn) return false; } =20 -static int tdx_memory_notifier(struct notifier_block *nb, unsigned long ac= tion, - void *v) +int tdx_check_hotplug_memory_range(u64 start, u64 size) { - struct memory_notify *mn =3D v; - - if (action !=3D MEM_GOING_ONLINE) - return NOTIFY_OK; + u64 start_pfn =3D PHYS_PFN(start); + u64 end_pfn =3D PHYS_PFN(start + size); =20 /* * Empty list means TDX isn't enabled. Allow any memory - * to go online. + * to be hot-added. */ if (list_empty(&tdx_memlist)) - return NOTIFY_OK; + return 0; =20 /* * The TDX memory configuration is static and can not be - * changed. Reject onlining any memory which is outside of + * changed. Reject hot-adding any memory which is outside of * the static configuration whether it supports TDX or not. */ - if (is_tdx_memory(mn->start_pfn, mn->start_pfn + mn->nr_pages)) - return NOTIFY_OK; + if (is_tdx_memory(start_pfn, end_pfn)) + return 0; =20 - return NOTIFY_BAD; + pr_info("Reject hot-adding memory range: %#llx-%#llx for TDX compatibilit= y.\n", + start, start + size); + + return -EINVAL; } =20 -static struct notifier_block tdx_memory_nb =3D { - .notifier_call =3D tdx_memory_notifier, -}; - static void __init check_tdx_erratum(void) { /* @@ -1465,13 +1461,6 @@ void __init tdx_init(void) return; } =20 - err =3D register_memory_notifier(&tdx_memory_nb); - if (err) { - pr_err("initialization failed: register_memory_notifier() failed (%d)\n", - err); - return; - } - #if defined(CONFIG_ACPI) && defined(CONFIG_SUSPEND) pr_info("Disable ACPI S3. Turn off TDX in the BIOS to use ACPI S3.\n"); acpi_suspend_lowlevel =3D NULL; diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index b27ddce5d324..c5ba7b909bb4 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -140,6 +140,9 @@ extern int try_online_node(int nid); =20 extern int arch_add_memory(int nid, u64 start, u64 size, struct mhp_params *params); + +extern int arch_check_hotplug_memory_range(u64 start, u64 size); + extern u64 max_mem_size; =20 extern int mhp_online_type_from_str(const char *str); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 621ae1015106..c4769f24b1e2 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1305,6 +1305,11 @@ int try_online_node(int nid) return ret; } =20 +int __weak arch_check_hotplug_memory_range(u64 start, u64 size) +{ + return 0; +} + static int check_hotplug_memory_range(u64 start, u64 size) { /* memory range must be block size aligned */ @@ -1315,7 +1320,7 @@ static int check_hotplug_memory_range(u64 start, u64 = size) return -EINVAL; } =20 - return 0; + return arch_check_hotplug_memory_range(start, size); } =20 static int online_memory_block(struct memory_block *mem, void *arg) --=20 2.39.2