Commit 812285fa authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'bpf_sk_storage_via_inet_diag' 



Martin KaFai Lau says:

====================
The bpf_prog can store specific info to a sk by using bpf_sk_storage.
In other words, a sk can be extended by a bpf_prog.

This series is to support providing bpf_sk_storage data during inet_diag's
dump.  The primary target is the usage like iproute2's "ss".

The first two patches are refactoring works in inet_diag to make
adding bpf_sk_storage support easier.  The next two patches do
the actual work.

Please see individual patch for details.

v2:
- Add commit message for u16 to u32 change in min_dump_alloc in Patch 4 (Song)
- Add comment to explain the !skb->len check in __inet_diag_dump in Patch 4.
- Do the map->map_type check earlier in Patch 3 for readability.
====================

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents d7f10df8 085c20ca

include/linux/bpf.h

+1 −0
Original line number Diff line number Diff line
@@ -1023,6 +1023,7 @@ void __bpf_free_used_maps(struct bpf_prog_aux *aux, 
void bpf_prog_free_id(struct bpf_prog *prog, bool do_idr_lock);

void bpf_map_free_id(struct bpf_map *map, bool do_idr_lock);



struct bpf_map *bpf_map_get(u32 ufd);

struct bpf_map *bpf_map_get_with_uref(u32 ufd);

struct bpf_map *__bpf_map_get(struct fd f);

void bpf_map_inc(struct bpf_map *map);

include/linux/inet_diag.h

+16 −11
Original line number Diff line number Diff line
@@ -15,11 +15,9 @@ struct netlink_callback; 
struct inet_diag_handler {

	void		(*dump)(struct sk_buff *skb,

				struct netlink_callback *cb,

				const struct inet_diag_req_v2 *r,

				struct nlattr *bc);

				const struct inet_diag_req_v2 *r);



	int		(*dump_one)(struct sk_buff *in_skb,

				    const struct nlmsghdr *nlh,

	int		(*dump_one)(struct netlink_callback *cb,

				    const struct inet_diag_req_v2 *req);



	void		(*idiag_get_info)(struct sock *sk,
@@ -40,18 +38,25 @@ struct inet_diag_handler { 
	__u16		idiag_info_size;

};



struct bpf_sk_storage_diag;

struct inet_diag_dump_data {

	struct nlattr *req_nlas[__INET_DIAG_REQ_MAX];

#define inet_diag_nla_bc req_nlas[INET_DIAG_REQ_BYTECODE]

#define inet_diag_nla_bpf_stgs req_nlas[INET_DIAG_REQ_SK_BPF_STORAGES]



	struct bpf_sk_storage_diag *bpf_stg_diag;

};



struct inet_connection_sock;

int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,

		      struct sk_buff *skb, const struct inet_diag_req_v2 *req,

		      struct user_namespace *user_ns,

		      u32 pid, u32 seq, u16 nlmsg_flags,

		      const struct nlmsghdr *unlh, bool net_admin);

		      struct sk_buff *skb, struct netlink_callback *cb,

		      const struct inet_diag_req_v2 *req,

		      u16 nlmsg_flags, bool net_admin);

void inet_diag_dump_icsk(struct inet_hashinfo *h, struct sk_buff *skb,

			 struct netlink_callback *cb,

			 const struct inet_diag_req_v2 *r,

			 struct nlattr *bc);

			 const struct inet_diag_req_v2 *r);

int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo,

			    struct sk_buff *in_skb, const struct nlmsghdr *nlh,

			    struct netlink_callback *cb,

			    const struct inet_diag_req_v2 *req);



struct sock *inet_diag_find_one_icsk(struct net *net,

include/linux/netlink.h

+2 −2
Original line number Diff line number Diff line
@@ -188,10 +188,10 @@ struct netlink_callback { 
	struct module		*module;

	struct netlink_ext_ack	*extack;

	u16			family;

	u16			min_dump_alloc;

	bool			strict_check;

	u16			answer_flags;

	u32			min_dump_alloc;

	unsigned int		prev_seq, seq;

	bool			strict_check;

	union {

		u8		ctx[48];

include/net/bpf_sk_storage.h

+27 −0
Original line number Diff line number Diff line
@@ -10,14 +10,41 @@ void bpf_sk_storage_free(struct sock *sk); 
extern const struct bpf_func_proto bpf_sk_storage_get_proto;

extern const struct bpf_func_proto bpf_sk_storage_delete_proto;



struct bpf_sk_storage_diag;

struct sk_buff;

struct nlattr;

struct sock;



#ifdef CONFIG_BPF_SYSCALL

int bpf_sk_storage_clone(const struct sock *sk, struct sock *newsk);

struct bpf_sk_storage_diag *

bpf_sk_storage_diag_alloc(const struct nlattr *nla_stgs);

void bpf_sk_storage_diag_free(struct bpf_sk_storage_diag *diag);

int bpf_sk_storage_diag_put(struct bpf_sk_storage_diag *diag,

			    struct sock *sk, struct sk_buff *skb,

			    int stg_array_type,

			    unsigned int *res_diag_size);

#else

static inline int bpf_sk_storage_clone(const struct sock *sk,

				       struct sock *newsk)

{

	return 0;

}

static inline struct bpf_sk_storage_diag *

bpf_sk_storage_diag_alloc(const struct nlattr *nla)

{

	return NULL;

}

static inline void bpf_sk_storage_diag_free(struct bpf_sk_storage_diag *diag)

{

}

static inline int bpf_sk_storage_diag_put(struct bpf_sk_storage_diag *diag,

					  struct sock *sk, struct sk_buff *skb,

					  int stg_array_type,

					  unsigned int *res_diag_size)

{

	return 0;

}

#endif



#endif /* _BPF_SK_STORAGE_H */

include/uapi/linux/inet_diag.h

+4 −1
Original line number Diff line number Diff line
@@ -64,9 +64,11 @@ struct inet_diag_req_raw { 
enum {

	INET_DIAG_REQ_NONE,

	INET_DIAG_REQ_BYTECODE,

	INET_DIAG_REQ_SK_BPF_STORAGES,

	__INET_DIAG_REQ_MAX,

};



#define INET_DIAG_REQ_MAX INET_DIAG_REQ_BYTECODE

#define INET_DIAG_REQ_MAX (__INET_DIAG_REQ_MAX - 1)



/* Bytecode is sequence of 4 byte commands followed by variable arguments.

 * All the commands identified by "code" are conditional jumps forward:
@@ -154,6 +156,7 @@ enum { 
	INET_DIAG_CLASS_ID,	/* request as INET_DIAG_TCLASS */

	INET_DIAG_MD5SIG,

	INET_DIAG_ULP_INFO,

	INET_DIAG_SK_BPF_STORAGES,

	__INET_DIAG_MAX,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE