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 5ECEEC43603 for ; Fri, 20 Dec 2019 18:50:13 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1EA2D206DA for ; Fri, 20 Dec 2019 18:50:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="EmbTb7qO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1EA2D206DA 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 C1A588E01A6; Fri, 20 Dec 2019 13:50:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BC9B38E019D; Fri, 20 Dec 2019 13:50:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE0E68E01A6; Fri, 20 Dec 2019 13:50:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0152.hostedemail.com [216.40.44.152]) by kanga.kvack.org (Postfix) with ESMTP id 980FC8E019D for ; Fri, 20 Dec 2019 13:50:12 -0500 (EST) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id 4BBE4585F for ; Fri, 20 Dec 2019 18:50:12 +0000 (UTC) X-FDA: 76286409864.04.chair58_7619e7db4ed08 X-HE-Tag: chair58_7619e7db4ed08 X-Filterd-Recvd-Size: 7171 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf41.hostedemail.com (Postfix) with ESMTP for ; Fri, 20 Dec 2019 18:50:11 +0000 (UTC) Received: by mail-wr1-f73.google.com with SMTP id i9so4147253wru.1 for ; Fri, 20 Dec 2019 10:50:11 -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=kBvC7Fllw8vrm6Q/YAbqF8E3B1njEbVJkGUanFnRs7s=; b=EmbTb7qO8TY7ZqoYtsAQismDGIQVxpEb828jVUxRKNdK/oAjtCADMewgADbcNPZ1jK BCYXq6CF4so27p/IHa9UUDzcjCj66JAGXO+nwlR/tdgg5r16aNGKY01r9B2oVq4cHOuv 8AL0ZiVZf7dJAH5PU58D2GVGf3jENk3EhTEg5RlZUx/T9VDyv3HEga9DE/nLo/4y4ISB SFJW2M+gepqkhcLhV1tpAffAZMz5ugcAe6gfP+M/+aAWUF9wZM1RzptD8vfl3+I92Pyw tu493kbb3/Xvgx7Fl5wGaJRvzyqrcRmcCgz7TYqrHJaijQGP4++2sckW9NM3Cz9/q1pk nORA== 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=kBvC7Fllw8vrm6Q/YAbqF8E3B1njEbVJkGUanFnRs7s=; b=MVip/2z97Qep9deYErs1b52KKIGKg5O8ki+sogEVc9GkBEgUTPfWJ+wScVZAessL0R QjBgXE5EEDbaG3jkmSfzqObX56cteUWzpzrBVAA5n/rph8SsOyT5rQabV6IC4lJcYrh7 2Qp7XMDwr6MH0JVG/0NXG5Z3mIX/ov1Et+x2UvPdx0brpjMdb5ukcZk64jZ3D8DOyJsU QQZl7m+bLyb3MGGSlWG96dIY1lOoc35HoisVbNkOlkI3srN0nJSyUS+O3TzNPIdHnEr1 hE7V8huxuBbc6RhwjWr6gWhDphC0WIApV6JCHEvEJpzGV59XIJdWkVOp1wY4lzXxs8Wf R62A== X-Gm-Message-State: APjAAAXAB/+USS7jcXgJeuBiaDh/TyhyjfZmTgpmQeKqGYB1k/yracOH HjkPDXW7IucQrC7/pjAb4t0x05qkFBQ= X-Google-Smtp-Source: APXvYqwB8s8eNTA3o/Hnc2XbsjgAN1x01j28LNoDk9BlDKL/xlsRkapKxW7brw2ZpJt8PUs3X2Lj5FBCw2A= X-Received: by 2002:a5d:6089:: with SMTP id w9mr16575961wrt.228.1576867810052; Fri, 20 Dec 2019 10:50:10 -0800 (PST) Date: Fri, 20 Dec 2019 19:49:16 +0100 In-Reply-To: <20191220184955.223741-1-glider@google.com> Message-Id: <20191220184955.223741-4-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 03/42] kasan: stackdepot: move filter_irq_stacks() to stackdepot.c From: glider@google.com To: Vegard Nossum , Dmitry Vyukov , Marco Elver , Andrey Konovalov , Andrey Ryabinin , linux-mm@kvack.org Cc: glider@google.com, viro@zeniv.linux.org.uk, adilger.kernel@dilger.ca, akpm@linux-foundation.org, 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 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: filter_irq_stacks() can be used by other tools (e.g. KMSAN), so it needs to be moved to a common location. lib/stackdepot.c seems a good place, as filter_irq_stacks() is usually applied to the output of stack_trace_save(). Signed-off-by: Alexander Potapenko To: Alexander Potapenko Cc: Vegard Nossum Cc: Dmitry Vyukov Cc: Marco Elver Cc: Andrey Konovalov Cc: Andrey Ryabinin Cc: linux-mm@kvack.org --- v4: - added an EXPORT_SYMBOL_GPL as requested by Marco Elver Change-Id: I65acecf64930a3658e8c2aa7423801082ded8602 --- include/linux/stackdepot.h | 2 ++ lib/stackdepot.c | 24 ++++++++++++++++++++++++ mm/kasan/common.c | 23 ----------------------- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/include/linux/stackdepot.h b/include/linux/stackdepot.h index 3efa97d482cb..24d49c732341 100644 --- a/include/linux/stackdepot.h +++ b/include/linux/stackdepot.h @@ -19,4 +19,6 @@ depot_stack_handle_t stack_depot_save(unsigned long *entries, unsigned int stack_depot_fetch(depot_stack_handle_t handle, unsigned long **entries); +unsigned int filter_irq_stacks(unsigned long *entries, unsigned int nr_entries); + #endif diff --git a/lib/stackdepot.c b/lib/stackdepot.c index 9d33059d874c..0efe82fa1e0f 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c @@ -20,6 +20,7 @@ */ #include +#include #include #include #include @@ -314,3 +315,26 @@ depot_stack_handle_t stack_depot_save(unsigned long *entries, return retval; } EXPORT_SYMBOL_GPL(stack_depot_save); + +static inline int in_irqentry_text(unsigned long ptr) +{ + return (ptr >= (unsigned long)&__irqentry_text_start && + ptr < (unsigned long)&__irqentry_text_end) || + (ptr >= (unsigned long)&__softirqentry_text_start && + ptr < (unsigned long)&__softirqentry_text_end); +} + +unsigned int filter_irq_stacks(unsigned long *entries, + unsigned int nr_entries) +{ + unsigned int i; + + for (i = 0; i < nr_entries; i++) { + if (in_irqentry_text(entries[i])) { + /* Include the irqentry function into the stack. */ + return i + 1; + } + } + return nr_entries; +} +EXPORT_SYMBOL_GPL(filter_irq_stacks); diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 2fa710bb6358..3b43899ebc51 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -15,7 +15,6 @@ */ #include -#include #include #include #include @@ -42,28 +41,6 @@ #include "kasan.h" #include "../slab.h" -static inline int in_irqentry_text(unsigned long ptr) -{ - return (ptr >= (unsigned long)&__irqentry_text_start && - ptr < (unsigned long)&__irqentry_text_end) || - (ptr >= (unsigned long)&__softirqentry_text_start && - ptr < (unsigned long)&__softirqentry_text_end); -} - -static inline unsigned int filter_irq_stacks(unsigned long *entries, - unsigned int nr_entries) -{ - unsigned int i; - - for (i = 0; i < nr_entries; i++) { - if (in_irqentry_text(entries[i])) { - /* Include the irqentry function into the stack. */ - return i + 1; - } - } - return nr_entries; -} - static inline depot_stack_handle_t save_stack(gfp_t flags) { unsigned long entries[KASAN_STACK_DEPTH]; -- 2.24.1.735.g03f4e72817-goog