From nobody Thu Oct 2 22:43:17 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B9F42BE036 for ; Wed, 10 Sep 2025 04:45:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757479539; cv=none; b=CAAz4MZ7NEkyy0HnT9LNuboymiy6DR7gDQfamiD1OICtTRqFp3GzWfe1tmlx9c/8N7kyscLPwFkHcyQFvP7MQCyPFoIq0oxwVgXTHN150+0q0teFdA9vRikJhji9ruj5XijBY0EtyKyd5VQP3JPdc2/9Zg2Zh2lz42azrqYhkeo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757479539; c=relaxed/simple; bh=syiSmSAFO+aipbEzZrniarasYU989JCArBVy1P7PnhU=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=j/V+KUGmtj7dhJS7MgDr4Sqn+f6z9gSGZAnb5s5RsqO+bAoK2WiszBMnFlLi1ipIvi79pKahA0R2sKws9g0tZHMDWlWQSPL5DCtltKrNTDXYZ/PBVpHGrypRe41XxBZWT/0ryhj9gfkJnifBGysnENxjh9m0XwlZg+PmVTOeyYM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jiaqiyan.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ZCBoPQh+; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jiaqiyan.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ZCBoPQh+" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-329ee88fb47so11759847a91.2 for ; Tue, 09 Sep 2025 21:45:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1757479537; x=1758084337; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=FJadLmysskB2boZjs9046Qcr8br6WCNXbEVyeTwtHYE=; b=ZCBoPQh+GNzJLIRKiqmcNlXL7lxgRv57fZL7g0oftxb/mTYkul78ipNKPdS8skYv4w xfysLsJbVWzeB+BYHhu2kxn4MzDGaaX6GQdIhfhMKq5yWA547kgClap7kE7tvxDYzsO4 J3wkbhqHKGWkXQ1XZELwiI3+fbd47S3ANAlB5LDqzfDD+QJIeWOHWqShHLZG7AXYEhZP cGnZxiZAcCxRW+luE2HH+3oUibkgNeeIjzJvJ2jo84Ue9iNM9ObLKD9bggWigspANXni 16WUqVrZeZAsfwqOlcXayR7NvmeQvqNCbUcuZ/CjSdeZ+ADE+y9JN2yZZ7rnym4qULna 4hBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757479537; x=1758084337; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=FJadLmysskB2boZjs9046Qcr8br6WCNXbEVyeTwtHYE=; b=V1dJz1PbUCqpBarKh20owjgAiEpq/mFPA/62UbdD7w0NYRdraiQAuYyXvJ1VDycx9e uDGegRdyb8uvbqF2BUX5vyFGAUfMFg8A+P5ULUnXIjiY/hZiYEHbrbE8ieSu295lxAdR u7neqx16/JOCSJt2X9ApenyiVBW7iXsJPc1qfiCpKGb1FVRwmz6Yyd+sqTIrqErPfqOZ eYp0k9i9QG33vPTvwYQBYjIp8liVGGAcbT4XKZGmpkeAqGwLLZyRhYK05VjZuFHWL7lp u+/o1ojjnyAk3e9Zl/TTC8/TxdslsVVVxfQksxpBXzFN5+LLMurx9IutUPBk2QpGQfhX zx5Q== X-Forwarded-Encrypted: i=1; AJvYcCVPwJc8JTsaHrEW67bLC2XhG5SeapDdL2v/3FtVvL8Fgqbfw9YZfvCD8x6o3Dnl2Bhio4U3ivNTgASYHzY=@vger.kernel.org X-Gm-Message-State: AOJu0Yx8a1Bw/XHm0pEu1qNtAZiPxlMzOoijEjdTv7nnVa1fYF+dNIwT uYHBBDeOaxK18YsuDblAiTtNlbfEyHwPShqmmzzuRl2z1cEGNM+BrgWg0OwPTymoNjo9IVkRD1W 47IHTapBmFodVNg== X-Google-Smtp-Source: AGHT+IGtF7G2qOTh8GkkHp+M2bIvebaZlladQ6uTxMfb0gBBP18Ndrlwth4enuUWrPoL3Hi7QjmZAZ4P9gFopQ== X-Received: from pjbqx4.prod.google.com ([2002:a17:90b:3e44:b0:327:cee7:a99f]) (user=jiaqiyan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:51cf:b0:32d:a721:8cc7 with SMTP id 98e67ed59e1d1-32da7226f41mr6178432a91.35.1757479537478; Tue, 09 Sep 2025 21:45:37 -0700 (PDT) Date: Wed, 10 Sep 2025 04:45:31 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.51.0.384.g4c02a37b29-goog Message-ID: <20250910044531.264043-1-jiaqiyan@google.com> Subject: [PATCH v3] ACPI: APEI: EINJ: Allow more types of addresses except MMIO From: Jiaqi Yan To: tony.luck@intel.com, rafael@kernel.org, guohanjun@huawei.com Cc: dan.j.williams@intel.com, bp@alien8.de, mchehab@kernel.org, xueshuai@linux.alibaba.com, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Jiaqi Yan Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" EINJ driver today only allows injection request to go through for two kinds of IORESOURCE_MEM: IORES_DESC_PERSISTENT_MEMORY and IORES_DESC_SOFT_RESERVED. This check prevents user of EINJ to test memory corrupted in many interesting areas: - Legacy persistent memory - Memory claimed to be used by ACPI tables or NV storage - Kernel crash memory and others There is need to test how kernel behaves when something consumes memory errors in these memory regions. For example, if certain ACPI table is corrupted, does kernel crash gracefully to prevent "silent data corruption". For another example, legacy persistent memory, when managed by Device DAX, does support recovering from Machine Check Exception raised by memory failure, hence worth to be tested. However, attempt to inject memory error via EINJ to legacy persistent memory or ACPI owned memory fails with -EINVAL. Allow EINJ to inject at address except it is MMIO. Leave it to the BIOS or firmware to decide what is a legitimate injection target. In addition to the test done in [1], on a machine having the following iomem resources: ... 01000000-08ffffff : Crash kernel 768f0098-768f00a7 : APEI EINJ ... 768f4000-77323fff : ACPI Non-volatile Storage 77324000-777fefff : ACPI Tables 777ff000-777fffff : System RAM 77800000-7fffffff : Reserved 80000000-8fffffff : PCI MMCONFIG 0000 [bus 00-ff] 90040000-957fffff : PCI Bus 0000:00 ... 300000000-3ffffffff : Persistent Memory (legacy) ... I commented __einj_error_inject during the test and just tested when injecting a memory error at each start address shown above: - 0x80000000 and 0x90040000 both failed with EINVAL - request passed through for all other addresses Signed-off-by: Jiaqi Yan Reviewed-by: Hanjun Guo --- Changelog v2 [2] -> v3: - Remove unnecessary IORES_DESC_CXL per comment from Hanjun [3]. - Minor update to code comment. v1 [1] -> v2: - In addition to allow IORES_DESC_PERSISTENT_MEMORY_LEGACY, open the door wider and only exclude MMIO per suggestion from Tony [4]. - Rebased to commit 11e7861d680c ("Merge tag 'for-linus' of git://git.kerne= l.org/pub/scm/virt/kvm/kvm"). [1] https://lore.kernel.org/linux-acpi/20250825223348.3780279-1-jiaqiyan@go= ogle.com [2] https://lore.kernel.org/linux-acpi/20250830030226.918555-1-jiaqiyan@goo= gle.com [3] https://lore.kernel.org/linux-acpi/bc8ad4b8-c000-0298-efd1-4a332c4c7820= @huawei.com [4] https://lore.kernel.org/linux-acpi/SJ1PR11MB60835824926BEE57F094DE6FFC3= 9A@SJ1PR11MB6083.namprd11.prod.outlook.com drivers/acpi/apei/einj-core.c | 51 ++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/drivers/acpi/apei/einj-core.c b/drivers/acpi/apei/einj-core.c index 2561b045acc7b..3c87953dbd197 100644 --- a/drivers/acpi/apei/einj-core.c +++ b/drivers/acpi/apei/einj-core.c @@ -656,6 +656,43 @@ static int __einj_error_inject(u32 type, u32 flags, u6= 4 param1, u64 param2, return rc; } =20 +/* Allow almost all types of address except MMIO. */ +static bool is_allowed_range(u64 base_addr, u64 size) +{ + int i; + /* + * MMIO region is usually claimed with IORESOURCE_MEM + IORES_DESC_NONE. + * However, IORES_DESC_NONE is treated like a wildcard when we check if + * region intersects with known resource. So do an allow list check for + * IORES_DESCs that definitely or most likely not MMIO. + */ + int non_mmio_desc[] =3D { + IORES_DESC_CRASH_KERNEL, + IORES_DESC_ACPI_TABLES, + IORES_DESC_ACPI_NV_STORAGE, + IORES_DESC_PERSISTENT_MEMORY, + IORES_DESC_PERSISTENT_MEMORY_LEGACY, + /* Treat IORES_DESC_DEVICE_PRIVATE_MEMORY as MMIO. */ + IORES_DESC_RESERVED, + IORES_DESC_SOFT_RESERVED, + }; + + if (region_intersects(base_addr, size, IORESOURCE_SYSTEM_RAM, IORES_DESC_= NONE) + =3D=3D REGION_INTERSECTS) + return true; + + for (i =3D 0; i < ARRAY_SIZE(non_mmio_desc); ++i) { + if (region_intersects(base_addr, size, IORESOURCE_MEM, non_mmio_desc[i]) + =3D=3D REGION_INTERSECTS) + return true; + } + + if (arch_is_platform_page(base_addr)) + return true; + + return false; +} + /* Inject the specified hardware error */ int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, u64 par= am3, u64 param4) @@ -702,19 +739,15 @@ int einj_error_inject(u32 type, u32 flags, u64 param1= , u64 param2, u64 param3, * Disallow crazy address masks that give BIOS leeway to pick * injection address almost anywhere. Insist on page or * better granularity and that target address is normal RAM or - * NVDIMM. + * as long as is not MMIO. */ base_addr =3D param1 & param2; size =3D ~param2 + 1; =20 - if (((param2 & PAGE_MASK) !=3D PAGE_MASK) || - ((region_intersects(base_addr, size, IORESOURCE_SYSTEM_RAM, IORES_DES= C_NONE) - !=3D REGION_INTERSECTS) && - (region_intersects(base_addr, size, IORESOURCE_MEM, IORES_DESC_PERSI= STENT_MEMORY) - !=3D REGION_INTERSECTS) && - (region_intersects(base_addr, size, IORESOURCE_MEM, IORES_DESC_SOFT_= RESERVED) - !=3D REGION_INTERSECTS) && - !arch_is_platform_page(base_addr))) + if ((param2 & PAGE_MASK) !=3D PAGE_MASK) + return -EINVAL; + + if (!is_allowed_range(base_addr, size)) return -EINVAL; =20 if (is_zero_pfn(base_addr >> PAGE_SHIFT)) --=20 2.51.0.384.g4c02a37b29-goog