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 X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26F22C43603 for ; Fri, 20 Dec 2019 18:50:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DC0AF20866 for ; Fri, 20 Dec 2019 18:50:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HPhrEb14" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC0AF20866 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8C26E8E01B2; Fri, 20 Dec 2019 13:50:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8994C8E019D; Fri, 20 Dec 2019 13:50:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7AAB88E01B2; Fri, 20 Dec 2019 13:50:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0018.hostedemail.com [216.40.44.18]) by kanga.kvack.org (Postfix) with ESMTP id 669AC8E019D for ; Fri, 20 Dec 2019 13:50:50 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id 097CC181AEF15 for ; Fri, 20 Dec 2019 18:50:50 +0000 (UTC) X-FDA: 76286411460.09.actor35_7ba39f2b9ae3f X-HE-Tag: actor35_7ba39f2b9ae3f X-Filterd-Recvd-Size: 5452 Received: from mail-qk1-f201.google.com (mail-qk1-f201.google.com [209.85.222.201]) by imf08.hostedemail.com (Postfix) with ESMTP for ; Fri, 20 Dec 2019 18:50:49 +0000 (UTC) Received: by mail-qk1-f201.google.com with SMTP id l7so6496033qke.8 for ; Fri, 20 Dec 2019 10:50:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=glKRHB/0K78MwySydLpP2T9VIPqw/Mc9ubXNOsDLnBg=; b=HPhrEb14PKnmQhJldjO9hWB7KWnTwELfh4/dQQtaRuDdC/LQ8mSoHggWBNs636yg0/ 1/3vtifIPTkrT2yCz47+KNANMIEkhGZ8rnvXH0mxz4ntAjq88pXj43G4ctOw19NX6PHx 1aLF1QjumMrfx+oBjix0SKOZXW+bpdcqUBAgihcRHWHW5MIhheReVF//irT06x48iHP+ ayMAWJCq/wE9opjxBzCZw6YO12k7yvzQS3A8K4d0+ps1s1BEQnV8JrhQQ/HSPDk9fLEH 027/zcjK5DFFcanU+wBaGtPfRKgveP9RlNxGQUg5u+GnibUBS9vQ/rfO7nluWTH7tz3X WDtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=glKRHB/0K78MwySydLpP2T9VIPqw/Mc9ubXNOsDLnBg=; b=FahTlmcwrKszPbt0egHsUt476Ak5v+StxUhQP9fKnlXzgTgRpRj7zw+SstRtMal6Ci YMvOc8hHQO6TqYOkkHB7OMpPzszL7HgiRGWBbV1fJA18GqkRyDoIJ/+p4Q1LD2sX4H3W snRJLR26dVebeWzgd4go9zAuaeTnxbxwr8xH7AFbQKsl+wl/mbEes4rj/+J+IlE06ofQ mpOtAYgMo7xWzEwOTVHrjtbWzDcWFRJnWzBL9jh6gTKIqGuJSxos3spTVB2Gx6T/Oy03 H2FTb6sUnAd8CQMSKa9MDhoK5OTSg0LitPMKCvWonENfFqwqbK06RTOftVwmouM1fzcn AgKQ== X-Gm-Message-State: APjAAAV8lrdGGRyt+bRLSDWzOC5fkqLQClKb2ozuzIqTjMRj/XihL/w4 pWIBaefJx/J0YOnZFo41l7Ri6qUBDmE= X-Google-Smtp-Source: APXvYqyujkveck7GJerZulFQnWJq5tEaH9q2YH5XMzxX3Bm3fU+ufpEZYpNJY7ykplFNHHyrKju5Idm4VdI= X-Received: by 2002:a0c:e58e:: with SMTP id t14mr13466422qvm.131.1576867848891; Fri, 20 Dec 2019 10:50:48 -0800 (PST) Date: Fri, 20 Dec 2019 19:49:28 +0100 In-Reply-To: <20191220184955.223741-1-glider@google.com> Message-Id: <20191220184955.223741-16-glider@google.com> Mime-Version: 1.0 References: <20191220184955.223741-1-glider@google.com> X-Mailer: git-send-email 2.24.1.735.g03f4e72817-goog Subject: [PATCH RFC v4 15/42] kmsan: x86: sync metadata pages on page fault From: glider@google.com To: Ingo Molnar , Vegard Nossum , Dmitry Vyukov , Marco Elver , Andrey Konovalov , linux-mm@kvack.org Cc: glider@google.com, viro@zeniv.linux.org.uk, adilger.kernel@dilger.ca, akpm@linux-foundation.org, aryabinin@virtuozzo.com, luto@kernel.org, ard.biesheuvel@linaro.org, arnd@arndb.de, hch@infradead.org, hch@lst.de, darrick.wong@oracle.com, davem@davemloft.net, dmitry.torokhov@gmail.com, ebiggers@google.com, edumazet@google.com, ericvh@gmail.com, gregkh@linuxfoundation.org, harry.wentland@amd.com, herbert@gondor.apana.org.au, iii@linux.ibm.com, jasowang@redhat.com, axboe@kernel.dk, m.szyprowski@samsung.com, mark.rutland@arm.com, martin.petersen@oracle.com, schwidefsky@de.ibm.com, willy@infradead.org, mst@redhat.com, mhocko@suse.com, monstr@monstr.eu, pmladek@suse.com, cai@lca.pw, rdunlap@infradead.org, robin.murphy@arm.com, sergey.senozhatsky@gmail.com, rostedt@goodmis.org, tiwai@suse.com, tytso@mit.edu, tglx@linutronix.de, gor@linux.ibm.com, wsa@the-dreams.de Content-Type: text/plain; charset="UTF-8" X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: KMSAN assumes shadow and origin pages for every allocated page are accessible. For pages in vmalloc region those metadata pages reside in [VMALLOC_END, VMALLOC_META_END), therefore we must sync a bigger memory region. Signed-off-by: Alexander Potapenko To: Alexander Potapenko Cc: Ingo Molnar Cc: Vegard Nossum Cc: Dmitry Vyukov Cc: Marco Elver Cc: Andrey Konovalov Cc: linux-mm@kvack.org --- Change-Id: I0d54855489870ef1180b37fe2120b601da464bf7 --- arch/x86/mm/fault.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 304d31d8cbbc..37834a7b88cd 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -320,7 +320,17 @@ static void dump_pagetable(unsigned long address) void vmalloc_sync_all(void) { +#ifdef CONFIG_KMSAN + /* + * For KMSAN, make sure metadata pages for vmalloc area and modules are + * also synced. + */ + sync_global_pgds(VMALLOC_START & PGDIR_MASK, VMALLOC_META_END); + sync_global_pgds(MODULES_SHADOW_START & PGDIR_MASK, + MODULES_ORIGIN_END); +#else sync_global_pgds(VMALLOC_START & PGDIR_MASK, VMALLOC_END); +#endif } /* @@ -337,7 +347,17 @@ static noinline int vmalloc_fault(unsigned long address) pte_t *pte; /* Make sure we are in vmalloc area: */ +#ifdef CONFIG_KMSAN + /* + * For KMSAN, make sure metadata pages for vmalloc area and modules are + * also synced. + */ + if (!(address >= VMALLOC_START && address < VMALLOC_META_END) && + !(address >= MODULES_SHADOW_START && + address < MODULES_ORIGIN_END)) +#else if (!(address >= VMALLOC_START && address < VMALLOC_END)) +#endif return -1; /* -- 2.24.1.735.g03f4e72817-goog