Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0f9f858 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[IPV4/IPV6]: Replace spin_lock_irq with spin_lock_bh 



In light of my recent patch to net/ipv4/udp.c that replaced the
spin_lock_irq calls on the receive queue lock with spin_lock_bh,
here is a similar patch for all other occurences of spin_lock_irq
on receive/error queue locks in IPv4 and IPv6.

In these stacks, we know that they can only be entered from user
or softirq context.  Therefore it's safe to disable BH only.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ed19f33

net/ipv4/ip_sockglue.c

+3 −3
Original line number Diff line number Diff line
@@ -360,14 +360,14 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len) 
	err = copied;



	/* Reset and regenerate socket error */

	spin_lock_irq(&sk->sk_error_queue.lock);

	spin_lock_bh(&sk->sk_error_queue.lock);

	sk->sk_err = 0;

	if ((skb2 = skb_peek(&sk->sk_error_queue)) != NULL) {

		sk->sk_err = SKB_EXT_ERR(skb2)->ee.ee_errno;

		spin_unlock_irq(&sk->sk_error_queue.lock);

		spin_unlock_bh(&sk->sk_error_queue.lock);

		sk->sk_error_report(sk);

	} else

		spin_unlock_irq(&sk->sk_error_queue.lock);

		spin_unlock_bh(&sk->sk_error_queue.lock);



out_free_skb:	

	kfree_skb(skb);

net/ipv4/raw.c

+2 −2
Original line number Diff line number Diff line
@@ -691,11 +691,11 @@ static int raw_ioctl(struct sock *sk, int cmd, unsigned long arg) 
			struct sk_buff *skb;

			int amount = 0;



			spin_lock_irq(&sk->sk_receive_queue.lock);

			spin_lock_bh(&sk->sk_receive_queue.lock);

			skb = skb_peek(&sk->sk_receive_queue);

			if (skb != NULL)

				amount = skb->len;

			spin_unlock_irq(&sk->sk_receive_queue.lock);

			spin_unlock_bh(&sk->sk_receive_queue.lock);

			return put_user(amount, (int __user *)arg);

		}

net/ipv6/datagram.c

+3 −3
Original line number Diff line number Diff line
@@ -353,14 +353,14 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len) 
	err = copied;



	/* Reset and regenerate socket error */

	spin_lock_irq(&sk->sk_error_queue.lock);

	spin_lock_bh(&sk->sk_error_queue.lock);

	sk->sk_err = 0;

	if ((skb2 = skb_peek(&sk->sk_error_queue)) != NULL) {

		sk->sk_err = SKB_EXT_ERR(skb2)->ee.ee_errno;

		spin_unlock_irq(&sk->sk_error_queue.lock);

		spin_unlock_bh(&sk->sk_error_queue.lock);

		sk->sk_error_report(sk);

	} else {

		spin_unlock_irq(&sk->sk_error_queue.lock);

		spin_unlock_bh(&sk->sk_error_queue.lock);

	}



out_free_skb:

net/ipv6/raw.c

+4 −4
Original line number Diff line number Diff line
@@ -434,12 +434,12 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk, 
	/* Clear queue. */

	if (flags&MSG_PEEK) {

		int clear = 0;

		spin_lock_irq(&sk->sk_receive_queue.lock);

		spin_lock_bh(&sk->sk_receive_queue.lock);

		if (skb == skb_peek(&sk->sk_receive_queue)) {

			__skb_unlink(skb, &sk->sk_receive_queue);

			clear = 1;

		}

		spin_unlock_irq(&sk->sk_receive_queue.lock);

		spin_unlock_bh(&sk->sk_receive_queue.lock);

		if (clear)

			kfree_skb(skb);

	}
@@ -971,11 +971,11 @@ static int rawv6_ioctl(struct sock *sk, int cmd, unsigned long arg) 
			struct sk_buff *skb;

			int amount = 0;



			spin_lock_irq(&sk->sk_receive_queue.lock);

			spin_lock_bh(&sk->sk_receive_queue.lock);

			skb = skb_peek(&sk->sk_receive_queue);

			if (skb != NULL)

				amount = skb->tail - skb->h.raw;

			spin_unlock_irq(&sk->sk_receive_queue.lock);

			spin_unlock_bh(&sk->sk_receive_queue.lock);

			return put_user(amount, (int __user *)arg);

		}

net/ipv6/udp.c

+2 −2
Original line number Diff line number Diff line
@@ -300,12 +300,12 @@ static int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk, 
	/* Clear queue. */

	if (flags&MSG_PEEK) {

		int clear = 0;

		spin_lock_irq(&sk->sk_receive_queue.lock);

		spin_lock_bh(&sk->sk_receive_queue.lock);

		if (skb == skb_peek(&sk->sk_receive_queue)) {

			__skb_unlink(skb, &sk->sk_receive_queue);

			clear = 1;

		}

		spin_unlock_irq(&sk->sk_receive_queue.lock);

		spin_unlock_bh(&sk->sk_receive_queue.lock);

		if (clear)

			kfree_skb(skb);

	}