From patchwork Sat May 7 01:19:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 619515 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 3r1rRn4JfRz9sBX for ; Sat, 7 May 2016 11:20:20 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=QDg/bJDS; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758894AbcEGBUE (ORCPT ); Fri, 6 May 2016 21:20:04 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:34803 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758804AbcEGBUC (ORCPT ); Fri, 6 May 2016 21:20:02 -0400 Received: by mail-pa0-f49.google.com with SMTP id r5so53956192pag.1 for ; Fri, 06 May 2016 18:20:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:in-reply-to:references :mime-version:content-transfer-encoding; bh=x1fIDMrR9zZQH2BKFBpLFUk49WaVxW3yldgV3tvgELA=; b=QDg/bJDS+JVOjl6LKIYRe+cXJscE7iYCmZtDr26nZ5BWzSPwGfrk8XCSoLjIoZNisu CbjPngSJmUoyD0JGHJVtEj3GiUYZdcm9U/AIRqeUKpNoZG3EqMfmnSM9PMrD74oL7pH7 fEEyYcT6CNRNcirKn/gdnf7mxAzFijxCD5nmQzwXOc5x/CntUKnj65AgmUladYI1NSLz +c8UPNk2BGU58C4MI5LC5vKJ0bgNaE08EDmaiHlQauDv4kXb8a53Qur0sD1e14y74tWE pGskZ8GEn6wzyqV2P7w5cb+bZuSGDwNGmRRaRB/C0Gc1OmtZw6sShfPw1okULguwfdMi T6OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:mime-version:content-transfer-encoding; bh=x1fIDMrR9zZQH2BKFBpLFUk49WaVxW3yldgV3tvgELA=; b=mOzZL7f2kaET/qBBZVRPYU+YvuHnxD2csvPnWPvYfrVVIxlIwc097EOSfiEm4vMiyr juwn5xlEAv+mMNDKJuvpM4AxgbL05P/cuucExCDAI+6eVpoNEjK7iGd+zAoGs7agGmoU FsQ571DX7iuOEI00hLs57/wK0FJm9n/JYf18u7WMbW4cPaqKzGIr0iQP2c8qXKFvjTuk sW1pW1+S+ugrYD4mBgw7yprzvO0Oeh0GJR79rVERGKu5lfN6WVR4LLUqhsevTzoK4p7u VNmOi59gnN6sLErG0wGpsYBOpGNkyEQ7D2y2hvQAIPSCsVlGvWJwCIJNXKbSc3jk8ke9 O4eQ== X-Gm-Message-State: AOPr4FV+g7NxbQ1xE4LmJbSyxvPvEJEyYDTGm6pVJzKWZCZ+pnKFt5RmmWXUz/7lhCQQTg== X-Received: by 10.66.43.143 with SMTP id w15mr33293165pal.76.1462584001033; Fri, 06 May 2016 18:20:01 -0700 (PDT) Received: from [172.26.49.69] ([172.26.49.69]) by smtp.googlemail.com with ESMTPSA id u65sm23719022pfa.9.2016.05.06.18.19.59 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 06 May 2016 18:20:00 -0700 (PDT) Message-ID: <1462583999.13075.67.camel@edumazet-glaptop3.roam.corp.google.com> Subject: [PATCH v2 net-next] ifb: support more features From: Eric Dumazet To: David Miller Cc: netdev Date: Fri, 06 May 2016 18:19:59 -0700 In-Reply-To: <1462578076.13075.63.camel@edumazet-glaptop3.roam.corp.google.com> References: <1462578076.13075.63.camel@edumazet-glaptop3.roam.corp.google.com> X-Mailer: Evolution 3.10.4-0ubuntu2 Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric Dumazet When using ifb+netem on ingress on SIT/IPIP/GRE traffic, GRO packets are not properly processed. Segmentation should not be forced, since ifb is already adding quite a performance hit. Signed-off-by: Eric Dumazet --- drivers/net/ifb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c index cc56fac3c3f8..66c0eeafcb5d 100644 --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c @@ -196,6 +196,7 @@ static const struct net_device_ops ifb_netdev_ops = { #define IFB_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG | NETIF_F_FRAGLIST | \ NETIF_F_TSO_ECN | NETIF_F_TSO | NETIF_F_TSO6 | \ + NETIF_F_GSO_ENCAP_ALL | \ NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_CTAG_TX | \ NETIF_F_HW_VLAN_STAG_TX) @@ -224,6 +225,8 @@ static void ifb_setup(struct net_device *dev) dev->tx_queue_len = TX_Q_LIMIT; dev->features |= IFB_FEATURES; + dev->hw_features |= dev->features; + dev->hw_enc_features |= dev->features; dev->vlan_features |= IFB_FEATURES & ~(NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX);