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

Commit 7a048d5a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bpf-helper-improvements' 



Daniel Borkmann says:

====================
Few minor BPF helper improvements

Just a few minor improvements around BPF helpers, first one is a
fix but given this late stage and that it's not really a critical
one, I think net-next is just fine. For details please see the
individual patches.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c14fec39 7a4b28c6

include/uapi/linux/bpf.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -419,6 +419,13 @@ enum bpf_func_id { 
	 */

	 */

	BPF_FUNC_csum_update,

	BPF_FUNC_csum_update,





	/**

	 * bpf_set_hash_invalid(skb)

	 * Invalidate current skb>hash.

	 * @skb: pointer to skb

	 */

	BPF_FUNC_set_hash_invalid,



	__BPF_FUNC_MAX_ID,

	__BPF_FUNC_MAX_ID,

};

};

net/core/filter.c

+21 −1
Original line number Original line Diff line number Diff line
@@ -1777,6 +1777,22 @@ static const struct bpf_func_proto bpf_get_hash_recalc_proto = { 
	.arg1_type	= ARG_PTR_TO_CTX,

	.arg1_type	= ARG_PTR_TO_CTX,

};

};





BPF_CALL_1(bpf_set_hash_invalid, struct sk_buff *, skb)

{

	/* After all direct packet write, this can be used once for

	 * triggering a lazy recalc on next skb_get_hash() invocation.

	 */

	skb_clear_hash(skb);

	return 0;

}



static const struct bpf_func_proto bpf_set_hash_invalid_proto = {

	.func		= bpf_set_hash_invalid,

	.gpl_only	= false,

	.ret_type	= RET_INTEGER,

	.arg1_type	= ARG_PTR_TO_CTX,

};



BPF_CALL_3(bpf_skb_vlan_push, struct sk_buff *, skb, __be16, vlan_proto,

BPF_CALL_3(bpf_skb_vlan_push, struct sk_buff *, skb, __be16, vlan_proto,

	   u16, vlan_tci)

	   u16, vlan_tci)

{

{
@@ -2408,7 +2424,7 @@ BPF_CALL_3(bpf_skb_under_cgroup, struct sk_buff *, skb, struct bpf_map *, map, 
	struct cgroup *cgrp;

	struct cgroup *cgrp;

	struct sock *sk;

	struct sock *sk;





	sk = skb->sk;

	sk = skb_to_full_sk(skb);

	if (!sk || !sk_fullsock(sk))

	if (!sk || !sk_fullsock(sk))

		return -ENOENT;

		return -ENOENT;

	if (unlikely(idx >= array->map.max_entries))

	if (unlikely(idx >= array->map.max_entries))
@@ -2534,6 +2550,8 @@ tc_cls_act_func_proto(enum bpf_func_id func_id) 
		return &bpf_get_route_realm_proto;

		return &bpf_get_route_realm_proto;

	case BPF_FUNC_get_hash_recalc:

	case BPF_FUNC_get_hash_recalc:

		return &bpf_get_hash_recalc_proto;

		return &bpf_get_hash_recalc_proto;

	case BPF_FUNC_set_hash_invalid:

		return &bpf_set_hash_invalid_proto;

	case BPF_FUNC_perf_event_output:

	case BPF_FUNC_perf_event_output:

		return &bpf_skb_event_output_proto;

		return &bpf_skb_event_output_proto;

	case BPF_FUNC_get_smp_processor_id:

	case BPF_FUNC_get_smp_processor_id:
@@ -2551,6 +2569,8 @@ xdp_func_proto(enum bpf_func_id func_id) 
	switch (func_id) {

	switch (func_id) {

	case BPF_FUNC_perf_event_output:

	case BPF_FUNC_perf_event_output:

		return &bpf_xdp_event_output_proto;

		return &bpf_xdp_event_output_proto;

	case BPF_FUNC_get_smp_processor_id:

		return &bpf_get_smp_processor_id_proto;

	default:

	default:

		return sk_filter_func_proto(func_id);

		return sk_filter_func_proto(func_id);

	}

	}