Commit ea02f941 authored by Michal Sekletar's avatar Michal Sekletar Committed by David S. Miller

net: introduce SO_BPF_EXTENSIONS

For user space packet capturing libraries such as libpcap, there's
currently only one way to check which BPF extensions are supported
by the kernel, that is, commit aa1113d9 ("net: filter: return
-EINVAL if BPF_S_ANC* operation is not supported"). For querying all
extensions at once this might be rather inconvenient.

Therefore, this patch introduces a new option which can be used as
an argument for getsockopt(), and allows one to obtain information
about which BPF extensions are supported by the current kernel.

As David Miller suggests, we do not need to define any bits right
now and status quo can just return 0 in order to state that this
versions supports SKF_AD_PROTOCOL up to SKF_AD_PAY_OFFSET. Later
additions to BPF extensions need to add their bits to the
bpf_tell_extensions() function, as documented in the comment.
Signed-off-by: default avatarMichal Sekletar <msekleta@redhat.com>
Cc: David Miller <davem@davemloft.net>
Reviewed-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 41804420
...@@ -85,4 +85,6 @@ ...@@ -85,4 +85,6 @@
#define SO_MAX_PACING_RATE 47 #define SO_MAX_PACING_RATE 47
#define SO_BPF_EXTENSIONS 48
#endif /* _UAPI_ASM_SOCKET_H */ #endif /* _UAPI_ASM_SOCKET_H */
...@@ -78,4 +78,6 @@ ...@@ -78,4 +78,6 @@
#define SO_MAX_PACING_RATE 47 #define SO_MAX_PACING_RATE 47
#define SO_BPF_EXTENSIONS 48
#endif /* _UAPI__ASM_AVR32_SOCKET_H */ #endif /* _UAPI__ASM_AVR32_SOCKET_H */
...@@ -80,6 +80,8 @@ ...@@ -80,6 +80,8 @@
#define SO_MAX_PACING_RATE 47 #define SO_MAX_PACING_RATE 47
#define SO_BPF_EXTENSIONS 48
#endif /* _ASM_SOCKET_H */ #endif /* _ASM_SOCKET_H */
...@@ -78,5 +78,7 @@ ...@@ -78,5 +78,7 @@
#define SO_MAX_PACING_RATE 47 #define SO_MAX_PACING_RATE 47
#define SO_BPF_EXTENSIONS 48
#endif /* _ASM_SOCKET_H */ #endif /* _ASM_SOCKET_H */
...@@ -87,4 +87,6 @@ ...@@ -87,4 +87,6 @@
#define SO_MAX_PACING_RATE 47 #define SO_MAX_PACING_RATE 47
#define SO_BPF_EXTENSIONS 48
#endif /* _ASM_IA64_SOCKET_H */ #endif /* _ASM_IA64_SOCKET_H */
...@@ -78,4 +78,6 @@ ...@@ -78,4 +78,6 @@
#define SO_MAX_PACING_RATE 47 #define SO_MAX_PACING_RATE 47
#define SO_BPF_EXTENSIONS 48
#endif /* _ASM_M32R_SOCKET_H */ #endif /* _ASM_M32R_SOCKET_H */
...@@ -96,4 +96,6 @@ ...@@ -96,4 +96,6 @@
#define SO_MAX_PACING_RATE 47 #define SO_MAX_PACING_RATE 47
#define SO_BPF_EXTENSIONS 48
#endif /* _UAPI_ASM_SOCKET_H */ #endif /* _UAPI_ASM_SOCKET_H */
...@@ -78,4 +78,6 @@ ...@@ -78,4 +78,6 @@
#define SO_MAX_PACING_RATE 47 #define SO_MAX_PACING_RATE 47
#define SO_BPF_EXTENSIONS 48
#endif /* _ASM_SOCKET_H */ #endif /* _ASM_SOCKET_H */
...@@ -77,4 +77,6 @@ ...@@ -77,4 +77,6 @@
#define SO_MAX_PACING_RATE 0x4028 #define SO_MAX_PACING_RATE 0x4028
#define SO_BPF_EXTENSIONS 0x4029
#endif /* _UAPI_ASM_SOCKET_H */ #endif /* _UAPI_ASM_SOCKET_H */
...@@ -85,4 +85,6 @@ ...@@ -85,4 +85,6 @@
#define SO_MAX_PACING_RATE 47 #define SO_MAX_PACING_RATE 47
#define SO_BPF_EXTENSIONS 48
#endif /* _ASM_POWERPC_SOCKET_H */ #endif /* _ASM_POWERPC_SOCKET_H */
...@@ -84,4 +84,6 @@ ...@@ -84,4 +84,6 @@
#define SO_MAX_PACING_RATE 47 #define SO_MAX_PACING_RATE 47
#define SO_BPF_EXTENSIONS 48
#endif /* _ASM_SOCKET_H */ #endif /* _ASM_SOCKET_H */
...@@ -74,6 +74,8 @@ ...@@ -74,6 +74,8 @@
#define SO_MAX_PACING_RATE 0x0031 #define SO_MAX_PACING_RATE 0x0031
#define SO_BPF_EXTENSIONS 0x0032
/* Security levels - as per NRL IPv6 - don't actually do anything */ /* Security levels - as per NRL IPv6 - don't actually do anything */
#define SO_SECURITY_AUTHENTICATION 0x5001 #define SO_SECURITY_AUTHENTICATION 0x5001
#define SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002 #define SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002
......
...@@ -89,4 +89,6 @@ ...@@ -89,4 +89,6 @@
#define SO_MAX_PACING_RATE 47 #define SO_MAX_PACING_RATE 47
#define SO_BPF_EXTENSIONS 48
#endif /* _XTENSA_SOCKET_H */ #endif /* _XTENSA_SOCKET_H */
...@@ -83,6 +83,17 @@ static inline void bpf_jit_free(struct sk_filter *fp) ...@@ -83,6 +83,17 @@ static inline void bpf_jit_free(struct sk_filter *fp)
#define SK_RUN_FILTER(FILTER, SKB) sk_run_filter(SKB, FILTER->insns) #define SK_RUN_FILTER(FILTER, SKB) sk_run_filter(SKB, FILTER->insns)
#endif #endif
static inline int bpf_tell_extensions(void)
{
/* When adding new BPF extension it is necessary to enumerate
* it here, so userspace software which wants to know what is
* supported can do so by inspecting return value of this
* function
*/
return 0;
}
enum { enum {
BPF_S_RET_K = 1, BPF_S_RET_K = 1,
BPF_S_RET_A, BPF_S_RET_A,
......
...@@ -80,4 +80,6 @@ ...@@ -80,4 +80,6 @@
#define SO_MAX_PACING_RATE 47 #define SO_MAX_PACING_RATE 47
#define SO_BPF_EXTENSIONS 48
#endif /* __ASM_GENERIC_SOCKET_H */ #endif /* __ASM_GENERIC_SOCKET_H */
...@@ -1167,6 +1167,10 @@ int sock_getsockopt(struct socket *sock, int level, int optname, ...@@ -1167,6 +1167,10 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
v.val = sock_flag(sk, SOCK_FILTER_LOCKED); v.val = sock_flag(sk, SOCK_FILTER_LOCKED);
break; break;
case SO_BPF_EXTENSIONS:
v.val = bpf_tell_extensions();
break;
case SO_SELECT_ERR_QUEUE: case SO_SELECT_ERR_QUEUE:
v.val = sock_flag(sk, SOCK_SELECT_ERR_QUEUE); v.val = sock_flag(sk, SOCK_SELECT_ERR_QUEUE);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment