ppp: remove rwlock usage
Subsystems (3)
RFC PATCH 1/1 ppp: remove rwlock usage
In struct channel, the upl lock is implemented using rwlock_t, protecting access to pch->ppp and pch->bridge.
As previously discussed on the list, using rwlock in the network fast path is not recommended.
This patch replaces the rwlock with a spinlock for writers, and uses RCU for readers.
- pch->ppp and pch->bridge are now declared as __rcu pointers.
- Readers use rcu_dereference_bh() under rcu_read_lock_bh().
- Writers use spin_lock_bh() to update, followed by synchronize_rcu() where required.
Signed-off-by Qingfang Deng <[email protected]>
--- drivers/net/ppp/ppp_generic.c | 121 ++++++++++++++++++---------------- 1 file changed, 65 insertions(+), 56 deletions(-)
drivers/net/ppp/ppp_generic.c +65 -56
@@ -173,11 +173,11 @@ struct channel {struct ppp_channel *chan;/* public channel data structure */ struct rw_semaphore chan_sem;/* protects `chan' during chan ioctl */ spinlock_t downl;/* protects `chan', file.xq dequeue */ -struct ppp *ppp;/* ppp unit we're connected to */ +struct ppp __rcu *ppp;/* ppp unit we're connected to */ struct net *chan_net;/* the net channel belongs to */ netns_tracker ns_tracker;struct list_head clist;/* link in list of channels per unit */ -rwlock_t upl;/* protects `ppp' and 'bridge' */ +spinlock_t upl;/* protects `ppp' and 'bridge' */ struct channel __rcu *bridge;/* "bridged" ppp channel */ #ifdef CONFIG_PPP_MULTILINK u8 avail;/* flag used in multilink stuff */
@@ -639,34 +639,34 @@ static struct bpf_prog *compat_ppp_get_filter(struct sock_fprog32 __user *p)*/ static int ppp_bridge_channels (struct channel *pch,struct channel *pchb) { -write_lock_bh (&pch->upl); -if (pch->ppp || +spin_lock_bh (&pch->upl); +if (rcu_dereference_protected (pch->ppp,lockdep_is_held (&pch->upl)) ||rcu_dereference_protected (pch->bridge,lockdep_is_held (&pch->upl))) { -write_unlock_bh (&pch->upl); +spin_unlock_bh (&pch->upl);return -EALREADY ; }refcount_inc (&pchb->file.refcnt);rcu_assign_pointer (pch->bridge, pchb); -write_unlock_bh (&pch->upl); +spin_unlock_bh (&pch->upl); -write_lock_bh (&pchb->upl); -if (pchb->ppp || +spin_lock_bh (&pchb->upl); +if (rcu_dereference_protected (pchb->ppp,lockdep_is_held (&pch->upl)) ||rcu_dereference_protected (pchb->bridge,lockdep_is_held (&pchb->upl))) { -write_unlock_bh (&pchb->upl); +spin_unlock_bh (&pchb->upl); goto err_unset; }refcount_inc (&pch->file.refcnt);rcu_assign_pointer (pchb->bridge, pch); -write_unlock_bh (&pchb->upl); +spin_unlock_bh (&pchb->upl);return 0 ; err_unset: -write_lock_bh (&pch->upl); +spin_lock_bh (&pch->upl);/* Re-read pch->bridge with upl held in case it was modified concurrently */ pchb =rcu_dereference_protected (pch->bridge,lockdep_is_held (&pch->upl));RCU_INIT_POINTER (pch->bridge,NULL ); -write_unlock_bh (&pch->upl); +spin_unlock_bh (&pch->upl);synchronize_rcu ();if (pchb)
@@ -680,25 +680,25 @@ static int ppp_unbridge_channels(struct channel *pch) {struct channel *pchb, *pchbb; -write_lock_bh (&pch->upl); +spin_lock_bh (&pch->upl); pchb =rcu_dereference_protected (pch->bridge,lockdep_is_held (&pch->upl));if (!pchb) { -write_unlock_bh (&pch->upl); +spin_unlock_bh (&pch->upl);return -EINVAL ; }RCU_INIT_POINTER (pch->bridge,NULL ); -write_unlock_bh (&pch->upl); +spin_unlock_bh (&pch->upl);/* Only modify pchb if phcb->bridge points back to pch. * If not, it implies that there has been a race unbridging (and possibly * even rebridging) pchb. We should leave pchb alone to avoid either a * refcount underflow, or breaking another established bridge instance. */ -write_lock_bh (&pchb->upl); +spin_lock_bh (&pchb->upl); pchbb =rcu_dereference_protected (pchb->bridge,lockdep_is_held (&pchb->upl));if (pchbb == pch)RCU_INIT_POINTER (pchb->bridge,NULL ); -write_unlock_bh (&pchb->upl); +spin_unlock_bh (&pchb->upl);synchronize_rcu ();
@@ -2139,10 +2139,9 @@ static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)#endif /* CONFIG_PPP_MULTILINK */ /* Try to send data out on a channel */ -static void __ppp_channel_push (struct channel *pch) +static void __ppp_channel_push (struct channel *pch,struct ppp *ppp) {struct sk_buff *skb; -struct ppp *ppp;spin_lock (&pch->downl);if (pch->chan) {
@@ -2161,7 +2160,6 @@ static void __ppp_channel_push(struct channel *pch)spin_unlock (&pch->downl);/* see if there is anything from the attached unit to be sent */ if (skb_queue_empty (&pch->file.xq)) { - ppp = pch->ppp;if (ppp)__ppp_xmit_process (ppp,NULL ); }
@@ -2169,15 +2167,18 @@ static void __ppp_channel_push(struct channel *pch)static void ppp_channel_push (struct channel *pch) { -read_lock_bh (&pch->upl); -if (pch->ppp) { - (*this_cpu_ptr (pch->ppp->xmit_recursion))++; -__ppp_channel_push (pch); - (*this_cpu_ptr (pch->ppp->xmit_recursion))--; +struct ppp *ppp; + +rcu_read_lock_bh (); + ppp =rcu_dereference_bh (pch->ppp); +if (ppp) { + (*this_cpu_ptr (ppp->xmit_recursion))++; +__ppp_channel_push (pch, ppp); + (*this_cpu_ptr (ppp->xmit_recursion))--; }else { -__ppp_channel_push (pch); +__ppp_channel_push (pch,NULL ); } -read_unlock_bh (&pch->upl); +rcu_read_unlock_bh (); }/*
@@ -2279,6 +2280,7 @@ void ppp_input(struct ppp_channel *chan, struct sk_buff *skb) { struct channel *pch = chan->ppp; +struct ppp *ppp;int proto;if (!pch) {
@@ -2290,18 +2292,19 @@ ppp_input(struct ppp_channel *chan, struct sk_buff *skb)if (ppp_channel_bridge_input (pch, skb))return ; -read_lock_bh (&pch->upl); +rcu_read_lock_bh (); + ppp =rcu_dereference_bh (pch->ppp);if (!ppp_decompress_proto (skb)) {kfree_skb (skb); -if (pch->ppp) { - ++pch->ppp->dev->stats.rx_length_errors; -ppp_receive_error (pch->ppp); +if (ppp) { + ++ppp->dev->stats.rx_length_errors; +ppp_receive_error (ppp); } goto done; } proto =PPP_PROTO (skb); -if (!pch->ppp || proto >=0xc000 || proto ==PPP_CCPFRAG ) { +if (!ppp || proto >=0xc000 || proto ==PPP_CCPFRAG ) {/* put it on the channel queue */ skb_queue_tail (&pch->file.rq, skb);/* drop old frames if queue too long */
@@ -2310,11 +2313,11 @@ ppp_input(struct ppp_channel *chan, struct sk_buff *skb)kfree_skb (skb);wake_up_interruptible (&pch->file.rwait); }else { -ppp_do_recv (pch->ppp, skb, pch); +ppp_do_recv (ppp, skb, pch); } done: -read_unlock_bh (&pch->upl); +rcu_read_unlock_bh (); }/* Put a 0-length skb in the receive queue as an error indication */
@@ -2323,20 +2326,22 @@ ppp_input_error(struct ppp_channel *chan, int code) {struct channel *pch = chan->ppp;struct sk_buff *skb; +struct ppp *ppp;if (!pch)return ; -read_lock_bh (&pch->upl); -if (pch->ppp) { +rcu_read_lock_bh (); + ppp =rcu_dereference_bh (pch->ppp); +if (ppp) { skb =alloc_skb (0 ,GFP_ATOMIC );if (skb) { skb->len =0 ;/* probably unnecessary */ skb->cb[0 ] = code; -ppp_do_recv (pch->ppp, skb, pch); +ppp_do_recv (ppp, skb, pch); } } -read_unlock_bh (&pch->upl); +rcu_read_unlock_bh (); }/*
@@ -2884,7 +2889,6 @@ int ppp_register_net_channel(struct net *net, struct ppp_channel *chan) pn =ppp_pernet (net); - pch->ppp =NULL ; pch->chan = chan; pch->chan_net =get_net_track (net, &pch->ns_tracker,GFP_KERNEL ); chan->ppp = pch;
@@ -2895,7 +2899,7 @@ int ppp_register_net_channel(struct net *net, struct ppp_channel *chan)#endif /* CONFIG_PPP_MULTILINK */ init_rwsem (&pch->chan_sem);spin_lock_init (&pch->downl); -rwlock_init (&pch->upl); +spin_lock_init (&pch->upl);spin_lock_bh (&pn->all_channels_lock); pch->file.index = ++pn->last_channel_index;
@@ -2924,13 +2928,15 @@ int ppp_channel_index(struct ppp_channel *chan)int ppp_unit_number (struct ppp_channel *chan) {struct channel *pch = chan->ppp; +struct ppp *ppp;int unit =-1 ;if (pch) { -read_lock_bh (&pch->upl); -if (pch->ppp) - unit = pch->ppp->file.index; -read_unlock_bh (&pch->upl); +rcu_read_lock_bh (); + ppp =rcu_dereference_bh (pch->ppp); +if (ppp) + unit = ppp->file.index; +rcu_read_unlock_bh (); }return unit; }
@@ -2942,12 +2948,14 @@ char *ppp_dev_name(struct ppp_channel *chan) {struct channel *pch = chan->ppp;char *name =NULL ; +struct ppp *ppp;if (pch) { -read_lock_bh (&pch->upl); -if (pch->ppp && pch->ppp->dev) - name = pch->ppp->dev->name; -read_unlock_bh (&pch->upl); +rcu_read_lock_bh (); + ppp =rcu_dereference_bh (pch->ppp); +if (ppp && ppp->dev) + name = ppp->dev->name; +rcu_read_unlock_bh (); }return name; }
@@ -3470,9 +3478,9 @@ ppp_connect_channel(struct channel *pch, int unit) ppp =ppp_find_unit (pn, unit);if (!ppp) goto out; -write_lock_bh (&pch->upl); +spin_lock_bh (&pch->upl); ret = -EINVAL ; -if (pch->ppp || +if (rcu_dereference_protected (pch->ppp,lockdep_is_held (&pch->upl)) ||rcu_dereference_protected (pch->bridge,lockdep_is_held (&pch->upl))) goto outl;
@@ -3497,13 +3505,13 @@ ppp_connect_channel(struct channel *pch, int unit) ppp->dev->hard_header_len = hdrlen;list_add_tail (&pch->clist, &ppp->channels); ++ppp->n_channels; - pch->ppp = ppp; +rcu_assign_pointer (pch->ppp, ppp);refcount_inc (&ppp->file.refcnt);ppp_unlock (ppp); ret =0 ; outl: -write_unlock_bh (&pch->upl); +spin_unlock_bh (&pch->upl); out:mutex_unlock (&pn->all_ppp_mutex);return ret;
@@ -3518,10 +3526,11 @@ ppp_disconnect_channel(struct channel *pch)struct ppp *ppp;int err = -EINVAL ; -write_lock_bh (&pch->upl); - ppp = pch->ppp; - pch->ppp =NULL ; -write_unlock_bh (&pch->upl); +spin_lock_bh (&pch->upl); + ppp =rcu_replace_pointer (pch->ppp,NULL ,lockdep_is_held (&pch->upl)); +spin_unlock_bh (&pch->upl); +synchronize_rcu (); +if (ppp) {/* remove it from the ppp unit's list */ ppp_lock (ppp);
Signature · 1 line
2.43.0