From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC872C6FA89 for ; Thu, 15 Sep 2022 15:11:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231216AbiIOPLl (ORCPT ); Thu, 15 Sep 2022 11:11:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230498AbiIOPJt (ORCPT ); Thu, 15 Sep 2022 11:09:49 -0400 Received: from mail-wr1-x449.google.com (mail-wr1-x449.google.com [IPv6:2a00:1450:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90F1A9DB63 for ; Thu, 15 Sep 2022 08:06:18 -0700 (PDT) Received: by mail-wr1-x449.google.com with SMTP id g19-20020adfa493000000b0022a2ee64216so4918865wrb.14 for ; Thu, 15 Sep 2022 08:06:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=y4+04AEFcGK6lJisKBf+d7wj7/tgJIfosEPW0CJiM4s=; b=TY9zj9hsonLfxsKiJ/Nk2jseei3hK6yzpjZdnJr1tEyHclD4r1lmduXOFaXWThcHMB DJaob/V+m/PRO6csCY9Qz7+UxT/duZ0JLxrjFhCX78YuVaTTZumMHyb2TWgLeR3UbElB 7X4tMiqGIMatHsfHnsy6juWEIz1QNOu/tb14hyG2cs2B6k04dPWvwNIFfjy6W/oOeaN0 QrnIqe66ITykN//4B+h/MckE3RzTc0/Lsnyh0ahzj+igL5hjBzIYjNA8Ky1MP7CzfGn4 gexfdk9N6b5itmc9hr0TODSZeATm0DUea9IoCzI93/y47kt1AL6SpSZT+FyLO6lv3DEl 7UAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=y4+04AEFcGK6lJisKBf+d7wj7/tgJIfosEPW0CJiM4s=; b=V2p1nPwBYX6bQSwmjVS6Iw8VMOppJ3zcmSH6HrQg/hHCgQVAEUIiUqc+A9u+r6nlU9 rIKNuSu3jFF9QrvNNeaq/9HcsIJQSHjCna0j2G1UvrrY9OdSVjD5J0Usx9v1L7+QF64X 7daIn+o8WwwCfxExu8BMCjJQVAq8Zyvefpa92JVl99AZOxEjmnaCDa/TIw5SEFJ6NF/1 8HMHNlZozOMfFFlpRgJdXv3ltWVjoayJCwfuIZMx280rZx0Ai5+YuuMPohWh9pL03Zs2 Ot+7QUuSssYp+MPUTh6kGfpzxyxlp7ndXeQ2dZI5FreUOFrnZQVM0uVace7cLMjMA7No kTvQ== X-Gm-Message-State: ACrzQf0nWYe1V7wHAjTMBMjCnLGC7g6772YU0usR0USC1nOQzGemnSx5 aotTGI4Vc/U88b6lfBTBmP3qweuBifM= X-Google-Smtp-Source: AMsMyM7TO7pwHZKC5FCuc6aosYGc8fP10GsQWeB+vHWTvsz1rJA3jVBR26bmI08PTxhgRL6r8YIYohpf0Dw= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:686d:27b5:495:85b7]) (user=glider job=sendgmr) by 2002:a05:6000:68c:b0:22a:bde3:f8cc with SMTP id bo12-20020a056000068c00b0022abde3f8ccmr71217wrb.556.1663254376855; Thu, 15 Sep 2022 08:06:16 -0700 (PDT) Date: Thu, 15 Sep 2022 17:04:10 +0200 In-Reply-To: <20220915150417.722975-1-glider@google.com> Mime-Version: 1.0 References: <20220915150417.722975-1-glider@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220915150417.722975-37-glider@google.com> Subject: [PATCH v7 36/43] x86: kmsan: sync metadata pages on page fault From: Alexander Potapenko To: glider@google.com Cc: Alexander Viro , Alexei Starovoitov , Andrew Morton , Andrey Konovalov , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Christoph Hellwig , Christoph Lameter , David Rientjes , Dmitry Vyukov , Eric Biggers , Eric Dumazet , Greg Kroah-Hartman , Herbert Xu , Ilya Leoshkevich , Ingo Molnar , Jens Axboe , Joonsoo Kim , Kees Cook , Marco Elver , Mark Rutland , Matthew Wilcox , "Michael S. Tsirkin" , Pekka Enberg , Peter Zijlstra , Petr Mladek , Stephen Rothwell , Steven Rostedt , Thomas Gleixner , Vasily Gorbik , Vegard Nossum , Vlastimil Babka , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org KMSAN assumes shadow and origin pages for every allocated page are accessible. For pages between [VMALLOC_START, VMALLOC_END] those metadata pages start at KMSAN_VMALLOC_SHADOW_START and KMSAN_VMALLOC_ORIGIN_START, therefore we must sync a bigger memory region. Signed-off-by: Alexander Potapenko --- v2: -- addressed reports from kernel test robot Link: https://linux-review.googlesource.com/id/Ia5bd541e54f1ecc11b86666c3ec87c62ac0bdfb8 --- arch/x86/mm/fault.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index fa71a5d12e872..d728791be8ace 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -260,7 +260,7 @@ static noinline int vmalloc_fault(unsigned long address) } NOKPROBE_SYMBOL(vmalloc_fault); -void arch_sync_kernel_mappings(unsigned long start, unsigned long end) +static void __arch_sync_kernel_mappings(unsigned long start, unsigned long end) { unsigned long addr; @@ -284,6 +284,27 @@ void arch_sync_kernel_mappings(unsigned long start, unsigned long end) } } +void arch_sync_kernel_mappings(unsigned long start, unsigned long end) +{ + __arch_sync_kernel_mappings(start, end); +#ifdef CONFIG_KMSAN + /* + * KMSAN maintains two additional metadata page mappings for the + * [VMALLOC_START, VMALLOC_END) range. These mappings start at + * KMSAN_VMALLOC_SHADOW_START and KMSAN_VMALLOC_ORIGIN_START and + * have to be synced together with the vmalloc memory mapping. + */ + if (start >= VMALLOC_START && end < VMALLOC_END) { + __arch_sync_kernel_mappings( + start - VMALLOC_START + KMSAN_VMALLOC_SHADOW_START, + end - VMALLOC_START + KMSAN_VMALLOC_SHADOW_START); + __arch_sync_kernel_mappings( + start - VMALLOC_START + KMSAN_VMALLOC_ORIGIN_START, + end - VMALLOC_START + KMSAN_VMALLOC_ORIGIN_START); + } +#endif +} + static bool low_pfn(unsigned long pfn) { return pfn < max_low_pfn; -- 2.37.2.789.g6183377224-goog