mirror of
https://github.com/schoebel/mars
synced 2024-12-19 05:14:45 +00:00
net: new setsockopt interface, around kernel 5.8
This commit is contained in:
Thomas Schoebel-Theuer
parent
248d1d0342
commit
16ce79105b
@ -265,6 +265,7 @@ extern int __oldcompat_unlink(
|
||||
|
||||
/* for networking */
|
||||
#include <net/sock.h>
|
||||
#include <linux/netdevice.h>
|
||||
|
||||
#ifndef TCP_MAX_REORDERING
|
||||
#define __HAS_IOV_ITER
|
||||
@ -281,6 +282,20 @@ extern int __oldcompat_unlink(
|
||||
#define MARS_HAS_SO_SNDTIMEO_NEW
|
||||
#endif
|
||||
|
||||
/* Adapt to the patchstack b58f0e8f38c0..7d7207c2d57
|
||||
* This is usable at upstream kernels from there, and becomes
|
||||
* mandatory after 5a892ff2facb4548c17c05931ed899038a0da63e.
|
||||
* This patch range is not easy to detect from OOT.
|
||||
* As a workaround, we guess via presence of
|
||||
* 9e343b467c70379e66b8b771d96f03ae23eba351 .
|
||||
* HINT: this may be wrong in general, especially for
|
||||
* Frankenstein kernels.
|
||||
*/
|
||||
#if defined(__READ_ONCE_SCALAR) || \
|
||||
defined(IOCB_WAITQ)
|
||||
#define MARS_USE_NEW_SETSOCKOPT
|
||||
#endif
|
||||
|
||||
/* for crypto stuff */
|
||||
#include <linux/crypto.h>
|
||||
|
||||
|
||||
@ -57,17 +57,12 @@ module_param_named(mars_port, mars_net_default_port, int, 0);
|
||||
__u32 enabled_net_compressions = 0;
|
||||
__u32 used_net_compression = 0;
|
||||
|
||||
/* TODO: allow binding to specific source addresses instead of catch-all.
|
||||
* TODO: make all the socket options configurable.
|
||||
* TODO: implement signal handling.
|
||||
* TODO: add authentication.
|
||||
* TODO: add compression / encryption.
|
||||
*/
|
||||
|
||||
struct mars_tcp_params mars_tcp_params[MARS_TRAFFIC_MAX] = {
|
||||
[MARS_TRAFFIC_META] = {
|
||||
.ip_tos = IPTOS_LOWDELAY,
|
||||
#ifndef MARS_USE_NEW_SETSOCKOPT
|
||||
.tcp_window_size = 8 * 1024 * 1024,
|
||||
#endif
|
||||
.tcp_nodelay = 0,
|
||||
.tcp_timeout = 2,
|
||||
.tcp_keepcnt = 3,
|
||||
@ -76,7 +71,9 @@ struct mars_tcp_params mars_tcp_params[MARS_TRAFFIC_MAX] = {
|
||||
},
|
||||
[MARS_TRAFFIC_REPLICATION] = {
|
||||
.ip_tos = IPTOS_RELIABILITY,
|
||||
#ifndef MARS_USE_NEW_SETSOCKOPT
|
||||
.tcp_window_size = 8 * 1024 * 1024,
|
||||
#endif
|
||||
.tcp_nodelay = 0,
|
||||
.tcp_timeout = 2,
|
||||
.tcp_keepcnt = 3,
|
||||
@ -85,7 +82,9 @@ struct mars_tcp_params mars_tcp_params[MARS_TRAFFIC_MAX] = {
|
||||
},
|
||||
[MARS_TRAFFIC_SYNC] = {
|
||||
.ip_tos = IPTOS_MINCOST,
|
||||
#ifndef MARS_USE_NEW_SETSOCKOPT
|
||||
.tcp_window_size = 8 * 1024 * 1024,
|
||||
#endif
|
||||
.tcp_nodelay = 0,
|
||||
.tcp_timeout = 2,
|
||||
.tcp_keepcnt = 3,
|
||||
@ -94,6 +93,60 @@ struct mars_tcp_params mars_tcp_params[MARS_TRAFFIC_MAX] = {
|
||||
},
|
||||
};
|
||||
|
||||
#ifdef MARS_USE_NEW_SETSOCKOPT
|
||||
|
||||
/* New Code. Many thanks to Christoph Hellwig who made adaptation
|
||||
* to newer kernels very simple.
|
||||
*/
|
||||
static
|
||||
void _set_socketopts(struct socket *sock, struct mars_tcp_params *params, bool is_server)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
||||
/* extra options, only for server-role sockets */
|
||||
if (is_server) {
|
||||
/* c4e446bf5a06 */
|
||||
ip_sock_set_freebind(sk);
|
||||
}
|
||||
/* 76ee0785f42a */
|
||||
sock_set_sndtimeo(sk, params->tcp_timeout);
|
||||
/* fe31a326a4aa */
|
||||
sock_set_reuseport(sk);
|
||||
|
||||
/* For now, I give up the old params->tcp_window_size.
|
||||
* Probably it is better to leave such fundamental thingies
|
||||
* to the kernel upstream experts.
|
||||
* When necessary, new kernel-internal interfaces can be added
|
||||
* (e.g. by somebody else).
|
||||
* I don't want to intrude into important discussions about
|
||||
* resposibility. Probably, not every tunable from this world
|
||||
* should be exported to userspace ;)
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_MARS_IPv4_TOS
|
||||
/* 6ebf71bab9fb */
|
||||
ip_sock_set_tos(sk, params->ip_tos);
|
||||
#endif
|
||||
/* 12abc5ee7873 */
|
||||
if (params->tcp_nodelay)
|
||||
tcp_sock_set_nodelay(sk);
|
||||
/* ce3d9544ceca */
|
||||
sock_set_keepalive(sk);
|
||||
/* 480aeb9639d6 */
|
||||
tcp_sock_set_keepcnt(sk, params->tcp_keepcnt);
|
||||
/* d41ecaac903c */
|
||||
tcp_sock_set_keepintvl(sk, params->tcp_keepintvl);
|
||||
/* 71c48eb81c9e */
|
||||
tcp_sock_set_keepidle(sk, params->tcp_keepidle);
|
||||
/* 76ee0785f42a */
|
||||
sock_set_sndtimeo(sk, params->tcp_timeout);
|
||||
/* I have given up the mirror symmetric rcvtimeo, for now.
|
||||
* Upon complaints from MARS users, this could be resurrected.
|
||||
*/
|
||||
}
|
||||
|
||||
#else /* OLD socketopt CODE & sister => to disappear */
|
||||
|
||||
static
|
||||
void __setsockopt(struct socket *sock, int level, int optname, char *optval, int optsize)
|
||||
{
|
||||
@ -106,6 +159,8 @@ void __setsockopt(struct socket *sock, int level, int optname, char *optval, int
|
||||
|
||||
#define _setsockopt(sock,level,optname,val) __setsockopt(sock, level, optname, (char*)&(val), sizeof(val))
|
||||
|
||||
#endif /* OLD socketopt CODE & sister => to disappear */
|
||||
|
||||
int mars_create_sockaddr(struct sockaddr_storage *addr, const char *spec)
|
||||
{
|
||||
struct sockaddr_in *sockaddr = (void*)addr;
|
||||
@ -190,6 +245,8 @@ EXPORT_SYMBOL_GPL(mars_create_sockaddr);
|
||||
|
||||
static int current_debug_nr = 0; // no locking, just for debugging
|
||||
|
||||
#ifndef MARS_USE_NEW_SETSOCKOPT /* OLD socketopt CODE & sister => to disappear */
|
||||
|
||||
static
|
||||
void _set_socketopts(struct socket *sock, struct mars_tcp_params *params, bool is_server)
|
||||
{
|
||||
@ -231,6 +288,8 @@ void _set_socketopts(struct socket *sock, struct mars_tcp_params *params, bool i
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif /* OLD socketopt CODE & sister => to disappear */
|
||||
|
||||
int mars_create_socket(struct mars_socket *msock,
|
||||
struct sockaddr_storage *addr,
|
||||
struct mars_tcp_params *params,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user