Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp5562702pxv; Wed, 28 Jul 2021 13:48:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJcGqEs91jBb9IPCGTSM8AD+a5CxkYVno0rMsjlmWKQUB7U6SBSFutVBBg1wp2SpjMfzv/ X-Received: by 2002:a17:907:1b02:: with SMTP id mp2mr1317823ejc.196.1627505333592; Wed, 28 Jul 2021 13:48:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627505333; cv=none; d=google.com; s=arc-20160816; b=0U5r5ML79JbJR5/TIXgcAhzFUOknKgIX2oqCzTxgKvQEMTIYlAowCnTLfYsAPwsfmw s7BElD009a8lkdPu7ampa8FdhUeVKKhHWUyZQx9TvYRwPCTDPe8EDHbedqS5trPKtsls V5jGygLFiVxc9wKW9AZ8HwpwEt3c5kxMGWkbW3KfTqPtdlu45GVEZf22k9JpHbFZNyd+ 1EyfmACMXfldMkV1WILiqHgYq/b5XZLU+8pc6O+SQP5apiG0jh3fuqQBG8v8IDNd0fWf 67hA0zC7FjlUqkfZT9MqxDsXOlWl6ZM3T3C3oYVWvDeAWAobDKh0CIGfTdOYWopD0+CN 2VPw== 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=jYZ9C+DewBMZj0K1oJPPLEBw+qrS3fUdPozOnxPd1Q8=; b=a9OlXSlG/kjLCu9quqxxBMqe5kiNYRXf5e0RAKW65H49JOg/AxNHUIgwLCfb8dpl/c Tm0pb720uDlMSOKMmQx4Ph4jDSs2aJ5KiL+37YMByaZMdJIv2U9U36F3v0YvmLqjjLRW MH49nGBTdOM0PhpVcklWzl5r+2JBmVT4QUkvvYrlFhBGEIVawKA387yUiFY1M/FNLmTw FzUiyX+dFlrH6vc2VUNnFIkqNMh921HK1I3EKW2BAw57iftQyKmiQnIK8RfI2uvk1hl0 26t/QWHEq4ujHKL38hV1oKFVx2Jei6iqCGlQhPiL2tBELt97ylJqNgsM1+S6u5hzkaau 3D9w== 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 e23si763721eje.315.2021.07.28.13.48.30; Wed, 28 Jul 2021 13:48:53 -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 S231716AbhG1UrI (ORCPT + 99 others); Wed, 28 Jul 2021 16:47:08 -0400 Received: from mga01.intel.com ([192.55.52.88]:60186 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231488AbhG1UrE (ORCPT ); Wed, 28 Jul 2021 16:47:04 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10059"; a="234634464" X-IronPort-AV: E=Sophos;i="5.84,276,1620716400"; d="scan'208";a="234634464" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2021 13:47:01 -0700 X-IronPort-AV: E=Sophos;i="5.84,276,1620716400"; d="scan'208";a="506679887" 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; 28 Jul 2021 13:47:01 -0700 From: Tony Luck To: Sean Christopherson , Jarkko Sakkinen , Dave Hansen Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Tony Luck Subject: [PATCH v3 6/7] x86/sgx: Add hook to error injection address validation Date: Wed, 28 Jul 2021 13:46:52 -0700 Message-Id: <20210728204653.1509010-7-tony.luck@intel.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210728204653.1509010-1-tony.luck@intel.com> References: <20210719182009.1409895-1-tony.luck@intel.com> <20210728204653.1509010-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 SGX reserved memory does not appear in the standard address maps. Add hook to call into the SGX code to check if an address is located in SGX memory. There are other challenges in injecting errors into SGX. Update the documentation with a sequence of operations to inject. Signed-off-by: Tony Luck --- .../firmware-guide/acpi/apei/einj.rst | 19 +++++++++++++++++++ drivers/acpi/apei/einj.c | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Documentation/firmware-guide/acpi/apei/einj.rst b/Documentation/firmware-guide/acpi/apei/einj.rst index c042176e1707..55e2331a6438 100644 --- a/Documentation/firmware-guide/acpi/apei/einj.rst +++ b/Documentation/firmware-guide/acpi/apei/einj.rst @@ -181,5 +181,24 @@ You should see something like this in dmesg:: [22715.834759] EDAC sbridge MC3: PROCESSOR 0:306e7 TIME 1422553404 SOCKET 0 APIC 0 [22716.616173] EDAC MC3: 1 CE memory read error on CPU_SrcID#0_Channel#0_DIMM#0 (channel:0 slot:0 page:0x12345 offset:0x0 grain:32 syndrome:0x0 - area:DRAM err_code:0001:0090 socket:0 channel_mask:1 rank:0) +Special notes for injection into SGX enclaves: + +There may be a separate BIOS setup option to enable SGX injection. + +The injection process consists of setting some special memory controller +trigger that will inject the error on the next write to the target +address. But the h/w prevents any software outside of an SGX enclave +from accessing enclave pages (even BIOS SMM mode). + +The following sequence can be used: + 1) Determine physical address of enclave page + 2) Use "notrigger=1" mode to inject (this will setup + the injection address, but will not actually inject) + 3) Enter the enclave + 4) Store data to the virtual address matching physical address from step 1 + 5) Execute CLFLUSH for that virtual address + 6) Spin delay for 250ms + 7) Read from the virtual address. This will trigger the error + For more information about EINJ, please refer to ACPI specification version 4.0, section 17.5 and ACPI 5.0, section 18.6. diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index 2882450c443e..cd7cffc955bf 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c @@ -544,7 +544,8 @@ static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, ((region_intersects(base_addr, size, IORESOURCE_SYSTEM_RAM, IORES_DESC_NONE) != REGION_INTERSECTS) && (region_intersects(base_addr, size, IORESOURCE_MEM, IORES_DESC_PERSISTENT_MEMORY) - != REGION_INTERSECTS))) + != REGION_INTERSECTS) && + !sgx_is_epc_page(base_addr))) return -EINVAL; inject: -- 2.29.2