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

Commit 02a56c81 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net_sched: em_meta: use skb_to_full_sk() helper 



SYNACK packets might be attached to request sockets.

Fixes: ca6fb065 ("tcp: attach SYNACK messages to request sockets instead of listener")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 743b2a66

net/sched/em_meta.c

+92 −46
Original line number Original line Diff line number Diff line
@@ -343,119 +343,145 @@ META_COLLECTOR(int_sk_refcnt) 




META_COLLECTOR(int_sk_rcvbuf)

META_COLLECTOR(int_sk_rcvbuf)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_rcvbuf;

	dst->value = sk->sk_rcvbuf;

}

}





META_COLLECTOR(int_sk_shutdown)

META_COLLECTOR(int_sk_shutdown)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_shutdown;

	dst->value = sk->sk_shutdown;

}

}





META_COLLECTOR(int_sk_proto)

META_COLLECTOR(int_sk_proto)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_protocol;

	dst->value = sk->sk_protocol;

}

}





META_COLLECTOR(int_sk_type)

META_COLLECTOR(int_sk_type)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_type;

	dst->value = sk->sk_type;

}

}





META_COLLECTOR(int_sk_rmem_alloc)

META_COLLECTOR(int_sk_rmem_alloc)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = sk_rmem_alloc_get(skb->sk);

	dst->value = sk_rmem_alloc_get(sk);

}

}





META_COLLECTOR(int_sk_wmem_alloc)

META_COLLECTOR(int_sk_wmem_alloc)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = sk_wmem_alloc_get(skb->sk);

	dst->value = sk_wmem_alloc_get(sk);

}

}





META_COLLECTOR(int_sk_omem_alloc)

META_COLLECTOR(int_sk_omem_alloc)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = atomic_read(&skb->sk->sk_omem_alloc);

	dst->value = atomic_read(&sk->sk_omem_alloc);

}

}





META_COLLECTOR(int_sk_rcv_qlen)

META_COLLECTOR(int_sk_rcv_qlen)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_receive_queue.qlen;

	dst->value = sk->sk_receive_queue.qlen;

}

}





META_COLLECTOR(int_sk_snd_qlen)

META_COLLECTOR(int_sk_snd_qlen)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_write_queue.qlen;

	dst->value = sk->sk_write_queue.qlen;

}

}





META_COLLECTOR(int_sk_wmem_queued)

META_COLLECTOR(int_sk_wmem_queued)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_wmem_queued;

	dst->value = sk->sk_wmem_queued;

}

}





META_COLLECTOR(int_sk_fwd_alloc)

META_COLLECTOR(int_sk_fwd_alloc)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_forward_alloc;

	dst->value = sk->sk_forward_alloc;

}

}





META_COLLECTOR(int_sk_sndbuf)

META_COLLECTOR(int_sk_sndbuf)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_sndbuf;

	dst->value = sk->sk_sndbuf;

}

}





META_COLLECTOR(int_sk_alloc)

META_COLLECTOR(int_sk_alloc)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = (__force int) skb->sk->sk_allocation;

	dst->value = (__force int) sk->sk_allocation;

}

}





META_COLLECTOR(int_sk_hash)

META_COLLECTOR(int_sk_hash)
@@ -469,92 +495,112 @@ META_COLLECTOR(int_sk_hash) 




META_COLLECTOR(int_sk_lingertime)

META_COLLECTOR(int_sk_lingertime)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_lingertime / HZ;

	dst->value = sk->sk_lingertime / HZ;

}

}





META_COLLECTOR(int_sk_err_qlen)

META_COLLECTOR(int_sk_err_qlen)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_error_queue.qlen;

	dst->value = sk->sk_error_queue.qlen;

}

}





META_COLLECTOR(int_sk_ack_bl)

META_COLLECTOR(int_sk_ack_bl)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_ack_backlog;

	dst->value = sk->sk_ack_backlog;

}

}





META_COLLECTOR(int_sk_max_ack_bl)

META_COLLECTOR(int_sk_max_ack_bl)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_max_ack_backlog;

	dst->value = sk->sk_max_ack_backlog;

}

}





META_COLLECTOR(int_sk_prio)

META_COLLECTOR(int_sk_prio)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_priority;

	dst->value = sk->sk_priority;

}

}





META_COLLECTOR(int_sk_rcvlowat)

META_COLLECTOR(int_sk_rcvlowat)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_rcvlowat;

	dst->value = sk->sk_rcvlowat;

}

}





META_COLLECTOR(int_sk_rcvtimeo)

META_COLLECTOR(int_sk_rcvtimeo)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_rcvtimeo / HZ;

	dst->value = sk->sk_rcvtimeo / HZ;

}

}





META_COLLECTOR(int_sk_sndtimeo)

META_COLLECTOR(int_sk_sndtimeo)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_sndtimeo / HZ;

	dst->value = sk->sk_sndtimeo / HZ;

}

}





META_COLLECTOR(int_sk_sendmsg_off)

META_COLLECTOR(int_sk_sendmsg_off)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_frag.offset;

	dst->value = sk->sk_frag.offset;

}

}





META_COLLECTOR(int_sk_write_pend)

META_COLLECTOR(int_sk_write_pend)

{

{

	if (skip_nonlocal(skb)) {

	const struct sock *sk = skb_to_full_sk(skb);



	if (!sk) {

		*err = -1;

		*err = -1;

		return;

		return;

	}

	}

	dst->value = skb->sk->sk_write_pending;

	dst->value = sk->sk_write_pending;

}

}





/**************************************************************************

/**************************************************************************