Commit 43a43b60 authored by Hannes Frederic Sowa's avatar Hannes Frederic Sowa Committed by David S. Miller
Browse files

ipv6: some ipv6 statistic counters failed to disable bh 



After commit c15b1cca ("ipv6: move DAD and addrconf_verify
processing to workqueue") some counters are now updated in process context
and thus need to disable bh before doing so, otherwise deadlocks can
happen on 32-bit archs. Fabio Estevam noticed this while while mounting
a NFS volume on an ARM board.

As a compensation for missing this I looked after the other *_STATS_BH
and found three other calls which need updating:

1) icmp6_send: ip6_fragment -> icmpv6_send -> icmp6_send (error handling)
2) ip6_push_pending_frames: rawv6_sendmsg -> rawv6_push_pending_frames -> ...
   (only in case of icmp protocol with raw sockets in error handling)
3) ping6_v6_sendmsg (error handling)

Fixes: c15b1cca ("ipv6: move DAD and addrconf_verify processing to workqueue")
Reported-by: default avatarFabio Estevam <festevam@gmail.com>
Tested-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 44934fac

net/ipv6/icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) 
			      np->tclass, NULL, &fl6, (struct rt6_info *)dst,

			      MSG_DONTWAIT, np->dontfrag);

	if (err) {

		ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTERRORS);

		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTERRORS);

		ip6_flush_pending_frames(sk);

	} else {

		err = icmpv6_push_pending_frames(sk, &fl6, &tmp_hdr,

net/ipv6/ip6_output.c

+2 −2
Original line number Diff line number Diff line
@@ -1567,8 +1567,8 @@ int ip6_push_pending_frames(struct sock *sk) 
	if (proto == IPPROTO_ICMPV6) {

		struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));



		ICMP6MSGOUT_INC_STATS_BH(net, idev, icmp6_hdr(skb)->icmp6_type);

		ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS);

		ICMP6MSGOUT_INC_STATS(net, idev, icmp6_hdr(skb)->icmp6_type);

		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);

	}



	err = ip6_local_out(skb);

net/ipv6/mcast.c

+6 −5
Original line number Diff line number Diff line
@@ -1620,11 +1620,12 @@ static void mld_sendpack(struct sk_buff *skb) 
		      dst_output);

out:

	if (!err) {

		ICMP6MSGOUT_INC_STATS_BH(net, idev, ICMPV6_MLD2_REPORT);

		ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS);

		IP6_UPD_PO_STATS_BH(net, idev, IPSTATS_MIB_OUTMCAST, payload_len);

	} else

		IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_OUTDISCARDS);

		ICMP6MSGOUT_INC_STATS(net, idev, ICMPV6_MLD2_REPORT);

		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);

		IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUTMCAST, payload_len);

	} else {

		IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);

	}



	rcu_read_unlock();

	return;

net/ipv6/ping.c

+2 −2
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ int ping_v6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
			      MSG_DONTWAIT, np->dontfrag);



	if (err) {

		ICMP6_INC_STATS_BH(sock_net(sk), rt->rt6i_idev,

		ICMP6_INC_STATS(sock_net(sk), rt->rt6i_idev,

				ICMP6_MIB_OUTERRORS);

		ip6_flush_pending_frames(sk);

	} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE