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 E9F46C2D0D2 for ; Fri, 20 Dec 2019 18:51:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B138A20866 for ; Fri, 20 Dec 2019 18:51:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="D2prUNT3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B138A20866 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 5FF6A8E01B7; Fri, 20 Dec 2019 13:51:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5D90C8E019D; Fri, 20 Dec 2019 13:51:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 478DF8E01B7; Fri, 20 Dec 2019 13:51:06 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 3157C8E019D for ; Fri, 20 Dec 2019 13:51:06 -0500 (EST) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id ED9A1247A for ; Fri, 20 Dec 2019 18:51:05 +0000 (UTC) X-FDA: 76286412090.03.watch08_7df52569b6938 X-HE-Tag: watch08_7df52569b6938 X-Filterd-Recvd-Size: 5467 Received: from mail-ua1-f73.google.com (mail-ua1-f73.google.com [209.85.222.73]) by imf41.hostedemail.com (Postfix) with ESMTP for ; Fri, 20 Dec 2019 18:51:05 +0000 (UTC) Received: by mail-ua1-f73.google.com with SMTP id q23so2720578uar.4 for ; Fri, 20 Dec 2019 10:51:05 -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=+9FqVts9P2Cp1ZKh/IQlkIpOigmD6mYueuPFnIv/r5Y=; b=D2prUNT3y2xZFztdJWxwIRTPjva2KJ/UN14kby2UU/8oCdFmfYM0OAJuh3hTyJGVyJ OKqi/SgZNh07n0buTpvP8v0+WtVHy8KY7O1SyCWdvyemR8VuGrpCmHj2AzK7YJfHBY3r Dq/KG/hO/diymn5MKGgTZ/pztKoAAwG0vRpmNrSvVTzkHUmwZDzg88FPX+2Tx7TC/58x G3RNHtIt7tmORw3GTm0GKkVRjRn6uhDRFY1JhRZIM+HkQ5azss4K+fOgqpRowt5I4b/a vT+5DIfgKT7gK5oWOqGx/Qx8iIwF5AaEa8bw16IlvZUJ21rvDUVpo5ndk291i1KuWv6F c4pg== 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=+9FqVts9P2Cp1ZKh/IQlkIpOigmD6mYueuPFnIv/r5Y=; b=sMUG4exOi/MIa75aEj2myFHhXGCiZfCeJZKEwnk6jCmjXhSLForO3wfrrUqT91XLVj XdDgGlwH9cuBTuI4+wtjVkstwxpHcNDuwXqt19Sx7n5Th0EDi10unqDVRcrLTZJ+Si4f zr+r88/vR+2cOZR8DdPbxb74sNiz4i5k2IGHATIKQ31U5TmK+5P5JVxHeeERN18qlIjz HWWPxEpsbYNmjG9RACteD199HHSzubwBgD56A0TKkq9yAkj8DOc2IN2r76fqOIDmUdk9 mzwZM3CJcgKSsIe209loeUeJdZ2oEYZqMDu2J/jbb5sc+bYkb2U1+TO7u/fRWEjgq95g YF6A== X-Gm-Message-State: APjAAAVanJu/b9bz3c/yAP46rpjAfY7ZnFLGXqAaSrcsDqnX2H1xT6Z/ 5KctkQpJG+357I9ytdQc9CQ/W7Jycis= X-Google-Smtp-Source: APXvYqyMTnc5Xb/eTA6KkFlp6qpHeKAGVGfiUEOcMs3gWarG3fw4iQz3iZWtJsFzuNR2BYR6IXjTr6alo6U= X-Received: by 2002:a1f:1144:: with SMTP id 65mr10829917vkr.77.1576867864724; Fri, 20 Dec 2019 10:51:04 -0800 (PST) Date: Fri, 20 Dec 2019 19:49:33 +0100 In-Reply-To: <20191220184955.223741-1-glider@google.com> Message-Id: <20191220184955.223741-21-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 20/42] kmsan: x86: increase stack sizes in KMSAN builds From: glider@google.com To: Jens Axboe , Andy Lutomirski , Vegard Nossum , Dmitry Vyukov , Marco Elver , Andrey Konovalov , Christoph Hellwig , linux-mm@kvack.org Cc: glider@google.com, viro@zeniv.linux.org.uk, adilger.kernel@dilger.ca, akpm@linux-foundation.org, aryabinin@virtuozzo.com, ard.biesheuvel@linaro.org, arnd@arndb.de, hch@infradead.org, 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, 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 instruments the code heavily, increasing register pressure and preventing functions from being inlined. As a result, the kernel requires more stack space to run. Rename KASAN_STACK_ORDER to EXTRA_STACK_ORDER and set EXTRA_STACK_ORDER to 2 for KMSAN builds, effectively making the stacks 4 times larger. Signed-off-by: Alexander Potapenko Cc: Jens Axboe Cc: Andy Lutomirski Cc: Vegard Nossum Cc: Dmitry Vyukov Cc: Marco Elver Cc: Andrey Konovalov Cc: Christoph Hellwig Cc: linux-mm@kvack.org --- Change-Id: I1d9df161419a885bf654abff141e247366895b68 --- arch/x86/include/asm/page_64_types.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h index 288b065955b7..ea9fbf09f43b 100644 --- a/arch/x86/include/asm/page_64_types.h +++ b/arch/x86/include/asm/page_64_types.h @@ -7,18 +7,20 @@ #endif #ifdef CONFIG_KASAN -#define KASAN_STACK_ORDER 1 +#define EXTRA_STACK_ORDER 1 +#elif defined(CONFIG_KMSAN) +#define EXTRA_STACK_ORDER 2 #else -#define KASAN_STACK_ORDER 0 +#define EXTRA_STACK_ORDER 0 #endif -#define THREAD_SIZE_ORDER (2 + KASAN_STACK_ORDER) +#define THREAD_SIZE_ORDER (2 + EXTRA_STACK_ORDER) #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER) -#define EXCEPTION_STACK_ORDER (0 + KASAN_STACK_ORDER) +#define EXCEPTION_STACK_ORDER (0 + EXTRA_STACK_ORDER) #define EXCEPTION_STKSZ (PAGE_SIZE << EXCEPTION_STACK_ORDER) -#define IRQ_STACK_ORDER (2 + KASAN_STACK_ORDER) +#define IRQ_STACK_ORDER (2 + EXTRA_STACK_ORDER) #define IRQ_STACK_SIZE (PAGE_SIZE << IRQ_STACK_ORDER) /* -- 2.24.1.735.g03f4e72817-goog