Unverified Commit 4e547f49 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1522 Allow bpf_get_netns_cookie in BPF_PROG_TYPE_SK_MSG and BPF_PROG_TYPE_SOCK_OPS 

Merge Pull Request from: @kwb0523 
 
We'd like to be able to identify netns from sock_ops and sk_msg hooks to
accelerate local process communication form different netns. 
 
Link:https://gitee.com/openeuler/kernel/pulls/1522

 

Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 75cd4528 17eb1641

net/core/filter.c

+28 −0
Original line number Diff line number Diff line
@@ -4677,6 +4677,30 @@ static const struct bpf_func_proto bpf_get_netns_cookie_sock_addr_proto = { 
	.arg1_type	= ARG_PTR_TO_CTX_OR_NULL,

};



BPF_CALL_1(bpf_get_netns_cookie_sock_ops, struct bpf_sock_ops_kern *, ctx)

{

	return __bpf_get_netns_cookie(ctx ? ctx->sk : NULL);

}



static const struct bpf_func_proto bpf_get_netns_cookie_sock_ops_proto = {

	.func		= bpf_get_netns_cookie_sock_ops,

	.gpl_only	= false,

	.ret_type	= RET_INTEGER,

	.arg1_type	= ARG_PTR_TO_CTX_OR_NULL,

};



BPF_CALL_1(bpf_get_netns_cookie_sk_msg, struct sk_msg *, ctx)

{

	return __bpf_get_netns_cookie(ctx ? ctx->sk : NULL);

}



static const struct bpf_func_proto bpf_get_netns_cookie_sk_msg_proto = {

	.func		= bpf_get_netns_cookie_sk_msg,

	.gpl_only	= false,

	.ret_type	= RET_INTEGER,

	.arg1_type	= ARG_PTR_TO_CTX_OR_NULL,

};



BPF_CALL_1(bpf_get_socket_uid, struct sk_buff *, skb)

{

	struct sock *sk = sk_to_full_sk(skb->sk);
@@ -7391,6 +7415,8 @@ sock_ops_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) 
		return &bpf_sk_storage_get_proto;

	case BPF_FUNC_sk_storage_delete:

		return &bpf_sk_storage_delete_proto;

	case BPF_FUNC_get_netns_cookie:

		return &bpf_get_netns_cookie_sock_ops_proto;

	case BPF_FUNC_get_sockops_uid_gid:

		return &bpf_get_sockops_uid_gid_proto;

	case BPF_FUNC_sk_original_addr:
@@ -7441,6 +7467,8 @@ sk_msg_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) 
		return &bpf_sk_storage_get_proto;

	case BPF_FUNC_sk_storage_delete:

		return &bpf_sk_storage_delete_proto;

	case BPF_FUNC_get_netns_cookie:

		return &bpf_get_netns_cookie_sk_msg_proto;

#ifdef CONFIG_CGROUPS

	case BPF_FUNC_get_current_cgroup_id:

		return &bpf_get_current_cgroup_id_proto;