From patchwork Wed Jul 8 23:16:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 493187 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 6EF411409A0 for ; Thu, 9 Jul 2015 09:14:23 +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=RMDIQMg6; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751797AbbGHXOS (ORCPT ); Wed, 8 Jul 2015 19:14:18 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:33457 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751299AbbGHXON (ORCPT ); Wed, 8 Jul 2015 19:14:13 -0400 Received: by pacws9 with SMTP id ws9so140676457pac.0 for ; Wed, 08 Jul 2015 16:14:13 -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=zWCxrLZmkDMuWd+a7N9BKDQZAPvpictBv/mNrq7Rlv8=; b=RMDIQMg6QntoALBDHgOpzrKyXMCVrmtam/YjkrO1zViUZgb9mKWo5PwgBDalAZdgn9 NeluzYK3sDQyFE1g66G/Uc2jhO/n6Hry/cvn14gAD93G2MPRMZ06H1kkSshhllOSSnQi 1tDGT2XwfYYT9eV+bR5KVxjGxhS9kkiJ3UHZ7oHWLoe9pZ5lVnNCIGOaUlbzAmFC5zsH F9UrsLRA5jhw8a7Y7twUHEiv29vNL8D7BF3KaurnLU5LyAnek0Vaaq1OjL+UfWFSOqzk EG3JqFnn3gXeIl50xqEXsOsAmvwf0uH149289dul9kL9GJvsyf/dFeYDlUHSM/XANyaG QG2Q== X-Received: by 10.68.68.201 with SMTP id y9mr24770520pbt.143.1436397252966; Wed, 08 Jul 2015 16:14:12 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.143]) by smtp.gmail.com with ESMTPSA id dc8sm3673599pdb.23.2015.07.08.16.14.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jul 2015 16:14:12 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: jiri@resnulli.us, roopa@cumulusnetworks.com Subject: [PATCH net-next 1/5] net: don't reforward packets already forwarded by offload device Date: Wed, 8 Jul 2015 16:16:39 -0700 Message-Id: <1436397403-62412-2-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1436397403-62412-1-git-send-email-sfeldma@gmail.com> References: <1436397403-62412-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 Just before queuing skb for xmit on port, check if skb has been marked by switchdev port driver as already fordwarded by device. If so, drop skb. A non-zero skb->offload_fwd_mark field is set by the switchdev port driver/device on ingress to indicate the skb has already been forwarded by the device to egress ports with matching dev->skb_mark. The switchdev port driver would assign a non-zero dev->skb_mark for each device port netdev during registration, for example. Signed-off-by: Scott Feldman --- include/linux/netdevice.h | 6 ++++++ include/linux/skbuff.h | 4 ++++ net/core/dev.c | 10 ++++++++++ 3 files changed, 20 insertions(+) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index e20979d..7be616e1 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1448,6 +1448,8 @@ enum netdev_priv_flags { * * @xps_maps: XXX: need comments on this one * + * @offload_fwd_mark: Offload device fwding mark + * * @trans_start: Time (in jiffies) of last Tx * @watchdog_timeo: Represents the timeout that is used by * the watchdog ( see dev_watchdog() ) @@ -1685,6 +1687,10 @@ struct net_device { struct xps_dev_maps __rcu *xps_maps; #endif +#ifdef CONFIG_NET_SWITCHDEV + u32 offload_fwd_mark; +#endif + /* These may be needed for future network-power-down code. */ /* diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index d6cdd6e..1533c4f 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -506,6 +506,7 @@ static inline u32 skb_mstamp_us_delta(const struct skb_mstamp *t1, * @no_fcs: Request NIC to treat last 4 bytes as Ethernet FCS * @napi_id: id of the NAPI struct this skb came from * @secmark: security marking + * @offload_fwd_mark: fwding offload mark * @mark: Generic packet mark * @vlan_proto: vlan encapsulation protocol * @vlan_tci: vlan tag control information @@ -653,6 +654,9 @@ struct sk_buff { #ifdef CONFIG_NETWORK_SECMARK __u32 secmark; #endif +#ifdef CONFIG_NET_SWITCHDEV + __u32 offload_fwd_mark; +#endif union { __u32 mark; __u32 reserved_tailroom; diff --git a/net/core/dev.c b/net/core/dev.c index e0d2701..71919cc 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3065,6 +3065,16 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv) else skb_dst_force(skb); +#ifdef CONFIG_NET_SWITCHDEV + /* Don't forward if offload device already forwarded */ + if (skb->offload_fwd_mark && + skb->offload_fwd_mark == dev->offload_fwd_mark) { + consume_skb(skb); + rc = NET_XMIT_SUCCESS; + goto out; + } +#endif + txq = netdev_pick_tx(dev, skb, accel_priv); q = rcu_dereference_bh(txq->qdisc);