From patchwork Sat Jun 13 18:04:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 483907 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 EAECB1401F0 for ; Sun, 14 Jun 2015 04:02:54 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=UH+76S9P; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753435AbbFMSCu (ORCPT ); Sat, 13 Jun 2015 14:02:50 -0400 Received: from mail-ig0-f182.google.com ([209.85.213.182]:34115 "EHLO mail-ig0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753287AbbFMSCm (ORCPT ); Sat, 13 Jun 2015 14:02:42 -0400 Received: by igboe5 with SMTP id oe5so4543593igb.1 for ; Sat, 13 Jun 2015 11:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FRswtaH9+QgvUQUhOSoYWl7b2AqC04EuNNM1t2bxtj4=; b=UH+76S9PWtqiZXb9jQ5Xji3M0Z73BP5VQMumJb4CwHq8/9qM2q6tdz924t3zTtBGDC V/Fx4kGzN3vH5Pf5C/nmfdXQxcgd1DFwY5fqAYbP40fNjH1xTec9vpMzKC4MKkRSpO4s dEhDmCqSjHdyfIdJ9nndbQKpZCFS84mfm/1OaXZqGGEwdCx7/1hM9okv99qc9McA93n8 s81VMdO3xZTRuK473Y16+sd2FxOyeCzpY9beE0+ns632wsrEMzEvGRuv7Kg3Jsnr6jTk 10xfH27oXuNl1zrkR74/DYK1xJgAg7XxtPDhpUazj/ldujAyS+qa42PvpUM//o+zFrKs L2Xw== X-Received: by 10.50.136.197 with SMTP id qc5mr11376967igb.6.1434218561285; Sat, 13 Jun 2015 11:02:41 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.143]) by mx.google.com with ESMTPSA id t7sm3777377ign.8.2015.06.13.11.02.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Jun 2015 11:02:40 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: jiri@resnulli.us, simon.horman@netronome.com, roopa@cumulusnetworks.com, ronen.arad@intel.com, john.r.fastabend@intel.com, andrew@lunn.ch, f.fainelli@gmail.com, linux@roeck-us.net, davidch@broadcom.com, stephen@networkplumber.org Subject: [RFC PATCH net-next 3/4] rocker: add fwd_mark support Date: Sat, 13 Jun 2015 11:04:29 -0700 Message-Id: <1434218670-43821-4-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1434218670-43821-1-git-send-email-sfeldma@gmail.com> References: <1434218670-43821-1-git-send-email-sfeldma@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Scott Feldman If device flags ingress packet as "fwd offload", mark the skb->fwd_mark using the ingress port's dev->fwd_mark. This will be the hint to the kernel that this packet has already been forwarded by device to egress ports matching skb->fwd_mark. For rocker, derive port dev->fwd_mark based on device switch ID. If port is bridged, include the bridge's ifindex in the key for deriving dev->fwd_mark. Signed-off-by: Scott Feldman --- drivers/net/ethernet/rocker/rocker.c | 24 ++++++++++++++++++++++++ drivers/net/ethernet/rocker/rocker.h | 1 + 2 files changed, 25 insertions(+) diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c index a06b93d..81407d8 100644 --- a/drivers/net/ethernet/rocker/rocker.c +++ b/drivers/net/ethernet/rocker/rocker.c @@ -4701,6 +4701,7 @@ static int rocker_port_rx_proc(const struct rocker *rocker, const struct rocker_tlv *attrs[ROCKER_TLV_RX_MAX + 1]; struct sk_buff *skb = rocker_desc_cookie_ptr_get(desc_info); size_t rx_len; + u16 rx_flags = 0; if (!skb) return -ENOENT; @@ -4708,6 +4709,8 @@ static int rocker_port_rx_proc(const struct rocker *rocker, rocker_tlv_parse_desc(attrs, ROCKER_TLV_RX_MAX, desc_info); if (!attrs[ROCKER_TLV_RX_FRAG_LEN]) return -EINVAL; + if (attrs[ROCKER_TLV_RX_FLAGS]) + rx_flags = rocker_tlv_get_u16(attrs[ROCKER_TLV_RX_FLAGS]); rocker_dma_rx_ring_skb_unmap(rocker, attrs); @@ -4715,6 +4718,9 @@ static int rocker_port_rx_proc(const struct rocker *rocker, skb_put(skb, rx_len); skb->protocol = eth_type_trans(skb, rocker_port->dev); + if (rx_flags & ROCKER_RX_FLAGS_FWD_OFFLOAD) + skb->fwd_mark = rocker_port->dev->fwd_mark; + rocker_port->dev->stats.rx_packets++; rocker_port->dev->stats.rx_bytes += skb->len; @@ -4814,6 +4820,21 @@ static void rocker_port_dev_addr_init(struct rocker_port *rocker_port) } } +static void rocker_port_fwd_mark_set(struct rocker_port *rocker_port) +{ + struct rocker *rocker = rocker_port->rocker; + struct { + u64 hw_id; + int ifindex; + } key = { + .hw_id = rocker->hw.id, + .ifindex = rocker_port_is_bridged(rocker_port) ? + rocker_port->bridge_dev->ifindex : 0, + }; + + rocker_port->dev->fwd_mark = switchdev_mark_get(&key, sizeof(key)); +} + static int rocker_probe_port(struct rocker *rocker, unsigned int port_number) { const struct pci_dev *pdev = rocker->pdev; @@ -4832,6 +4853,7 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number) rocker_port->pport = port_number + 1; rocker_port->brport_flags = BR_LEARNING | BR_LEARNING_SYNC; INIT_LIST_HEAD(&rocker_port->trans_mem); + rocker_port_fwd_mark_set(rocker_port); rocker_port_dev_addr_init(rocker_port); dev->netdev_ops = &rocker_port_netdev_ops; @@ -5131,6 +5153,7 @@ static int rocker_port_bridge_join(struct rocker_port *rocker_port, rocker_port_internal_vlan_id_get(rocker_port, bridge->ifindex); rocker_port->bridge_dev = bridge; + rocker_port_fwd_mark_set(rocker_port); return rocker_port_vlan_add(rocker_port, SWITCHDEV_TRANS_NONE, untagged_vid, 0); @@ -5152,6 +5175,7 @@ static int rocker_port_bridge_leave(struct rocker_port *rocker_port) rocker_port->dev->ifindex); rocker_port->bridge_dev = NULL; + rocker_port_fwd_mark_set(rocker_port); err = rocker_port_vlan_add(rocker_port, SWITCHDEV_TRANS_NONE, untagged_vid, 0); diff --git a/drivers/net/ethernet/rocker/rocker.h b/drivers/net/ethernet/rocker/rocker.h index c61fbf9..f846c0d 100644 --- a/drivers/net/ethernet/rocker/rocker.h +++ b/drivers/net/ethernet/rocker/rocker.h @@ -245,6 +245,7 @@ enum { #define ROCKER_RX_FLAGS_TCP BIT(5) #define ROCKER_RX_FLAGS_UDP BIT(6) #define ROCKER_RX_FLAGS_TCP_UDP_CSUM_GOOD BIT(7) +#define ROCKER_RX_FLAGS_FWD_OFFLOAD BIT(8) enum { ROCKER_TLV_TX_UNSPEC,