From patchwork Thu Mar 7 04:57:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brodie Greenfield X-Patchwork-Id: 1052640 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=alliedtelesis.co.nz Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=alliedtelesis.co.nz header.i=@alliedtelesis.co.nz header.b="n9KAPBva"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44FJKR5p6Yz9s7T for ; Thu, 7 Mar 2019 15:57:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726549AbfCGE5l (ORCPT ); Wed, 6 Mar 2019 23:57:41 -0500 Received: from gate2.alliedtelesis.co.nz ([202.36.163.20]:60591 "EHLO gate2.alliedtelesis.co.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726010AbfCGE5k (ORCPT ); Wed, 6 Mar 2019 23:57:40 -0500 Received: from mmarshal3.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id 5CBD9891A8; Thu, 7 Mar 2019 17:57:33 +1300 (NZDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1551934653; bh=/ncGicRhpT0Jrx1YkKh+dSzX+9GKtXbzCjm1aNfcRSU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=n9KAPBvavYyD02eiecddhrAWviSIYoQ+xgP9zccYXyBjrpDSCxoP2/AyT+txAj1sV wIrUlctugDnFhnaztIUVxo4u0WMfVDEtdL5wRx8AhtdD4I43lb3Sal6KJgjC9KvTLx gsqoHozDtAUvmbmcac+PaKg6yI8RYj6sBPpB7dw5haIQZTAsjm43eWs2lDxEKSzAc2 2ZMrPzlUP7vXAdQYXrKzGDlDVVv/WKwIZvOAwx+bqmL3SFzsSB+JJwATM4EUxQt3Co IlNf+GF3tq+vYS5/eGbGCWR0xhImh8stHMTnH8Pzsb7++b4SqQrCwR5jMbxAYJc6YT FOV81yQBDi5zA== Received: from smtp (Not Verified[10.32.16.33]) by mmarshal3.atlnz.lc with Trustwave SEG (v7, 5, 8, 10121) id ; Thu, 07 Mar 2019 17:57:32 +1300 Received: from brodieg-dl.ws.atlnz.lc (brodieg-dl.ws.atlnz.lc [10.33.22.16]) by smtp (Postfix) with ESMTP id 5B5E213EED5; Thu, 7 Mar 2019 17:57:33 +1300 (NZDT) Received: by brodieg-dl.ws.atlnz.lc (Postfix, from userid 1718) id 1B47B500285; Thu, 7 Mar 2019 17:57:33 +1300 (NZDT) From: Brodie Greenfield To: davem@davemloft.net, stephen@networkplumber.org, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, chris.packham@alliedtelesis.co.nz, luuk.paulussen@alliedtelesis.co.nz, Brodie Greenfield Subject: [PATCH 1/2] ipmr: Make cache queue length configurable Date: Thu, 7 Mar 2019 17:57:28 +1300 Message-Id: <20190307045729.14972-2-brodie.greenfield@alliedtelesis.co.nz> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190307045729.14972-1-brodie.greenfield@alliedtelesis.co.nz> References: <20190307045729.14972-1-brodie.greenfield@alliedtelesis.co.nz> MIME-Version: 1.0 x-atlnz-ls: pat Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We want to be able to keep more spaces available in our queue for processing incoming multicast traffic (adding (S,G) entries) - this lets us learn more groups faster, rather than dropping them at this stage. Signed-off-by: Brodie Greenfield --- Documentation/networking/ip-sysctl.txt | 8 ++++++++ include/net/netns/ipv4.h | 1 + net/ipv4/af_inet.c | 1 + net/ipv4/ipmr.c | 4 +++- net/ipv4/sysctl_net_ipv4.c | 7 +++++++ 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index acdfb5d2bcaa..02f77e932adf 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -887,6 +887,14 @@ ip_local_reserved_ports - list of comma separated ranges Default: Empty +ip_mr_cache_queue_length - INTEGER + Limit the number of multicast packets we can have in the queue to be + resolved. + Bear in mind that when an unresolved multicast packet is received, + there is an O(n) traversal of the queue. This should be considered + if increasing. + Default: 10 + ip_unprivileged_port_start - INTEGER This is a per-namespace sysctl. It defines the first unprivileged port in the network namespace. Privileged ports diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index 104a6669e344..3411d3f18d51 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h @@ -187,6 +187,7 @@ struct netns_ipv4 { int sysctl_igmp_max_msf; int sysctl_igmp_llm_reports; int sysctl_igmp_qrv; + unsigned int sysctl_ip_mr_cache_queue_length; struct ping_group_range ping_group_range; diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 0dfb72c46671..8e25538bdb1e 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1827,6 +1827,7 @@ static __net_init int inet_init_net(struct net *net) net->ipv4.sysctl_igmp_llm_reports = 1; net->ipv4.sysctl_igmp_qrv = 2; + net->ipv4.sysctl_ip_mr_cache_queue_length = 10; return 0; } diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index ddbf8c9a1abb..c6a6c3e453a9 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -1127,6 +1127,7 @@ static int ipmr_cache_unresolved(struct mr_table *mrt, vifi_t vifi, struct sk_buff *skb, struct net_device *dev) { const struct iphdr *iph = ip_hdr(skb); + struct net *net = dev_net(dev); struct mfc_cache *c; bool found = false; int err; @@ -1142,7 +1143,8 @@ static int ipmr_cache_unresolved(struct mr_table *mrt, vifi_t vifi, if (!found) { /* Create a new entry if allowable */ - if (atomic_read(&mrt->cache_resolve_queue_len) >= 10 || + if (atomic_read(&mrt->cache_resolve_queue_len) >= + net->ipv4.sysctl_ip_mr_cache_queue_length || (c = ipmr_cache_alloc_unres()) == NULL) { spin_unlock_bh(&mfc_unres_lock); diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index ba0fc4b18465..78ae86e8c6cb 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c @@ -784,6 +784,13 @@ static struct ctl_table ipv4_net_table[] = { .proc_handler = proc_dointvec }, #ifdef CONFIG_IP_MULTICAST + { + .procname = "ip_mr_cache_queue_length", + .data = &init_net.ipv4.sysctl_ip_mr_cache_queue_length, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec + }, { .procname = "igmp_qrv", .data = &init_net.ipv4.sysctl_igmp_qrv, From patchwork Thu Mar 7 04:57:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brodie Greenfield X-Patchwork-Id: 1052641 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=alliedtelesis.co.nz Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=alliedtelesis.co.nz header.i=@alliedtelesis.co.nz header.b="eZF10GY+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44FJKW4LDLz9s7T for ; Thu, 7 Mar 2019 15:57:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726502AbfCGE5i (ORCPT ); Wed, 6 Mar 2019 23:57:38 -0500 Received: from gate2.alliedtelesis.co.nz ([202.36.163.20]:60594 "EHLO gate2.alliedtelesis.co.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726441AbfCGE5i (ORCPT ); Wed, 6 Mar 2019 23:57:38 -0500 Received: from mmarshal3.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id 64F39891A9; Thu, 7 Mar 2019 17:57:33 +1300 (NZDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1551934653; bh=VizPhgqyp68cQLltl/u4qfW8BE0iqZhkMvIfY/AeUIo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eZF10GY+0LJ9VxJk68MWKFEYjiouxXbMR6MfWAc6QOEyQ2vxUR54k/0j9PTZQ/nw2 C9zkt1JAp+vx5nVGd4iBpqKmMahpKc7Jmc0vRKBrBlQFbnyO4/O/L0sO2BzmQANTsq MGjL4YBZYF5bR+6oBUNKJq4zVUmmf6iVXgQn6jaunqLdyykDoHE2fJ3FwmkBfmbYPE xDUmaduKHZojIFGp1TBALmqNsLYVAy74kGiybfTb/Kfp2uJPguPCfMNMT/QxR35p/B hcuayBcCiuJE0V5kUnxRvjkO/djBlZ+lWSIiAQVnyg7rweVi0+zDCQmuDYVAgfbJnB HbJizP4ky+tNQ== Received: from smtp (Not Verified[10.32.16.33]) by mmarshal3.atlnz.lc with Trustwave SEG (v7, 5, 8, 10121) id ; Thu, 07 Mar 2019 17:57:32 +1300 Received: from brodieg-dl.ws.atlnz.lc (brodieg-dl.ws.atlnz.lc [10.33.22.16]) by smtp (Postfix) with ESMTP id 5CA5B13EEF9; Thu, 7 Mar 2019 17:57:33 +1300 (NZDT) Received: by brodieg-dl.ws.atlnz.lc (Postfix, from userid 1718) id 1C58D500347; Thu, 7 Mar 2019 17:57:33 +1300 (NZDT) From: Brodie Greenfield To: davem@davemloft.net, stephen@networkplumber.org, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, chris.packham@alliedtelesis.co.nz, luuk.paulussen@alliedtelesis.co.nz, Brodie Greenfield Subject: [PATCH 2/2] ip6mr: Make cache queue length configurable Date: Thu, 7 Mar 2019 17:57:29 +1300 Message-Id: <20190307045729.14972-3-brodie.greenfield@alliedtelesis.co.nz> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190307045729.14972-1-brodie.greenfield@alliedtelesis.co.nz> References: <20190307045729.14972-1-brodie.greenfield@alliedtelesis.co.nz> MIME-Version: 1.0 x-atlnz-ls: pat Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We want to be able to keep more spaces available in our queue for processing incoming IPv6 multicast traffic (adding (S,G) entries) - this lets us learn more groups faster, rather than dropping them at this stage. Signed-off-by: Brodie Greenfield --- Documentation/networking/ip-sysctl.txt | 8 ++++++++ include/net/netns/ipv6.h | 1 + net/ipv6/af_inet6.c | 1 + net/ipv6/ip6mr.c | 4 +++- net/ipv6/sysctl_net_ipv6.c | 7 +++++++ 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index 02f77e932adf..68eada3ca915 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -1481,6 +1481,14 @@ skip_notify_on_dev_down - BOOLEAN on userspace caches to track link events and evict routes. Default: false (generate message) +ip6_mr_cache_queue_length - INTEGER + Limit the number of multicast packets we can have in the queue to be + resolved. + Bear in mind that when an unresolved multicast packet is received, + there is an O(n) traversal of the queue. This should be considered + if increasing. + Default: 10 + IPv6 Fragmentation: ip6frag_high_thresh - INTEGER diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h index ef1ed529f33c..84b58424c799 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h @@ -46,6 +46,7 @@ struct netns_sysctl_ipv6 { int max_hbh_opts_len; int seg6_flowlabel; bool skip_notify_on_dev_down; + unsigned int ip6_mr_cache_queue_length; }; struct netns_ipv6 { diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index d99753b5e39b..6551bb63e5a2 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -856,6 +856,7 @@ static int __net_init inet6_net_init(struct net *net) net->ipv6.sysctl.max_hbh_opts_cnt = IP6_DEFAULT_MAX_HBH_OPTS_CNT; net->ipv6.sysctl.max_dst_opts_len = IP6_DEFAULT_MAX_DST_OPTS_LEN; net->ipv6.sysctl.max_hbh_opts_len = IP6_DEFAULT_MAX_HBH_OPTS_LEN; + net->ipv6.sysctl.ip6_mr_cache_queue_length = 10; atomic_set(&net->ipv6.fib6_sernum, 1); err = ipv6_init_mibs(net); diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index cc01aa3f2b5e..bb445871437e 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -1135,6 +1135,7 @@ static int ip6mr_cache_report(struct mr_table *mrt, struct sk_buff *pkt, static int ip6mr_cache_unresolved(struct mr_table *mrt, mifi_t mifi, struct sk_buff *skb, struct net_device *dev) { + struct net *net = dev_net(dev); struct mfc6_cache *c; bool found = false; int err; @@ -1153,7 +1154,8 @@ static int ip6mr_cache_unresolved(struct mr_table *mrt, mifi_t mifi, * Create a new entry if allowable */ - if (atomic_read(&mrt->cache_resolve_queue_len) >= 10 || + if (atomic_read(&mrt->cache_resolve_queue_len) >= + net->ipv6.sysctl.ip6_mr_cache_queue_length || (c = ip6mr_cache_alloc_unres()) == NULL) { spin_unlock_bh(&mfc_unres_lock); diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c index e15cd37024fd..a27299d4cc34 100644 --- a/net/ipv6/sysctl_net_ipv6.c +++ b/net/ipv6/sysctl_net_ipv6.c @@ -159,6 +159,13 @@ static struct ctl_table ipv6_table_template[] = { .mode = 0644, .proc_handler = proc_dointvec }, + { + .procname = "ip6_mr_cache_queue_length", + .data = &init_net.ipv6.sysctl.ip6_mr_cache_queue_length, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec + }, { } };