From patchwork Fri Dec 20 18:49:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 11306149 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2A9096C1 for ; Fri, 20 Dec 2019 18:50:30 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E14E6206DA for ; Fri, 20 Dec 2019 18:50:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="U729EFXz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E14E6206DA 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 E8AC78E01AB; Fri, 20 Dec 2019 13:50:28 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E61778E019D; Fri, 20 Dec 2019 13:50:28 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D506D8E01AB; Fri, 20 Dec 2019 13:50:28 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0070.hostedemail.com [216.40.44.70]) by kanga.kvack.org (Postfix) with ESMTP id BE7008E019D for ; Fri, 20 Dec 2019 13:50:28 -0500 (EST) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id 7F6E1824999B for ; Fri, 20 Dec 2019 18:50:28 +0000 (UTC) X-FDA: 76286410536.04.heat81_7878edf7ba960 X-Spam-Summary: 2,0,0,cfbee30eb6532d9c,d41d8cd98f00b204,38hf9xqykca0tyvqr4t11tyr.p1zyv07a-zzx8npx.14t@flex--glider.bounces.google.com,:vegard.nossum@oracle.com:akpm@linux-foundation.org:dvyukov@google.com:elver@google.com:andreyknvl@google.com::glider@google.com:viro@zeniv.linux.org.uk:adilger.kernel@dilger.ca: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:mingo@elte.hu: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.c om:tytso X-HE-Tag: heat81_7878edf7ba960 X-Filterd-Recvd-Size: 5512 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf47.hostedemail.com (Postfix) with ESMTP for ; Fri, 20 Dec 2019 18:50:27 +0000 (UTC) Received: by mail-wr1-f73.google.com with SMTP id o6so283531wrp.8 for ; Fri, 20 Dec 2019 10:50:27 -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=8AimtizIAIjax6j+Ps7uORSo2TLqrLsGsV7odvt1qdA=; b=U729EFXzTNqq7UIpJcgMYSwLtzcP3yTCQVh5WXv8MDS3tc5tAbMILjaOS6Bf0bG+Bt iQ6xcEXI89lbX/wq+1RWFrgyGyWP7TY0vhvbPW64MaKwbyqskOnImAUcSMLuK+Bvnz84 7Aj/6wyCi+VjGt52XR78l4SdAcR3T++noaalDR+quc3ueYg2TZI0rQrPaMtb0Ky3odQT waBkYQvoyuLq6tTykZQWG3DSzSbUuoHDHwj+SNe0/pW5E1J4+GtBJ57y3MSV3qyC8rl+ brKDgMEKul8qaogcsvlqfg5ys9oV5G3zIZ1ylMOW0Oj1hfDiXt6uB2EP2GUv3w1MYfYF wQlQ== 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=8AimtizIAIjax6j+Ps7uORSo2TLqrLsGsV7odvt1qdA=; b=BimVs3JNnSuxFnafmkCE7pbk7uLGko6L7yoPdAdJ6qPXGZUtxKCxBfXmFc3ZuxYmHm G5M3Z+lcp6/IdVaLdkTG/Bv0+9sMHbH4zUIGmyYuxaYgOJ5Dvemj8oSi+S7LMawxPO3G zACliUcPtbX6544G/liWc2O5AMnRH5AIWpc6PenkKL6YQ4Z+sWEaObvvXTV8k10+XBHG 0a6/8LcBU44HHmfLQrJG/6ClOHcgnAuF+m0+nnk8hzXVqnoBrmlY68Nr83jqFCkWK9Wt 98GDgrRLxT/Dr9iKYrdXq8YM5+GED4QKmT9KOed9+R7l/poIj+b2ws+K3fRbBjEevj6A Oq/w== X-Gm-Message-State: APjAAAWMWubA8ZBDwaBNePt4k6DLFUXNPYF2wjL0o3bJFF8CwYpuKf/u juoZ3642vr0hB5yYJnKRDO5wni7tsTo= X-Google-Smtp-Source: APXvYqx3PFcNeF5vThcPcN3J9+h/Mo654n/u00jGjtsULXQyk+pISWKsea6YY3JDbrxFLJiIQSHJ4EFnJVo= X-Received: by 2002:a5d:6a88:: with SMTP id s8mr16147393wru.173.1576867826019; Fri, 20 Dec 2019 10:50:26 -0800 (PST) Date: Fri, 20 Dec 2019 19:49:21 +0100 In-Reply-To: <20191220184955.223741-1-glider@google.com> Message-Id: <20191220184955.223741-9-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 08/42] kmsan: reduce vmalloc space From: glider@google.com To: Vegard Nossum , Andrew Morton , Dmitry Vyukov , Marco Elver , Andrey Konovalov , linux-mm@kvack.org Cc: glider@google.com, viro@zeniv.linux.org.uk, adilger.kernel@dilger.ca, 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, mingo@elte.hu, 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 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 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 To: Alexander Potapenko Cc: Vegard Nossum Cc: Andrew Morton Cc: Dmitry Vyukov Cc: Marco Elver Cc: Andrey Konovalov Cc: linux-mm@kvack.org --- Change-Id: Iaa5e8e0fc2aa66c956f937f5a1de6e5ef40d57cc --- arch/x86/include/asm/pgtable_64_types.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h index 52e5f5f2240d..586629e20436 100644 --- a/arch/x86/include/asm/pgtable_64_types.h +++ b/arch/x86/include/asm/pgtable_64_types.h @@ -139,7 +139,22 @@ extern unsigned int ptrs_per_p4d; # define VMEMMAP_START __VMEMMAP_BASE_L4 #endif /* CONFIG_DYNAMIC_MEMORY_LAYOUT */ +#ifndef CONFIG_KMSAN #define VMALLOC_END (VMALLOC_START + (VMALLOC_SIZE_TB << 40) - 1) +#else +/* + * In KMSAN builds vmalloc area is four times smaller, and the remaining 3/4 + * are used to keep the metadata for virtual pages. + */ +#define VMALLOC_QUARTER_SIZE ((VMALLOC_SIZE_TB << 40) >> 2) +#define VMALLOC_END (VMALLOC_START + VMALLOC_QUARTER_SIZE - 1) +#define VMALLOC_SHADOW_OFFSET VMALLOC_QUARTER_SIZE +#define VMALLOC_ORIGIN_OFFSET (VMALLOC_QUARTER_SIZE * 2) +#define VMALLOC_META_END (VMALLOC_END + VMALLOC_ORIGIN_OFFSET) +#define MODULES_SHADOW_START (VMALLOC_META_END + 1) +#define MODULES_ORIGIN_START (MODULES_SHADOW_START + MODULES_LEN) +#define MODULES_ORIGIN_END (MODULES_ORIGIN_START + MODULES_LEN) +#endif #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE) /* The module sections ends with the start of the fixmap */