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

Commit 808c1b69 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

bpf, dst: add and use dst_tclassid helper 



We can just add a small helper dst_tclassid() for retrieving the
dst->tclassid value. It makes the code a bit better in that we can
get rid of the ifdef from filter.c by moving this into the header.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 09c37a2c

include/net/dst.h

+12 −0
Original line number Diff line number Diff line
@@ -398,6 +398,18 @@ static inline void skb_tunnel_rx(struct sk_buff *skb, struct net_device *dev, 
	__skb_tunnel_rx(skb, dev, net);

}



static inline u32 dst_tclassid(const struct sk_buff *skb)

{

#ifdef CONFIG_IP_ROUTE_CLASSID

	const struct dst_entry *dst;



	dst = skb_dst(skb);

	if (dst)

		return dst->tclassid;

#endif

	return 0;

}



int dst_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb);

static inline int dst_discard(struct sk_buff *skb)

{

net/core/filter.c

+1 −8
Original line number Diff line number Diff line
@@ -1682,14 +1682,7 @@ static const struct bpf_func_proto bpf_get_cgroup_classid_proto = { 


static u64 bpf_get_route_realm(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5)

{

#ifdef CONFIG_IP_ROUTE_CLASSID

	const struct dst_entry *dst;



	dst = skb_dst((struct sk_buff *) (unsigned long) r1);

	if (dst)

		return dst->tclassid;

#endif

	return 0;

	return dst_tclassid((struct sk_buff *) (unsigned long) r1);

}



static const struct bpf_func_proto bpf_get_route_realm_proto = {