From: Patrick Farrell Date: Thu, 15 Aug 2019 15:52:37 +0000 (-0400) Subject: LU-12477 lnet: Remove obsolete config options X-Git-Tag: 2.13.51~203 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=25929ea0d2955afc6fb1150e57fd8e527ffc6b4f LU-12477 lnet: Remove obsolete config options Remove a few obselete config options, some for kernels we no longer support, some for configs that should be unused. Test-Parameters: trivial Signed-off-by: Patrick Farrell Change-Id: Icb949b1dd69e5cac0278965dfc5b8e3d1120f153 Reviewed-on: https://review.whamcloud.com/35343 Reviewed-by: Shaun Tancheff Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index 7c7764a..42ced43 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -1,53 +1,3 @@ -# -# LN_CHECK_GCC_VERSION -# -# Check compiler version -# -AC_DEFUN([LN_CHECK_GCC_VERSION], [ -AC_MSG_CHECKING([compiler version]) -PTL_CC_VERSION=`$CC --version | awk '/^gcc/{print $ 3}'` -PTL_MIN_CC_VERSION="3.2.2" -v2n() { - awk -F. '{printf "%d\n", (($ 1)*100+($ 2))*100+($ 3)}' -} -if test -z "$PTL_CC_VERSION" -o \ - $(echo $PTL_CC_VERSION | v2n) -ge $(echo $PTL_MIN_CC_VERSION | v2n); then - AC_MSG_RESULT([ok]) -else - AC_MSG_RESULT([Buggy compiler found]) - AC_MSG_ERROR([Need gcc version >= $PTL_MIN_CC_VERSION]) -fi -]) # LN_CHECK_GCC_VERSION - -# -# LN_CONFIG_AFFINITY -# -# check if cpu affinity is available/wanted -# -AC_DEFUN([LN_CONFIG_AFFINITY], [ -AC_MSG_CHECKING([whether to enable CPU affinity support]) -AC_ARG_ENABLE([affinity], - AC_HELP_STRING([--disable-affinity], - [disable process/irq affinity]), - [], [enable_affinity="yes"]) -AC_MSG_RESULT([$enable_affinity]) -AS_IF([test "x$enable_affinity" = xyes], [ - LB_CHECK_COMPILE([if Linux kernel has cpu affinity support], - set_cpus_allowed_ptr, [ - #include - ],[ - struct task_struct *t = NULL; - cpumask_t m = { }; - - set_cpus_allowed_ptr(t, &m); - ],[ - AC_DEFINE(CPU_AFFINITY, 1, - [kernel has cpu affinity support]) - ]) -]) -]) # LN_CONFIG_AFFINITY - -# # LN_CONFIG_BACKOFF # # check if tunable tcp backoff is available/wanted @@ -634,45 +584,6 @@ AC_SUBST(GNICPPFLAGS) AC_SUBST(GNILND) ]) # LN_CONFIG_GNILND -# -# LN_CONFIG_SK_SLEEP -# -# 2.6.35 kernel has sk_sleep function -# -AC_DEFUN([LN_CONFIG_SK_SLEEP], [ -LB_CHECK_COMPILE([if Linux kernel has 'sk_sleep'], -sk_sleep, [ - #include -],[ - sk_sleep(NULL); -],[ - AC_DEFINE(HAVE_SK_SLEEP, 1, - [kernel has sk_sleep]) -]) -]) # LN_CONFIG_SK_SLEEP - -# -# LN_CONFIG_TCP_SENDPAGE -# -# 2.6.36 tcp_sendpage() first parameter is 'struct sock' -# instead of 'struct socket'. -# -AC_DEFUN([LN_CONFIG_TCP_SENDPAGE], [ -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_CHECK_COMPILE([if 'tcp_sendpage' first parameter is socket], -tcp_sendpage_socket, [ - #include - #include -],[ - tcp_sendpage((struct socket*)0, NULL, 0, 0, 0); -],[ - AC_DEFINE(HAVE_TCP_SENDPAGE_USE_SOCKET, 1, - [tcp_sendpage use socket as first parameter]) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) # LN_CONFIG_TCP_SENDPAGE - # LN_CONFIG_SOCK_CREATE_KERN # # 4.x sock_create_kern() added a first parameter as 'struct net *' @@ -846,14 +757,9 @@ AC_DEFUN([LN_PROG_LINUX], [ AC_MSG_NOTICE([LNet kernel checks ==============================================================================]) -LN_CONFIG_AFFINITY LN_CONFIG_BACKOFF LN_CONFIG_O2IB LN_CONFIG_GNILND -# 2.6.35 -LN_CONFIG_SK_SLEEP -# 2.6.36 -LN_CONFIG_TCP_SENDPAGE # 3.10 LN_EXPORT_KMAP_TO_PAGE # 3.15 diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h index 27fa83d..bc77359 100644 --- a/lnet/klnds/socklnd/socklnd.h +++ b/lnet/klnds/socklnd/socklnd.h @@ -54,14 +54,6 @@ #include #include -#ifdef HAVE_TCP_SENDPAGE_USE_SOCKET -# define cfs_tcp_sendpage(sk, page, offset, size, flags) \ - tcp_sendpage((sk)->sk_socket, page, offset, size, flags) -#else /* !HAVE_TCP_SENDPAGE_USE_SOCKET */ -# define cfs_tcp_sendpage(sk, page, offset, size, flags) \ - tcp_sendpage(sk, page, offset, size, flags) -#endif /* HAVE_TCP_SENDPAGE_USE_SOCKET */ - #ifndef NETIF_F_CSUM_MASK # define NETIF_F_CSUM_MASK NETIF_F_ALL_CSUM #endif @@ -152,9 +144,7 @@ struct ksock_tunables { unsigned int *ksnd_zc_min_payload; /* minimum zero copy payload size */ int *ksnd_zc_recv; /* enable ZC receive (for Chelsio TOE) */ int *ksnd_zc_recv_min_nfrags; /* minimum # of fragments to enable ZC receive */ -#ifdef CPU_AFFINITY int *ksnd_irq_affinity; /* enable IRQ affinity? */ -#endif #ifdef SOCKNAL_BACKOFF int *ksnd_backoff_init; /* initial TCP backoff */ int *ksnd_backoff_max; /* maximum TCP backoff */ diff --git a/lnet/klnds/socklnd/socklnd_lib.c b/lnet/klnds/socklnd/socklnd_lib.c index a5654df..93d4b8f 100644 --- a/lnet/klnds/socklnd/socklnd_lib.c +++ b/lnet/klnds/socklnd/socklnd_lib.c @@ -145,8 +145,7 @@ ksocknal_lib_send_kiov(struct ksock_conn *conn, struct ksock_tx *tx, rc = sk->sk_prot->sendpage(sk, page, offset, fragsize, msgflg); } else { - rc = cfs_tcp_sendpage(sk, page, offset, fragsize, - msgflg); + rc = tcp_sendpage(sk, page, offset, fragsize, msgflg); } } else { #if SOCKNAL_SINGLE_FRAG_TX || !SOCKNAL_RISK_KMAP_DEADLOCK diff --git a/lnet/klnds/socklnd/socklnd_modparams.c b/lnet/klnds/socklnd/socklnd_modparams.c index df9d96e..046436f 100644 --- a/lnet/klnds/socklnd/socklnd_modparams.c +++ b/lnet/klnds/socklnd/socklnd_modparams.c @@ -117,11 +117,9 @@ static int inject_csum_error = 0; module_param(inject_csum_error, int, 0644); MODULE_PARM_DESC(inject_csum_error, "set non-zero to inject a checksum error"); -#ifdef CPU_AFFINITY static int enable_irq_affinity = 0; module_param(enable_irq_affinity, int, 0644); MODULE_PARM_DESC(enable_irq_affinity, "enable IRQ affinity"); -#endif static int nonblk_zcack = 1; module_param(nonblk_zcack, int, 0644); @@ -189,7 +187,6 @@ int ksocknal_tunables_init(void) ksocknal_tunables.ksnd_zc_recv = &zc_recv; ksocknal_tunables.ksnd_zc_recv_min_nfrags = &zc_recv_min_nfrags; -#ifdef CPU_AFFINITY if (enable_irq_affinity) { CWARN("irq_affinity is removed from socklnd because modern " "computer always has fast CPUs and more cores than " @@ -197,7 +194,6 @@ int ksocknal_tunables_init(void) "another way, please check manual for details.\n"); } ksocknal_tunables.ksnd_irq_affinity = &enable_irq_affinity; -#endif #ifdef SOCKNAL_BACKOFF ksocknal_tunables.ksnd_backoff_init = &backoff_init; diff --git a/lnet/lnet/lib-socket.c b/lnet/lnet/lib-socket.c index 4580beb..642d8b5 100644 --- a/lnet/lnet/lib-socket.c +++ b/lnet/lnet/lib-socket.c @@ -332,13 +332,6 @@ lnet_sock_listen(struct socket **sockp, return rc; } -#ifndef HAVE_SK_SLEEP -static inline wait_queue_head_t *sk_sleep(struct sock *sk) -{ - return sk->sk_sleep; -} -#endif - int lnet_sock_accept(struct socket **newsockp, struct socket *sock) {