Commit 3b7d636b authored by Veaceslav Falico's avatar Veaceslav Falico Committed by David S. Miller

bonding: remove bond->lock from bond_arp_rcv

We're always called with rcu_read_lock() held (bond_arp_rcv() is only
called from bond_handle_frame(), which is rx_handler and always called
under rcu from __netif_receive_skb_core() ).

The slave active/passive and/or bonding params can change in-flight, however
we don't really care about that - we only modify the last time packet was
received, which is harmless.

CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: default avatarVeaceslav Falico <vfalico@redhat.com>
Acked-by: default avatarDing Tianhong <dingtianhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 814ce148
...@@ -2260,8 +2260,6 @@ int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond, ...@@ -2260,8 +2260,6 @@ int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond,
if (skb->protocol != __cpu_to_be16(ETH_P_ARP)) if (skb->protocol != __cpu_to_be16(ETH_P_ARP))
return RX_HANDLER_ANOTHER; return RX_HANDLER_ANOTHER;
read_lock(&bond->lock);
if (!slave_do_arp_validate(bond, slave)) if (!slave_do_arp_validate(bond, slave))
goto out_unlock; goto out_unlock;
...@@ -2318,7 +2316,6 @@ int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond, ...@@ -2318,7 +2316,6 @@ int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond,
bond_validate_arp(bond, slave, tip, sip); bond_validate_arp(bond, slave, tip, sip);
out_unlock: out_unlock:
read_unlock(&bond->lock);
if (arp != (struct arphdr *)skb->data) if (arp != (struct arphdr *)skb->data)
kfree(arp); kfree(arp);
return RX_HANDLER_ANOTHER; return RX_HANDLER_ANOTHER;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment