Received: by 2002:a05:6358:e9c4:b0:b2:91dc:71ab with SMTP id hc4csp6267022rwb; Tue, 9 Aug 2022 12:04:41 -0700 (PDT) X-Google-Smtp-Source: AA6agR5Th6vXxGMtnTFZ/nhuXQgd8QoRcszMu+bGPOYeOAHYWmbzYiH32ItRwq8oVqVH3wBNTzuJ X-Received: by 2002:a17:90b:2c13:b0:1f3:359a:c7d5 with SMTP id rv19-20020a17090b2c1300b001f3359ac7d5mr27975726pjb.72.1660071880892; Tue, 09 Aug 2022 12:04:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660071880; cv=none; d=google.com; s=arc-20160816; b=CPDEjDomVafTE8RgZSdPSR/xCn+ThXU1hluLP9qRqbgd7yVe+O6DGs/kutV1Xh420a FxbqfbLKEy5BpkA4SDoxhcVLT1P+gtsh4PZUTePqYZbTE0QYzcV+v1NGto1NmrBbZXdQ Dr9x4kN7yb+gci1AVwkh7xBTu6A+eku2NpXVjPGhjD5+qiHy2nG2r8kUqO5fkajcVQbo jc24wjor6Fv9wK1PzQb1zQCoH3CytpD6rWP6kMtX3nmsjx+rvvc2M2vHcmrR1MU1D2t7 2QP/J/pGfcYP0UMZDGBQt63k2Z4SMlETjCq7NezH6LSB77QApxkiB5ptc4ijji7FURKN 9k2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nxAvKQZSJhxTMDC97hUfCcLsEBpb3ItXsBLwC/oKGvE=; b=FFsoUC572fqdGCEzUSMV7/XUUaHjMm9M5O66nFKDNF0H770zR4la8EjT+cm+devWLV oIMHAS1JOA2d0bi7cSNrLBfk4udMtwf2Ca+QbXjlX2vMLpUrrzO5AdC8cF6vL65iAi1h ftg7tppfRXlAOWKM3+FVNCSr6mosSgYhumqSCZR90LKdQaFEa981dAbpD53hsEE/okI8 4ZBb0F+Z1WsgyfkA8K5m18PGFlW8vfQWEP8EDod+PGa4TAWoG2y7qLyVLzqr6+tLgg8k L7/DAK9xsNxffWSRlro1hfqvhL2v7uK+HSX6VZlxjzL8FKNs6Zm7L2exaFaPBd89XIUv yoVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=baUyoisu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n12-20020a170902f60c00b0016d8a0c399dsi15062950plg.158.2022.08.09.12.04.20; Tue, 09 Aug 2022 12:04:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=baUyoisu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344431AbiHISGO (ORCPT + 99 others); Tue, 9 Aug 2022 14:06:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344675AbiHISFa (ORCPT ); Tue, 9 Aug 2022 14:05:30 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72AEC27B1A; Tue, 9 Aug 2022 11:02:30 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id F1608B8171A; Tue, 9 Aug 2022 18:02:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50008C433D6; Tue, 9 Aug 2022 18:02:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660068147; bh=p57W8xdgWJ4rBg4QKkF/0C1QRV+CcyrZojmXs1ej7Rs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=baUyoisuFVB7MLPLu9/12yEZeao2kC7QYD5fQw4Q7OiwA6SKzvpzxtqoYKqKD09zp eX7uJayWjACmEPLso3dfiT5F7riv69mCyIIV93BKkWk2RKYLw04O5hQJwIYsvgUtZz 2J2hIRe6azyX7mTTmvWKDdABSg+fS9h7+T1dSARE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xin Long , Marcelo Ricardo Leitner , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 18/32] Documentation: fix sctp_wmem in ip-sysctl.rst Date: Tue, 9 Aug 2022 20:00:09 +0200 Message-Id: <20220809175513.662269725@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220809175513.082573955@linuxfoundation.org> References: <20220809175513.082573955@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xin Long [ Upstream commit aa709da0e032cee7c202047ecd75f437bb0126ed ] Since commit 1033990ac5b2 ("sctp: implement memory accounting on tx path"), SCTP has supported memory accounting on tx path where 'sctp_wmem' is used by sk_wmem_schedule(). So we should fix the description for this option in ip-sysctl.rst accordingly. v1->v2: - Improve the description as Marcelo suggested. Fixes: 1033990ac5b2 ("sctp: implement memory accounting on tx path") Signed-off-by: Xin Long Acked-by: Marcelo Ricardo Leitner Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- Documentation/networking/ip-sysctl.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index e315e6052b9f..eb24b8137226 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -2170,7 +2170,14 @@ sctp_rmem - vector of 3 INTEGERs: min, default, max Default: 4K sctp_wmem - vector of 3 INTEGERs: min, default, max - Currently this tunable has no effect. + Only the first value ("min") is used, "default" and "max" are + ignored. + + min: Minimum size of send buffer that can be used by SCTP sockets. + It is guaranteed to each SCTP socket (but not association) even + under moderate memory pressure. + + Default: 4K addr_scope_policy - INTEGER Control IPv4 address scoping - draft-stewart-tsvwg-sctp-ipv4-00 -- 2.35.1