Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1576124

[PATCH v2 net-next 7/9] sunvnet: remove extra rcu_read_unlocks

Show all headers | View raw

The RCU read lock is grabbed first thing in sunvnet_start_xmit_common()
so it always needs to be released.  This removes the conditional release
in the dropped packet error path and removes a couple of superfluous
calls in the middle of the code.

Reported-by: Bijan Mottahedeh <bijan.mottahedeh@oracle.com>
Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com>
---
 drivers/net/ethernet/sun/sunvnet_common.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/sun/sunvnet_common.c b/drivers/net/ethernet/sun/sunvnet_common.c
index d2aed2c..9384db0 100644
--- a/drivers/net/ethernet/sun/sunvnet_common.c
+++ b/drivers/net/ethernet/sun/sunvnet_common.c
@@ -1279,10 +1279,8 @@ int sunvnet_start_xmit_common(struct sk_buff *skb, struct net_device *dev,
 
 	rcu_read_lock();
 	port = vnet_tx_port(skb, dev);
-	if (unlikely(!port)) {
-		rcu_read_unlock();
+	if (unlikely(!port))
 		goto out_dropped;
-	}
 
 	if (skb_is_gso(skb) && skb->len > port->tsolen) {
 		err = vnet_handle_offloads(port, skb, vnet_tx_port);
@@ -1307,7 +1305,6 @@ int sunvnet_start_xmit_common(struct sk_buff *skb, struct net_device *dev,
 			fl4.saddr = ip_hdr(skb)->saddr;
 
 			rt = ip_route_output_key(dev_net(dev), &fl4);
-			rcu_read_unlock();
 			if (!IS_ERR(rt)) {
 				skb_dst_set(skb, &rt->dst);
 				icmp_send(skb, ICMP_DEST_UNREACH,
@@ -1467,8 +1464,7 @@ int sunvnet_start_xmit_common(struct sk_buff *skb, struct net_device *dev,
 				jiffies + VNET_CLEAN_TIMEOUT);
 	else if (port)
 		del_timer(&port->clean_timer);
-	if (port)
-		rcu_read_unlock();
+	rcu_read_unlock();
 	if (skb)
 		dev_kfree_skb(skb);
 	vnet_free_skbs(freeskbs);
-- 
1.7.1

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH v2 net-next 0/9] sunvnet driver updates Shannon Nelson <shannon.nelson@oracle.com> - 2017-02-07 23:20 +0100
  [PATCH v2 net-next 8/9] ldmvsw: update and simplify version string Shannon Nelson <shannon.nelson@oracle.com> - 2017-02-07 23:20 +0100
  [PATCH v2 net-next 2/9] sunvnet: remove unused variable in maybe_tx_wakeup Shannon Nelson <shannon.nelson@oracle.com> - 2017-02-07 23:20 +0100
  [PATCH v2 net-next 6/9] sunvnet: straighten up message event handling logic Shannon Nelson <shannon.nelson@oracle.com> - 2017-02-07 23:20 +0100
    Re: [PATCH v2 net-next 6/9] sunvnet: straighten up message event  handling logic Sowmini Varadhan <sowmini.varadhan@oracle.com> - 2017-02-08 17:10 +0100
      Re: [PATCH v2 net-next 6/9] sunvnet: straighten up message event  handling logic Sowmini Varadhan <sowmini.varadhan@oracle.com> - 2017-02-08 17:40 +0100
      Re: [PATCH v2 net-next 6/9] sunvnet: straighten up message event  handling logic Shannon Nelson <shannon.nelson@oracle.com> - 2017-02-08 17:40 +0100
  [PATCH v2 net-next 5/9] sunvnet: add memory barrier before check for tx enable Shannon Nelson <shannon.nelson@oracle.com> - 2017-02-07 23:20 +0100
  [PATCH v2 net-next 1/9] sunvnet: make sunvnet common code dynamically loadable Shannon Nelson <shannon.nelson@oracle.com> - 2017-02-07 23:20 +0100
    Re: [PATCH v2 net-next 1/9] sunvnet: make sunvnet common code  dynamically loadable David Miller <davem@davemloft.net> - 2017-02-08 20:40 +0100
      Re: [PATCH v2 net-next 1/9] sunvnet: make sunvnet common code  dynamically loadable Shannon Nelson <shannon.nelson@oracle.com> - 2017-02-08 23:00 +0100
  [PATCH v2 net-next 4/9] sunvnet: add driver stats for ethtool support Shannon Nelson <shannon.nelson@oracle.com> - 2017-02-07 23:20 +0100
  [PATCH v2 net-next 9/9] ldmvsw: disable tso and gso for bridge operations Shannon Nelson <shannon.nelson@oracle.com> - 2017-02-07 23:20 +0100
  [PATCH v2 net-next 7/9] sunvnet: remove extra rcu_read_unlocks Shannon Nelson <shannon.nelson@oracle.com> - 2017-02-07 23:30 +0100

csiph-web