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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E802C43334 for ; Mon, 11 Jul 2022 16:13:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E449B94000D; Mon, 11 Jul 2022 12:13:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DF3158E0002; Mon, 11 Jul 2022 12:13:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C6DB394000D; Mon, 11 Jul 2022 12:13:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id B75E48E0002 for ; Mon, 11 Jul 2022 12:13:37 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 7C65BCDC for ; Mon, 11 Jul 2022 16:13:37 +0000 (UTC) X-FDA: 79675314474.15.97FA938 Received: from mail-yw1-f180.google.com (mail-yw1-f180.google.com [209.85.128.180]) by imf04.hostedemail.com (Postfix) with ESMTP id 82B3E40027 for ; Mon, 11 Jul 2022 16:13:36 +0000 (UTC) Received: by mail-yw1-f180.google.com with SMTP id 00721157ae682-3137316bb69so54012657b3.10 for ; Mon, 11 Jul 2022 09:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=BOu1n0uYdCsudxoJVtyz5/UL8tUbc5xPCGC+9KrKzU4=; b=jfZhtAzNU5rTNiQTs4mptKw1m2kTa9R6IQTrIM+PBmuO9yyCHXVyohDAlN7KTzn6Ah we0Ko3BSxqQWXKVCJWUqcjMFYTQ78+eNUIvCbS8SdyauGnfHltCkJdcl53p9aqKvWY3m IRJ3N9l8PXZ6ZZNwNwgBnoO6YhW3Kajtwmk3Yppwor2+/X/PfamcxKpfKaKnsiD5jMwe C7PQoBo9a8L6Gtf9tzt2aclez/bEA+frq7ccjV5CWtuVTh7ZAko/VlLMTBm4+dOZMCSz yHdAEc6RTrY4quwMSVG8R6BnUsgBhGlxx3SUpp5nDkGFTpMdMtR9QNkzjQOQ51Hqem1r ROgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=BOu1n0uYdCsudxoJVtyz5/UL8tUbc5xPCGC+9KrKzU4=; b=UeySRrcY7o7donL1BFsrIVT5QtNa5FSqJXY8z7LzZgxN3rkegKZfiFpyYisP+8VPMC 1McbeVTUZtcRHP8eWKPJLkx49NygrFbjXTpU98tZCAQREy5gSXWIE+u9GowfmPLu4GE3 rH6+GZ9NO92LA6DM1c9CYNYVZVz4KzK3FpqPAOXoJG3n2VRTLDs1pEcZI08C8/VJ8CNI XRIz5k9L1VYkMn3N4WmbrorFcqn9r01SpZK3ETH8LURdl9+BmIfxzkGBvEIiVyAOE1sz QlvLee7iqUpHkYED4vYcYEKR2l49y0kNb8BvWU6YA+d9IIvM3A/lfDEzqUU2O7cT/Jee d8Ww== X-Gm-Message-State: AJIora+5MAMpvf/uViqMw7j8WaV18lUZG42YYtQ6ZRMONcrLgmFt16+8 BYExCm8lz+zeWPkPKmamz2B+u/9suIFXs7NyKbE6rw== X-Google-Smtp-Source: AGRyM1u7w4vwWQLqCchegA4jWk07R+nBUJyoXBnwnNANR5KSe1C5dJ2LQvRXdoOq/VOfMNDgU8kdjtBCXiK48O1MRt0= X-Received: by 2002:a81:98d:0:b0:31c:921c:9783 with SMTP id 135-20020a81098d000000b0031c921c9783mr19996386ywj.316.1657556015569; Mon, 11 Jul 2022 09:13:35 -0700 (PDT) MIME-Version: 1.0 References: <20220701142310.2188015-1-glider@google.com> <20220701142310.2188015-10-glider@google.com> In-Reply-To: <20220701142310.2188015-10-glider@google.com> From: Marco Elver Date: Mon, 11 Jul 2022 18:12:59 +0200 Message-ID: Subject: Re: [PATCH v4 09/45] x86: kmsan: pgtable: reduce vmalloc space To: Alexander Potapenko Cc: Alexander Viro , Alexei Starovoitov , Andrew Morton , Andrey Konovalov , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Christoph Hellwig , Christoph Lameter , David Rientjes , Dmitry Vyukov , Eric Dumazet , Greg Kroah-Hartman , Herbert Xu , Ilya Leoshkevich , Ingo Molnar , Jens Axboe , Joonsoo Kim , Kees Cook , Mark Rutland , Matthew Wilcox , "Michael S. Tsirkin" , Pekka Enberg , Peter Zijlstra , Petr Mladek , 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" ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=jfZhtAzN; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf04.hostedemail.com: domain of elver@google.com designates 209.85.128.180 as permitted sender) smtp.mailfrom=elver@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657556016; h=from:from:sender: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=BOu1n0uYdCsudxoJVtyz5/UL8tUbc5xPCGC+9KrKzU4=; b=BkQAJEJ3HgepFsi+kg8HlXxI+YwLCOxx8knJwWYYm5SZHOJWZgQkl6W5AuMb5obrQUmpH8 +94/mLhcNy9K3tokmG9AK1UyE2eVxymMrFN6MeUmTq0e3c17tzQQs5nL7k+L+IjVB1Kai+ 3RS8LrCtQcQFg4W1yWuehev2kvqZUI8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657556016; a=rsa-sha256; cv=none; b=c6YV4Rh00QZP0sw1jqYI+rLbXUmE/zkqO97OM+3TEhsaMnlfyqKCh19s6y9/bdBR2goKf6 GfGx1csA1VJFsPmrdz3sI9jyFxo/x7RU4Xy4ul/MQ7Qch9DlYd79Uc2CljyEnEOR6tnSDF NSSWMlDT0+G8Ya+YpqRZYI3G/T3hLQg= Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=jfZhtAzN; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf04.hostedemail.com: domain of elver@google.com designates 209.85.128.180 as permitted sender) smtp.mailfrom=elver@google.com X-Rspamd-Server: rspam06 X-Rspam-User: X-Stat-Signature: r3djq4rfbjwad1wnj5xjhrpbpdutc3ei X-Rspamd-Queue-Id: 82B3E40027 X-HE-Tag: 1657556016-910018 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: On Fri, 1 Jul 2022 at 16:23, Alexander Potapenko wrote: > > KMSAN is going to use 3/4 of existing vmalloc space to hold the > metadata, therefore we lower VMALLOC_END to make sure vmalloc() doesn't > allocate past the first 1/4. > > Signed-off-by: Alexander Potapenko > --- > v2: > -- added x86: to the title > > Link: https://linux-review.googlesource.com/id/I9d8b7f0a88a639f1263bc693cbd5c136626f7efd > --- > arch/x86/include/asm/pgtable_64_types.h | 41 ++++++++++++++++++++++++- > arch/x86/mm/init_64.c | 2 +- > 2 files changed, 41 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h > index 70e360a2e5fb7..ad6ded5b1dedf 100644 > --- a/arch/x86/include/asm/pgtable_64_types.h > +++ b/arch/x86/include/asm/pgtable_64_types.h > @@ -139,7 +139,46 @@ extern unsigned int ptrs_per_p4d; > # define VMEMMAP_START __VMEMMAP_BASE_L4 > #endif /* CONFIG_DYNAMIC_MEMORY_LAYOUT */ > > -#define VMALLOC_END (VMALLOC_START + (VMALLOC_SIZE_TB << 40) - 1) > +#define VMEMORY_END (VMALLOC_START + (VMALLOC_SIZE_TB << 40) - 1) Comment what VMEMORY_END is? (Seems obvious, but less guessing is better here.) > +#ifndef CONFIG_KMSAN > +#define VMALLOC_END VMEMORY_END > +#else > +/* > + * In KMSAN builds vmalloc area is four times smaller, and the remaining 3/4 > + * are used to keep the metadata for virtual pages. The memory formerly > + * belonging to vmalloc area is now laid out as follows: > + * > + * 1st quarter: VMALLOC_START to VMALLOC_END - new vmalloc area > + * 2nd quarter: KMSAN_VMALLOC_SHADOW_START to > + * VMALLOC_END+KMSAN_VMALLOC_SHADOW_OFFSET - vmalloc area shadow > + * 3rd quarter: KMSAN_VMALLOC_ORIGIN_START to > + * VMALLOC_END+KMSAN_VMALLOC_ORIGIN_OFFSET - vmalloc area origins > + * 4th quarter: KMSAN_MODULES_SHADOW_START to KMSAN_MODULES_ORIGIN_START > + * - shadow for modules, > + * KMSAN_MODULES_ORIGIN_START to > + * KMSAN_MODULES_ORIGIN_START + MODULES_LEN - origins for modules. > + */ > +#define VMALLOC_QUARTER_SIZE ((VMALLOC_SIZE_TB << 40) >> 2) > +#define VMALLOC_END (VMALLOC_START + VMALLOC_QUARTER_SIZE - 1) > + > +/* > + * vmalloc metadata addresses are calculated by adding shadow/origin offsets > + * to vmalloc address. > + */ > +#define KMSAN_VMALLOC_SHADOW_OFFSET VMALLOC_QUARTER_SIZE > +#define KMSAN_VMALLOC_ORIGIN_OFFSET (VMALLOC_QUARTER_SIZE << 1) > + > +#define KMSAN_VMALLOC_SHADOW_START (VMALLOC_START + KMSAN_VMALLOC_SHADOW_OFFSET) > +#define KMSAN_VMALLOC_ORIGIN_START (VMALLOC_START + KMSAN_VMALLOC_ORIGIN_OFFSET) > + > +/* > + * The shadow/origin for modules are placed one by one in the last 1/4 of > + * vmalloc space. > + */ > +#define KMSAN_MODULES_SHADOW_START (VMALLOC_END + KMSAN_VMALLOC_ORIGIN_OFFSET + 1) > +#define KMSAN_MODULES_ORIGIN_START (KMSAN_MODULES_SHADOW_START + MODULES_LEN) > +#endif /* CONFIG_KMSAN */ > > #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE) > /* The module sections ends with the start of the fixmap */ > diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c > index 39c5246964a91..5806331172361 100644 > --- a/arch/x86/mm/init_64.c > +++ b/arch/x86/mm/init_64.c > @@ -1287,7 +1287,7 @@ static void __init preallocate_vmalloc_pages(void) > unsigned long addr; > const char *lvl; > > - for (addr = VMALLOC_START; addr <= VMALLOC_END; addr = ALIGN(addr + 1, PGDIR_SIZE)) { > + for (addr = VMALLOC_START; addr <= VMEMORY_END; addr = ALIGN(addr + 1, PGDIR_SIZE)) { > pgd_t *pgd = pgd_offset_k(addr); > p4d_t *p4d; > pud_t *pud; > -- > 2.37.0.rc0.161.g10f37bed90-goog >