diff mbox series

[net-next,v2] macsec: add noinline tag to avoid a frame size warning

Message ID 20190401205909.3234-1-fw@strlen.de
State Accepted
Delegated to: David Miller
Headers show
Series [net-next,v2] macsec: add noinline tag to avoid a frame size warning | expand

Commit Message

Florian Westphal April 1, 2019, 8:59 p.m. UTC 
seen with debug config:
drivers/net/macsec.c: In function 'dump_secy':
drivers/net/macsec.c:2597: warning: the frame size of 2216 bytes is larger
than 2048 bytes [-Wframe-larger-than=]

just mark it with noinline_for_stack, this is netlink dump code.

v2: use 'static noinline_for_stack int' consistently

Cc: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Florian Westphal <fw@strlen.de>
---
 drivers/net/macsec.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

Comments

Sabrina Dubroca April 1, 2019, 9:37 p.m. UTC | #1 
2019-04-01, 22:59:09 +0200, Florian Westphal wrote:
> seen with debug config:
> drivers/net/macsec.c: In function 'dump_secy':
> drivers/net/macsec.c:2597: warning: the frame size of 2216 bytes is larger
> than 2048 bytes [-Wframe-larger-than=]
> 
> just mark it with noinline_for_stack, this is netlink dump code.
> 
> v2: use 'static noinline_for_stack int' consistently
> 
> Cc: Sabrina Dubroca <sd@queasysnail.net>
> Signed-off-by: Florian Westphal <fw@strlen.de>

Thanks Florian.

Reviewed-by: Sabrina Dubroca <sd@queasysnail.net>
David Miller April 2, 2019, 1:52 a.m. UTC | #2 
From: Florian Westphal <fw@strlen.de>
Date: Mon,  1 Apr 2019 22:59:09 +0200

> seen with debug config:
> drivers/net/macsec.c: In function 'dump_secy':
> drivers/net/macsec.c:2597: warning: the frame size of 2216 bytes is larger
> than 2048 bytes [-Wframe-larger-than=]
> 
> just mark it with noinline_for_stack, this is netlink dump code.
> 
> v2: use 'static noinline_for_stack int' consistently
> 
> Cc: Sabrina Dubroca <sd@queasysnail.net>
> Signed-off-by: Florian Westphal <fw@strlen.de>

Applied, thank you.
diff mbox series

Patch

diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 947c40f112d1..263bfafdb004 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -2175,8 +2175,9 @@  static int copy_tx_sa_stats(struct sk_buff *skb,
 	return 0;
 }
 
-static int copy_rx_sa_stats(struct sk_buff *skb,
-			    struct macsec_rx_sa_stats __percpu *pstats)
+static noinline_for_stack int
+copy_rx_sa_stats(struct sk_buff *skb,
+		 struct macsec_rx_sa_stats __percpu *pstats)
 {
 	struct macsec_rx_sa_stats sum = {0, };
 	int cpu;
@@ -2201,8 +2202,8 @@  static int copy_rx_sa_stats(struct sk_buff *skb,
 	return 0;
 }
 
-static int copy_rx_sc_stats(struct sk_buff *skb,
-			    struct pcpu_rx_sc_stats __percpu *pstats)
+static noinline_for_stack int
+copy_rx_sc_stats(struct sk_buff *skb, struct pcpu_rx_sc_stats __percpu *pstats)
 {
 	struct macsec_rx_sc_stats sum = {0, };
 	int cpu;
@@ -2265,8 +2266,8 @@  static int copy_rx_sc_stats(struct sk_buff *skb,
 	return 0;
 }
 
-static int copy_tx_sc_stats(struct sk_buff *skb,
-			    struct pcpu_tx_sc_stats __percpu *pstats)
+static noinline_for_stack int
+copy_tx_sc_stats(struct sk_buff *skb, struct pcpu_tx_sc_stats __percpu *pstats)
 {
 	struct macsec_tx_sc_stats sum = {0, };
 	int cpu;
@@ -2305,8 +2306,8 @@  static int copy_tx_sc_stats(struct sk_buff *skb,
 	return 0;
 }
 
-static int copy_secy_stats(struct sk_buff *skb,
-			   struct pcpu_secy_stats __percpu *pstats)
+static noinline_for_stack int
+copy_secy_stats(struct sk_buff *skb, struct pcpu_secy_stats __percpu *pstats)
 {
 	struct macsec_dev_stats sum = {0, };
 	int cpu;
@@ -2410,8 +2411,9 @@  static int nla_put_secy(struct macsec_secy *secy, struct sk_buff *skb)
 	return 1;
 }
 
-static int dump_secy(struct macsec_secy *secy, struct net_device *dev,
-		     struct sk_buff *skb, struct netlink_callback *cb)
+static noinline_for_stack int
+dump_secy(struct macsec_secy *secy, struct net_device *dev,
+	  struct sk_buff *skb, struct netlink_callback *cb)
 {
 	struct macsec_rx_sc *rx_sc;
 	struct macsec_tx_sc *tx_sc = &secy->tx_sc;