From patchwork Fri Sep 1 09:22:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 808601 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="tZojQ9ub"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xkDLG67GQz9s7C for ; Fri, 1 Sep 2017 19:23:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751686AbdIAJXA (ORCPT ); Fri, 1 Sep 2017 05:23:00 -0400 Received: from mail-eopbgr10043.outbound.protection.outlook.com ([40.107.1.43]:22560 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751618AbdIAJW6 (ORCPT ); Fri, 1 Sep 2017 05:22:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=1LiXyXx71jdN39Tyg4LGzC6Dq0efiqfsghPtVFAEDPQ=; b=tZojQ9ubYIVjriLDATWEoS3CrOr9rFCpBXCxJayx9ON6lR5TplND1xLCM82cxxw3CfBOCUIshwRtYy5QtZrvTstrQahPB5YrLY997Z7GMTyL7Mp7DVeY2Rx8RhKyy2xBABYNDnAJhpQ3nayzc2Zslj4NA9lNzkFzVC+89xdaxi4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; Received: from shredder.mtl.com (79.179.121.124) by HE1PR0501MB2011.eurprd05.prod.outlook.com (2603:10a6:3:35::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9; Fri, 1 Sep 2017 09:22:53 +0000 From: Ido Schimmel To: netdev@vger.kernel.org Cc: davem@davemloft.net, stephen@networkplumber.org, nikolay@cumulusnetworks.com, jiri@mellanox.com, yotamg@mellanox.com, mlxsw@mellanox.com, bridge@lists.linux-foundation.org, Ido Schimmel Subject: [PATCH net] bridge: switchdev: Clear forward mark when transmitting packet Date: Fri, 1 Sep 2017 12:22:25 +0300 Message-Id: <20170901092225.31597-1-idosch@mellanox.com> X-Mailer: git-send-email 2.13.5 MIME-Version: 1.0 X-Originating-IP: [79.179.121.124] X-ClientProxiedBy: HE1PR09CA0076.eurprd09.prod.outlook.com (2603:10a6:7:3d::20) To HE1PR0501MB2011.eurprd05.prod.outlook.com (2603:10a6:3:35::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fe421750-4af3-4bbe-13be-08d4f11b0701 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(48565401081)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:HE1PR0501MB2011; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2011; 3:3sUrbZfiOsqu7OXNPSckBCOxkeQPPDesG60sLvFJB03p3cBAYqr9snnxBeL+4WHwyjgkHThaw4lAqgf5q7X5Qjj5MpZXgJs6TXNDYY/MrUgHodegLO5sbtsWR2pWGVXf5n1e3aClMiI9sEy4z4VWvgW5i7imLwVJmc8XlXo7UW06z4jvGxXCNn+7NUE47bA8esCCG9B6sDFFs6rgPn6UAx00usm10E3lVEg0jXRDRPk0sFrlSxf3tvM3U8xekrsX; 25:qzfS/PAaP57d91xmcHBj9+9kPTlj1pLifa7CETMR6xWU0hFWEDvLaIU3/d2JKyyFq6eanMiBMrMtB4iSnRJZCHSUq9zqjGP/U5BRVieuKEImLS6CHYN2k26em0cLZcOCF271neRsyr+PMr+5Pn/V46N4HhTQiuznGvMuVx9yFjqGUoQWuOjHZaktr49aBi5oiQHvjuKjYgiuuiB3QR95N2kNLLOwafMhJirFotmSR2QHqp09GwFbEa5ybyxs0vhwbK6dh1nFP1TjuR8It9v1mbN8Rhd8Lu5ZPGFHhsniw8bfEn48hV3T0VMitd/yk9Ldc46zezdt54piQxYR3iY37w==; 31:evmgk+IK7DUHLpk5OnSTn23zk3knc/wgkbqpxFXLzNgnrzPBfpWRAmt7gdakAdEkVioIS8aHBWx9HWjytUrXSNVtTMNWH1CEcrn8N6NNC1n9NK3jcu43/1VXQn2fAO7FXV9f6BQQWKIcm7IhwrqMHC8QYsJA5mj1yDPxnp2eujTkx2JGomy0m7umxH11WatXPI/z1xvFq8jYo0zfx9mKlrBDWSruJMpuym5BHCw3mpU= X-MS-TrafficTypeDiagnostic: HE1PR0501MB2011: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2011; 20:1ydSsA/81LUGqE5rVTV+bKMT9f9fj466lftedYDKdzsWAlSYud2Y0voDTxX3RA90bJtQmzOEVbeZiWxsexFk8f1n9EijXi6CM9XK25e9ml+vp818DH4Fs7919eZ0xOOfAXHEfqWvEEMPBARpo6OeoXifdgIRAJBYsNyBjq3ph7Ehy44QM8nVGFBR0EHlN3GCDU/DI2luDPvmHnBrWjQd+f4txkmVKbVHT2JMdv9PryIlhUwDO5Iuo/SO/tSIoPQtKsep8e++DAbH+I30pLNbc2pHAfRfRFOTlutAXevb7em1sGysGf53annqAEuzQK8EBGLKi9fmYe5YlZtgGNxJbt4W+UC6gFwAClNe23jXGaDcJnsJR5FDqEVYtcFZARxWh0cbTkzHB2NOGqCsRQjYp809Z7+GyeRIDwUYeDuxOd1bEgY4GlPwmH+u7uU53jNWqeMt1klDGSjv7tbi4VcP6H0U/jgud2HMrKXVOFP6P6rjTYq/hmdmIK8aFSO3/9QV; 4:Uo4/JYDYPyjdkSVxbQGHX+KcnKWVK8SuOIQmkc5DPsGtgVURS1AiF4XZSOzSX+VY/X6w/YYKivwbJykBm/5p9Am95JqlLFhndeKm/ta8by+ceqUIaDbdm1tfXR9zL++oh2zIBf80+jmM0gBO44tk3nVuA7uVnMLdHDbx1gCam7YgUak7OzQ5pT8Bha8+MdQtSCt1jxekQNkKncXQe+Z++2W4HcKYuiqQSMr3rIkrQgHBiaPksLFQ70tSHnjSUOW5 X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(10201501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(6055026)(6041248)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123562025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:HE1PR0501MB2011; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:HE1PR0501MB2011; X-Forefront-PRVS: 0417A3FFD2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(7370300001)(6009001)(39860400002)(189002)(199003)(25786009)(50226002)(33646002)(7350300001)(81166006)(81156014)(8676002)(6116002)(1076002)(50986999)(3846002)(6916009)(97736004)(6666003)(106356001)(105586002)(2351001)(2361001)(478600001)(48376002)(50466002)(7736002)(53416004)(305945005)(42186005)(36756003)(2906002)(47776003)(4326008)(86362001)(101416001)(5003940100001)(66066001)(189998001)(6512007)(5660300001)(68736007)(6486002)(6506006)(53936002)(107886003)(110136004); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0501MB2011; H:shredder.mtl.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2011; 23:OAqgFIF4T4d/KTHvuquurGZAQ5X9wIJRtGg19v+e3wcKN63OF77Q87D1AlJrm7nGgwEU8JB8wMUWVzTnc2FR7Y1qX9ZWbPyhDybx+loRStwESiF6PlQxQty9fMySY2VGoIQWCBBMAJ6r91tFWz+deDg01/c+THPRMveSsxiEtkMUP9TpefNNWKxnJ20vnYUTHswXFlUxXXjhYII7eicds5F573RtjWLUkqQ46nGlC1RufoBCkiXzu0+enHFeLmZr1fW0omhcOg3IUMbUMonCdS4poQPrPNsaxRwyqmnMhA7ShqNVbSGloZAxLx5gA5p1nHE/tQZWDkmsLp189L3/6AbOgvC8iaBj69qn7aKUa+K1yvLb07XQRw77hEULd4WDAQIH+0LvVY3/KpTSEaMyxWOovGBOFCxh30RupVonlwiVSH6JACtWDptBBuHC8BgBfREKaeX/A5Mw1R5p7LU4IBoNQ0PM78WyFBAGBB0fiLCVVSZNtLUAgyNYYfl+1o/u4ZlDtldxssnjkh/dBRSZ65tZzfpNZI7jH4790bMsB5TwNFML6IWi2T7pu/Z//rrxkAIS3lsTQQ/HZ+fy64BV4tX8RCvnTfpn3O1wkGOtQtMdPRXDZEY9aB+7j/rSYsckWIIlxQ/bnqIaIUWUiLQxh1cfKcNWOIn4fXUrY5SBkRwzbxMKMUx02G9nuFasivLk4HHTRT6PNnXR2OeE4hs9T6OqeTTn7oAYvOTRdHSDXEsEYFm5SZkY0Tl0HFT8DOyg0DMK9FZO9xfiau139slmn8JuKuY7OommixgViNuGKuYWoKLJ7jQgdQNGPPevNVtJUrvmlfOrBQzMQfb6xQ1B8vItYqkOGS5kvYe0XNIbPDUQgAftIWKdRT7os9qSC+MpwYOviou/T4dRf5HG0+BSkQsXHlTqKT8FwpE6xg5q8RMm3KWTm3Yi8N17lFiB+gZ/sUHKvPH5RKuSbGwxkBmnQMjROYmNyihdP2a0Eaj8emh2SeL1XuB0D7/aK5NYtP/iK1fTU5705pLo+wUmT2GTSGQZOig8rSM56CNECbDLwoX/Hw+PFPuWVYSITcPkkmAeTrH/0x9l7rFueaOMZAp343opKQETmBDdrtLOrQjggOv2srl3j0zyBQJNRievX5LdkbN+9BY0/SqrIf2dcYeAdA== X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2011; 6:IK8VAq/MAb3x4Lj6GiohAJGWRnCcB6EFdRv0aznD3v3ac4kUxfHhwpg3LBtXsRjEMqdvqb0wiIt/+dpXTEmsJ/5KD//0Mktj4AqZqhglYK8pMxHbWUuwHsWe71F78XRLYBC8b+eYze3LrGxrWI1QiYO/FO5TUcLTyaTP73HTf0NKNJC/AOXlTJBL2Y63poCYlT5UcvDSKhE36EKzt3phhOMaGFep0ivZWCsN1dwYsiIlK46SJue+2SGYHwGNZbf8+OpqPItlnIEIy2883t48F/VW6yTV99SH6TQf6vhB/aRTib2lX12m//7jahqCYai/vw0WckTFt2OGaK5TTwduvQ==; 5:5oPlyFGgxm1HZZkz+VyMEvgevQjiplzmLHb3IuaNRHz3HTMQOroWYlhXcxOvQavIXQ+4ty1nfkzJgFm3yIXBQGqQpJk9fWpjaMYbilx/Fy0gCiLrZJc9y18rX6+lYwcxlzZ7fjWElqcHFotIFeB+dQ==; 24:ey5tFL91LbNQg+cxvfzUApBjgKPrPym+qkSocVQTWFLfSLkrC/Z2pJdryPyH45IdkH+wzbfzVDJgzHiJIWIncDfviQILIvAHciNueRnX8a8=; 7:9HWQlpFBpg4VrAb+pm2IqV0D3FarOno3vhekELUk/10FULWvzvF15GM/N0oVqJkGHj97kFuXN9B4KwSAXtq7pS28wicmW/aA+FSmttw+cWeOhagDihodRgP7wT5F6vscIJzBL3iExZm7ImP5oVrACuEtgzDPrQvKsLqu9/b8hqYeJ800rutO36gV2mVvp6F/f7zBSkT6ddUFX2mwgxa0Q+gD11nBbZDy3GVm78FLrcA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2017 09:22:53.6566 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0501MB2011 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 6bc506b4fb06 ("bridge: switchdev: Add forward mark support for stacked devices") added the 'offload_fwd_mark' bit to the skb in order to allow drivers to indicate to the bridge driver that they already forwarded the packet in L2. In case the bit is set, before transmitting the packet from each port, the port's mark is compared with the mark stored in the skb's control block. If both marks are equal, we know the packet arrived from a switch device that already forwarded the packet and it's not re-transmitted. However, if the packet is transmitted from the bridge device itself (e.g., br0), we should clear the 'offload_fwd_mark' bit as the mark stored in the skb's control block isn't valid. This scenario can happen in rare cases where a packet was trapped during L3 forwarding and forwarded by the kernel to a bridge device. Fixes: 6bc506b4fb06 ("bridge: switchdev: Add forward mark support for stacked devices") Signed-off-by: Ido Schimmel Reported-by: Yotam Gigi Tested-by: Yotam Gigi Reviewed-by: Jiri Pirko Acked-by: Nikolay Aleksandrov --- net/bridge/br_device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 861ae2a165f4..5a7be3bddfa9 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -53,6 +53,9 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) brstats->tx_bytes += skb->len; u64_stats_update_end(&brstats->syncp); +#ifdef CONFIG_NET_SWITCHDEV + skb->offload_fwd_mark = 0; +#endif BR_INPUT_SKB_CB(skb)->brdev = dev; skb_reset_mac_header(skb);