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

!8454 v3 net: Bacport hulk patches 

Merge Pull Request from: @ci-robot 
 
PR sync from: Dong Chenchen <dongchenchen2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/77NSMYZV2P6FPFDSQHVPABW4U2UDDOSA/ 
Bacport hulk patches

Dong Chenchen (1):
  net: xfrm: skip policies marked as dead while reinserting policies

Lu Wei (4):
  netfilter: make return-type and function-name in the same line
  bpf: fix magic numbers in bpf_get_sockops_uid_gid()
  bpf: socketmap: add Kconfig for customized socketmap
  tcp_comp: modify default value of TCP_COMP to n

Ziyang Xuan (2):
  bpf: fix format type mismatch warning
  bpf: fix type incompatible warning


-- 
2.25.1
 
https://gitee.com/openeuler/kernel/issues/I9K8D1 
 
Link:https://gitee.com/openeuler/kernel/pulls/8454

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents b63c2f8c 1c83df88

arch/arm64/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -1835,6 +1835,7 @@ CONFIG_NET_RX_BUSY_POLL=y 
CONFIG_BQL=y

CONFIG_BPF_JIT=y

CONFIG_BPF_STREAM_PARSER=y

CONFIG_EULER_SOCKETMAP=y

CONFIG_NET_FLOW_LIMIT=y



#

arch/x86/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -1769,6 +1769,7 @@ CONFIG_NET_RX_BUSY_POLL=y 
CONFIG_BQL=y

CONFIG_BPF_JIT=y

CONFIG_BPF_STREAM_PARSER=y

CONFIG_EULER_SOCKETMAP=y

CONFIG_NET_FLOW_LIMIT=y



#

include/net/netfilter/nf_conntrack.h

+2 −0
Original line number Diff line number Diff line
@@ -342,8 +342,10 @@ nf_ct_set(struct sk_buff *skb, struct nf_conn *ct, enum ip_conntrack_info info) 
#define MODULE_ALIAS_NFCT_HELPER(helper) \

        MODULE_ALIAS("nfct-helper-" helper)



#ifdef CONFIG_EULER_SOCKETMAP

typedef int (*bpf_getorigdst_opt_func)(struct sock *sk, int optname,

				       void *optval, int *optlen, int dir);

extern bpf_getorigdst_opt_func bpf_getorigdst_opt;

#endif



#endif /* _NF_CONNTRACK_H */

include/net/sock.h

+5 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ struct sock { 
#endif

	struct rcu_head		sk_rcu;



#ifndef __GENKSYMS__

#if defined(CONFIG_EULER_SOCKETMAP) && !defined(__GENKSYMS__)

	union {

		kgid_t	sk_gid;

		u64	sk_gid_padding;
@@ -1985,7 +1985,9 @@ static inline void sock_graft(struct sock *sk, struct socket *parent) 
	parent->sk = sk;

	sk_set_socket(sk, parent);

	sk->sk_uid = SOCK_INODE(parent)->i_uid;

#ifdef CONFIG_EULER_SOCKETMAP

	sk->sk_gid = SOCK_INODE(parent)->i_gid;

#endif

	security_sock_graft(sk, parent);

	write_unlock_bh(&sk->sk_callback_lock);

}
@@ -1999,10 +2001,12 @@ static inline kuid_t sock_net_uid(const struct net *net, const struct sock *sk) 
	return sk ? sk->sk_uid : make_kuid(net->user_ns, 0);

}



#ifdef CONFIG_EULER_SOCKETMAP

static inline kgid_t sock_net_gid(const struct net *net, const struct sock *sk)

{

	return sk ? sk->sk_gid : make_kgid(net->user_ns, 0);

}

#endif



static inline u32 net_tx_rndhash(void)

{

net/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -318,6 +318,16 @@ config BPF_STREAM_PARSER 
	  It can be used to enforce socket policy, implement socket redirects,

	  etc.



config EULER_SOCKETMAP

	bool "enable EulerOS SOCKETMAP"

	depends on INET

	depends on BPF_SYSCALL

	depends on CGROUP_BPF

	select NET_SOCK_MSG

	default n

	help

	  Enabling this support socket map in EulerOS.



config NET_FLOW_LIMIT

	bool

	depends on RPS