Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp149783pxb; Fri, 17 Sep 2021 22:00:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyewgY9Xsl2kSxS/ufREml+WmkAcE0/NOBK7U88U7c3RVShSn8M01yQsgjoDaWQctehLkb9 X-Received: by 2002:a17:906:7802:: with SMTP id u2mr16335895ejm.325.1631941216362; Fri, 17 Sep 2021 22:00:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631941216; cv=none; d=google.com; s=arc-20160816; b=NJ54a8skiogJdzmwM2TuhA2auC8aEv6U1GayOaMV+lWC1MzyfEXG6GpFKGr0LIzG7x VSgbs2DOG9OWWOldoB+HeTrCNqVKxlwX2jCoAkkGM3O1WWts05uIF9NN8n0peaVXBZm0 MS+Cu7bjmDQSREg9wOP4DJOjeLnfowGJOmPb3YuugDLtUEStSvvGkTG+bTHC6X5TaCqG /FeeAURrz7FlFH/oQIjzgOhqJeZen5ZJOY5F/pZXPpcYEjZgI5XsMa53B8DKa8EpeHkY fAE6fsmG7MSsZSqk/ytxFIs2RIRDxZl6z8JUTXvcYHzhlSRdNr12afwtHpaFkGvR9yrZ /aXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=nu3eEJsWDRjlcZdUThzLsxSUfhaup/TLsX2ltpGh08s=; b=u+nT24ScZeM92w1Qzko7LK/o7xmd4KuKHwplu+oAI0BL56FNWIYyY+u00+BI+e1/A1 ZqwSXzMhBuXW8hs3OJTHEu+CgBD6gaXiH9uX7zWOneH6GNcQKhLf8GFRV4cKVXlLwOx5 VnknkNRurml3yT3Bkj6jIIWZreFoWh0IiA63NvpevmUNbT4+FygcxLPpzgUVTItmwFai 3jyAtr6ImWtKrrGRj4ThoT4UvfobOuuFA1U8Fe102mtFYsd9SYt7fA5bX87bksi6hmto U5bCUSYF07t+zAT5La+L3uZVxzsZF9zIEdPp+7yq2aYWyQF/R7YgXOPVlw5Q+JGn2bE4 +5Yg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id de19si9869601ejc.97.2021.09.17.21.59.51; Fri, 17 Sep 2021 22:00:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245057AbhIQVk0 (ORCPT + 99 others); Fri, 17 Sep 2021 17:40:26 -0400 Received: from mga07.intel.com ([134.134.136.100]:54587 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242243AbhIQVkN (ORCPT ); Fri, 17 Sep 2021 17:40:13 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10110"; a="286563052" X-IronPort-AV: E=Sophos;i="5.85,302,1624345200"; d="scan'208";a="286563052" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2021 14:38:50 -0700 X-IronPort-AV: E=Sophos;i="5.85,302,1624345200"; d="scan'208";a="546646810" Received: from agluck-desk2.sc.intel.com ([10.3.52.146]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2021 14:38:50 -0700 From: Tony Luck To: Sean Christopherson , Jarkko Sakkinen , Dave Hansen Cc: Cathy Zhang , linux-sgx@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, Tony Luck Subject: [PATCH v5 5/7] x86/sgx: Hook arch_memory_failure() into mainline code Date: Fri, 17 Sep 2021 14:38:34 -0700 Message-Id: <20210917213836.175138-6-tony.luck@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210917213836.175138-1-tony.luck@intel.com> References: <20210827195543.1667168-1-tony.luck@intel.com> <20210917213836.175138-1-tony.luck@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a call inside memory_failure() to check if the address is an SGX EPC page and handle it. Note the SGX EPC pages do not have a "struct page" entry, so the hook goes in at the same point as the device mapping hook. Pull the call to acquire the mutex earlier so the SGX errors are also protected. Make set_mce_nospec() skip SGX pages when trying to adjust the 1:1 map. Signed-off-by: Tony Luck --- arch/x86/include/asm/processor.h | 8 ++++++++ arch/x86/include/asm/set_memory.h | 4 ++++ include/linux/mm.h | 13 +++++++++++++ mm/memory-failure.c | 19 +++++++++++++------ 4 files changed, 38 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 9ad2acaaae9b..4865f2860a4f 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -853,4 +853,12 @@ enum mds_mitigations { MDS_MITIGATION_VMWERV, }; +#ifdef CONFIG_X86_SGX +int arch_memory_failure(unsigned long pfn, int flags); +#define arch_memory_failure arch_memory_failure + +bool arch_is_platform_page(u64 paddr); +#define arch_is_platform_page arch_is_platform_page +#endif + #endif /* _ASM_X86_PROCESSOR_H */ diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h index 43fa081a1adb..ce8dd215f5b3 100644 --- a/arch/x86/include/asm/set_memory.h +++ b/arch/x86/include/asm/set_memory.h @@ -2,6 +2,7 @@ #ifndef _ASM_X86_SET_MEMORY_H #define _ASM_X86_SET_MEMORY_H +#include #include #include @@ -98,6 +99,9 @@ static inline int set_mce_nospec(unsigned long pfn, bool unmap) unsigned long decoy_addr; int rc; + /* SGX pages are not in the 1:1 map */ + if (arch_is_platform_page(pfn << PAGE_SHIFT)) + return 0; /* * We would like to just call: * set_memory_XX((unsigned long)pfn_to_kaddr(pfn), 1); diff --git a/include/linux/mm.h b/include/linux/mm.h index 73a52aba448f..3cc63682fe47 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3284,5 +3284,18 @@ static inline int seal_check_future_write(int seals, struct vm_area_struct *vma) return 0; } +#ifndef arch_memory_failure +static inline int arch_memory_failure(unsigned long pfn, int flags) +{ + return -ENXIO; +} +#endif +#ifndef arch_is_platform_page +static inline bool arch_is_platform_page(u64 paddr) +{ + return false; +} +#endif + #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 54879c339024..5693bac9509c 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1632,21 +1632,28 @@ int memory_failure(unsigned long pfn, int flags) if (!sysctl_memory_failure_recovery) panic("Memory failure on page %lx", pfn); + mutex_lock(&mf_mutex); + p = pfn_to_online_page(pfn); if (!p) { + res = arch_memory_failure(pfn, flags); + if (res == 0) + goto unlock_mutex; + if (pfn_valid(pfn)) { pgmap = get_dev_pagemap(pfn, NULL); - if (pgmap) - return memory_failure_dev_pagemap(pfn, flags, - pgmap); + if (pgmap) { + res = memory_failure_dev_pagemap(pfn, flags, + pgmap); + goto unlock_mutex; + } } pr_err("Memory failure: %#lx: memory outside kernel control\n", pfn); - return -ENXIO; + res = -ENXIO; + goto unlock_mutex; } - mutex_lock(&mf_mutex); - try_again: if (PageHuge(p)) { res = memory_failure_hugetlb(pfn, flags); -- 2.31.1