From patchwork Thu Nov 13 23:36:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 410644 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 E3EA11400B6 for ; Fri, 14 Nov 2014 10:38:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934765AbaKMXiC (ORCPT ); Thu, 13 Nov 2014 18:38:02 -0500 Received: from na3sys009aog115.obsmtp.com ([74.125.149.238]:45277 "HELO na3sys009aog115.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S934636AbaKMXh6 (ORCPT ); Thu, 13 Nov 2014 18:37:58 -0500 Received: from mail-pd0-f174.google.com ([209.85.192.174]) (using TLSv1) by na3sys009aob115.postini.com ([74.125.148.12]) with SMTP ID DSNKVGVA1mAWIcxvj0yMK3c2jpRhhGVwbknn@postini.com; Thu, 13 Nov 2014 15:37:58 PST Received: by mail-pd0-f174.google.com with SMTP id p10so15537115pdj.33 for ; Thu, 13 Nov 2014 15:37:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=X814fYRhxqq80pOeSqdIOpXCep9n/5i+3ENpzahD2yQ=; b=Bfxp0uaomnOEpA63RNV/o8g0fIeqLb6J10DbUW4M7wg46kbHYBCpRRdK/e0Zs6TUic RcQ27tBDkB0yN1MyxLAQ7TppWuMy/J5Qm8wtlXK3mXQgZ9Umfukih3pR0ppdyTMK2EmY jTMb6oXp2DTZlOfkKlhZyzpK7xh2PmswYFYhw9GNddgfzpxY0yrFFogxvcVLFvKR3zwp V8EzFSq6lBA5Txy/zFU11vxcsHrkEiOOiZ71EeUiGdRsynwdNhaS7XG47HG/XHH/4eVP fhGbBPxThGO7VfCIDYUdEH5EEcbgFXGsGVsdP1ATnSLPl9HCA3fksFjDJT9lOdoqcGmL nwDQ== X-Gm-Message-State: ALoCoQlN8MLvT1nMcOJDNBqKBQwMQgL6XP0YApxzyjKBZ5D/ysUw0AWqrjAy7arO/OEC/+vs3BkrXLvCTEz10GvzPV4QBswo1p/hK1gmXIUfd1UjEZQewUVWViOIVgMJw+QfzAd+0Skbe/iS3FH77OeF3opeR+uRrA== X-Received: by 10.68.220.169 with SMTP id px9mr6296225pbc.146.1415921878149; Thu, 13 Nov 2014 15:37:58 -0800 (PST) X-Received: by 10.68.220.169 with SMTP id px9mr6296218pbc.146.1415921878075; Thu, 13 Nov 2014 15:37:58 -0800 (PST) Received: from htb-1n-eng-dhcp192.localdomain ([208.91.2.4]) by mx.google.com with ESMTPSA id fl15sm25772109pdb.92.2014.11.13.15.37.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Nov 2014 15:37:57 -0800 (PST) From: Joe Stringer To: netdev@vger.kernel.org Cc: matthew.vick@intel.com, jeffrey.t.kirsher@intel.com, linux.nics@intel.com, therbert@google.com, gerlitz.or@gmail.com, alexander.duyck@gmail.com, linux-kernel@vger.kernel.org Subject: [PATCHv2 net 2/2] fm10k: Implement ndo_gso_check() Date: Thu, 13 Nov 2014 15:36:41 -0800 Message-Id: <1415921801-10452-2-git-send-email-joestringer@nicira.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1415921801-10452-1-git-send-email-joestringer@nicira.com> References: <1415921801-10452-1-git-send-email-joestringer@nicira.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ndo_gso_check() was recently introduced to allow NICs to report the offloading support that they have on a per-skb basis. Add an implementation for this driver which checks for something that looks like VXLAN. Signed-off-by: Joe Stringer --- v2: Reuse fm10k_tx_encap_offload(). --- drivers/net/ethernet/intel/fm10k/fm10k.h | 1 + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 +- drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h index 42eb434..d38f088 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k.h +++ b/drivers/net/ethernet/intel/fm10k/fm10k.h @@ -443,6 +443,7 @@ netdev_tx_t fm10k_xmit_frame_ring(struct sk_buff *skb, struct fm10k_ring *tx_ring); void fm10k_tx_timeout_reset(struct fm10k_intfc *interface); bool fm10k_check_tx_hang(struct fm10k_ring *tx_ring); +__be16 fm10k_tx_encap_offload(struct sk_buff *skb); void fm10k_alloc_rx_buffers(struct fm10k_ring *rx_ring, u16 cleaned_count); /* PCI */ diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c index 3a85291..1144e14 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c @@ -727,7 +727,7 @@ static struct ethhdr *fm10k_gre_is_nvgre(struct sk_buff *skb) return (struct ethhdr *)(&nvgre_hdr->tni); } -static __be16 fm10k_tx_encap_offload(struct sk_buff *skb) +__be16 fm10k_tx_encap_offload(struct sk_buff *skb) { struct ethhdr *eth_hdr; u8 l4_hdr = 0; diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c index 8811364..6e8630a 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c @@ -1350,6 +1350,13 @@ static void fm10k_dfwd_del_station(struct net_device *dev, void *priv) } } +static bool fm10k_gso_check(struct sk_buff *skb, struct net_device *dev) +{ + return (!(skb_shinfo(skb)->gso_type & + (SKB_GSO_UDP_TUNNEL | SKB_GSO_GRE)) || + fm10k_tx_encap_offload(skb)); +} + static const struct net_device_ops fm10k_netdev_ops = { .ndo_open = fm10k_open, .ndo_stop = fm10k_close, @@ -1372,6 +1379,7 @@ static const struct net_device_ops fm10k_netdev_ops = { .ndo_do_ioctl = fm10k_ioctl, .ndo_dfwd_add_station = fm10k_dfwd_add_station, .ndo_dfwd_del_station = fm10k_dfwd_del_station, + .ndo_gso_check = fm10k_gso_check, }; #define DEFAULT_DEBUG_LEVEL_SHIFT 3