From patchwork Thu Aug 15 13:03:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "D. Wythe" X-Patchwork-Id: 13764773 X-Patchwork-Delegate: kuba@kernel.org Received: from out30-132.freemail.mail.aliyun.com (out30-132.freemail.mail.aliyun.com [115.124.30.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DDF911714A8; Thu, 15 Aug 2024 13:03:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.132 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723726999; cv=none; b=AThkqbmFY8VFGb4uYCM2e8t2/ewGU2lkQzmWQWcuose4Yj4Q3Fx3iRbXhTMgUkyWHY9VOh1hNKIWdCwIQOu7lO33lloNS8cqAVIni0p9judQper+CxrvGQ4J7XUu308/R9xxktosIePGSFGlJOCR1zzCkKI4TXSGsigFaSOf9Lw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723726999; c=relaxed/simple; bh=/RGsSbPAIOmPNh+/a4L3wjmZCcRv7PuIehiotuBXq3c=; h=From:To:Cc:Subject:Date:Message-Id; b=Id54sarltqAdciAo879eCV/SB6ipMPd1BTqbi/JrO8kBoLLHlCTleumo5gi92g9Nzq0Oxa1LIX8mzf58Yqhvy6QFewkAck60gg5JujWwmx1PEkYRFq/oMrWmaOZD8dAVBiIG1NXdCOHWJDwx3EvCUrSoTsGQf9aI3g7CBIKwP3k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=MsoOKiFP; arc=none smtp.client-ip=115.124.30.132 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="MsoOKiFP" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1723726993; h=From:To:Subject:Date:Message-Id; bh=KCljbSJWl0HTihtTmQnEdIg787ehDbBCyKtfsSczpwI=; b=MsoOKiFPiMgQJqCXxeDMxGSFLU38S6aoAIH22Gm7HTeBeA4RoWWnwE42upHA3YNgwcWHD3rAF4ESjcYIgov4fdLMRrfTTNPnYQ+sEpiy8uCMchiew50uPwGVnZLKJjhmGEfgLy2p5vRoUARF57QUhKf08Z8iJc14SsxZ69EWeiA= Received: from j66a10360.sqa.eu95.tbsite.net(mailfrom:alibuda@linux.alibaba.com fp:SMTPD_---0WCwty7G_1723726988) by smtp.aliyun-inc.com; Thu, 15 Aug 2024 21:03:13 +0800 From: "D. Wythe" To: kgraul@linux.ibm.com, wenjia@linux.ibm.com, jaka@linux.ibm.com, wintera@linux.ibm.com, guwen@linux.alibaba.com Cc: kuba@kernel.org, davem@davemloft.net, netdev@vger.kernel.org, linux-s390@vger.kernel.org, linux-rdma@vger.kernel.org, tonylu@linux.alibaba.com, pabeni@redhat.com, edumazet@google.com Subject: [PATCH net-next] net/smc: add sysctl for smc_limit_hs Date: Thu, 15 Aug 2024 21:03:08 +0800 Message-Id: <1723726988-78651-1-git-send-email-alibuda@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: X-Patchwork-Delegate: kuba@kernel.org From: "D. Wythe" In commit 48b6190a0042 ("net/smc: Limit SMC visits when handshake workqueue congested"), we introduce a mechanism to put constraint on SMC connections visit according to the pressure of SMC handshake process. At that time, we believed that controlling the feature through netlink was sufficient, However, most people have realized now that netlink is not convenient in container scenarios, and sysctl is a more suitable approach. In addition, it is not reasonable for us to initialize limit_smc_hs in smc_pnet_net_init, we made a mistable before. It should be initialized in smc_sysctl_net_init(), just like other systcl. Signed-off-by: D. Wythe --- net/smc/smc_pnet.c | 3 --- net/smc/smc_sysctl.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/net/smc/smc_pnet.c b/net/smc/smc_pnet.c index 2adb92b..1dd3623 100644 --- a/net/smc/smc_pnet.c +++ b/net/smc/smc_pnet.c @@ -887,9 +887,6 @@ int smc_pnet_net_init(struct net *net) smc_pnet_create_pnetids_list(net); - /* disable handshake limitation by default */ - net->smc.limit_smc_hs = 0; - return 0; } diff --git a/net/smc/smc_sysctl.c b/net/smc/smc_sysctl.c index 13f2bc0..2fab645 100644 --- a/net/smc/smc_sysctl.c +++ b/net/smc/smc_sysctl.c @@ -90,6 +90,15 @@ .extra1 = &conns_per_lgr_min, .extra2 = &conns_per_lgr_max, }, + { + .procname = "limit_smc_hs", + .data = &init_net.smc.limit_smc_hs, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, + }, }; int __net_init smc_sysctl_net_init(struct net *net) @@ -121,6 +130,8 @@ int __net_init smc_sysctl_net_init(struct net *net) WRITE_ONCE(net->smc.sysctl_rmem, net_smc_rmem_init); net->smc.sysctl_max_links_per_lgr = SMC_LINKS_PER_LGR_MAX_PREFER; net->smc.sysctl_max_conns_per_lgr = SMC_CONN_PER_LGR_PREFER; + /* disable handshake limitation by default */ + net->smc.limit_smc_hs = 0; return 0;