@@ -1,14 +1,14 @@

 Summary:	Linux API header files

 Name:		linux-api-headers

-Version:	4.9.94

-Release:	2%{?dist}

+Version:	4.9.97

+Release:	1%{?dist}

 License:	GPLv2

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

 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=82437991bdd6284fd3fd1fe21eb13f97abac203b

+%define sha1 linux=3091c6a679a1d32a5f3e512960069a3ef5a10efb

 BuildArch:	noarch

 %description

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

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

 %defattr(-,root,root)

 %{_includedir}/*

 %changelog

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

+-   Update to version 4.9.97

 *   Mon Apr 23 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.94-2

 -   Add full retpoline support by building with retpoline-enabled gcc.

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

@@ -1,15 +1,15 @@

 %global security_hardening none

 Summary:        Kernel

 Name:           linux-aws

-Version:        4.9.94

-Release:        2%{?kat_build:.%kat_build}%{?dist}

+Version:        4.9.97

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

 License:    	GPLv2

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

 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=82437991bdd6284fd3fd1fe21eb13f97abac203b

+%define sha1 linux=3091c6a679a1d32a5f3e512960069a3ef5a10efb

 Source1:	config-aws

 Source2:	initramfs.trigger

 # common

@@ -45,12 +45,7 @@ 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

+Patch33:        vmxnet3-fix-incorrect-dereference-when-rxvlan-is-disabled.patch

 # For Spectre

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

@@ -213,8 +208,7 @@ This package contains the 'perf' performance analysis tools for Linux kernel.

 %patch30 -p1

 %patch31 -p1

 %patch32 -p1

-%patch33 -p1 -R

-%patch34 -p1 -R

+%patch33 -p1

 %patch52 -p1

 %patch53 -p1

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

 /usr/share/doc/*

 %changelog

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

+-   Update to version 4.9.97. Apply 3rd vmxnet3 patch.

 *   Mon Apr 23 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.94-2

 -   Add full retpoline support by building with retpoline-enabled gcc.

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

@@ -1,15 +1,15 @@

 %global security_hardening none

 Summary:        Kernel

 Name:           linux-esx

-Version:        4.9.94

-Release:        2%{?dist}

+Version:        4.9.97

+Release:        1%{?dist}

 License:        GPLv2

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

 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=82437991bdd6284fd3fd1fe21eb13f97abac203b

+%define sha1 linux=3091c6a679a1d32a5f3e512960069a3ef5a10efb

 Source1:        config-esx

 Source2:        initramfs.trigger

 # common

@@ -42,6 +42,7 @@ 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

+Patch33:        vmxnet3-fix-incorrect-dereference-when-rxvlan-is-disabled.patch

 # For Spectre

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

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

@@ -121,6 +122,7 @@ The Linux package contains the Linux kernel doc files

 %patch30 -p1

 %patch31 -p1

 %patch32 -p1

+%patch33 -p1

 %patch52 -p1

 %patch53 -p1

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

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

 %changelog

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

+-   Update to version 4.9.97. Apply 3rd vmxnet3 patch.

 *   Mon Apr 23 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.94-2

 -   Add full retpoline support by building with retpoline-enabled gcc.

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

@@ -1,15 +1,15 @@

 %global security_hardening none

 Summary:        Kernel

 Name:           linux-secure

-Version:        4.9.94

-Release:        2%{?kat_build:.%kat_build}%{?dist}

+Version:        4.9.97

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

 License:        GPLv2

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

 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=82437991bdd6284fd3fd1fe21eb13f97abac203b

+%define sha1 linux=3091c6a679a1d32a5f3e512960069a3ef5a10efb

 Source1:        config-secure

 Source2:        aufs4.9.tar.gz

 %define sha1 aufs=ebe716ce4b638a3772c7cd3161abbfe11d584906

@@ -51,6 +51,7 @@ 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

+Patch35:        vmxnet3-fix-incorrect-dereference-when-rxvlan-is-disabled.patch

 # For Spectre

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

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

@@ -174,6 +175,7 @@ EOF

 %patch32 -p1

 %patch33 -p1

 %patch34 -p1

+%patch35 -p1

 # spectre

 %patch52 -p1

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

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

 %changelog

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

+-   Update to version 4.9.97. Apply 3rd vmxnet3 patch.

 *   Mon Apr 23 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.94-2

 -   Add full retpoline support by building with retpoline-enabled gcc.

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

@@ -1,15 +1,15 @@

 %global security_hardening none

 Summary:        Kernel

 Name:           linux

-Version:        4.9.94

-Release:        2%{?kat_build:.%kat_build}%{?dist}

+Version:        4.9.97

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

 License:    	GPLv2

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

 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=82437991bdd6284fd3fd1fe21eb13f97abac203b

+%define sha1 linux=3091c6a679a1d32a5f3e512960069a3ef5a10efb

 Source1:	config

 Source2:	initramfs.trigger

 %define ena_version 1.1.3

@@ -47,13 +47,9 @@ Patch26:        add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.pat

 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

+# To fix kernel PANIC in cascade

 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

+Patch33:        vmxnet3-fix-incorrect-dereference-when-rxvlan-is-disabled.patch

 # For Spectre

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

@@ -171,8 +167,7 @@ This package contains the 'perf' performance analysis tools for Linux kernel.

 %patch30 -p1

 %patch31 -p1

 %patch32 -p1

-%patch33 -p1 -R

-%patch34 -p1 -R

+%patch33 -p1

 %patch52 -p1

 %patch53 -p1

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

 /usr/share/doc/*

 %changelog

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

+-   Update to version 4.9.97. Apply 3rd vmxnet3 patch.

 *   Mon Apr 23 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.94-2

 -   Add full retpoline support by building with retpoline-enabled gcc.

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

deleted file mode 100644

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

-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

-+++ b/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

deleted file mode 100644

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

-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

-+++ b/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,83 @@

+From 65ec0bd1c7c14522670a5294de35710fb577a7fd Mon Sep 17 00:00:00 2001

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

+Date: Wed, 18 Apr 2018 12:48:04 -0700

+Subject: vmxnet3: fix incorrect dereference when rxvlan is disabled

+

+vmxnet3_get_hdr_len() is used to calculate the header length which in

+turn is used to calculate the gso_size for skb. When rxvlan offload is

+disabled, vlan tag is present in the header and the function references

+ip header from sizeof(ethhdr) and leads to incorrect pointer reference.

+

+This patch fixes this issue by taking sizeof(vlan_ethhdr) into account

+if vlan tag is present and correctly references the ip hdr.

+

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

+Acked-by: Guolin Yang <gyang@vmware.com>

+Acked-by: Louis Luo <llouis@vmware.com>

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

+---

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

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

+ 2 files changed, 15 insertions(+), 6 deletions(-)

+

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

+index e04937f..9ebe2a6 100644

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

+@@ -1218,6 +1218,7 @@ vmxnet3_get_hdr_len(struct vmxnet3_adapter *adapter, struct sk_buff *skb,

+ 	union {

+ 		void *ptr;

+ 		struct ethhdr *eth;

++		struct vlan_ethhdr *veth;

+ 		struct iphdr *ipv4;

+ 		struct ipv6hdr *ipv6;

+ 		struct tcphdr *tcp;

+@@ -1228,16 +1229,24 @@ vmxnet3_get_hdr_len(struct vmxnet3_adapter *adapter, struct sk_buff *skb,

+ 	if (unlikely(sizeof(struct iphdr) + sizeof(struct tcphdr) > maplen))

+ 		return 0;

+ 

++	if (skb->protocol == cpu_to_be16(ETH_P_8021Q) ||

++	    skb->protocol == cpu_to_be16(ETH_P_8021AD))

++		hlen = sizeof(struct vlan_ethhdr);

++	else

++		hlen = sizeof(struct ethhdr);

++

+ 	hdr.eth = eth_hdr(skb);

+ 	if (gdesc->rcd.v4) {

+-		BUG_ON(hdr.eth->h_proto != htons(ETH_P_IP));

+-		hdr.ptr += sizeof(struct ethhdr);

++		BUG_ON(hdr.eth->h_proto != htons(ETH_P_IP) &&

++		       hdr.veth->h_vlan_encapsulated_proto != htons(ETH_P_IP));

++		hdr.ptr += hlen;

+ 		BUG_ON(hdr.ipv4->protocol != IPPROTO_TCP);

+ 		hlen = hdr.ipv4->ihl << 2;

+ 		hdr.ptr += hdr.ipv4->ihl << 2;

+ 	} else if (gdesc->rcd.v6) {

+-		BUG_ON(hdr.eth->h_proto != htons(ETH_P_IPV6));

+-		hdr.ptr += sizeof(struct ethhdr);

++		BUG_ON(hdr.eth->h_proto != htons(ETH_P_IPV6) &&

++		       hdr.veth->h_vlan_encapsulated_proto != htons(ETH_P_IPV6));

++		hdr.ptr += hlen;

+ 		/* Use an estimated value, since we also need to handle

+ 		 * TSO case.

+ 		 */

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

+index 59ec340..a332646 100644

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

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

+ /*

+  * Version numbers

+  */

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

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

+ 

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

+-#define VMXNET3_DRIVER_VERSION_NUM      0x01040d00

++#define VMXNET3_DRIVER_VERSION_NUM      0x01040e00

+ 

+ #if defined(CONFIG_PCI_MSI)

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

+-- 

+cgit v1.1

+