@@ -1,6 +1,6 @@

 Summary:	Linux API header files

 Name:		linux-api-headers

-Version:	4.9.90

+Version:	4.9.94

 Release:	1%{?dist}

 License:	GPLv2

 URL:		http://www.kernel.org/

@@ -8,7 +8,7 @@ Group:		System Environment/Kernel

 Vendor:		VMware, Inc.

 Distribution: Photon

 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

-%define sha1 linux=e6f8a32fdfe078407073514fbdda968f59406725

+%define sha1 linux=82437991bdd6284fd3fd1fe21eb13f97abac203b

 BuildArch:	noarch

 %description

 The Linux API Headers expose the kernel's API for use by Glibc.

@@ -25,6 +25,10 @@ find /%{buildroot}%{_includedir} \( -name .install -o -name ..install.cmd \) -de

 %defattr(-,root,root)

 %{_includedir}/*

 %changelog

+*   Wed Apr 18 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.94-1

+-   Update to version 4.9.94

+*   Mon Apr 02 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.92-1

+-   Update to version 4.9.92

 *   Tue Mar 27 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.90-1

 -   Update to version 4.9.90

 *   Thu Mar 22 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.89-1

@@ -3684,8 +3684,7 @@ CONFIG_HYPERV_BALLOON=m

 #

 CONFIG_XEN_BALLOON=y

 CONFIG_XEN_SELFBALLOONING=y

-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y

-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512

+# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set

 CONFIG_XEN_SCRUB_PAGES=y

 CONFIG_XEN_DEV_EVTCHN=m

 CONFIG_XEN_BACKEND=y

@@ -1,7 +1,7 @@

 %global security_hardening none

 Summary:        Kernel

 Name:           linux-aws

-Version:        4.9.90

+Version:        4.9.94

 Release:        1%{?kat_build:.%kat_build}%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

@@ -9,7 +9,7 @@ Group:        	System Environment/Kernel

 Vendor:         VMware, Inc.

 Distribution: 	Photon

 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

-%define sha1 linux=e6f8a32fdfe078407073514fbdda968f59406725

+%define sha1 linux=82437991bdd6284fd3fd1fe21eb13f97abac203b

 Source1:	config-aws

 Source2:	initramfs.trigger

 # common

@@ -42,6 +42,16 @@ Patch25:        0002-allow-also-ecb-cipher_null.patch

 Patch26:        add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch

 # Fix CVE-2017-1000252

 Patch28:        kvm-dont-accept-wrong-gsi-values.patch

+Patch30:        vmxnet3-avoid-xmit-reset-due-to-a-race-in-vmxnet3.patch

+Patch31:        vmxnet3-use-correct-flag-to-indicate-LRO-feature.patch

+Patch32:        netfilter-ipset-pernet-ops-must-be-unregistered-last.patch

+

+# TODO: remove these patches on update

+# 4.9.94 has a compile time error. Revert this commit to fix it.

+# https://www.spinics.net/lists/stable/msg235266.html

+Patch33:        perf-tests-Decompress-kernel-module-before-objdump.patch

+Patch34:        perf-tests-Decompress-kernel-module-when-reading-DSO-data.patch

+

 # For Spectre

 Patch52: 0141-locking-barriers-introduce-new-observable-speculatio.patch

 Patch53: 0142-bpf-prevent-speculative-execution-in-eBPF-interprete.patch

@@ -200,6 +210,11 @@ This package contains the 'perf' performance analysis tools for Linux kernel.

 %patch25 -p1

 %patch26 -p1

 %patch28 -p1

+%patch30 -p1

+%patch31 -p1

+%patch32 -p1

+%patch33 -p1 -R

+%patch34 -p1 -R

 %patch52 -p1

 %patch53 -p1

@@ -419,6 +434,10 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/doc/*

 %changelog

+*   Wed Apr 18 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.94-1

+-   Update to version 4.9.94. Fix panic in ip_set.

+*   Mon Apr 02 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.92-1

+-   Update to version 4.9.92. Apply vmxnet3 patches.

 *   Tue Mar 27 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.90-1

 -   Update to version 4.9.90

 *   Thu Mar 22 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.89-1

@@ -1,7 +1,7 @@

 %global security_hardening none

 Summary:        Kernel

 Name:           linux-esx

-Version:        4.9.90

+Version:        4.9.94

 Release:        1%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

@@ -9,7 +9,7 @@ Group:          System Environment/Kernel

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

-%define sha1 linux=e6f8a32fdfe078407073514fbdda968f59406725

+%define sha1 linux=82437991bdd6284fd3fd1fe21eb13f97abac203b

 Source1:        config-esx

 Source2:        initramfs.trigger

 # common

@@ -39,6 +39,9 @@ Patch22:        add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.pat

 # Fix CVE-2017-1000252

 Patch24:        kvm-dont-accept-wrong-gsi-values.patch

 Patch25:        init-do_mounts-recreate-dev-root.patch

+Patch30:        vmxnet3-avoid-xmit-reset-due-to-a-race-in-vmxnet3.patch

+Patch31:        vmxnet3-use-correct-flag-to-indicate-LRO-feature.patch

+Patch32:        netfilter-ipset-pernet-ops-must-be-unregistered-last.patch

 # For Spectre

 Patch52: 0141-locking-barriers-introduce-new-observable-speculatio.patch

 Patch53: 0142-bpf-prevent-speculative-execution-in-eBPF-interprete.patch

@@ -115,6 +118,9 @@ The Linux package contains the Linux kernel doc files

 %patch22 -p1

 %patch24 -p1

 %patch25 -p1

+%patch30 -p1

+%patch31 -p1

+%patch32 -p1

 %patch52 -p1

 %patch53 -p1

@@ -226,6 +232,10 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Wed Apr 18 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.94-1

+-   Update to version 4.9.94. Fix panic in ip_set.

+*   Mon Apr 02 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.92-1

+-   Update to version 4.9.92. Apply vmxnet3 patches.

 *   Tue Mar 27 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.90-1

 -   Update to version 4.9.90

 *   Thu Mar 22 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.89-1

@@ -1,7 +1,7 @@

 %global security_hardening none

 Summary:        Kernel

 Name:           linux-secure

-Version:        4.9.90

+Version:        4.9.94

 Release:        1%{?kat_build:.%kat_build}%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

@@ -9,7 +9,7 @@ Group:          System Environment/Kernel

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

-%define sha1 linux=e6f8a32fdfe078407073514fbdda968f59406725

+%define sha1 linux=82437991bdd6284fd3fd1fe21eb13f97abac203b

 Source1:        config-secure

 Source2:        aufs4.9.tar.gz

 %define sha1 aufs=ebe716ce4b638a3772c7cd3161abbfe11d584906

@@ -48,6 +48,9 @@ Patch28:        0002-allow-also-ecb-cipher_null.patch

 Patch29:        add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch

 # Fix CVE-2017-1000252

 Patch31:        kvm-dont-accept-wrong-gsi-values.patch

+Patch32:        vmxnet3-avoid-xmit-reset-due-to-a-race-in-vmxnet3.patch

+Patch33:        vmxnet3-use-correct-flag-to-indicate-LRO-feature.patch

+Patch34:        netfilter-ipset-pernet-ops-must-be-unregistered-last.patch

 # For Spectre

 Patch52: 0141-locking-barriers-introduce-new-observable-speculatio.patch

 Patch53: 0142-bpf-prevent-speculative-execution-in-eBPF-interprete.patch

@@ -168,6 +171,9 @@ EOF

 %patch28 -p1

 %patch29 -p1

 %patch31 -p1

+%patch32 -p1

+%patch33 -p1

+%patch34 -p1

 # spectre

 %patch52 -p1

@@ -315,6 +321,10 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Wed Apr 18 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.94-1

+-   Update to version 4.9.94. Fix panic in ip_set.

+*   Mon Apr 02 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.92-1

+-   Update to version 4.9.92. Apply vmxnet3 patches.

 *   Tue Mar 27 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.90-1

 -   Update to version 4.9.90

 *   Thu Mar 22 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.89-1

@@ -1,7 +1,7 @@

 %global security_hardening none

 Summary:        Kernel

 Name:           linux

-Version:        4.9.90

+Version:        4.9.94

 Release:        1%{?kat_build:.%kat_build}%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

@@ -9,7 +9,7 @@ Group:        	System Environment/Kernel

 Vendor:         VMware, Inc.

 Distribution: 	Photon

 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

-%define sha1 linux=e6f8a32fdfe078407073514fbdda968f59406725

+%define sha1 linux=82437991bdd6284fd3fd1fe21eb13f97abac203b

 Source1:	config

 Source2:	initramfs.trigger

 %define ena_version 1.1.3

@@ -45,6 +45,16 @@ Patch25:        0002-allow-also-ecb-cipher_null.patch

 Patch26:        add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch

 # Fix CVE-2017-1000252

 Patch28:        kvm-dont-accept-wrong-gsi-values.patch

+Patch30:        vmxnet3-avoid-xmit-reset-due-to-a-race-in-vmxnet3.patch

+Patch31:        vmxnet3-use-correct-flag-to-indicate-LRO-feature.patch

+Patch32:        netfilter-ipset-pernet-ops-must-be-unregistered-last.patch

+

+# TODO: remove these patches on update

+# 4.9.94 has a compile time error. Revert this commit to fix it.

+# https://www.spinics.net/lists/stable/msg235266.html

+Patch33:        perf-tests-Decompress-kernel-module-before-objdump.patch

+Patch34:        perf-tests-Decompress-kernel-module-when-reading-DSO-data.patch

+

 # For Spectre

 Patch52: 0141-locking-barriers-introduce-new-observable-speculatio.patch

 Patch53: 0142-bpf-prevent-speculative-execution-in-eBPF-interprete.patch

@@ -158,6 +168,11 @@ This package contains the 'perf' performance analysis tools for Linux kernel.

 %patch25 -p1

 %patch26 -p1

 %patch28 -p1

+%patch30 -p1

+%patch31 -p1

+%patch32 -p1

+%patch33 -p1 -R

+%patch34 -p1 -R

 %patch52 -p1

 %patch53 -p1

@@ -340,6 +355,11 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/doc/*

 %changelog

+*   Wed Apr 18 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.94-1

+-   Update to version 4.9.94. Fix panic in ip_set.

+-   .config: disable XEN_BALLOON_MEMORY_HOTPLUG

+*   Mon Apr 02 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.92-1

+-   Update to version 4.9.92. Apply vmxnet3 patches.

 *   Tue Mar 27 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.90-1

 -   Update to version 4.9.90

 *   Thu Mar 22 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.89-1

new file mode 100644

@@ -0,0 +1,81 @@

+From e23ed762db7ed1950a6408c3be80bc56909ab3d4 Mon Sep 17 00:00:00 2001

+From: Florian Westphal <fw@strlen.de>

+Date: Tue, 26 Sep 2017 11:57:54 +0200

+Subject: netfilter: ipset: pernet ops must be unregistered last

+

+Removing the ipset module leaves a small window where one cpu performs

+module removal while another runs a command like 'ipset flush'.

+

+ipset uses net_generic(), unregistering the pernet ops frees this

+storage area.

+

+Fix it by first removing the user-visible api handlers and the pernet

+ops last.

+

+Fixes: 1785e8f473082 ("netfiler: ipset: Add net namespace for ipset")

+Reported-by: Li Shuang <shuali@redhat.com>

+Signed-off-by: Florian Westphal <fw@strlen.de>

+Acked-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

+---

+ net/netfilter/ipset/ip_set_core.c | 22 +++++++++++++---------

+ 1 file changed, 13 insertions(+), 9 deletions(-)

+

+(limited to 'net/netfilter/ipset/ip_set_core.c')

+

+diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c

+index e495b5e..a7f049f 100644

+--- a/net/netfilter/ipset/ip_set_core.c

+@@ -2072,25 +2072,28 @@ static struct pernet_operations ip_set_net_ops = {

+ static int __init

+ ip_set_init(void)

+ {

+-	int ret = nfnetlink_subsys_register(&ip_set_netlink_subsys);

++	int ret = register_pernet_subsys(&ip_set_net_ops);

+ 

++	if (ret) {

++		pr_err("ip_set: cannot register pernet_subsys.\n");

++		return ret;

++	}

++

++	ret = nfnetlink_subsys_register(&ip_set_netlink_subsys);

+ 	if (ret != 0) {

+ 		pr_err("ip_set: cannot register with nfnetlink.\n");

++		unregister_pernet_subsys(&ip_set_net_ops);

+ 		return ret;

+ 	}

++

+ 	ret = nf_register_sockopt(&so_set);

+ 	if (ret != 0) {

+ 		pr_err("SO_SET registry failed: %d\n", ret);

+ 		nfnetlink_subsys_unregister(&ip_set_netlink_subsys);

++		unregister_pernet_subsys(&ip_set_net_ops);

+ 		return ret;

+ 	}

+-	ret = register_pernet_subsys(&ip_set_net_ops);

+-	if (ret) {

+-		pr_err("ip_set: cannot register pernet_subsys.\n");

+-		nf_unregister_sockopt(&so_set);

+-		nfnetlink_subsys_unregister(&ip_set_netlink_subsys);

+-		return ret;

+-	}

++

+ 	pr_info("ip_set: protocol %u\n", IPSET_PROTOCOL);

+ 	return 0;

+ }

+@@ -2098,9 +2101,10 @@ ip_set_init(void)

+ static void __exit

+ ip_set_fini(void)

+ {

+-	unregister_pernet_subsys(&ip_set_net_ops);

+ 	nf_unregister_sockopt(&so_set);

+ 	nfnetlink_subsys_unregister(&ip_set_netlink_subsys);

++

++	unregister_pernet_subsys(&ip_set_net_ops);

+ 	pr_debug("these are the famous last words\n");

+ }

+ 

+-- 

+cgit v1.1

+

new file mode 100644

@@ -0,0 +1,65 @@

+commit 7525a238be8f46617cdda29d1be5b85ffe3b042d

+Author: Namhyung Kim <namhyung@kernel.org>

+Date:   Thu Jun 8 16:31:07 2017 +0900

+

+    perf tests: Decompress kernel module before objdump

+    

+    

+    [ Upstream commit 94df1040b1e6aacd8dec0ba3c61d7e77cd695f26 ]

+    

+    If a kernel modules is compressed, it should be decompressed before

+    running objdump to parse binary data correctly.  This fixes a failure of

+    object code reading test for me.

+    

+    Signed-off-by: Namhyung Kim <namhyung@kernel.org>

+    Acked-by: Adrian Hunter <adrian.hunter@intel.com>

+    Acked-by: Jiri Olsa <jolsa@kernel.org>

+    Cc: David Ahern <dsahern@gmail.com>

+    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>

+    Cc: Wang Nan <wangnan0@huawei.com>

+    Cc: kernel-team@lge.com

+    Link: http://lkml.kernel.org/r/20170608073109.30699-8-namhyung@kernel.org

+    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>

+    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

+

+diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c

+index ff5bc6363a79..150334064071 100644

+--- a/tools/perf/tests/code-reading.c

+@@ -224,6 +224,8 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode,

+ 	unsigned char buf2[BUFSZ];

+ 	size_t ret_len;

+ 	u64 objdump_addr;

++	const char *objdump_name;

++	char decomp_name[KMOD_DECOMP_LEN];

+ 	int ret;

+ 

+ 	pr_debug("Reading object code for memory address: %#"PRIx64"\n", addr);

+@@ -284,9 +286,25 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode,

+ 		state->done[state->done_cnt++] = al.map->start;

+ 	}

+ 

++	objdump_name = al.map->dso->long_name;

++	if (dso__needs_decompress(al.map->dso)) {

++		if (dso__decompress_kmodule_path(al.map->dso, objdump_name,

++						 decomp_name,

++						 sizeof(decomp_name)) < 0) {

++			pr_debug("decompression failed\n");

++			return -1;

++		}

++

++		objdump_name = decomp_name;

++	}

++

+ 	/* Read the object code using objdump */

+ 	objdump_addr = map__rip_2objdump(al.map, al.addr);

+-	ret = read_via_objdump(al.map->dso->long_name, objdump_addr, buf2, len);

++	ret = read_via_objdump(objdump_name, objdump_addr, buf2, len);

++

++	if (dso__needs_decompress(al.map->dso))

++		unlink(objdump_name);

++

+ 	if (ret > 0) {

+ 		/*

+ 		 * The kernel maps are inaccurate - assume objdump is right in

new file mode 100644

@@ -0,0 +1,52 @@

+commit e2d054998b151e85b6305aa72264f67097bd78e9

+Author: Namhyung Kim <namhyung@kernel.org>

+Date:   Thu Jun 8 16:31:05 2017 +0900

+

+    perf tools: Decompress kernel module when reading DSO data

+    

+    

+    [ Upstream commit 1d6b3c9ba756a5134fd7ad1959acac776d17404b ]

+    

+    Currently perf decompresses kernel modules when loading the symbol table

+    but it missed to do it when reading raw data.

+    

+    Signed-off-by: Namhyung Kim <namhyung@kernel.org>

+    Acked-by: Jiri Olsa <jolsa@kernel.org>

+    Cc: Adrian Hunter <adrian.hunter@intel.com>

+    Cc: David Ahern <dsahern@gmail.com>

+    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>

+    Cc: Wang Nan <wangnan0@huawei.com>

+    Cc: kernel-team@lge.com

+    Link: http://lkml.kernel.org/r/20170608073109.30699-6-namhyung@kernel.org

+    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>

+    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

+

+diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c

+index d2c6cdd9d42b..4bc58822416c 100644

+--- a/tools/perf/util/dso.c

+@@ -366,7 +366,23 @@ static int __open_dso(struct dso *dso, struct machine *machine)

+ 	if (!is_regular_file(name))

+ 		return -EINVAL;

+ 

++	if (dso__needs_decompress(dso)) {

++		char newpath[KMOD_DECOMP_LEN];

++		size_t len = sizeof(newpath);

++

++		if (dso__decompress_kmodule_path(dso, name, newpath, len) < 0) {

++			free(name);

++			return -dso->load_errno;

++		}

++

++		strcpy(name, newpath);

++	}

++

+ 	fd = do_open(name);

++

++	if (dso__needs_decompress(dso))

++		unlink(name);

++

+ 	free(name);

+ 	return fd;

+ }

new file mode 100644

@@ -0,0 +1,96 @@

+From 7a4c003d6921e2af215f4790aa43a292bdc78be0 Mon Sep 17 00:00:00 2001

+From: Ronak Doshi <doshir@vmware.com>

+Date: Fri, 16 Mar 2018 14:47:54 -0700

+Subject: vmxnet3: avoid xmit reset due to a race in vmxnet3

+

+The field txNumDeferred is used by the driver to keep track of the number

+of packets it has pushed to the emulation. The driver increments it on

+pushing the packet to the emulation and the emulation resets it to 0 at

+the end of the transmit.

+

+There is a possibility of a race either when (a) ESX is under heavy load or

+(b) workload inside VM is of low packet rate.

+

+This race results in xmit hangs when network coalescing is disabled. This

+change creates a local copy of txNumDeferred and uses it to perform ring

+arithmetic.

+

+Reported-by: Noriho Tanaka <ntanaka@vmware.com>

+Signed-off-by: Ronak Doshi <doshir@vmware.com>

+Acked-by: Shrikrishna Khare <skhare@vmware.com>

+Signed-off-by: David S. Miller <davem@davemloft.net>

+---

+ drivers/net/vmxnet3/vmxnet3_drv.c | 13 ++++++++-----

+ drivers/net/vmxnet3/vmxnet3_int.h |  4 ++--

+ 2 files changed, 10 insertions(+), 7 deletions(-)

+

+diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c

+index 8b39c16..b466a42 100644

+--- a/drivers/net/vmxnet3/vmxnet3_drv.c

+@@ -977,6 +977,8 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,

+ {

+ 	int ret;

+ 	u32 count;

++	int num_pkts;

++	int tx_num_deferred;

+ 	unsigned long flags;

+ 	struct vmxnet3_tx_ctx ctx;

+ 	union Vmxnet3_GenericDesc *gdesc;

+@@ -1075,12 +1077,12 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,

+ #else

+ 	gdesc = ctx.sop_txd;

+ #endif

++	tx_num_deferred = le32_to_cpu(tq->shared->txNumDeferred);

+ 	if (ctx.mss) {

+ 		gdesc->txd.hlen = ctx.eth_ip_hdr_size + ctx.l4_hdr_size;

+ 		gdesc->txd.om = VMXNET3_OM_TSO;

+ 		gdesc->txd.msscof = ctx.mss;

+-		le32_add_cpu(&tq->shared->txNumDeferred, (skb->len -

+-			     gdesc->txd.hlen + ctx.mss - 1) / ctx.mss);

++		num_pkts = (skb->len - gdesc->txd.hlen + ctx.mss - 1) / ctx.mss;

+ 	} else {

+ 		if (skb->ip_summed == CHECKSUM_PARTIAL) {

+ 			gdesc->txd.hlen = ctx.eth_ip_hdr_size;

+@@ -1091,8 +1093,10 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,

+ 			gdesc->txd.om = 0;

+ 			gdesc->txd.msscof = 0;

+ 		}

+-		le32_add_cpu(&tq->shared->txNumDeferred, 1);

++		num_pkts = 1;

+ 	}

++	le32_add_cpu(&tq->shared->txNumDeferred, num_pkts);

++	tx_num_deferred += num_pkts;

+ 

+ 	if (skb_vlan_tag_present(skb)) {

+ 		gdesc->txd.ti = 1;

+@@ -1118,8 +1122,7 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,

+ 

+ 	spin_unlock_irqrestore(&tq->tx_lock, flags);

+ 

+-	if (le32_to_cpu(tq->shared->txNumDeferred) >=

+-					le32_to_cpu(tq->shared->txThreshold)) {

++	if (tx_num_deferred >= le32_to_cpu(tq->shared->txThreshold)) {

+ 		tq->shared->txNumDeferred = 0;

+ 		VMXNET3_WRITE_BAR0_REG(adapter,

+ 				       VMXNET3_REG_TXPROD + tq->qid * 8,

+diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h

+index 5ba2229..b94fdfd 100644

+--- a/drivers/net/vmxnet3/vmxnet3_int.h

+@@ -69,10 +69,10 @@

+ /*

+  * Version numbers

+  */

+-#define VMXNET3_DRIVER_VERSION_STRING   "1.4.a.0-k"

++#define VMXNET3_DRIVER_VERSION_STRING   "1.4.c.0-k"

+ 

+ /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */

+-#define VMXNET3_DRIVER_VERSION_NUM      0x01040a00

++#define VMXNET3_DRIVER_VERSION_NUM      0x01040c00

+ 

+ #if defined(CONFIG_PCI_MSI)

+ 	/* RSS only makes sense if MSI-X is supported. */

+-- 

+cgit v1.1

+

new file mode 100644

@@ -0,0 +1,70 @@

+From 034f405793897a3c8f642935f5494b86c340cde7 Mon Sep 17 00:00:00 2001

+From: Ronak Doshi <doshir@vmware.com>

+Date: Fri, 16 Mar 2018 14:49:19 -0700

+Subject: vmxnet3: use correct flag to indicate LRO feature

+

+'Commit 45dac1d6ea04 ("vmxnet3: Changes for vmxnet3 adapter version 2

+(fwd)")' introduced a flag "lro" in structure vmxnet3_adapter which is

+used to indicate whether LRO is enabled or not. However, the patch

+did not set the flag and hence it was never exercised.

+

+So, when LRO is enabled, it resulted in poor TCP performance due to

+delayed acks. This issue is seen with packets which are larger than

+the mss getting a delayed ack rather than an immediate ack, thus

+resulting in high latency.

+

+This patch removes the lro flag and directly uses device features

+against NETIF_F_LRO to check if lro is enabled.

+

+Fixes: 45dac1d6ea04 ("vmxnet3: Changes for vmxnet3 adapter version 2 (fwd)")

+Reported-by: Rachel Lunnon <rachel_lunnon@stormagic.com>

+Signed-off-by: Ronak Doshi <doshir@vmware.com>

+Acked-by: Shrikrishna Khare <skhare@vmware.com>

+Signed-off-by: David S. Miller <davem@davemloft.net>

+---

+ drivers/net/vmxnet3/vmxnet3_drv.c | 3 ++-

+ drivers/net/vmxnet3/vmxnet3_int.h | 5 ++---

+ 2 files changed, 4 insertions(+), 4 deletions(-)

+

+diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c

+index b466a42..e04937f 100644

+--- a/drivers/net/vmxnet3/vmxnet3_drv.c

+@@ -1473,7 +1473,8 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,

+ 			vmxnet3_rx_csum(adapter, skb,

+ 					(union Vmxnet3_GenericDesc *)rcd);

+ 			skb->protocol = eth_type_trans(skb, adapter->netdev);

+-			if (!rcd->tcp || !adapter->lro)

++			if (!rcd->tcp ||

++			    !(adapter->netdev->features & NETIF_F_LRO))

+ 				goto not_lro;

+ 

+ 			if (segCnt != 0 && mss != 0) {

+diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h

+index b94fdfd..99387a4 100644

+--- a/drivers/net/vmxnet3/vmxnet3_int.h

+@@ -69,10 +69,10 @@

+ /*

+  * Version numbers

+  */

+-#define VMXNET3_DRIVER_VERSION_STRING   "1.4.c.0-k"

++#define VMXNET3_DRIVER_VERSION_STRING   "1.4.d.0-k"

+ 

+ /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */

+-#define VMXNET3_DRIVER_VERSION_NUM      0x01040c00

++#define VMXNET3_DRIVER_VERSION_NUM      0x01040d00

+ 

+ #if defined(CONFIG_PCI_MSI)

+ 	/* RSS only makes sense if MSI-X is supported. */

+@@ -343,7 +343,6 @@ struct vmxnet3_adapter {

+ 	u8                              version;

+ 

+ 	bool				rxcsum;

+-	bool				lro;

+ 

+ #ifdef VMXNET3_RSS

+ 	struct UPT1_RSSConf		*rss_conf;

+-- 

+cgit v1.1

+

new file mode 100755

@@ -0,0 +1,18 @@

+#! /bin/sh

+

+specs="linux-api-headers/linux-api-headers.spec linux/linux.spec linux/linux-esx.spec linux/linux-secure.spec linux/linux-aws.spec"

+

+tarball_url=`curl -s https://www.kernel.org  | grep -Eo 'https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.9.[0-9]*.tar.xz'`

+tarball=$(basename $tarball_url)

+version=`echo $tarball | sed 's/linux-//; s/.tar.xz//'`

+echo latest linux version: $version

+test -f stage/SOURCES/$tarball && echo up to date && exit 0

+$(cd stage/SOURCES && wget $tarball_url)

+sha1=`sha1sum stage/SOURCES/$tarball | awk '{print $1}'`

+changelog_entry=$(echo "`date +"%a %b %d %Y"` `git config user.name` <`git config user.email`> $version-1")

+for spec in $specs; do

+	sed -i '/^Version:/ s/4.9.[0-9]*/'$version'/' SPECS/$spec

+	sed -i '/^Release:/ s/[0-9]*%/1%/' SPECS/$spec

+	sed -i '/^%define sha1 linux/ s/=[0-9a-f]*$/='$sha1'/' SPECS/$spec

+	sed -i '/^%changelog/a*   '"$changelog_entry"'\n-   Update to version '"$version"'' SPECS/$spec

+done

deleted file mode 100755

@@ -1,18 +0,0 @@

-#! /bin/sh

-

-specs="linux-api-headers/linux-api-headers.spec linux/linux.spec linux/linux-esx.spec linux/linux-secure.spec linux/linux-aws.spec"

-

-tarball_url=`curl -s https://www.kernel.org  | grep -Eo 'https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.9.[0-9]*.tar.xz'`

-tarball=$(basename $tarball_url)

-version=`echo $tarball | sed 's/linux-//; s/.tar.xz//'`

-echo latest linux version: $version

-test -f stage/SOURCES/$tarball && echo up to date && exit 0

-$(cd stage/SOURCES && wget $tarball_url)

-sha1=`sha1sum stage/SOURCES/$tarball | awk '{print $1}'`

-changelog_entry=$(echo "`date +"%a %b %d %Y"` `git config user.name` <`git config user.email`> $version-1")

-for spec in $specs; do

-	sed -i '/^Version:/ s/4.9.[0-9]*/'$version'/' SPECS/$spec

-	sed -i '/^Release:/ s/[0-9]*%/1%/' SPECS/$spec

-	sed -i '/^%define sha1 linux/ s/=[0-9a-f]*$/='$sha1'/' SPECS/$spec

-	sed -i '/^%changelog/a*   '"$changelog_entry"'\n-   Update to version '"$version"'' SPECS/$spec

-done