Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81f7503f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

ethtool: reduce stack usage with clang 



commit 3499e87ea0413ee5b2cc028f4c8ed4d424bc7f98 upstream.

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: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarMichal Kubecek <mkubecek@suse.cz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarMiles Chen <miles.chen@mediatek.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 30db8e40

net/core/ethtool.c

+9 −7
Original line number Diff line number Diff line
@@ -2413,7 +2413,8 @@ 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,

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)

{
@@ -2443,7 +2444,8 @@ static int ethtool_get_per_queue_coalesce(struct net_device *dev, 
	return 0;

}



static int ethtool_set_per_queue_coalesce(struct net_device *dev,

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)

{
@@ -2499,7 +2501,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;