summaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorWander Lairson Costa <wander@redhat.com>2021-05-31 18:23:23 +0300
committerDavid S. Miller <davem@davemloft.net>2021-06-02 01:15:11 +0300
commitb0f6c9ac8088a01cd9b6bfba8ede22f1bd0ff72f (patch)
tree2fd1350338ec602101e1eff3b872d5b2420335b9 /net/core
parenta20af95fba7258103ce909acab52ccfb25ae3813 (diff)
downloadlinux-b0f6c9ac8088a01cd9b6bfba8ede22f1bd0ff72f.tar.xz
netpoll: don't require irqs disabled in rt kernels
write_msg(netconsole.c:836) calls netpoll_send_udp after a call to spin_lock_irqsave, which normally disables interrupts; but in PREEMPT_RT this call just locks an rt_mutex without disabling irqs. In this case, netpoll_send_udp is called with interrupts enabled. Signed-off-by: Wander Lairson Costa <wander@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/netpoll.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index c310c7c1cef7..0a6b04714558 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -36,6 +36,7 @@
#include <net/ip6_checksum.h>
#include <asm/unaligned.h>
#include <trace/events/napi.h>
+#include <linux/kconfig.h>
/*
* We maintain a small pool of fully-sized skbs, to make sure the
@@ -389,7 +390,8 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
static atomic_t ip_ident;
struct ipv6hdr *ip6h;
- WARN_ON_ONCE(!irqs_disabled());
+ if (!IS_ENABLED(CONFIG_PREEMPT_RT))
+ WARN_ON_ONCE(!irqs_disabled());
udp_len = len + sizeof(*udph);
if (np->ipv6)