From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757512AbcAYPnu (ORCPT ); Mon, 25 Jan 2016 10:43:50 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:53351 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754225AbcAYPnq (ORCPT ); Mon, 25 Jan 2016 10:43:46 -0500 From: Arnd Bergmann To: David Woodhouse , Brian Norris Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] mtd: avoid stack overflow in MTD CFI code Date: Mon, 25 Jan 2016 16:41:51 +0100 Message-Id: <1453736525-1959191-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:0hHX4rdMZusBvEhlcJf2EC11ZiAQ/rOFor7z6mEQ9oeIp2j2zrL rSV6XEoXhzcEwXQyanwmoK2KzdLIMfkYI1mZe6gX9SE8Eo6YrZ9fs2u6jDlsBuxSxwQ1LvP q5mK7jzIIsf5dsCWMQQd2n0qFxzWWYueRI3xFz1llc00RTb+MF6Efvefo/uZ7gvX2bXruno Elygxsfc61z39mZae7DCQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:60YWHoHhj4I=:++vYE2gWXwFLriH/rVwCDY 7IMLiSTSVDDbjswVwr2PaD88yG2P4oMsNonSqzOEmExx6ZxYXl49VzoqcITFMn5e+A6qf0jND UDGyuQVjmf7ajMyW+Quoksk7BdT2x7ofcme2T1OhewrpMLITKGwhR9JhsxIiV23vFdNI4mZH+ rz1h3nl8stnEZO/Ex/oIXGrux5hxxNy1Y9EqDR+cHPYUX2VBeTsUnYb+5nx3KBWCD2EOPlMR/ Av2U5pOLbj5buLCi1xkdo6HB/tdiRLGYM48YjPnN876+b6OrZuicFBLX/8jBvMPXSu2jKQGog aJvvWTjr/7UuNrbPpkNMNlJ6aPXrnygy5pjRPLOORR27GviKuvP57y4xowhZx6vA6ClnttpgH VBtBsjB3/tZCuekJQJzM+WDQNCHpW8zp4dJ0W7EFvUj0XpYNe8j7o24mWU/3D+jRej0dw2+tp GOiT/LB5+K0BQ/huoPtABWpBK9Xexoy6fi9bbQ5CnexzU8AeyNjSiGJF7kje8MmlndeQLONIg XpEgTN8bSB0JoMYmcs9d8gEtudhhidy8ERG5hzJ/bONE8dAlKUxgeGVeTuch0VeDKBtUfkN3h EK2gFiJbcxazuylxHWg3DoiC9SeCblISM5f99xo9/YAs60kLmkrO2qbAT8QX5nlnQxx4gzJHk Iq3Y/9Li4h08d5dAUcsocDLvEi9FROtUXxx/8/V8XDYx/C0vTS6t73yS38iv8q4g6dRs= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When map_word gets too large, we use a lot of kernel stack, and for MTD_MAP_BANK_WIDTH_32, this means we use more than the recommended 1024 bytes in a number of functions: drivers/mtd/chips/cfi_cmdset_0020.c: In function 'cfi_staa_write_buffers': drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1336 bytes is larger than 1024 bytes [-Wframe-larger-than=] drivers/mtd/chips/cfi_cmdset_0020.c: In function 'cfi_staa_erase_varsize': drivers/mtd/chips/cfi_cmdset_0020.c:972:1: warning: the frame size of 1208 bytes is larger than 1024 bytes [-Wframe-larger-than=] drivers/mtd/chips/cfi_cmdset_0001.c: In function 'do_write_buffer': drivers/mtd/chips/cfi_cmdset_0001.c:1835:1: warning: the frame size of 1240 bytes is larger than 1024 bytes [-Wframe-larger-than=] This can be avoided if all operations on the map word are done indirectly and the stack gets reused between the calls. We can mostly achieve this by selecting MTD_COMPLEX_MAPPINGS whenever MTD_MAP_BANK_WIDTH_32 is set, but for the case that no other bank width is enabled, we also need to use a non-constant map_bankwidth() to convince the compiler to use less stack. Signed-off-by: Arnd Bergmann --- drivers/mtd/chips/Kconfig | 1 + include/linux/mtd/map.h | 19 +++++++------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig index 3b3dabce58de..b24be7d75c9c 100644 --- a/drivers/mtd/chips/Kconfig +++ b/drivers/mtd/chips/Kconfig @@ -115,6 +115,7 @@ config MTD_MAP_BANK_WIDTH_16 config MTD_MAP_BANK_WIDTH_32 bool "Support 256-bit buswidth" if MTD_CFI_GEOMETRY + select MTD_COMPLEX_MAPPINGS default n help If you wish to support CFI devices on a physical bus which is diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h index 58f3ba709ade..e20fcf678155 100644 --- a/include/linux/mtd/map.h +++ b/include/linux/mtd/map.h @@ -122,18 +122,13 @@ #endif #ifdef CONFIG_MTD_MAP_BANK_WIDTH_32 -# ifdef map_bankwidth -# undef map_bankwidth -# define map_bankwidth(map) ((map)->bankwidth) -# undef map_bankwidth_is_large -# define map_bankwidth_is_large(map) (map_bankwidth(map) > BITS_PER_LONG/8) -# undef map_words -# define map_words(map) map_calc_words(map) -# else -# define map_bankwidth(map) 32 -# define map_bankwidth_is_large(map) (1) -# define map_words(map) map_calc_words(map) -# endif +/* always use indirect access for 256-bit to preserve kernel stack */ +# undef map_bankwidth +# define map_bankwidth(map) ((map)->bankwidth) +# undef map_bankwidth_is_large +# define map_bankwidth_is_large(map) (map_bankwidth(map) > BITS_PER_LONG/8) +# undef map_words +# define map_words(map) map_calc_words(map) #define map_bankwidth_is_32(map) (map_bankwidth(map) == 32) #undef MAX_MAP_BANKWIDTH #define MAX_MAP_BANKWIDTH 32 -- 2.7.0