From patchwork Sat Dec 17 18:55:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 34228 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1635945wrn; Sat, 17 Dec 2022 10:56:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXuApa2AyFr8xHYlWUmx9sRRRvfU3xYYBty/2YZ97A05on+tF7B5+IAxOIAYsDzlKzq4W403 X-Received: by 2002:a05:6402:5d0:b0:474:5de4:a5d1 with SMTP id n16-20020a05640205d000b004745de4a5d1mr13639222edx.39.1671303411722; Sat, 17 Dec 2022 10:56:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671303411; cv=none; d=google.com; s=arc-20160816; b=zOpT1EzveMB+gGxPb+iFaklyZ/kj53vBRpvAcPi7aUgnxIivM5n3mIMZW8ak2KyGV8 61f8TqLn6i27b2zF289VEiy0Bfk7RQ29rD884u+GDUUKQnN3e67r1br/wFkGTFE9jI/Z r12q8cs6cXYE5JQ+T6hNEj4WEkt7zJSECNEn3pzCcsCnKpq6XGvPpKq2kDO3qQNnmXef QpJwynqPXKrHECKz+4wM4t/+ZcNgyN6LjTMtKvm5HMYPRX3/kScVJ3JDrUSfodOfsfjP KyakSBkAGoZCEdkyl1Q5vXH+pqFydjIzCLqhpmBnY1VvxF4grSYPRURLg/Q084VeN57M Y8xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=1fby/FWhMgBFgSgj/PaArXHkmn6eSmECHfo+9ME1Nuk=; b=gRt87liXIxwGyF3//FJembTJiwycWKLQBBduD3m6LeiaHf/AZDhPxR9I1bWOUqcrbc XOEZDkQzRUrLp0C7GlXy2gQxTpmfWOnQov+kyZsEwh710YzdAnp6dnEG/f355Acmf2K9 Y/8KMny2ABPMLd6JbWORMtP5hCs5srUm3Nu1YT4F++lyR9pATx7Uf6PEwrViAsRZdeQ4 BUymBw4gi9AhW2D5XNeltjoY5Q+7SAfKLehBqm3rsB+XgjOP1wZZJbN4sljd7vww5qeW 0deVgUkeooPUe+vKj1MSdMfpcg0b3EoHCW/TW+i4lGgGKi/ZsxfJKsBk3zbNi0IdxJ70 x+Bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=YxMxYxP5; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v25-20020aa7d819000000b0046c53c2be4asi4964416edq.365.2022.12.17.10.56.28; Sat, 17 Dec 2022 10:56:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=YxMxYxP5; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229506AbiLQSzz (ORCPT + 99 others); Sat, 17 Dec 2022 13:55:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229973AbiLQSzf (ORCPT ); Sat, 17 Dec 2022 13:55:35 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90FAF10B5E; Sat, 17 Dec 2022 10:55:32 -0800 (PST) Date: Sat, 17 Dec 2022 18:55:29 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1671303330; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1fby/FWhMgBFgSgj/PaArXHkmn6eSmECHfo+9ME1Nuk=; b=YxMxYxP5JnOSZPQadGpBpxhV0aHrBLkoJchDkB7K5VgUU7WmWTgVu43y/KqJhuOO5dp/bY f9MBlzbL0rG6RRMzHknzUcyInmuzIm5DwvWOPVDDM3vhKoOSkiYiZskYvhRxNzSWI1Oqf9 tPzjhB84kdziKsrEy5o67NsolqmwU7wlny6RsZMwdlkJ3oFS/up7C0i1o2huMQX1cHU9vu hMtq6QqdXzW96r9+79kI5iJa7lfgOQF+AZS7Mo7KXRkY6nu9e4Qde+yvYPP+RASkcY8iIF z6D1QA/SLdQgPsVE2l/6BqDI+iA7SppWqoz3eAamMDhsD8847vmLJjBVmtWiOw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1671303330; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1fby/FWhMgBFgSgj/PaArXHkmn6eSmECHfo+9ME1Nuk=; b=r4kHNYS4ky0qAx9WcIIcuGtKYCMIHaBP5bdQFt+rz504cUFP8t0ZIgF5IQM0vDwWuBwBco +lDGV6mG3APWn5Aw== From: "tip-bot2 for Sean Christopherson" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/mm] x86/kasan: Populate shadow for shared chunk of the CPU entry area Cc: syzbot+8cdd16fd5a6c0565e227@syzkaller.appspotmail.com, Sean Christopherson , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221110203504.1985010-6-seanjc@google.com> References: <20221110203504.1985010-6-seanjc@google.com> MIME-Version: 1.0 Message-ID: <167130332944.4906.9099433993827830759.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749143316306858415?= X-GMAIL-MSGID: =?utf-8?q?1752488645876304491?= The following commit has been merged into the x86/mm branch of tip: Commit-ID: 1cfaac2400c73378e78182a706be0f3ac8b93cd7 Gitweb: https://git.kernel.org/tip/1cfaac2400c73378e78182a706be0f3ac8b93cd7 Author: Sean Christopherson AuthorDate: Thu, 10 Nov 2022 20:35:04 Committer: Dave Hansen CommitterDate: Thu, 15 Dec 2022 10:37:28 -08:00 x86/kasan: Populate shadow for shared chunk of the CPU entry area Popuplate the shadow for the shared portion of the CPU entry area, i.e. the read-only IDT mapping, during KASAN initialization. A recent change modified KASAN to map the per-CPU areas on-demand, but forgot to keep a shadow for the common area that is shared amongst all CPUs. Map the common area in KASAN init instead of letting idt_map_in_cea() do the dirty work so that it Just Works in the unlikely event more shared data is shoved into the CPU entry area. The bug manifests as a not-present #PF when software attempts to lookup an IDT entry, e.g. when KVM is handling IRQs on Intel CPUs (KVM performs direct CALL to the IRQ handler to avoid the overhead of INTn): BUG: unable to handle page fault for address: fffffbc0000001d8 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 16c03a067 P4D 16c03a067 PUD 0 Oops: 0000 [#1] PREEMPT SMP KASAN CPU: 5 PID: 901 Comm: repro Tainted: G W 6.1.0-rc3+ #410 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015 RIP: 0010:kasan_check_range+0xdf/0x190 vmx_handle_exit_irqoff+0x152/0x290 [kvm_intel] vcpu_run+0x1d89/0x2bd0 [kvm] kvm_arch_vcpu_ioctl_run+0x3ce/0xa70 [kvm] kvm_vcpu_ioctl+0x349/0x900 [kvm] __x64_sys_ioctl+0xb8/0xf0 do_syscall_64+0x2b/0x50 entry_SYSCALL_64_after_hwframe+0x46/0xb0 Fixes: 9fd429c28073 ("x86/kasan: Map shadow for percpu pages on demand") Reported-by: syzbot+8cdd16fd5a6c0565e227@syzkaller.appspotmail.com Signed-off-by: Sean Christopherson Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20221110203504.1985010-6-seanjc@google.com --- arch/x86/mm/kasan_init_64.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index afc5e12..0302491 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -341,7 +341,7 @@ void __init kasan_populate_shadow_for_vaddr(void *va, size_t size, int nid) void __init kasan_init(void) { - unsigned long shadow_cea_begin, shadow_cea_end; + unsigned long shadow_cea_begin, shadow_cea_per_cpu_begin, shadow_cea_end; int i; memcpy(early_top_pgt, init_top_pgt, sizeof(early_top_pgt)); @@ -384,6 +384,7 @@ void __init kasan_init(void) } shadow_cea_begin = kasan_mem_to_shadow_align_down(CPU_ENTRY_AREA_BASE); + shadow_cea_per_cpu_begin = kasan_mem_to_shadow_align_up(CPU_ENTRY_AREA_PER_CPU); shadow_cea_end = kasan_mem_to_shadow_align_up(CPU_ENTRY_AREA_BASE + CPU_ENTRY_AREA_MAP_SIZE); @@ -409,6 +410,15 @@ void __init kasan_init(void) kasan_mem_to_shadow((void *)VMALLOC_END + 1), (void *)shadow_cea_begin); + /* + * Populate the shadow for the shared portion of the CPU entry area. + * Shadows for the per-CPU areas are mapped on-demand, as each CPU's + * area is randomly placed somewhere in the 512GiB range and mapping + * the entire 512GiB range is prohibitively expensive. + */ + kasan_populate_shadow(shadow_cea_begin, + shadow_cea_per_cpu_begin, 0); + kasan_populate_early_shadow((void *)shadow_cea_end, kasan_mem_to_shadow((void *)__START_KERNEL_map));