@@ -2,7 +2,7 @@

 Summary:       Kernel

 Name:          linux-esx

 Version:       4.2.0

-Release:       15%{?dist}

+Release:       16%{?dist}

 License:       GPLv2

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

 Group:         System Environment/Kernel

@@ -15,11 +15,12 @@ Patch0:        RDS-race-condition-on-unbound-socket-null-deref.patch

 Patch1:        KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch

 Patch2:        ovl-fix-permission-checking-for-setattr.patch

 Patch3:        double-tcp_mem-limits.patch

-Patch4:        01-clear-linux.patch

-Patch5:        02-pci-probe.patch

-Patch6:        03-poweroff.patch

-Patch7:        04-quiet-boot.patch

-Patch8:        05-pv-ops.patch

+Patch4:         veth-do-not-modify-ip_summed.patch

+Patch5:        01-clear-linux.patch

+Patch6:        02-pci-probe.patch

+Patch7:        03-poweroff.patch

+Patch8:        04-quiet-boot.patch

+Patch9:        05-pv-ops.patch

 BuildRequires: bc 

 BuildRequires: kbd

 BuildRequires: kmod

@@ -63,6 +64,7 @@ The Linux package contains the Linux kernel doc files

 %patch6 -p1

 %patch7 -p1

 %patch8 -p1

+%patch9 -p1

 %build

 make mrproper

@@ -128,6 +130,8 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg

 /usr/src/%{name}-headers-%{version}-%{release}

 %changelog

+*   Sun Feb 14 2016 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-16

+-   veth patch: don’t modify ip_summed

 *   Mon Feb 08 2016 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-15

 -   Double tcp_mem limits, patch is added.

 *   Wed Feb 03 2016 Anish Swaminathan <anishs@vmware.com>  4.2.0-14

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux

 Version:    	4.2.0

-Release:    	14%{?dist}

+Release:    	15%{?dist}

 License:    	GPLv2

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

 Group:        	System Environment/Kernel

@@ -15,6 +15,7 @@ Patch0:         KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch

 Patch1:         RDS-race-condition-on-unbound-socket-null-deref.patch

 Patch2:         ovl-fix-permission-checking-for-setattr.patch

 Patch3:         double-tcp_mem-limits.patch

+Patch4:         veth-do-not-modify-ip_summed.patch

 BuildRequires:  bc

 BuildRequires:  kbd

 BuildRequires:  kmod

@@ -74,6 +75,7 @@ Kernel driver for oprofile, a statistical profiler for Linux systems

 %patch1 -p1

 %patch2 -p1

 %patch3 -p1

+%patch4 -p1

 %build

 make mrproper

@@ -161,6 +163,8 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg

 /lib/modules/%{version}/kernel/arch/x86/oprofile/

 %changelog

+*   Sun Feb 14 2016 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-15

+-   veth patch: don’t modify ip_summed

 *   Thu Feb 11 2016 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-14

 -   Full tickless -> idle tickless + simple CPU time accounting

 -   SLUB -> SLAB

new file mode 100644

@@ -0,0 +1,73 @@

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

+From: Vijay Pandurangan <vijayp@vijayp.ca>

+Date: Fri, 18 Dec 2015 14:34:59 -0500

+Subject: =?UTF-8?q?veth:=20don=E2=80=99t=20modify=20ip=5Fsummed;=20doing?=

+ =?UTF-8?q?=20so=20treats=20packets=20with=20bad=20checksums=20as=20good.?=

+MIME-Version: 1.0

+Content-Type: text/plain; charset=UTF-8

+Content-Transfer-Encoding: 8bit

+

+Packets that arrive from real hardware devices have ip_summed ==

+CHECKSUM_UNNECESSARY if the hardware verified the checksums, or

+CHECKSUM_NONE if the packet is bad or it was unable to verify it. The

+current version of veth will replace CHECKSUM_NONE with

+CHECKSUM_UNNECESSARY, which causes corrupt packets routed from hardware to

+a veth device to be delivered to the application. This caused applications

+at Twitter to receive corrupt data when network hardware was corrupting

+packets.

+

+We believe this was added as an optimization to skip computing and

+verifying checksums for communication between containers. However, locally

+generated packets have ip_summed == CHECKSUM_PARTIAL, so the code as

+written does nothing for them. As far as we can tell, after removing this

+code, these packets are transmitted from one stack to another unmodified

+(tcpdump shows invalid checksums on both sides, as expected), and they are

+delivered correctly to applications. We didn’t test every possible network

+configuration, but we tried a few common ones such as bridging containers,

+using NAT between the host and a container, and routing from hardware

+devices to containers. We have effectively deployed this in production at

+Twitter (by disabling RX checksum offloading on veth devices).

+

+This code dates back to the first version of the driver, commit

+<e314dbdc1c0dc6a548ecf> ("[NET]: Virtual ethernet device driver"), so I

+suspect this bug occurred mostly because the driver API has evolved

+significantly since then. Commit <0b7967503dc97864f283a> ("net/veth: Fix

+packet checksumming") (in December 2010) fixed this for packets that get

+created locally and sent to hardware devices, by not changing

+CHECKSUM_PARTIAL. However, the same issue still occurs for packets coming

+in from hardware devices.

+

+Co-authored-by: Evan Jones <ej@evanjones.ca>

+Signed-off-by: Evan Jones <ej@evanjones.ca>

+Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>

+Cc: Phil Sutter <phil@nwl.cc>

+Cc: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>

+Cc: netdev@vger.kernel.org

+Cc: linux-kernel@vger.kernel.org

+Signed-off-by: Vijay Pandurangan <vijayp@vijayp.ca>

+Acked-by: Cong Wang <cwang@twopensource.com>

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

+---

+ drivers/net/veth.c | 6 ------

+ 1 file changed, 6 deletions(-)

+

+diff --git a/drivers/net/veth.c b/drivers/net/veth.c

+index 0ef4a5a..ba21d07 100644

+--- a/drivers/net/veth.c

+@@ -117,12 +117,6 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)

+ 		kfree_skb(skb);

+ 		goto drop;

+ 	}

+-	/* don't change ip_summed == CHECKSUM_PARTIAL, as that

+-	 * will cause bad checksum on forwarded packets

+-	 */

+-	if (skb->ip_summed == CHECKSUM_NONE &&

+-	    rcv->features & NETIF_F_RXCSUM)

+-		skb->ip_summed = CHECKSUM_UNNECESSARY;

+ 

+ 	if (likely(dev_forward_skb(rcv, skb) == NET_RX_SUCCESS)) {

+ 		struct pcpu_vstats *stats = this_cpu_ptr(dev->vstats);

+-- 

+cgit v0.12

+