Received: by 2002:ac0:e350:0:0:0:0:0 with SMTP id g16csp1942893imn; Mon, 1 Aug 2022 05:53:53 -0700 (PDT) X-Google-Smtp-Source: AA6agR5U5qIIfQvs4OxYfBOAMVYwjAZSRzq5XhjT9SCuBY6ME8OLCsBQ0y6jXX3v8NSbCCaEmzo7 X-Received: by 2002:a17:90b:384f:b0:1f4:ee87:9523 with SMTP id nl15-20020a17090b384f00b001f4ee879523mr8227665pjb.100.1659358433297; Mon, 01 Aug 2022 05:53:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659358433; cv=none; d=google.com; s=arc-20160816; b=x5nNmSzMujmSo6pobkQWhV2eol7+5XvFhorl5sergrhyzRvDOaak/l0osnKM7U15ph aRjfigbSBzYsAe/Go11XXT8+d0+zTacsOJJnEAmawZQ/AN63znjnisVEZtg3uCQc5F8A rHT8nYhjr2o8azD76gS/iB/oOcngVLn0qA2X+BpnI9l+C5HEN7apRDA7zXSkEdAMj/dC +bbzNd/TDL73v5wXS7ItPJa2hEDGfvyeX9E7++OE3/hzzepjWqTFhGbug++J3415tLzO juUJlZFJgS5ikjOfAyz43y3VsVoMK191gJJhhdyCRoTJMnVJA6TIWwVbDvo8kXLO6LOg Ek8Q== 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=L58I7rlBz6h++5URobAa712iRt9Oz/BZCdjPfJw2Inw=; b=JyMu/ET2X/DFl7R+z8xPkfFQBLzg7fi7yLsHMck92ouaKgCSzN1r3vgcGGu7lvJeFv UQZKMBCEL33FY2tOyxEUg/9TxQhSLWs2lCk7fwt6vGqWDioI30sdHwmyDaRikOMm/TWr PU47IT5sgCqcLV+vZa4orFg25FSImZhdy/8XxjNOmxwIZY/hDCjq6nlRXLxm29AfHTAV HvWO+BOKFlEx0Sb31Pe9GdiZzYvb8Tr+4bqjMmu/Y344nHSCr/cNCzk+V6KHJFIP1qFS nOoir6reyzPBLYV+JrJdFlVB8++TIeeIXk7q04splYS/T7EjByHty+KCyu0OIfQCXthT fmag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=e3V2gLah; 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 r11-20020a170902c60b00b0016dbdf52620si11340180plr.457.2022.08.01.05.53.38; Mon, 01 Aug 2022 05:53:53 -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=e3V2gLah; 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 S234162AbiHAMO4 (ORCPT + 99 others); Mon, 1 Aug 2022 08:14:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234086AbiHAMOJ (ORCPT ); Mon, 1 Aug 2022 08:14:09 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AC57481DA; Mon, 1 Aug 2022 04:57:52 -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 01B45B80EAC; Mon, 1 Aug 2022 11:57:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50AD5C4314C; Mon, 1 Aug 2022 11:57:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1659355069; bh=/5CZygGq4BwDZcE4D5t5rnKAa8XQjuxhRvcakUpGfME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e3V2gLahlIb0C5gioBYOIWbPSpyGiFLe11W8pcZPv8wtNAT4YUvjaJgeawHKnsCRw 3Ts+wfP0mjcbPc3KJoOrzITnfBuFRmXvuFmfwstVOt7rPQFdnHaM0CHvn1bay8vnfI i72oZyluXs2LTNS1UnG9Qkz+AyuVqJrCwKiRLza8= 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 5.18 51/88] Documentation: fix sctp_wmem in ip-sysctl.rst Date: Mon, 1 Aug 2022 13:47:05 +0200 Message-Id: <20220801114140.357178617@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220801114138.041018499@linuxfoundation.org> References: <20220801114138.041018499@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 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.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst index 8899b474edbf..e29017d4d7a2 100644 --- a/Documentation/networking/ip-sysctl.rst +++ b/Documentation/networking/ip-sysctl.rst @@ -2848,7 +2848,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