From patchwork Mon Feb 19 08:57:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hopps X-Patchwork-Id: 13562389 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.chopps.org (smtp.chopps.org [54.88.81.56]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1F25222333 for ; Mon, 19 Feb 2024 08:59:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.88.81.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708333165; cv=none; b=PRKFI7Zi0X75Lf3HArSZSw9RizHLk3AYPNrUYIfNSgl/EqSR0WXUGU04oY9z1jVj608UnFubnS7ExxX78MA/cEqtJZeGWVZsBZkrfaFOBEfqjsbJq/9IbJkwNb62y8Wrst5fG3y6Ib3bDNsH/2GBHL8xHWFUQtkWFzArMIhxWmU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708333165; c=relaxed/simple; bh=gT6zd5YDYHEJGs4nc2Oe/fyB8GGeEO68WKkPckq9YYQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qMKwIi233OlLDTPODt+Etti7CgMTXJqlAhcx117gScBTNAYib/Jn2fzwstB9fwCNWpG+Jmj33e167TPWpAl4Y5kWSWy5UIwLZDdvFnVVitxTkm99EDFYu0CEBQvU1NxqGxyQ8m7P7xIYRNxlIY5oemcH53iYOKI/ZyoIFHFoQS8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chopps.org; spf=fail smtp.mailfrom=chopps.org; arc=none smtp.client-ip=54.88.81.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chopps.org Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=chopps.org Received: from labnh.int.chopps.org (172-222-091-149.res.spectrum.com [172.222.91.149]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) by smtp.chopps.org (Postfix) with ESMTPSA id 455597D119; Mon, 19 Feb 2024 08:59:23 +0000 (UTC) From: Christian Hopps To: devel@linux-ipsec.org Cc: Steffen Klassert , netdev@vger.kernel.org, Christian Hopps , Christian Hopps Subject: [PATCH ipsec-next v1 4/8] iptfs: sysctl: allow configuration of global default values Date: Mon, 19 Feb 2024 03:57:31 -0500 Message-ID: <20240219085735.1220113-5-chopps@chopps.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240219085735.1220113-1-chopps@chopps.org> References: <20240219085735.1220113-1-chopps@chopps.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Christian Hopps Add sysctls for the changing the IPTFS default SA values. Signed-off-by: Christian Hopps --- Documentation/networking/xfrm_sysctl.rst | 30 +++++++++++++++++++ include/net/netns/xfrm.h | 6 ++++ net/xfrm/xfrm_sysctl.c | 38 ++++++++++++++++++++++++ 3 files changed, 74 insertions(+) diff --git a/Documentation/networking/xfrm_sysctl.rst b/Documentation/networking/xfrm_sysctl.rst index 47b9bbdd0179..4d900c74b405 100644 --- a/Documentation/networking/xfrm_sysctl.rst +++ b/Documentation/networking/xfrm_sysctl.rst @@ -9,3 +9,33 @@ XFRM Syscall xfrm_acq_expires - INTEGER default 30 - hard timeout in seconds for acquire requests + +xfrm_iptfs_max_qsize - UNSIGNED INTEGER + The default IPTFS max output queue size in octets. The output queue is + where received packets destined for output over an IPTFS tunnel are + stored prior to being output in aggregated/fragmented form over the + IPTFS tunnel. + + Default 1M. + +xfrm_iptfs_drop_time - UNSIGNED INTEGER + The default IPTFS drop time in microseconds. The drop time is the amount + of time before a missing out-of-order IPTFS tunnel packet is considered + lost. See also the reorder window. + + Default 1s (1000000). + +xfrm_iptfs_init_delay - UNSIGNED INTEGER + The default IPTFS initial output delay in microseconds. The initial + output delay is the amount of time prior to servicing the output queue + after queueing the first packet on said queue. This applies anytime + the output queue was previously empty. + + Default 0. + +xfrm_iptfs_reorder_window - UNSIGNED INTEGER + The default IPTFS reorder window size. The reorder window size dictates + the maximum number of IPTFS tunnel packets in a sequence that may arrive + out of order. + + Default 3. diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h index 423b52eca908..e11e71c8ceef 100644 --- a/include/net/netns/xfrm.h +++ b/include/net/netns/xfrm.h @@ -66,6 +66,12 @@ struct netns_xfrm { u32 sysctl_aevent_rseqth; int sysctl_larval_drop; u32 sysctl_acq_expires; +#if IS_ENABLED(CONFIG_XFRM_IPTFS) + u32 sysctl_iptfs_drop_time; + u32 sysctl_iptfs_init_delay; + u32 sysctl_iptfs_max_qsize; + u32 sysctl_iptfs_reorder_window; +#endif u8 policy_default[XFRM_POLICY_MAX]; diff --git a/net/xfrm/xfrm_sysctl.c b/net/xfrm/xfrm_sysctl.c index 7fdeafc838a7..dddb1025b7de 100644 --- a/net/xfrm/xfrm_sysctl.c +++ b/net/xfrm/xfrm_sysctl.c @@ -10,6 +10,12 @@ static void __net_init __xfrm_sysctl_init(struct net *net) net->xfrm.sysctl_aevent_rseqth = XFRM_AE_SEQT_SIZE; net->xfrm.sysctl_larval_drop = 1; net->xfrm.sysctl_acq_expires = 30; +#if IS_ENABLED(CONFIG_XFRM_IPTFS) + net->xfrm.sysctl_iptfs_max_qsize = 1024 * 1024; /* 1M */ + net->xfrm.sysctl_iptfs_drop_time = 1000000; /* 1s */ + net->xfrm.sysctl_iptfs_init_delay = 0; /* no initial delay */ + net->xfrm.sysctl_iptfs_reorder_window = 3; /* tcp folks suggested */ +#endif } #ifdef CONFIG_SYSCTL @@ -38,6 +44,32 @@ static struct ctl_table xfrm_table[] = { .mode = 0644, .proc_handler = proc_dointvec }, +#if IS_ENABLED(CONFIG_XFRM_IPTFS) + { + .procname = "xfrm_iptfs_drop_time", + .maxlen = sizeof(uint), + .mode = 0644, + .proc_handler = proc_douintvec + }, + { + .procname = "xfrm_iptfs_init_delay", + .maxlen = sizeof(uint), + .mode = 0644, + .proc_handler = proc_douintvec + }, + { + .procname = "xfrm_iptfs_max_qsize", + .maxlen = sizeof(uint), + .mode = 0644, + .proc_handler = proc_douintvec + }, + { + .procname = "xfrm_iptfs_reorder_window", + .maxlen = sizeof(uint), + .mode = 0644, + .proc_handler = proc_douintvec + }, +#endif {} }; @@ -55,6 +87,12 @@ int __net_init xfrm_sysctl_init(struct net *net) table[1].data = &net->xfrm.sysctl_aevent_rseqth; table[2].data = &net->xfrm.sysctl_larval_drop; table[3].data = &net->xfrm.sysctl_acq_expires; +#if IS_ENABLED(CONFIG_XFRM_IPTFS) + table[4].data = &net->xfrm.sysctl_iptfs_drop_time; + table[5].data = &net->xfrm.sysctl_iptfs_init_delay; + table[6].data = &net->xfrm.sysctl_iptfs_max_qsize; + table[7].data = &net->xfrm.sysctl_iptfs_reorder_window; +#endif /* Don't export sysctls to unprivileged users */ if (net->user_ns != &init_user_ns) {