Browse code
kernels: Double tcp_mem limits
Change-Id: Icc3c3b5d24f546e37235a93b69b98a36b0ff6948
Reviewed-on: http://photon-jenkins.eng.vmware.com/517
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Alexey Makhalov authored on 2016/02/09 11:21:05Showing 3 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,11 @@ |
| 0 |
+--- a/net/ipv4/tcp.c 2015-10-28 13:34:09.604899230 -0700 |
|
| 1 |
+@@ -3099,7 +3099,7 @@ |
|
| 2 |
+ |
|
| 3 |
+ static void __init tcp_init_mem(void) |
|
| 4 |
+ {
|
|
| 5 |
+- unsigned long limit = nr_free_buffer_pages() / 16; |
|
| 6 |
++ unsigned long limit = nr_free_buffer_pages() / 8; |
|
| 7 |
+ |
|
| 8 |
+ limit = max(limit, 128UL); |
|
| 9 |
+ sysctl_tcp_mem[0] = limit / 4 * 3; /* 4.68 % */ |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
Summary: Kernel |
| 3 | 3 |
Name: linux-esx |
| 4 | 4 |
Version: 4.2.0 |
| 5 |
-Release: 14%{?dist}
|
|
| 5 |
+Release: 15%{?dist}
|
|
| 6 | 6 |
License: GPLv2 |
| 7 | 7 |
URL: http://www.kernel.org/ |
| 8 | 8 |
Group: System Environment/Kernel |
| ... | ... |
@@ -13,12 +13,13 @@ Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.2.tar.xz |
| 13 | 13 |
Source1: config-esx-%{version}
|
| 14 | 14 |
Patch0: RDS-race-condition-on-unbound-socket-null-deref.patch |
| 15 | 15 |
Patch1: KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch |
| 16 |
-Patch2: 01-clear-linux.patch |
|
| 17 |
-Patch3: 02-pci-probe.patch |
|
| 18 |
-Patch4: 03-poweroff.patch |
|
| 19 |
-Patch5: 04-quiet-boot.patch |
|
| 20 |
-Patch6: 05-pv-ops.patch |
|
| 21 |
-Patch7: ovl-fix-permission-checking-for-setattr.patch |
|
| 16 |
+Patch2: ovl-fix-permission-checking-for-setattr.patch |
|
| 17 |
+Patch3: double-tcp_mem-limits.patch |
|
| 18 |
+Patch4: 01-clear-linux.patch |
|
| 19 |
+Patch5: 02-pci-probe.patch |
|
| 20 |
+Patch6: 03-poweroff.patch |
|
| 21 |
+Patch7: 04-quiet-boot.patch |
|
| 22 |
+Patch8: 05-pv-ops.patch |
|
| 22 | 23 |
BuildRequires: bc |
| 23 | 24 |
BuildRequires: kbd |
| 24 | 25 |
BuildRequires: kmod |
| ... | ... |
@@ -61,6 +62,7 @@ The Linux package contains the Linux kernel doc files |
| 61 | 61 |
%patch5 -p1 |
| 62 | 62 |
%patch6 -p1 |
| 63 | 63 |
%patch7 -p1 |
| 64 |
+%patch8 -p1 |
|
| 64 | 65 |
|
| 65 | 66 |
%build |
| 66 | 67 |
make mrproper |
| ... | ... |
@@ -126,6 +128,8 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg
|
| 126 | 126 |
/usr/src/%{name}-headers-%{version}-%{release}
|
| 127 | 127 |
|
| 128 | 128 |
%changelog |
| 129 |
+* Mon Feb 08 2016 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-15 |
|
| 130 |
+- Double tcp_mem limits, patch is added. |
|
| 129 | 131 |
* Wed Feb 03 2016 Anish Swaminathan <anishs@vmware.com> 4.2.0-14 |
| 130 | 132 |
- Fixes for CVE-2015-7990/6937 and CVE-2015-8660. |
| 131 | 133 |
* Fri Jan 22 2016 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-13 |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
Summary: Kernel |
| 3 | 3 |
Name: linux |
| 4 | 4 |
Version: 4.2.0 |
| 5 |
-Release: 12%{?dist}
|
|
| 5 |
+Release: 13%{?dist}
|
|
| 6 | 6 |
License: GPLv2 |
| 7 | 7 |
URL: http://www.kernel.org/ |
| 8 | 8 |
Group: System Environment/Kernel |
| ... | ... |
@@ -14,6 +14,7 @@ Source1: config-%{version}
|
| 14 | 14 |
Patch0: KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch |
| 15 | 15 |
Patch1: RDS-race-condition-on-unbound-socket-null-deref.patch |
| 16 | 16 |
Patch2: ovl-fix-permission-checking-for-setattr.patch |
| 17 |
+Patch3: double-tcp_mem-limits.patch |
|
| 17 | 18 |
BuildRequires: bc |
| 18 | 19 |
BuildRequires: kbd |
| 19 | 20 |
BuildRequires: kmod |
| ... | ... |
@@ -72,6 +73,7 @@ Kernel driver for oprofile, a statistical profiler for Linux systems |
| 72 | 72 |
%patch0 -p1 |
| 73 | 73 |
%patch1 -p1 |
| 74 | 74 |
%patch2 -p1 |
| 75 |
+%patch3 -p1 |
|
| 75 | 76 |
|
| 76 | 77 |
%build |
| 77 | 78 |
make mrproper |
| ... | ... |
@@ -159,6 +161,8 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg
|
| 159 | 159 |
/lib/modules/%{version}/kernel/arch/x86/oprofile/
|
| 160 | 160 |
|
| 161 | 161 |
%changelog |
| 162 |
+* Mon Feb 08 2016 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-13 |
|
| 163 |
+- Double tcp_mem limits, patch is added. |
|
| 162 | 164 |
* Wed Feb 03 2016 Anish Swaminathan <anishs@vmware.com> 4.2.0-12 |
| 163 | 165 |
- Fixes for CVE-2015-7990/6937 and CVE-2015-8660. |
| 164 | 166 |
* Tue Jan 26 2016 Anish Swaminathan <anishs@vmware.com> 4.2.0-11 |