From patchwork Tue Jul 27 18:26:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 60022 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 273A1B70AA for ; Wed, 28 Jul 2010 04:26:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753200Ab0G0S0h (ORCPT ); Tue, 27 Jul 2010 14:26:37 -0400 Received: from mail.vyatta.com ([76.74.103.46]:45765 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751879Ab0G0S0g (ORCPT ); Tue, 27 Jul 2010 14:26:36 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.vyatta.com (Postfix) with ESMTP id 8A666182902F; Tue, 27 Jul 2010 11:22:52 -0700 (PDT) X-Virus-Scanned: amavisd-new at tahiti.vyatta.com Received: from mail.vyatta.com ([127.0.0.1]) by localhost (mail.vyatta.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KdT5PsmicVvR; Tue, 27 Jul 2010 11:22:51 -0700 (PDT) Received: from nehalam (unknown [10.250.0.105]) by mail.vyatta.com (Postfix) with ESMTPSA id 338001829014; Tue, 27 Jul 2010 11:22:51 -0700 (PDT) Date: Tue, 27 Jul 2010 11:26:30 -0700 From: Stephen Hemminger To: paulmck@linux.vnet.ibm.com Cc: Johannes Berg , netdev Subject: Re: br_forward.c - rcu dereference warning Message-ID: <20100727112630.5a5ce84b@nehalam> In-Reply-To: <20100727123859.GF3766@linux.vnet.ibm.com> References: <1280227553.3755.2.camel@jlt3.sipsolutions.net> <20100727123859.GF3766@linux.vnet.ibm.com> Organization: Vyatta X-Mailer: Claws Mail 3.7.5 (GTK+ 2.20.1; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org I think this is needed (untested)... ----- Subject: bridge: add rcu_read_lock on transmit Long ago, when bridge was converted to RCU, rcu lock was equivalent to having preempt disabled. RCU has changed a lot since then and bridge code was still assuming the since transmit was called with bottom half disabled, it was RCU safe. Signed-off-by: Stephen Hemminger --- net/bridge/br_device.c | 4 +++- net/bridge/br_fdb.c | 2 +- net/bridge/br_input.c | 7 +++---- net/bridge/br_stp_bpdu.c | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/net/bridge/br_device.c 2010-07-27 08:57:43.169399349 -0700 +++ b/net/bridge/br_device.c 2010-07-27 11:18:51.677053426 -0700 @@ -22,7 +22,7 @@ #include #include "br_private.h" -/* net device transmit always called with no BH (preempt_disabled) */ +/* net device transmit always called with no BH disabled */ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) { struct net_bridge *br = netdev_priv(dev); @@ -48,6 +48,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff * skb_reset_mac_header(skb); skb_pull(skb, ETH_HLEN); + rcu_read_lock(); if (is_multicast_ether_addr(dest)) { if (unlikely(netpoll_tx_running(dev))) { br_flood_deliver(br, skb); @@ -67,6 +68,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff * br_flood_deliver(br, skb); out: + rcu_read_unlock(); return NETDEV_TX_OK; } --- a/net/bridge/br_fdb.c 2010-07-27 11:18:30.815320981 -0700 +++ b/net/bridge/br_fdb.c 2010-07-27 11:18:59.597710975 -0700 @@ -214,7 +214,7 @@ void br_fdb_delete_by_port(struct net_br spin_unlock_bh(&br->hash_lock); } -/* No locking or refcounting, assumes caller has no preempt (rcu_read_lock) */ +/* No locking or refcounting, assumes caller has rcu_read_lock */ struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br, const unsigned char *addr) { --- a/net/bridge/br_input.c 2010-07-27 11:19:05.266181492 -0700 +++ b/net/bridge/br_input.c 2010-07-27 11:19:29.148163149 -0700 @@ -39,7 +39,7 @@ static int br_pass_frame_up(struct sk_bu netif_receive_skb); } -/* note: already called with rcu_read_lock (preempt_disabled) */ +/* note: already called with rcu_read_lock */ int br_handle_frame_finish(struct sk_buff *skb) { const unsigned char *dest = eth_hdr(skb)->h_dest; @@ -110,7 +110,7 @@ drop: goto out; } -/* note: already called with rcu_read_lock (preempt_disabled) */ +/* note: already called with rcu_read_lock */ static int br_handle_local_finish(struct sk_buff *skb) { struct net_bridge_port *p = br_port_get_rcu(skb->dev); @@ -133,8 +133,7 @@ static inline int is_link_local(const un /* * Return NULL if skb is handled - * note: already called with rcu_read_lock (preempt_disabled) from - * netif_receive_skb + * note: already called with rcu_read_lock from netif_receive_skb */ struct sk_buff *br_handle_frame(struct sk_buff *skb) { --- a/net/bridge/br_stp_bpdu.c 2010-07-27 11:19:34.092573294 -0700 +++ b/net/bridge/br_stp_bpdu.c 2010-07-27 11:19:40.725123403 -0700 @@ -131,7 +131,7 @@ void br_send_tcn_bpdu(struct net_bridge_ /* * Called from llc. * - * NO locks, but rcu_read_lock (preempt_disabled) + * NO locks, but rcu_read_lock */ void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb, struct net_device *dev)