net: don't use in_atomic() in gfp_any()
Subsystems (3)
PATCH 1/2 net: don't use in_atomic() in gfp_any()
From: Andrew Morton <[email protected]>
The problem is that in_atomic() will return false inside spinlocks if CONFIG_PREEMPT=n. This will lead to deadlockable GFP_KERNEL allocations from spinlocked regions.
Secondly, if CONFIG_PREEMPT=y, this bug solves itself because networking will instead use GFP_ATOMIC from this callsite. Hence we won't get the might_sleep() debugging warnings which would have informed us of the buggy callsites.
Solve both these problems by switching to in_interrupt(). Now, if someone runs a gfp_any() allocation from inside spinlock we will get the warning if CONFIG_PREEMPT=y.
I reviewed all callsites and most of them were too complex for my little brain and none of them documented their interface requirements. I have no idea what this patch will do.
---
include/net/sock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/sock.h renamed from include/net/sock.h~net-dont-use-in_atomic-in-gfp_any +1 -1
@@ -1313,7 +1313,7 @@ static inline int sock_writeable(const sstatic inline gfp_t gfp_any (void ) { -return in_atomic () ?GFP_ATOMIC :GFP_KERNEL ; +return in_softirq () ?GFP_ATOMIC :GFP_KERNEL ; }static inline long sock_rcvtimeo (const struct sock *sk,int noblock)
_
include/net/sock.h static inline int sock_writeable(const s · line 1317
Quoted 9 lines · Andrew Morton
Solve both these problems by switching to
in_interrupt(). Now, if someone runs agfp_any()allocation from inside spinlock we will get the warning ifCONFIG_PREEMPT=y.static inline
gfp_tgfp_any(void)
{include/net/sock.h renamed from include/net/sock.h~net-dont-use-in_atomic-in-gfp_any +1
-1-return in_atomic () ?GFP_ATOMIC :GFP_KERNEL ; +return in_softirq () ?GFP_ATOMIC :GFP_KERNEL ; }
sed -i -e 's/in_softirq/in_interrupt/' ?
Quoted 11 lines · On Thu, 12 Feb 2009 06:38:55 +0900 Tetsuo Handa…
include/net/sock.h static inline int sock_writeable(const s · line 1317
Quoted 9 lines · Andrew Morton
Solve both these problems by switching to
in_interrupt(). Now, if someone runs agfp_any()allocation from inside spinlock we will get the warning ifCONFIG_PREEMPT=y.static inline
gfp_tgfp_any(void)
{include/net/sock.h renamed from include/net/sock.h~net-dont-use-in_atomic-in-gfp_any +1
-1-return in_atomic () ?GFP_ATOMIC :GFP_KERNEL ; +return in_softirq () ?GFP_ATOMIC :GFP_KERNEL ; }sed -i -e 's/in_softirq/in_interrupt/' ?
heh, good question.
I did all my testing with in_softirq() - the changelog didn't catch up.
Is gfp_any() supposed to be usable from hardirq context?
If so, we should use in_interrupt().
If not, we should use in_softirq(), and we'll then get might_sleep() warnings if anyone uses gfp_any() from hard irq context.
David Miller
maintainerFrom: Andrew Morton <[email protected]>
Date: Wed, 11 Feb 2009 13:48:42 -0800
Quoted 6 lines
Is
gfp_any()supposed to be usable from hardirq context?If so, we should use
in_interrupt().If not, we should use
in_softirq(), and we'll then getmight_sleep()warnings if anyone usesgfp_any()from hard irq context.
It never will be used in hardware IRQ context, at least in the networking.
And all uses in the tree are.. networking :-)
Resend with cc's restored. Please DO NOT edit the Cc: line :(
Quoted 11 lines · On Thu, 12 Feb 2009 06:38:55 +0900 Tetsuo Handa…
include/net/sock.h static inline int sock_writeable(const s · line 1317
Quoted 9 lines · Andrew Morton
Solve both these problems by switching to
in_interrupt(). Now, if someone runs agfp_any()allocation from inside spinlock we will get the warning ifCONFIG_PREEMPT=y.static inline
gfp_tgfp_any(void)
{include/net/sock.h renamed from include/net/sock.h~net-dont-use-in_atomic-in-gfp_any +1
-1-return in_atomic () ?GFP_ATOMIC :GFP_KERNEL ; +return in_softirq () ?GFP_ATOMIC :GFP_KERNEL ; }sed -i -e 's/in_softirq/in_interrupt/' ?
heh, good question.
I did all my testing with in_softirq() - the changelog didn't catch up.
Is gfp_any() supposed to be usable from hardirq context?
If so, we should use in_interrupt().
If not, we should use in_softirq(), and we'll then get might_sleep() warnings if anyone uses gfp_any() from hard irq context.
From: [email protected]
Date: Wed, 11 Feb 2009 13:27:19 -0800
Quoted 13 lines
The problem is that
in_atomic()will return false inside spinlocks ifCONFIG_PREEMPT=n. This will lead to deadlockableGFP_KERNELallocations from spinlocked regions.Secondly, if
CONFIG_PREEMPT=y, this bug solves itself because networking will instead useGFP_ATOMICfrom this callsite. Hence we won't get themight_sleep()debugging warnings which would have informed us of the buggy callsites.Solve both these problems by switching to
in_interrupt(). Now, if someone runs agfp_any()allocation from inside spinlock we will get the warning ifCONFIG_PREEMPT=y.
Quoted 5 lines
I reviewed all callsites and most of them were too complex for my little brain and none of them documented their interface requirements. I have no idea what this patch will do.
Signed-off-by Andrew Morton <[email protected]>
Applied.