lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sat, 22 Aug 2020 13:54:19 -0400 From: Neil Horman <nhorman@...alhost.localdomain> To: Herbert Xu <herbert@...dor.apana.org.au> Cc: "David S. Miller" <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>, netdev@...r.kernel.org, Neil Horman <nhorman@...driver.com> Subject: Re: [PATCH] net: Get rid of consume_skb when tracing is off On Sat, Aug 22, 2020 at 08:23:29AM +1000, Herbert Xu wrote: > The function consume_skb is only meaningful when tracing is enabled. > This patch makes it conditional on CONFIG_TRACEPOINTS. > > Signed-off-by: Herbert Xu <herbert@...dor.apana.org.au> > > diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h > index 46881d902124..e8bca74857a3 100644 > --- a/include/linux/skbuff.h > +++ b/include/linux/skbuff.h > @@ -1056,7 +1056,16 @@ void kfree_skb(struct sk_buff *skb); > void kfree_skb_list(struct sk_buff *segs); > void skb_dump(const char *level, const struct sk_buff *skb, bool full_pkt); > void skb_tx_error(struct sk_buff *skb); > + > +#ifdef CONFIG_TRACEPOINTS > void consume_skb(struct sk_buff *skb); > +#else > +static inline void consume_skb(struct sk_buff *skb) > +{ > + return kfree_skb(skb); > +} > +#endif > + Wouldn't it be better to make this: #define consume_skb(x) kfree_skb(x) ? Best Neil > void __consume_stateless_skb(struct sk_buff *skb); > void __kfree_skb(struct sk_buff *skb); > extern struct kmem_cache *skbuff_head_cache; > diff --git a/net/core/skbuff.c b/net/core/skbuff.c > index 7e2e502ef519..593fe73d4993 100644 > --- a/net/core/skbuff.c > +++ b/net/core/skbuff.c > @@ -820,6 +820,7 @@ void skb_tx_error(struct sk_buff *skb) > } > EXPORT_SYMBOL(skb_tx_error); > > +#ifdef CONFIG_TRACEPOINTS > /** > * consume_skb - free an skbuff > * @skb: buffer to free > @@ -837,6 +838,7 @@ void consume_skb(struct sk_buff *skb) > __kfree_skb(skb); > } > EXPORT_SYMBOL(consume_skb); > +#endif > > /** > * consume_stateless_skb - free an skbuff, assuming it is stateless > -- > Email: Herbert Xu <herbert@...dor.apana.org.au> > Home Page: http://gondor.apana.org.au/~herbert/ > PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt >
Powered by blists - more mailing lists