x86/sev: Take NUMA node into account when allocating memory for per-CPU SEV data
authorLi RongQing <lirongqing@baidu.com>
Fri, 12 Apr 2024 03:01:30 +0000 (11:01 +0800)
committerIngo Molnar <mingo@kernel.org>
Fri, 12 Apr 2024 10:12:11 +0000 (12:12 +0200)
per-CPU SEV data is dominantly accessed from their own local CPUs,
so allocate them node-local to improve performance.

Signed-off-by: Li RongQing <lirongqing@baidu.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Nikunj A Dadhania <nikunj@amd.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Link: https://lore.kernel.org/r/20240412030130.49704-1-lirongqing@baidu.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/sev.c

index 38ad066179d81fe7efc2b2469fbe583c12586e06..995f944671015cf713289cee54445ce219e7bc90 100644 (file)
@@ -938,7 +938,7 @@ static int snp_set_vmsa(void *va, bool vmsa)
 #define INIT_LDTR_ATTRIBS      (SVM_SELECTOR_P_MASK | 2)
 #define INIT_TR_ATTRIBS                (SVM_SELECTOR_P_MASK | 3)
 
-static void *snp_alloc_vmsa_page(void)
+static void *snp_alloc_vmsa_page(int cpu)
 {
        struct page *p;
 
@@ -950,7 +950,7 @@ static void *snp_alloc_vmsa_page(void)
         *
         * Allocate an 8k page which is also 8k-aligned.
         */
-       p = alloc_pages(GFP_KERNEL_ACCOUNT | __GFP_ZERO, 1);
+       p = alloc_pages_node(cpu_to_node(cpu), GFP_KERNEL_ACCOUNT | __GFP_ZERO, 1);
        if (!p)
                return NULL;
 
@@ -1019,7 +1019,7 @@ static int wakeup_cpu_via_vmgexit(u32 apic_id, unsigned long start_ip)
         * #VMEXIT of that vCPU would wipe out all of the settings being done
         * here.
         */
-       vmsa = (struct sev_es_save_area *)snp_alloc_vmsa_page();
+       vmsa = (struct sev_es_save_area *)snp_alloc_vmsa_page(cpu);
        if (!vmsa)
                return -ENOMEM;
 
@@ -1341,7 +1341,7 @@ static void __init alloc_runtime_data(int cpu)
 {
        struct sev_es_runtime_data *data;
 
-       data = memblock_alloc(sizeof(*data), PAGE_SIZE);
+       data = memblock_alloc_node(sizeof(*data), PAGE_SIZE, cpu_to_node(cpu));
        if (!data)
                panic("Can't allocate SEV-ES runtime data");