2015-04-17 17:06:41

by Denys Vlasenko

Subject: [PATCH] netns: remove BUG_ONs from net_generic()

This inline has ~500 callsites.

On 04/14/2015 08:37 PM, David Miller wrote:
> That BUG_ON() was added 7 years ago, and I don't remember it ever
> triggering or helping us diagnose something, so just remove it and
> keep the function inlined.

On x86 allyesconfig build:

text data bss dec hex filename
82447071 22255384 20627456 125329911 77861f7 vmlinux4
82441375 22255384 20627456 125324215 7784bb7 vmlinux5prime

Signed-off-by: Denys Vlasenko <[email protected]>
CC: Eric W. Biederman <[email protected]>
CC: David S. Miller <[email protected]>
CC: Jan Engelhardt <[email protected]>
CC: Jiri Pirko <[email protected]>
CC: [email protected]
CC: [email protected]
---
include/net/netns/generic.h | 2 --
1 file changed, 2 deletions(-)

diff --git a/include/net/netns/generic.h b/include/net/netns/generic.h
index 0931618..70e1585 100644
--- a/include/net/netns/generic.h
+++ b/include/net/netns/generic.h
@@ -38,11 +38,9 @@ static inline void *net_generic(const struct net *net, int id)

rcu_read_lock();
ng = rcu_dereference(net->gen);
- BUG_ON(id == 0 || id > ng->len);
ptr = ng->ptr[id - 1];
rcu_read_unlock();

- BUG_ON(!ptr);
return ptr;
}
#endif
--
1.8.1.4

2015-04-17 19:22:06

by David Miller

Subject: Re: [PATCH] netns: remove BUG_ONs from net_generic()

From: Denys Vlasenko <[email protected]>
Date: Fri, 17 Apr 2015 19:06:30 +0200

> This inline has ~500 callsites.
>
> On 04/14/2015 08:37 PM, David Miller wrote:
>> That BUG_ON() was added 7 years ago, and I don't remember it ever
>> triggering or helping us diagnose something, so just remove it and
>> keep the function inlined.
>
> On x86 allyesconfig build:
>
> text data bss dec hex filename
> 82447071 22255384 20627456 125329911 77861f7 vmlinux4
> 82441375 22255384 20627456 125324215 7784bb7 vmlinux5prime
>
> Signed-off-by: Denys Vlasenko <[email protected]>

Applied.