From 488b7dcba7a5dcf5d65349992c7fc32b3d9c17d1 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 31 Jul 2018 07:03:07 +0200 Subject: peer: simplify rcu reference counts Use RCU reference counts only when we must, and otherwise use a more reasonably named function. Reported-by: Jann Horn Signed-off-by: Jason A. Donenfeld --- src/queueing.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/queueing.h') diff --git a/src/queueing.h b/src/queueing.h index c17b0d8..3fb7b5c 100644 --- a/src/queueing.h +++ b/src/queueing.h @@ -132,20 +132,14 @@ static inline int queue_enqueue_per_device_and_peer(struct crypt_queue *device_q static inline void queue_enqueue_per_peer(struct crypt_queue *queue, struct sk_buff *skb, enum packet_state state) { - struct wireguard_peer *peer = peer_rcu_get(PACKET_PEER(skb)); - atomic_set(&PACKET_CB(skb)->state, state); - queue_work_on(cpumask_choose_online(&peer->serial_work_cpu, peer->internal_id), peer->device->packet_crypt_wq, &queue->work); - peer_put(peer); + queue_work_on(cpumask_choose_online(&PACKET_PEER(skb)->serial_work_cpu, PACKET_PEER(skb)->internal_id), PACKET_PEER(skb)->device->packet_crypt_wq, &queue->work); } static inline void queue_enqueue_per_peer_napi(struct crypt_queue *queue, struct sk_buff *skb, enum packet_state state) { - struct wireguard_peer *peer = peer_rcu_get(PACKET_PEER(skb)); - atomic_set(&PACKET_CB(skb)->state, state); - napi_schedule(&peer->napi); - peer_put(peer); + napi_schedule(&PACKET_PEER(skb)->napi); } #ifdef DEBUG -- cgit v1.2.3