From patchwork Mon Feb 25 06:05:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pravin B Shelar X-Patchwork-Id: 222850 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B7CE72C0091 for ; Mon, 25 Feb 2013 17:06:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752629Ab3BYGGC (ORCPT ); Mon, 25 Feb 2013 01:06:02 -0500 Received: from na3sys009aog129.obsmtp.com ([74.125.149.142]:45900 "HELO na3sys009aog129.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751323Ab3BYGGA (ORCPT ); Mon, 25 Feb 2013 01:06:00 -0500 Received: from mail-da0-f69.google.com ([209.85.210.69]) (using TLSv1) by na3sys009aob129.postini.com ([74.125.148.12]) with SMTP ID DSNKUSr/R7j+i4gvSSRvHU7IdWOPFf+5keSQ@postini.com; Sun, 24 Feb 2013 22:06:00 PST Received: by mail-da0-f69.google.com with SMTP id p8so2536021dan.0 for ; Sun, 24 Feb 2013 22:05:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=bDBxwZZGgFX/65foBD4lo3Ue/21yo+ys56aOZ9ihQW8=; b=ZwMF/OGGbdgpo+oEgSu5ToIMKnPR9KwWLTsCGFil31+SvOzjaO1vZG5nsZ+KrMGyxb aawSEL86WZZBIQFyolj5EdqsX/fTiVBPQl1CmdXt0kc9o2wK9Q/flORbd6hT/oK/nWXg Q4jOd2AGQG6b/pOZlNKqvbnyokmqWPUrqlHdvonGAjk6xR9CBmLLUGvd39Y+Jpo2JSnS tYY42SC5xVbsffcIZXoap0gH6GwTyxBiw9f6vTDLzNMEdVp+BAkxGaAjzhOs165AAscT M8LbO/ZvQyf1g++BvJPgfHdv1L8tec58dXczmQvS9H8e82BaxXzOYv6GEqxt2s3Fg+/K LQ5A== X-Received: by 10.66.89.226 with SMTP id br2mr17171063pab.57.1361772359765; Sun, 24 Feb 2013 22:05:59 -0800 (PST) X-Received: by 10.66.89.226 with SMTP id br2mr17171050pab.57.1361772359551; Sun, 24 Feb 2013 22:05:59 -0800 (PST) Received: from localhost (c-76-126-241-147.hsd1.ca.comcast.net. [76.126.241.147]) by mx.google.com with ESMTPS id t4sm12549560pax.0.2013.02.24.22.05.57 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Sun, 24 Feb 2013 22:05:58 -0800 (PST) From: Pravin B Shelar To: davem@davemloft.net Cc: netdev@vger.kernel.org, dmitry@broadcom.com, Pravin B Shelar Subject: [PATCH net-next 2/2] Revert "ip_gre: propogate target device GSO capability to the tunnel device" Date: Sun, 24 Feb 2013 22:05:12 -0800 Message-Id: <1361772312-1698-1-git-send-email-pshelar@nicira.com> X-Mailer: git-send-email 1.7.12.315.g682ce8b X-Gm-Message-State: ALoCoQnaRrn4sLOz0enL5AOkQw2V166/r/Ei87xpUpDbgNDoQmlJZVKJ7WMK15VIT3C1U+LjmMJZLyCedCOW+lac36jvTHSAyx0q2zcPm+YK9ry404JdMfVHsCfQ5Bi4RetYCNs75RTVUXXl1zH5RnEpdZ+/HM0HizFrSJ9UmoeDCFPZelAgiZE= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This reverts commit eb6b9a8cad65e820b145547844b108117cece3a0. Above commit limits GSO capability of gre device to just TSO, but software GRE-GSO is capable of handling all GSO capabilities. This patch also fixes following panic which reverted commit introduced:- BUG: unable to handle kernel NULL pointer dereference at 00000000000000a2 IP: [] ipgre_tunnel_bind_dev+0x161/0x1f0 [ip_gre] PGD 42bc19067 PUD 42bca9067 PMD 0 Oops: 0000 [#1] SMP Pid: 2636, comm: ip Tainted: GF 3.8.0+ #83 Dell Inc. PowerEdge R620/0KCKR5 RIP: 0010:[] [] ipgre_tunnel_bind_dev+0x161/0x1f0 [ip_gre] RSP: 0018:ffff88042bfcb708 EFLAGS: 00010246 RAX: 00000000000005b6 RBX: ffff88042d2fa000 RCX: 0000000000000044 RDX: 0000000000000018 RSI: 0000000000000078 RDI: 0000000000000060 RBP: ffff88042bfcb748 R08: 0000000000000018 R09: 000000000000000c R10: 0000000000000020 R11: 000000000101010a R12: ffff88042d2fa800 R13: 0000000000000000 R14: ffff88042d2fa800 R15: ffff88042cd7f650 FS: 00007fa784f55700(0000) GS:ffff88043fd20000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00000000000000a2 CR3: 000000042d8b9000 CR4: 00000000000407e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process ip (pid: 2636, threadinfo ffff88042bfca000, task ffff88042d142a80) Stack: 0000000100000000 002f000000000000 0a01010100000000 000000000b010101 ffff88042d2fa800 ffff88042d2fa000 ffff88042bfcb858 ffff88042f418c00 ffff88042bfcb798 ffffffffa068199a ffff88042bfcb798 ffff88042d2fa830 Call Trace: [] ipgre_newlink+0xca/0x160 [ip_gre] [] rtnl_newlink+0x532/0x5f0 [] ? rtnl_newlink+0x19c/0x5f0 [] rtnetlink_rcv_msg+0x2c8/0x340 [] ? rtnetlink_rcv+0x40/0x40 [] netlink_rcv_skb+0xa9/0xd0 [] rtnetlink_rcv+0x25/0x40 [] netlink_unicast+0x1ac/0x230 [] netlink_sendmsg+0x265/0x380 [] sock_sendmsg+0xb0/0xe0 [] ? move_addr_to_kernel+0x4e/0x90 [] ? verify_iovec+0x85/0xf0 [] __sys_sendmsg+0x3fd/0x420 [] ? handle_mm_fault+0x251/0x3b0 [] ? vma_link+0xcf/0xe0 [] sys_sendmsg+0x49/0x90 [] system_call_fastpath+0x16/0x1b CC: Dmitry Kravkov Signed-off-by: Pravin B Shelar Acked-by: Dmitry Kravkov --- net/ipv4/ip_gre.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 9b4996d..1517b6f 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -1105,14 +1105,8 @@ static int ipgre_tunnel_bind_dev(struct net_device *dev) tunnel->hlen = addend; /* TCP offload with GRE SEQ is not supported. */ if (!(tunnel->parms.o_flags & GRE_SEQ)) { - /* device supports enc gso offload*/ - if (tdev->hw_enc_features & NETIF_F_GRE_GSO) { - dev->features |= NETIF_F_TSO; - dev->hw_features |= NETIF_F_TSO; - } else { - dev->features |= NETIF_F_GSO_SOFTWARE; - dev->hw_features |= NETIF_F_GSO_SOFTWARE; - } + dev->features |= NETIF_F_GSO_SOFTWARE; + dev->hw_features |= NETIF_F_GSO_SOFTWARE; } return mtu;