From patchwork Thu Mar 7 09:33:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 159813 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp7218255jad; Thu, 7 Mar 2019 01:34:38 -0800 (PST) X-Google-Smtp-Source: APXvYqyp4vCTSp1hXbpnFWerJrEm14eCCdS1Rih9Wvi9ZC8Qz6ovxZd5n9JyLycAlQGIkIkaR/F2 X-Received: by 2002:a17:902:3:: with SMTP id 3mr6668514pla.114.1551951278530; Thu, 07 Mar 2019 01:34:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551951278; cv=none; d=google.com; s=arc-20160816; b=wE7d0DZIChlLDPaiIAdf/Je/Hm6KjzwO8mnna+O4tZrjKrnsew/z0WpkvoDp15jy4k HGoTWFPdUyiNogdwYeSgkwUTWfScqhD0pl3iWl54tW5lz4/Jx/wliNYL8qtPCeD6GqTu OePH3J4VZI62KVKXeZk0W/BdlfEduXHTDdpmJ6bhQm8hXHfy+jLKnSjmGsTQQmClnM8P E0x96MlDQsnb9q6TaZ4tGSZm/WYd0UwyixrJykF0zJoEc5PxL/vZd961fNB20i94HAZ0 GlkpCI3EZmqGPwE6Oy7R+ndtthEso9jM+YO3IQO04d1SXvrd0tjgPXBPHFA8pXg4vkJA R/yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=ichhNHuLL2fUpoRTtqPyzaLTcgpkkrHIqK31OyvIfBs=; b=ksYj3I3XQQMVsAody0KN3omU3QsIQepQFw0J4XCVu627AtIyX6Iz/m1p/zxWLuoo4q MEFa0lcdD9Y+F2I2JcMpwkNhvsP18QIScyxkhyDy7k+LhajaDxx8SPppOcaF1khHbDun jrtUkXEnClDxc5trROAn8zmEEqQTsxCt48kZEpkj+bv+8DSEsiu9WH3N3KTCVXdNqbcy gtR/jqrfPruRc5Ra1MNi3I1ls4ZB1Rpy03kHsDSau+w3Ha2FGXxvxFJSQDR0sbZk2Ylv m6p5brCaYU6TSWS4c296HmRh/37BKrd/5/XgVDssgiP6QkQAvqO88aQENU26sPrudS11 tQDQ== 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 b17si3774058pfm.57.2019.03.07.01.34.38; Thu, 07 Mar 2019 01:34:38 -0800 (PST) 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 S1726286AbfCGJeg (ORCPT + 31 others); Thu, 7 Mar 2019 04:34:36 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:59717 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725747AbfCGJeg (ORCPT ); Thu, 7 Mar 2019 04:34:36 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1MoNMu-1ghsoJ3rnU-00ooKz; Thu, 07 Mar 2019 10:34:16 +0100 From: Arnd Bergmann To: "David S. Miller" , Florian Fainelli , Jakub Kicinski , Jiri Pirko Cc: Nick Desaulniers , Arnd Bergmann , Kees Cook , Wenwen Wang , Ilya Lesokhin , Pablo Neira Ayuso , Edward Cree , Michal Kubecek , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ethtool: reduce stack usage with clang Date: Thu, 7 Mar 2019 10:33:35 +0100 Message-Id: <20190307093408.3425010-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:AQpBvpTMTgac1mdMpFa68Lz1u6kxqu97sFrs8yO6CwxOrNdBXns i/3zDpfANmMIprACgJ+yPHpsW1CGj6Y+P4K8Y/2THNtw0KtDONsteWf0jojs3oOMcvx5i8s nI5JW+5Hbn4Ea7wMX2BVy1DzwRvZeQK5CR5SctNhC2DnWJPRK0AJilmHcTeOYHuouqKUX6/ I8J6H2OUZp5oAC9i976dA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:vf7fJ+tdSZs=:U4l4hbGT3tBEvxywEgqRL3 H0lqeQIac/dDlOb4IVkmaz/qQCURstV0nRmbsqBK9EXCImDiNWUXeBwyQuS7X/NgE2W37TjWU GRjyDtOBlnAWEw6ZkscfZLyxFUPd5GooHR+uBUhJWVwgUmsiBJGL6TsFkU4g2uowiCIdG0CgA W6YfVamEhxWM3i8l0qC+/euCQjfuLXbZbRe7oWP2j0ULU7tJzRCj7ISpiR98KSmHhTLGrd1ZJ SHbDnUB2NzaNUlFSY7uIJOrBqXTmQ8ffxWDCpHz1UTXpUvS98YICElgQ9gLBR4sfZFeteNjM4 2oGtX/scpBfOrcosa7k51tnmosVS8WsjimG33Pg36aBR3gy5A8qGAK7Fe5M+QIE6yC/C1F3Bd g/pFbqlihpLppVwxf/gS6AD7NiqtC3KxcHDhrgsv4zsVat1scbCQfM5yR3aXZEr36PDP3Tvah +fX0kvi+fZ/WAXehyAjIlfI2i069JpiiKKxzhmBlHrZ7NDeYHgTRFJnytN9jFEaGk9dPucbAh /iymthgKeYQIm9rovL+hw1UvJCl9fM7biSzqsT1tkFX/jwyWRbjA31pUyafzRw5zVeosTNovq pyMyqjYkppHLqGPhbljHXbszv59Y9Qh5BWppDXboYv8h1DkZQixbIwywTxKOfaDeuML7fnVhW IWCQH6JBc5owJ/EqUsBXNX+v3MtrllcFPgv9Q7QsE5Ln7NINiz3dAo2U9F4QKFJ1b+qgJHYao UYDTKcOxJxBABebWw3gK2WXhcav2zp05pcknVQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org clang inlines the dev_ethtool() more aggressively than gcc does, leading to a larger amount of used stack space: net/core/ethtool.c:2536:24: error: stack frame size of 1216 bytes in function 'dev_ethtool' [-Werror,-Wframe-larger-than=] Marking the sub-functions that require the most stack space as noinline_for_stack gives us reasonable behavior on all compilers. Signed-off-by: Arnd Bergmann --- net/core/ethtool.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) -- 2.20.0 diff --git a/net/core/ethtool.c b/net/core/ethtool.c index d4918ffddda8..fcbed78172a0 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -2319,9 +2319,10 @@ static int ethtool_set_tunable(struct net_device *dev, void __user *useraddr) return ret; } -static int ethtool_get_per_queue_coalesce(struct net_device *dev, - void __user *useraddr, - struct ethtool_per_queue_op *per_queue_opt) +static noinline_for_stack int +ethtool_get_per_queue_coalesce(struct net_device *dev, + void __user *useraddr, + struct ethtool_per_queue_op *per_queue_opt) { u32 bit; int ret; @@ -2349,9 +2350,10 @@ static int ethtool_get_per_queue_coalesce(struct net_device *dev, return 0; } -static int ethtool_set_per_queue_coalesce(struct net_device *dev, - void __user *useraddr, - struct ethtool_per_queue_op *per_queue_opt) +static noinline_for_stack int +ethtool_set_per_queue_coalesce(struct net_device *dev, + void __user *useraddr, + struct ethtool_per_queue_op *per_queue_opt) { u32 bit; int i, ret = 0; @@ -2405,7 +2407,7 @@ static int ethtool_set_per_queue_coalesce(struct net_device *dev, return ret; } -static int ethtool_set_per_queue(struct net_device *dev, +static int noinline_for_stack ethtool_set_per_queue(struct net_device *dev, void __user *useraddr, u32 sub_cmd) { struct ethtool_per_queue_op per_queue_opt; @@ -2533,7 +2535,7 @@ static int ethtool_set_fecparam(struct net_device *dev, void __user *useraddr) /* The main entry point in this file. Called from net/core/dev_ioctl.c */ -int dev_ethtool(struct net *net, struct ifreq *ifr) +int noinline_for_stack dev_ethtool(struct net *net, struct ifreq *ifr) { struct net_device *dev = __dev_get_by_name(net, ifr->ifr_name); void __user *useraddr = ifr->ifr_data;