From patchwork Tue Feb 14 10:30:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 56827 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2890886wrn; Tue, 14 Feb 2023 02:39:01 -0800 (PST) X-Google-Smtp-Source: AK7set9mp7BdFl8/dnsDyufkJjbiok+Eo/thfzFqu4BdZlpqDHX+TROINJyaCp4vmfJeaoCkFwGM X-Received: by 2002:a17:90a:6485:b0:234:190d:e653 with SMTP id h5-20020a17090a648500b00234190de653mr2027189pjj.6.1676371141304; Tue, 14 Feb 2023 02:39:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676371141; cv=none; d=google.com; s=arc-20160816; b=ksk/kVGwxm/QZFDVTmyzL53GlRNutvdb1XFPk+yJggBzABUdAV3w1csdeVIebWwtP+ QNY8kSHvKcFLdu+kPS+t1xIWaloBh/Ou2rN2ZgAyqyFoX6HJSrBZlx3oWD/Cdu1GfDAk VU2jYRFuYq3C1M646R/LTdTmjonZQ45ViahN7mt8hUFoi4FDGB/mBph5MRBgD9OcVPHo VWNSL+KCx6x7q9tkNqQxV8JU8L9RWKimBBURzgkCbbEvr34J1DcDvC9srWvSivE09K6y rSmEiBsdsX8+mdAHkaoY3hrXGB9i3H5eCCDXFG1a7pmOf2R8eDLP78HVZzj4HyfG436d UAqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=iO2oNcvyj+5oQXBNXKeF8zvrEC8UyLgmscT1pfcl3Oc=; b=uWDevREgpZ+vnPvAkpVdT1G/dqETfDdpjfey5hHzVSiYlRONEfDKMGZh6eGzvaAmK+ L/1URaVzHf/ZAFWiPtUjhRy/q7bIh3a7+PYROS4JHdmUfBBLNG35Qv0/gfVdrLdlhBko cGwYeJltTX9mF3fTzqQ97UxLfkiNcUTD7OAeJ2l6v0xsH2CHQwnVnxfAiwCeWthUgidD SIQ25PUjWf/5l3p0EwKbbzk2Og3EC2oB5si3ws8L2nbYGc+WHPB+kFxkXUrLB17zLnFB qFbFjsGuWy4lpsbVjFxkUbC2o4r7tbVWY0XdCIQ5aRsG7XpPVEfCdLs0L2kzbgNRXDhI 7p2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FRujVgQd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z22-20020a17090ad79600b00233773a522esi2171897pju.49.2023.02.14.02.38.48; Tue, 14 Feb 2023 02:39:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FRujVgQd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232443AbjBNKao (ORCPT + 99 others); Tue, 14 Feb 2023 05:30:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232428AbjBNKam (ORCPT ); Tue, 14 Feb 2023 05:30:42 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65F67241C9 for ; Tue, 14 Feb 2023 02:30:35 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EC04B614F8 for ; Tue, 14 Feb 2023 10:30:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7E7BC433EF; Tue, 14 Feb 2023 10:30:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676370634; bh=9T6pAt8RK/wq+3Lfrzi3xrLApHJkjngyCRo3iZZ8lcM=; h=From:To:Cc:Subject:Date:From; b=FRujVgQdhII1Y1kLFdI49NShstvdPkwW9DJTqMSApgiaz2cPn7FjCjQsVcxy4228C Y2iGvCNYWUAVz2GoYmvgW2/ja59ZwxyVnyZ/BZ5onLQ07n19oJvl9EMTfpbNRn2xgq QEkw6+6Tsoyx5p198fWDYBUoQNdDInMJM93CtK3a8RafJ9ykweJIG58qK5MtdG6Xwh U9+1ikY/FV6uI+wm1uM8FqSnEwksPW9wwkTs3CdLV2cNxbQXAybJXpU5dvxK+b++fE KjkKPqFqmv32h6dHpqvqQmgppq5BrWQQ5lZ0JudInrsf0adg25t3Pl1T7cCZATr4/h jIv3FSv/RYIZQ== From: Arnd Bergmann To: "Liam R. Howlett" Cc: Arnd Bergmann , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , kasan-dev@googlegroups.com, Andrew Morton , Vernon Yang , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] [RFC] maple_tree: reduce stack usage with gcc-9 and earlier Date: Tue, 14 Feb 2023 11:30:24 +0100 Message-Id: <20230214103030.1051950-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757802546002288650?= X-GMAIL-MSGID: =?utf-8?q?1757802546002288650?= From: Arnd Bergmann gcc-10 changed the way inlining works to be less aggressive, but older versions run into an oversized stack frame warning whenever CONFIG_KASAN_STACK is enabled, as that forces variables from inlined callees to be non-overlapping: lib/maple_tree.c: In function 'mas_wr_bnode': lib/maple_tree.c:4320:1: error: the frame size of 1424 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] Change the annotations on mas_store_b_node() and mas_commit_b_node() to explicitly forbid inlining in this configuration, which is the same behavior that newer versions already have. Cc: Andrey Ryabinin Cc: Alexander Potapenko Cc: Andrey Konovalov Cc: Dmitry Vyukov Cc: Vincenzo Frascino Cc: kasan-dev@googlegroups.com Signed-off-by: Arnd Bergmann Reviewed-by: David Hildenbrand Reviewed-by: Liam R. Howlett --- lib/maple_tree.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 5e9703189259..646297cae5d1 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -146,6 +146,13 @@ struct maple_subtree_state { struct maple_big_node *bn; }; +#ifdef CONFIG_KASAN_STACK +/* Prevent mas_wr_bnode() from exceeding the stack frame limit */ +#define noinline_for_kasan noinline_for_stack +#else +#define noinline_for_kasan inline +#endif + /* Functions */ static inline struct maple_node *mt_alloc_one(gfp_t gfp) { @@ -2107,7 +2114,7 @@ static inline void mas_bulk_rebalance(struct ma_state *mas, unsigned char end, * * Return: The actual end of the data stored in @b_node */ -static inline void mas_store_b_node(struct ma_wr_state *wr_mas, +static noinline_for_kasan void mas_store_b_node(struct ma_wr_state *wr_mas, struct maple_big_node *b_node, unsigned char offset_end) { unsigned char slot; @@ -3579,7 +3586,7 @@ static inline bool mas_reuse_node(struct ma_wr_state *wr_mas, * @b_node: The maple big node * @end: The end of the data. */ -static inline int mas_commit_b_node(struct ma_wr_state *wr_mas, +static noinline_for_kasan int mas_commit_b_node(struct ma_wr_state *wr_mas, struct maple_big_node *b_node, unsigned char end) { struct maple_node *node;