Message ID | 20211105073541.2981935-1-imagedong@tencent.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 69dfccbc1186f7091f97b70a9437d6a51313834d |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] net: udp: correct the document for udp_mem | expand |
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 5 Nov 2021 15:35:41 +0800 you wrote: > From: Menglong Dong <imagedong@tencent.com> > > udp_mem is a vector of 3 INTEGERs, which is used to limit the number of > pages allowed for queueing by all UDP sockets. > > However, sk_has_memory_pressure() in __sk_mem_raise_allocated() always > return false for udp, as memory pressure is not supported by udp, which > means that __sk_mem_raise_allocated() will fail once pages allocated > for udp socket exceeds udp_mem[0]. > > [...] Here is the summary with links: - [net-next] net: udp: correct the document for udp_mem https://git.kernel.org/netdev/net/c/69dfccbc1186 You are awesome, thank you!
diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst index d91ab28718d4..8edc1547170b 100644 --- a/Documentation/networking/ip-sysctl.rst +++ b/Documentation/networking/ip-sysctl.rst @@ -1012,13 +1012,11 @@ udp_l3mdev_accept - BOOLEAN udp_mem - vector of 3 INTEGERs: min, pressure, max Number of pages allowed for queueing by all UDP sockets. - min: Below this number of pages UDP is not bothered about its - memory appetite. When amount of memory allocated by UDP exceeds - this number, UDP starts to moderate memory usage. + min: Number of pages allowed for queueing by all UDP sockets. pressure: This value was introduced to follow format of tcp_mem. - max: Number of pages allowed for queueing by all UDP sockets. + max: This value was introduced to follow format of tcp_mem. Default is calculated at boot time from amount of available memory.