From patchwork Wed Jun 14 21:15:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 105585 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp489009qgd; Wed, 14 Jun 2017 14:18:26 -0700 (PDT) X-Received: by 10.84.179.65 with SMTP id a59mr2151081plc.82.1497475106756; Wed, 14 Jun 2017 14:18:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497475106; cv=none; d=google.com; s=arc-20160816; b=dJKIVlOph366PkNq/ORPuZH1mow+3AFNmiPw9nrnbLjwvw379TWu6o++TbO1uaFEw4 Hgf3um1g6fgomSIrSSC8/rqtz7jm8auMyrcTKRRk9ZhBCa5QMKnWZaqhJyaAJj76T9Z1 gVQBHbNypxJL2XwHaiD5Ad8zRkN06OIYzpP0g5Ua8weTmgGvTBoVjrVvEruVq53l3p+Y JWo4A8QCIdkOPT1gZFSuAjiIi9MbQ33L4AIrRbM3Ondr88qL4iQtVjtmKvFM3hfAPs2X 6vva8f59jmF/KetSgugQfGA2Qz382d2ab0o+1vPmtBR4EtsxmL7bAqKvwT7FXZ4Y8jIC oqXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=10B0P9CK356snv41bf1z4MNmIwoWz/pAi1ycHzvQ3v8=; b=h2S6tRpmso+plpFmIVAqoS5r1Y67oRAoN6QRUSTjxOBM3vbgGq46Mjyn07RC0vAaea K7syV+ZX/O+XmTjTW+mLY+JhbZdKjuNwHzVllbtM1ONqP9WGMpHwidawxhiyFYb9uIXo Fc+4gmhc1cU1drnzHVdwOPQs2rOxJ9LyHTSn/C/u95HjScecfVrCFHyxhfcS9dJsLdKw 2U47F6aOjoirGvXcLHAwxAFnK827HqcG+vQMDmmboobNknDquNM1Lz2ARPy52NhLQqss oUyipVkZDUyGiOuTcwQujGPrc+lehmXF7HOu9gJT7ZHEeBa5xIsJ8OgNqbIckmFjcwrJ 8VbA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 66si6829plb.534.2017.06.14.14.18.26; Wed, 14 Jun 2017 14:18:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752589AbdFNVSY (ORCPT + 25 others); Wed, 14 Jun 2017 17:18:24 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:56740 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751760AbdFNVSV (ORCPT ); Wed, 14 Jun 2017 17:18:21 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0MPuXS-1dQDTh2FWc-004x8Y; Wed, 14 Jun 2017 23:17:43 +0200 From: Arnd Bergmann To: Andrew Morton Cc: kasan-dev@googlegroups.com, Dmitry Vyukov , Alexander Potapenko , Andrey Ryabinin , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Arend van Spriel , Arnd Bergmann , "David S. Miller" , Johannes Berg , Alexey Dobriyan Subject: [PATCH v2 02/11] netlink: mark nla_put_{u8, u16, u32} noinline_if_stackbloat Date: Wed, 14 Jun 2017 23:15:37 +0200 Message-Id: <20170614211556.2062728-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170614211556.2062728-1-arnd@arndb.de> References: <20170614211556.2062728-1-arnd@arndb.de> X-Provags-ID: V03:K0:TKL0Byza9vYr2CVMkrAqqlEgTOqakS66rWF8Ku06lRXzJ8SO7mt F9OlkuIBQFcF7rGD8LIlqKYprULL+EWj622o6/rmwEiHtc+7nQwMgnOwJhfMf9xxIROyrug GtOksf/kVCjqVMMPWHvedaOA+1sVIkLWNnY4sY9KHeO2gznOFXMwquruiddRS0sAlw0TPZW xYpDiV1JKkaIOYip4yHUw== X-UI-Out-Filterresults: notjunk:1; V01:K0:04/dfBfZEck=:TERwiQUKocfV2ZtyDpmN1N tLVsksWdo0pqIdX6zA+FMX3YZqqh2T1RI6CJtpF/4t61o8vJp4BNsc/xGvQ5V5ZgosslMjj2B rCY3qDqVqUqm4fRHKEi2zXa9a5BsLxyGWp/gdfQSpsJMaQr6PyBD9DbaKHCeQtgnid6wb4MKq 3um+wMhuLYHqOMddgzEJFUc8IALuPaF8E/DJQSFmrY2wZirNEHn7aUcJHr0iTfNU4x+I1O03V NNEGSsc9SAEFAnaEQ7lDfh/Twueh4muU9d1P7Tv4z2Ei+jLUIkqug7DNkmd3ma9Qw3XYGcuT8 knr5WdGPsatNIwv1I45GVMLe9vwsP/2/nqLBMFS76bg7So6w9T9xXxjkSvZpPxPqti5afVgMj vPsGdxikjGdTP5hUvE0yMvNaoODtMPszhIjkT+U8JrDzuqw357F1bhdyCXuy0IItibwAssqFW D4RfGNZKN6YUBJVmYcJbQ1GRSFGcyjKJqIbmAu944l3yCwm9lmu3w+fGT5LmMLO9LCSzNjTi4 0T939W7qAnwFzFpj5ZHXKpN93MLJIChx5EV6DpWG/zfdM3UBfysq7iP4SDPGUCmb5cy0IV0Eh snGRYXH6cmErdYMWcXjOJcv3KDoiAI6PTvidaDiDYp+9vEyjWr1Y1SYWnvlwqff7ndnM5dJck RxvWl4P5+zAOAu9Kn1qnz1N7LvI9OKnxX+gc/aEEuNW0lDAmhXM3wPBKHqAURRdUofWM= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_KASAN is enabled, the "--param asan-stack=1" causes rather large stack frames in some functions. This goes unnoticed normally because CONFIG_FRAME_WARN is disabled with CONFIG_KASAN by default as of commit 3f181b4d8652 ("lib/Kconfig.debug: disable -Wframe-larger-than warnings with KASAN=y"). The kernelci.org build bot however has the warning enabled and that led me to investigate it a little further, as every build produces these warnings: net/wireless/nl80211.c:4389:1: warning: the frame size of 2240 bytes is larger than 2048 bytes [-Wframe-larger-than=] net/wireless/nl80211.c:1895:1: warning: the frame size of 3776 bytes is larger than 2048 bytes [-Wframe-larger-than=] net/wireless/nl80211.c:1410:1: warning: the frame size of 2208 bytes is larger than 2048 bytes [-Wframe-larger-than=] net/bridge/br_netlink.c:1282:1: warning: the frame size of 2544 bytes is larger than 2048 bytes [-Wframe-larger-than=] With the new noinline_if_stackbloat annotation, we can avoid the problem when KASAN is enabled but not change anything otherwise. Cc: Andrey Ryabinin Cc: Alexander Potapenko Cc: Dmitry Vyukov Cc: kasan-dev@googlegroups.com Signed-off-by: Arnd Bergmann --- include/net/netlink.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) -- 2.9.0 diff --git a/include/net/netlink.h b/include/net/netlink.h index 01709172b3d3..24b4badd6eaf 100644 --- a/include/net/netlink.h +++ b/include/net/netlink.h @@ -766,7 +766,7 @@ static inline int nla_parse_nested(struct nlattr *tb[], int maxtype, * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_u8(struct sk_buff *skb, int attrtype, u8 value) +static noinline_if_stackbloat int nla_put_u8(struct sk_buff *skb, int attrtype, u8 value) { return nla_put(skb, attrtype, sizeof(u8), &value); } @@ -777,7 +777,7 @@ static inline int nla_put_u8(struct sk_buff *skb, int attrtype, u8 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_u16(struct sk_buff *skb, int attrtype, u16 value) +static noinline_if_stackbloat int nla_put_u16(struct sk_buff *skb, int attrtype, u16 value) { return nla_put(skb, attrtype, sizeof(u16), &value); } @@ -788,7 +788,7 @@ static inline int nla_put_u16(struct sk_buff *skb, int attrtype, u16 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_be16(struct sk_buff *skb, int attrtype, __be16 value) +static noinline_if_stackbloat int nla_put_be16(struct sk_buff *skb, int attrtype, __be16 value) { return nla_put(skb, attrtype, sizeof(__be16), &value); } @@ -799,7 +799,7 @@ static inline int nla_put_be16(struct sk_buff *skb, int attrtype, __be16 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_net16(struct sk_buff *skb, int attrtype, __be16 value) +static noinline_if_stackbloat int nla_put_net16(struct sk_buff *skb, int attrtype, __be16 value) { return nla_put_be16(skb, attrtype | NLA_F_NET_BYTEORDER, value); } @@ -810,7 +810,7 @@ static inline int nla_put_net16(struct sk_buff *skb, int attrtype, __be16 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_le16(struct sk_buff *skb, int attrtype, __le16 value) +static noinline_if_stackbloat int nla_put_le16(struct sk_buff *skb, int attrtype, __le16 value) { return nla_put(skb, attrtype, sizeof(__le16), &value); } @@ -821,7 +821,7 @@ static inline int nla_put_le16(struct sk_buff *skb, int attrtype, __le16 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_u32(struct sk_buff *skb, int attrtype, u32 value) +static noinline_if_stackbloat int nla_put_u32(struct sk_buff *skb, int attrtype, u32 value) { return nla_put(skb, attrtype, sizeof(u32), &value); } @@ -832,7 +832,7 @@ static inline int nla_put_u32(struct sk_buff *skb, int attrtype, u32 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_be32(struct sk_buff *skb, int attrtype, __be32 value) +static noinline_if_stackbloat int nla_put_be32(struct sk_buff *skb, int attrtype, __be32 value) { return nla_put(skb, attrtype, sizeof(__be32), &value); } @@ -843,7 +843,7 @@ static inline int nla_put_be32(struct sk_buff *skb, int attrtype, __be32 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_net32(struct sk_buff *skb, int attrtype, __be32 value) +static noinline_if_stackbloat int nla_put_net32(struct sk_buff *skb, int attrtype, __be32 value) { return nla_put_be32(skb, attrtype | NLA_F_NET_BYTEORDER, value); } @@ -854,7 +854,7 @@ static inline int nla_put_net32(struct sk_buff *skb, int attrtype, __be32 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_le32(struct sk_buff *skb, int attrtype, __le32 value) +static noinline_if_stackbloat int nla_put_le32(struct sk_buff *skb, int attrtype, __le32 value) { return nla_put(skb, attrtype, sizeof(__le32), &value); } @@ -866,7 +866,7 @@ static inline int nla_put_le32(struct sk_buff *skb, int attrtype, __le32 value) * @value: numeric value * @padattr: attribute type for the padding */ -static inline int nla_put_u64_64bit(struct sk_buff *skb, int attrtype, +static noinline_if_stackbloat int nla_put_u64_64bit(struct sk_buff *skb, int attrtype, u64 value, int padattr) { return nla_put_64bit(skb, attrtype, sizeof(u64), &value, padattr); @@ -879,7 +879,7 @@ static inline int nla_put_u64_64bit(struct sk_buff *skb, int attrtype, * @value: numeric value * @padattr: attribute type for the padding */ -static inline int nla_put_be64(struct sk_buff *skb, int attrtype, __be64 value, +static noinline_if_stackbloat int nla_put_be64(struct sk_buff *skb, int attrtype, __be64 value, int padattr) { return nla_put_64bit(skb, attrtype, sizeof(__be64), &value, padattr); @@ -892,7 +892,7 @@ static inline int nla_put_be64(struct sk_buff *skb, int attrtype, __be64 value, * @value: numeric value * @padattr: attribute type for the padding */ -static inline int nla_put_net64(struct sk_buff *skb, int attrtype, __be64 value, +static noinline_if_stackbloat int nla_put_net64(struct sk_buff *skb, int attrtype, __be64 value, int padattr) { return nla_put_be64(skb, attrtype | NLA_F_NET_BYTEORDER, value, @@ -906,7 +906,7 @@ static inline int nla_put_net64(struct sk_buff *skb, int attrtype, __be64 value, * @value: numeric value * @padattr: attribute type for the padding */ -static inline int nla_put_le64(struct sk_buff *skb, int attrtype, __le64 value, +static noinline_if_stackbloat int nla_put_le64(struct sk_buff *skb, int attrtype, __le64 value, int padattr) { return nla_put_64bit(skb, attrtype, sizeof(__le64), &value, padattr); @@ -918,7 +918,7 @@ static inline int nla_put_le64(struct sk_buff *skb, int attrtype, __le64 value, * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_s8(struct sk_buff *skb, int attrtype, s8 value) +static noinline_if_stackbloat int nla_put_s8(struct sk_buff *skb, int attrtype, s8 value) { return nla_put(skb, attrtype, sizeof(s8), &value); } @@ -929,7 +929,7 @@ static inline int nla_put_s8(struct sk_buff *skb, int attrtype, s8 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_s16(struct sk_buff *skb, int attrtype, s16 value) +static noinline_if_stackbloat int nla_put_s16(struct sk_buff *skb, int attrtype, s16 value) { return nla_put(skb, attrtype, sizeof(s16), &value); } @@ -940,7 +940,7 @@ static inline int nla_put_s16(struct sk_buff *skb, int attrtype, s16 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_s32(struct sk_buff *skb, int attrtype, s32 value) +static noinline_if_stackbloat int nla_put_s32(struct sk_buff *skb, int attrtype, s32 value) { return nla_put(skb, attrtype, sizeof(s32), &value); } @@ -952,7 +952,7 @@ static inline int nla_put_s32(struct sk_buff *skb, int attrtype, s32 value) * @value: numeric value * @padattr: attribute type for the padding */ -static inline int nla_put_s64(struct sk_buff *skb, int attrtype, s64 value, +static noinline_if_stackbloat int nla_put_s64(struct sk_buff *skb, int attrtype, s64 value, int padattr) { return nla_put_64bit(skb, attrtype, sizeof(s64), &value, padattr); @@ -987,7 +987,7 @@ static inline int nla_put_flag(struct sk_buff *skb, int attrtype) * @njiffies: number of jiffies to convert to msecs * @padattr: attribute type for the padding */ -static inline int nla_put_msecs(struct sk_buff *skb, int attrtype, +static noinline_if_stackbloat int nla_put_msecs(struct sk_buff *skb, int attrtype, unsigned long njiffies, int padattr) { u64 tmp = jiffies_to_msecs(njiffies);