From patchwork Thu Mar 2 16:38:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9601413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B8B6160414 for ; Thu, 2 Mar 2017 19:15:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8525285CC for ; Thu, 2 Mar 2017 19:15:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B865285D8; Thu, 2 Mar 2017 19:15:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16AEE285CC for ; Thu, 2 Mar 2017 19:15:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752978AbdCBTOQ (ORCPT ); Thu, 2 Mar 2017 14:14:16 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:52776 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752262AbdCBTNm (ORCPT ); Thu, 2 Mar 2017 14:13:42 -0500 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0M0Y1e-1cRONI0uSc-00ur9H; Thu, 02 Mar 2017 17:38:58 +0100 From: Arnd Bergmann To: kasan-dev@googlegroups.com Cc: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-wireless@vger.kernel.org, kernel-build-reports@lists.linaro.org, "David S . Miller" , Arnd Bergmann Subject: [PATCH 23/26] mtd: cfi: reduce stack size with KASAN Date: Thu, 2 Mar 2017 17:38:31 +0100 Message-Id: <20170302163834.2273519-24-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170302163834.2273519-1-arnd@arndb.de> References: <20170302163834.2273519-1-arnd@arndb.de> X-Provags-ID: V03:K0:/XLv8TKeiKvBmlfFDU21Ai8TuvhHs12VWA6ygifx+CScoVbw6bg GOMiSZMdp/VXZ9eR+ezSXJq4DiWAwzUEhaNZW89Ps4BNmscBaVLDcWLiVsjY2JvFI/PsHoR MC2NHPKvFglWSL7R3jy5Jz67Arrk2AEuuYK5RsBN5ifgTgPYvH4GJyBMBDV+B8hB7Z/Gq0I LmSBmmANJu8TY/mMGmglg== X-UI-Out-Filterresults: notjunk:1; V01:K0:6+pXvrs+5tc=:xQf2vUOPVYEwtqX+8H/u/n CZKHIZ3NZMZAoQCnCJi5gjn3FA/9uPSgtHzzzHuEJHMmzlPEvoN9Wk4KlcRwSxBnAZYU3QJW6 iCp3D/K0feO6UjNNIzzhF0xijGMvkFpUej3LZaIOIJIRvVz8ZbpSZTVTXNGrWNy9TLnvwn6tu RIcodnDMSjt8X9T9XZ/Weuh02O7rpAincgpyMdjFJ83nEYtWApoBeDXR9SE67uaTsRnmoitz+ onR5lftHsyFlVS7AHq572nU7EOJK7FetboNEoWFdXy8U6YEtQDQgG2M2oLub+Vivn8oYsoQUa Mj/s55gnSEo7mDh7CfPBN7aadCrJ0LUC3m/s3Nk64CcZBC3HpA94Q8P/MDN7QQM+ZRiBYQ8uN fHr6Si/ZUzL6oV6ihY/AUHhsIIoQdLpC3RaU1/ZupjTkRt/YrNO8EVJp/XxZbPwWpOIduLPXR 4wqzwkl3lvM+wRd8HKsuaEye/v9/QmcAk04M9coDsYYSkEtvTXiUDeIurKUsX6PghfxO1h7Yt zgbsK5QkFDtyCtrtesp60hZ0Kpnsihtj6U1kKBAUYLEuzxyYkkQbyQKVRNjOgC+9/yqrI2eWF z4ks7sW6G20JpBdp2nQKyEgiPuN2UYolkwh7DUTgevUQF/qVAwf9Y47mMfVWZInRsIi+WN0WA PHooLvPYamUirfsj9LIF3MWa6j09QIxsSLvQEPtzOR//LTNpqbhaPg9BHYmVKJFEZpMA= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When CONFIG_KASAN is used, we consume a lot of extra stack space: drivers/mtd/chips/cfi_cmdset_0020.c: In function 'do_write_buffer': drivers/mtd/chips/cfi_cmdset_0020.c:603:1: error: the frame size of 2080 bytes is larger than 1536 bytes [-Werror=frame-larger-than=] drivers/mtd/chips/cfi_cmdset_0020.c: In function 'cfi_staa_erase_varsize': drivers/mtd/chips/cfi_cmdset_0020.c:972:1: error: the frame size of 1936 bytes is larger than 1536 bytes [-Werror=frame-larger-than=] drivers/mtd/chips/cfi_cmdset_0001.c: In function 'do_write_buffer': drivers/mtd/chips/cfi_cmdset_0001.c:1841:1: error: the frame size of 1776 bytes is larger than 1536 bytes [-Werror=frame-larger-than=] This marks some functions as noinline_for_kasan to keep reduce the overall stack size. Signed-off-by: Arnd Bergmann --- drivers/mtd/chips/cfi_cmdset_0020.c | 8 ++++---- include/linux/mtd/map.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c index 94d3eb42c4d5..8a21e030829c 100644 --- a/drivers/mtd/chips/cfi_cmdset_0020.c +++ b/drivers/mtd/chips/cfi_cmdset_0020.c @@ -244,7 +244,7 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map) } -static inline int do_read_onechip(struct map_info *map, struct flchip *chip, loff_t adr, size_t len, u_char *buf) +static noinline_for_kasan int do_read_onechip(struct map_info *map, struct flchip *chip, loff_t adr, size_t len, u_char *buf) { map_word status, status_OK; unsigned long timeo; @@ -728,7 +728,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs, } -static inline int do_erase_oneblock(struct map_info *map, struct flchip *chip, unsigned long adr) +static noinline_for_kasan int do_erase_oneblock(struct map_info *map, struct flchip *chip, unsigned long adr) { struct cfi_private *cfi = map->fldrv_priv; map_word status, status_OK; @@ -1029,7 +1029,7 @@ static void cfi_staa_sync (struct mtd_info *mtd) } } -static inline int do_lock_oneblock(struct map_info *map, struct flchip *chip, unsigned long adr) +static noinline_for_kasan int do_lock_oneblock(struct map_info *map, struct flchip *chip, unsigned long adr) { struct cfi_private *cfi = map->fldrv_priv; map_word status, status_OK; @@ -1175,7 +1175,7 @@ static int cfi_staa_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) } return 0; } -static inline int do_unlock_oneblock(struct map_info *map, struct flchip *chip, unsigned long adr) +static noinline_for_kasan int do_unlock_oneblock(struct map_info *map, struct flchip *chip, unsigned long adr) { struct cfi_private *cfi = map->fldrv_priv; map_word status, status_OK; diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h index 3aa56e3104bb..8c2e241f45c7 100644 --- a/include/linux/mtd/map.h +++ b/include/linux/mtd/map.h @@ -316,7 +316,7 @@ static inline map_word map_word_or(struct map_info *map, map_word val1, map_word return r; } -static inline int map_word_andequal(struct map_info *map, map_word val1, map_word val2, map_word val3) +static noinline_for_kasan int map_word_andequal(struct map_info *map, map_word val1, map_word val2, map_word val3) { int i; @@ -328,7 +328,7 @@ static inline int map_word_andequal(struct map_info *map, map_word val1, map_wor return 1; } -static inline int map_word_bitsset(struct map_info *map, map_word val1, map_word val2) +static noinline_for_kasan int map_word_bitsset(struct map_info *map, map_word val1, map_word val2) { int i; @@ -362,7 +362,7 @@ static inline map_word map_word_load(struct map_info *map, const void *ptr) return r; } -static inline map_word map_word_load_partial(struct map_info *map, map_word orig, const unsigned char *buf, int start, int len) +static noinline_for_kasan map_word map_word_load_partial(struct map_info *map, map_word orig, const unsigned char *buf, int start, int len) { int i; @@ -392,7 +392,7 @@ static inline map_word map_word_load_partial(struct map_info *map, map_word orig #define MAP_FF_LIMIT 8 #endif -static inline map_word map_word_ff(struct map_info *map) +static noinline_for_kasan map_word map_word_ff(struct map_info *map) { map_word r; int i;