From: Cong Wang <amwang@redhat.com>
To: netdev@vger.kernel.org
Cc: Cong Wang <amwang@redhat.com>, "David S. Miller" <davem@davemloft.net>
Subject: [PATCH 04/14] netpoll: take rcu_read_lock_bh() in netpoll_rx()
Date: Thu, 9 Aug 2012 23:00:16 +0800 [thread overview]
Message-ID: <1344524426-11588-5-git-send-email-amwang@redhat.com> (raw)
In-Reply-To: <1344524426-11588-1-git-send-email-amwang@redhat.com>
In __netpoll_rx(), it dereferences ->npinfo without rcu_dereference_bh(),
this patch fixes it by using the 'npinfo' passed from netpoll_rx()
where it is already dereferenced with rcu_dereference_bh().
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
include/linux/netpoll.h | 4 ++--
net/core/netpoll.c | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 907812e..5d881c3 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -52,7 +52,7 @@ void netpoll_set_trap(int trap);
void __netpoll_cleanup(struct netpoll *np);
void __netpoll_free_rcu(struct netpoll *np);
void netpoll_cleanup(struct netpoll *np);
-int __netpoll_rx(struct sk_buff *skb);
+int __netpoll_rx(struct sk_buff *skb, struct netpoll_info *npinfo);
void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
struct net_device *dev);
static inline void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
@@ -77,7 +77,7 @@ static inline bool netpoll_rx(struct sk_buff *skb)
spin_lock(&npinfo->rx_lock);
/* check rx_flags again with the lock held */
- if (npinfo->rx_flags && __netpoll_rx(skb))
+ if (npinfo->rx_flags && __netpoll_rx(skb, npinfo))
ret = true;
spin_unlock(&npinfo->rx_lock);
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index dc17f1d..d055bb0 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -543,13 +543,12 @@ static void arp_reply(struct sk_buff *skb)
spin_unlock_irqrestore(&npinfo->rx_lock, flags);
}
-int __netpoll_rx(struct sk_buff *skb)
+int __netpoll_rx(struct sk_buff *skb, struct netpoll_info *npinfo)
{
int proto, len, ulen;
int hits = 0;
const struct iphdr *iph;
struct udphdr *uh;
- struct netpoll_info *npinfo = skb->dev->npinfo;
struct netpoll *np, *tmp;
if (list_empty(&npinfo->rx_np))
--
1.7.7.6
next prev parent reply other threads:[~2012-08-09 15:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-09 15:00 [PATCH v3 0/14] some netpoll and netconsole fixes Cong Wang
2012-08-09 15:00 ` [PATCH 01/14] netpoll: use GFP_ATOMIC in slave_enable_netpoll() and __netpoll_setup() Cong Wang
2012-08-09 15:00 ` [PATCH 02/14] netpoll: make __netpoll_cleanup non-block Cong Wang
2012-08-09 15:00 ` [PATCH 03/14] netconsole: do not release spin_lock when calling __netpoll_cleanup Cong Wang
2012-08-09 15:00 ` Cong Wang [this message]
2012-08-09 15:00 ` [PATCH 05/14] netpoll: use netpoll_rx_on() in netpoll_rx() Cong Wang
2012-08-09 15:00 ` [PATCH 06/14] netpoll: take rcu_read_lock_bh() in netpoll_send_skb_on_dev() Cong Wang
2012-08-09 15:00 ` [PATCH 07/14] bridge: add some comments for NETDEV_RELEASE Cong Wang
2012-08-09 15:00 ` [PATCH 08/14] bridge: use list_for_each_entry() in netpoll functions Cong Wang
2012-08-09 15:00 ` [PATCH 09/14] netpoll: check netpoll tx status on the right device Cong Wang
2012-08-09 15:00 ` [PATCH 10/14] netpoll: convert several functions to bool Cong Wang
2012-08-09 15:00 ` [PATCH 11/14] vlan: clean up vlan_dev_hard_start_xmit() Cong Wang
2012-08-09 15:00 ` [PATCH 12/14] netpoll: handle vlan tags in netpoll tx and rx path Cong Wang
2012-08-09 15:00 ` [PATCH 13/14] netpoll: re-enable irq in poll_napi() Cong Wang
2012-08-09 15:00 ` [PATCH 14/14] netconsole.txt: revision of examples for the receiver of kernel messages Cong Wang
2012-08-09 23:30 ` [PATCH v3 0/14] some netpoll and netconsole fixes David Miller
2012-08-09 23:36 ` David Miller
2012-08-10 2:13 ` Cong Wang
2012-08-10 4:03 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2012-08-10 7:10 [PATCH v4 00/14] " Cong Wang
2012-08-10 7:10 ` [PATCH 04/14] netpoll: take rcu_read_lock_bh() in netpoll_rx() Cong Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1344524426-11588-5-git-send-email-amwang@redhat.com \
--to=amwang@redhat.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).