From patchwork Fri Jan 18 15:57:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1027524 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="ny7cuDjJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43h5GN6sYlz9sBQ for ; Sat, 19 Jan 2019 02:58:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728003AbfARP6v (ORCPT ); Fri, 18 Jan 2019 10:58:51 -0500 Received: from mail-eopbgr30058.outbound.protection.outlook.com ([40.107.3.58]:19209 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727467AbfARP6v (ORCPT ); Fri, 18 Jan 2019 10:58:51 -0500 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:X-MS-Exchange-SenderADCheck; bh=SZKeJR4MYGK5y3nhmxFN9XOaRMWXoozwg5A+pr8qXto=; b=ny7cuDjJ/hh9ykc2N30H6Gv03pIO7NldCFgyBU36p93tUT3bv1l41D+Gr2RBNanftaM7TcQjYCpXUq6ALcPMtamB4ef4LC+7/wHjOJtB9Hx0HqLAieI8oz49OqCaB0ivlrARx3hz1UJSyhY3W4kpl2TB9S8JMETq8gX7fSJUZrs= Received: from AM6PR05MB6056.eurprd05.prod.outlook.com (20.179.2.148) by AM6PR05MB6424.eurprd05.prod.outlook.com (20.179.6.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Fri, 18 Jan 2019 15:57:55 +0000 Received: from AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f]) by AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f%3]) with mapi id 15.20.1516.019; Fri, 18 Jan 2019 15:57:55 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Alexander Petrovskiy , Ido Schimmel Subject: [PATCH net 1/8] mlxsw: pci: Ring CQ's doorbell before RDQ's Thread-Topic: [PATCH net 1/8] mlxsw: pci: Ring CQ's doorbell before RDQ's Thread-Index: AQHUr0aTN3iiyHvYQUK/ebBaettxNA== Date: Fri, 18 Jan 2019 15:57:55 +0000 Message-ID: <20190118155719.14827-2-idosch@mellanox.com> References: <20190118155719.14827-1-idosch@mellanox.com> In-Reply-To: <20190118155719.14827-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0032.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::45) To AM6PR05MB6056.eurprd05.prod.outlook.com (2603:10a6:20b:ab::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [79.183.38.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR05MB6424; 6:B/fOpjm2uGrSR3eJE+tLO0UekpK5hzciXYxvnaWoZmYRRPoW3JDZDqH0IqGppVBv+GIoP29f92UG5DbLXM6mMTjdOPwBu5WCl36b1D86IXgHArYVZU705MPRdw/lMZ3UL0S4zdzH8qZkVg56pIV7PqTqUWwEhPB/yMap0Mk5SbI/qtmMvdLoWzEJLB7jECFoogxOlYHuqRIgO8sKnAlo3jzHrblVyrNOOKdDRhSjQOjXQ3JXm6KpyNs51MgpQezQU4Jx7qhRfsNNilOkgkDeh+2Wq2LU/2qAw2EMR8zVkGPkiaVlLVEKkrIdKkWP4Zqc5P7rPwpgXNnunrX9tHukubrxZ/CK0O991pzBSN6Eg0gLn8/EPFt9kbt9G/Am1gNrEF+tVvgdZPedwuBMKdNARSDv8ji5f5gXd1Pp+hhpVOScl4INsmJ3fDbo1yzM8VwQs8ab9oOpqq0w/va3C7LoEA==; 5:BdruAHR2eZT+LNq33hG5lyBBA5hLebz6XD8zBoPa7uBRBpIQ879usjXpHgelAg6MhMXJ9wNyQ9KCj2GJm951nbitf3KHw2tJWhvKNzTiZCMGocmfCbLC27QUAbYxOEWkOOqtVY8e141gI6bEcNEV+OI2DhINd0+O/iHJT8ieIoLR7d9XgWVnOelznt4Kwil5hvGcQp/YL5lyc4B+E73BEQ==; 7:gfRINp/6CnCqbdYzXw9PIntGXN/XxiLOHBvwSd2OkebiXs9TIdVGfK7Hsy4Nf982keoD8ZPr8w+bh9cSp/dBjl84zT/5jWGksSvjy6Cb7eT1zXsmjpnAeuPykhV9Xsrmuh8k3Ju+oPicjjwFNbetIA== x-ms-office365-filtering-correlation-id: 5ceb1846-9f5b-4b76-97c8-08d67d5db570 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB6424; x-ms-traffictypediagnostic: AM6PR05MB6424: x-microsoft-antispam-prvs: x-forefront-prvs: 0921D55E4F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(136003)(346002)(39860400002)(189003)(199004)(81166006)(11346002)(256004)(86362001)(54906003)(106356001)(316002)(2616005)(5640700003)(105586002)(71190400001)(476003)(14444005)(97736004)(71200400001)(486006)(99286004)(6436002)(446003)(2906002)(6486002)(14454004)(25786009)(2501003)(305945005)(7736002)(8936002)(26005)(5660300001)(1730700003)(81156014)(386003)(186003)(50226002)(102836004)(36756003)(8676002)(478600001)(4326008)(66066001)(6512007)(1076003)(53936002)(6506007)(2351001)(6916009)(6116002)(3846002)(76176011)(52116002)(68736007)(107886003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB6424; H:AM6PR05MB6056.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: B3W/pt/uG3jpneTswoXja+/PeZHe4kazeEi4kpl1e0G3AlqJWCcWWc8R3DQW38D4DKREirrsvSi0Hq6fdnunAlF3U64/SDPfe+GiSZmOuKi/zKGbhORwmQg5pCjfiW3fDsipM/Yw+07pZSWVyPu05GMC8VrSw7EXS2MsgpKDRoAKkxfq5E2nJvJShz8Hx5+BUdfh3GalUJuxG8MYINCMa+fa0pfjUrEU2gHDIb2H8I5HIYw3kA+u600I++vKSnhb40fJd6D389gbZmEDLT84t+oqL4kNNOC8OUXo3QVsgKfQYlH2FGQsd84PpnRLJT6rfHl8+Yw8fW6RtChGXjcqxbeYnkwYjZYXXmGhjw3CqOBKsuxN07CFukLF2EnVKoB27DPQcNyKJo+yx6nFijXXVaUfjrZ4oi22fb9axdJZHBs= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ceb1846-9f5b-4b76-97c8-08d67d5db570 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2019 15:57:54.3205 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When a packet should be trapped to the CPU the device consumes a WQE (work queue element) from an RDQ (receive descriptor queue) and copies the packet to the address specified in the WQE. The device then tries to post a CQE (completion queue element) that contains various metadata (e.g., ingress port) about the packet to a CQ (completion queue). In case the device managed to consume a WQE, but did not manage to post the corresponding CQE, it will get stuck. This unlikely situation can be triggered due to the scheme the driver is currently using to process CQEs. The driver will consume up to 512 CQEs at a time and after processing each corresponding WQE it will ring the RDQ's doorbell, letting the device know that a new WQE was posted for it to consume. Only after processing all the CQEs (up to 512), the driver will ring the CQ's doorbell, letting the device know that new ones can be posted. Fix this by having the driver ring the CQ's doorbell for every processed CQE, but before ringing the RDQ's doorbell. This guarantees that whenever we post a new WQE, there is a corresponding CQE available. Copy the currently processed CQE to prevent the device from overwriting it with a new CQE after ringing the doorbell. Note that the driver still arms the CQ only after processing all the pending CQEs, so that interrupts for this CQ will only be delivered after the driver finished its processing. Before commit 8404f6f2e8ed ("mlxsw: pci: Allow to use CQEs of version 1 and version 2") the issue was virtually impossible to trigger since the number of CQEs was twice the number of WQEs and the number of CQEs processed at a time was equal to the number of available WQEs. Fixes: 8404f6f2e8ed ("mlxsw: pci: Allow to use CQEs of version 1 and version 2") Signed-off-by: Ido Schimmel Reported-by: Semion Lisyansky Tested-by: Semion Lisyansky Acked-by: Jiri Pirko --- drivers/net/ethernet/mellanox/mlxsw/pci.c | 12 +++++++----- drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c index 66b8098c6fd2..91bf294f7677 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/pci.c +++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c @@ -604,29 +604,31 @@ static void mlxsw_pci_cq_tasklet(unsigned long data) u16 wqe_counter = mlxsw_pci_cqe_wqe_counter_get(cqe); u8 sendq = mlxsw_pci_cqe_sr_get(q->u.cq.v, cqe); u8 dqn = mlxsw_pci_cqe_dqn_get(q->u.cq.v, cqe); + char ncqe[MLXSW_PCI_CQE_SIZE_MAX]; + + memcpy(ncqe, cqe, q->elem_size); + mlxsw_pci_queue_doorbell_consumer_ring(mlxsw_pci, q); if (sendq) { struct mlxsw_pci_queue *sdq; sdq = mlxsw_pci_sdq_get(mlxsw_pci, dqn); mlxsw_pci_cqe_sdq_handle(mlxsw_pci, sdq, - wqe_counter, cqe); + wqe_counter, ncqe); q->u.cq.comp_sdq_count++; } else { struct mlxsw_pci_queue *rdq; rdq = mlxsw_pci_rdq_get(mlxsw_pci, dqn); mlxsw_pci_cqe_rdq_handle(mlxsw_pci, rdq, - wqe_counter, q->u.cq.v, cqe); + wqe_counter, q->u.cq.v, ncqe); q->u.cq.comp_rdq_count++; } if (++items == credits) break; } - if (items) { - mlxsw_pci_queue_doorbell_consumer_ring(mlxsw_pci, q); + if (items) mlxsw_pci_queue_doorbell_arm_consumer_ring(mlxsw_pci, q); - } } static u16 mlxsw_pci_cq_elem_count(const struct mlxsw_pci_queue *q) diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h b/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h index bb99f6d41fe0..4265dd394f27 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h +++ b/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h @@ -53,6 +53,7 @@ #define MLXSW_PCI_WQE_SIZE 32 /* 32 bytes per element */ #define MLXSW_PCI_CQE01_SIZE 16 /* 16 bytes per element */ #define MLXSW_PCI_CQE2_SIZE 32 /* 32 bytes per element */ +#define MLXSW_PCI_CQE_SIZE_MAX MLXSW_PCI_CQE2_SIZE #define MLXSW_PCI_EQE_SIZE 16 /* 16 bytes per element */ #define MLXSW_PCI_WQE_COUNT (MLXSW_PCI_AQ_SIZE / MLXSW_PCI_WQE_SIZE) #define MLXSW_PCI_CQE01_COUNT (MLXSW_PCI_AQ_SIZE / MLXSW_PCI_CQE01_SIZE) From patchwork Fri Jan 18 15:57:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1027522 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="Ih9UTR/c"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43h5G00R4Wz9sBQ for ; Sat, 19 Jan 2019 02:58:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727786AbfARP6a (ORCPT ); Fri, 18 Jan 2019 10:58:30 -0500 Received: from mail-eopbgr140054.outbound.protection.outlook.com ([40.107.14.54]:20406 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727471AbfARP6a (ORCPT ); Fri, 18 Jan 2019 10:58:30 -0500 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:X-MS-Exchange-SenderADCheck; bh=wSuq2ZIOhXL4vgMVBeMrpYSUz/kNpksY0H+nsfGwxeU=; b=Ih9UTR/cd9bbqREVYB/0ItJ8S119A41z+gCfy2poAaUNJNhCgPdStUVWGcG81jYLp7g6BWcb14WJYc3KTUpZRxQlQFjnFi3lXXAAew2xDnykdJBrcYbLGtIr1tWiK8Yk1LxDpPzyVO/n1egDwYTK9c9OrcKCm7pJH8s0qF2raAU= Received: from AM6PR05MB6056.eurprd05.prod.outlook.com (20.179.2.148) by AM6PR05MB6424.eurprd05.prod.outlook.com (20.179.6.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Fri, 18 Jan 2019 15:57:57 +0000 Received: from AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f]) by AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f%3]) with mapi id 15.20.1516.019; Fri, 18 Jan 2019 15:57:57 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Alexander Petrovskiy , Nir Dotan , Ido Schimmel Subject: [PATCH net 2/8] mlxsw: pci: Increase PCI SW reset timeout Thread-Topic: [PATCH net 2/8] mlxsw: pci: Increase PCI SW reset timeout Thread-Index: AQHUr0aUB5YXJVYdZUW8PciRNwEJ+w== Date: Fri, 18 Jan 2019 15:57:56 +0000 Message-ID: <20190118155719.14827-3-idosch@mellanox.com> References: <20190118155719.14827-1-idosch@mellanox.com> In-Reply-To: <20190118155719.14827-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0032.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::45) To AM6PR05MB6056.eurprd05.prod.outlook.com (2603:10a6:20b:ab::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [79.183.38.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR05MB6424; 6:dBKL+nJ/EnuqRJ48JynOBVGkoZJwuK24dtbKLS/6Rb1/y2JzsGgyi2JGGRIf8BR8kB6F6sft09WhHV1K55r2HR4ySbLA95ffHzACA3zrfaqZjf4ayJFZT2DCHS7P2nOnFlso/KeGdN2UXTdLJrgr+tvdD9rTtVq3YYqUOch1XphyFGMVIVO2NUFB3r5UXfA/H1+KWqNG2WyEyARZN1E6oZ/Vya+QHTnnHXc06SqMk+Fv18I77y2qw3HWCynLf9N4u3IIBa62atH6lSrBLMjZ7jfH8fdtsbvpFJQ5VsRWFSJcv4h6WuhuxCajYoX60cNcV/WtSCahcsNYcBD3zXxAJm85ntvQVDFd6OEuxN/gZ/3Ges1zzMZnK0Wt+iGNVuf/wE9fHPro4sP1cu4CpX6sFShbZToNqgV7mqGJAlKSmEwMGGtUxn3+8guIaCj2MvN8bJn4ax7ZZ5xIXuukFUFAeg==; 5:7p5MjBxzLrNM+i9B3Hj0KnJEH8xEESK9uvC2HkIHibNLvJF2gzRwFNYgMqaj7XG1Ho1jsA1KRssOwvZsVBCWF0N0qZxoZSqR2dZkC1kcL+6jKnWU4O2EL5DtO12dLAVKqJW6MhdTxaNt4DnUsLC2BjAU8eYSJWl+4Y/ZolDZycTcefIpFSVXG0ljENNev8fSWDgiDIJ5LrmY+CP1XJ1FXQ==; 7:CUUDIWmAmT//5N5sv4YcR0hqsHK7XZIhMg9h398xn3vb5Up2WOAd8GSIt/1aaHpgTkm+A/IVkfHC+O1cN9wwGs5k+8hscrj+49bSkCCfV6Bm1Kl2RZwBCkTfrMiapPL6gWT10ZY2NaYMM0GHwBNtrQ== x-ms-office365-filtering-correlation-id: 10b3a415-df1b-43e4-dc44-08d67d5db656 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB6424; x-ms-traffictypediagnostic: AM6PR05MB6424: x-microsoft-antispam-prvs: x-forefront-prvs: 0921D55E4F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(136003)(346002)(39860400002)(189003)(199004)(81166006)(11346002)(256004)(86362001)(54906003)(106356001)(316002)(2616005)(5640700003)(105586002)(71190400001)(476003)(14444005)(97736004)(71200400001)(486006)(99286004)(6436002)(446003)(2906002)(6486002)(14454004)(25786009)(2501003)(305945005)(7736002)(8936002)(26005)(5660300001)(1730700003)(81156014)(386003)(186003)(50226002)(102836004)(36756003)(8676002)(478600001)(4326008)(66066001)(6512007)(1076003)(53936002)(6506007)(2351001)(6916009)(6116002)(3846002)(76176011)(52116002)(68736007)(107886003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB6424; H:AM6PR05MB6056.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 7UUxYm8BictEEBI3mmCQcb2AqE3W3/cuzAoy24aeH4dizREVuQaxoN6+YJbkaputxVEULcJqbjZ5HKOKUHPkm6FgvX38cANSsxW+BDrmTOAq/QrdF1ck78g/N8NoDSmj+7L2QEeezWGOoBecEnz3k26TN7qh5OUhmgxhkfqQMIkJX2JmsUrGmeqmd23HZ/DTneOipwV0XnBzuRd5zYiDwQUjMOQ1KzRL9f2SwR/HgpdZ4LeClJ83HtrhCN1fYrI25EBf6+EKUMXhV7E9XOxuDQXf+C6JCS9TpVVjlRRJLSdrZCLowtFwYkQ83vqisXkWfYnf6DjrzTccUTTugTSsG7RPOqoCDbqAT93ZXT6pOlo+QC4ef0FUYksvxpIawIoRQ//q8luImBXpJ6bqcgCBdCFRg6vIIGpXhQqUypVfU48= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10b3a415-df1b-43e4-dc44-08d67d5db656 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2019 15:57:55.7465 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Nir Dotan Spectrum-2 PHY layer introduces a calibration period which is a part of the Spectrum-2 firmware boot process. Hence increase the SW timeout waiting for the firmware to come out of boot. This does not increase system boot time in cases where the firmware PHY calibration process is done quickly. Fixes: c3ab435466d5 ("mlxsw: spectrum: Extend to support Spectrum-2 ASIC") Signed-off-by: Nir Dotan Acked-by: Jiri Pirko Signed-off-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h b/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h index 4265dd394f27..ffee38e36ce8 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h +++ b/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h @@ -27,7 +27,7 @@ #define MLXSW_PCI_SW_RESET 0xF0010 #define MLXSW_PCI_SW_RESET_RST_BIT BIT(0) -#define MLXSW_PCI_SW_RESET_TIMEOUT_MSECS 5000 +#define MLXSW_PCI_SW_RESET_TIMEOUT_MSECS 13000 #define MLXSW_PCI_SW_RESET_WAIT_MSECS 100 #define MLXSW_PCI_FW_READY 0xA1844 #define MLXSW_PCI_FW_READY_MASK 0xFFFF From patchwork Fri Jan 18 15:57:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1027517 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="USS2/szI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43h5FR1th3z9sBQ for ; Sat, 19 Jan 2019 02:58:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727942AbfARP6C (ORCPT ); Fri, 18 Jan 2019 10:58:02 -0500 Received: from mail-eopbgr150073.outbound.protection.outlook.com ([40.107.15.73]:21666 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727491AbfARP6B (ORCPT ); Fri, 18 Jan 2019 10:58:01 -0500 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:X-MS-Exchange-SenderADCheck; bh=9wBeUs/G22yZP4PiDhP+m5kFKRCETSE+lTxXRRm/oFw=; b=USS2/szI/mgAs6cQR6GApvdWEx7lGiOIjYQ1mXVKMByMcFLIs8Gc5LPOSJqX0b67dUaeEMzjbODQGnp9eqYECJvhQI1jom1tMbVy2XgpI9+82mfYfARST2C2pdzIc8YenEoUl6sh3rV8aIctYoGYAHuUlXeyygURk8tlYahc5vU= Received: from AM6PR05MB6056.eurprd05.prod.outlook.com (20.179.2.148) by AM6PR05MB5702.eurprd05.prod.outlook.com (20.178.86.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Fri, 18 Jan 2019 15:57:58 +0000 Received: from AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f]) by AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f%3]) with mapi id 15.20.1516.019; Fri, 18 Jan 2019 15:57:58 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Alexander Petrovskiy , Nir Dotan , Ido Schimmel Subject: [PATCH net 3/8] mlxsw: pci: Return error on PCI reset timeout Thread-Topic: [PATCH net 3/8] mlxsw: pci: Return error on PCI reset timeout Thread-Index: AQHUr0aUWfl/sCgHiUWDMrXWL3AhEQ== Date: Fri, 18 Jan 2019 15:57:57 +0000 Message-ID: <20190118155719.14827-4-idosch@mellanox.com> References: <20190118155719.14827-1-idosch@mellanox.com> In-Reply-To: <20190118155719.14827-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0032.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::45) To AM6PR05MB6056.eurprd05.prod.outlook.com (2603:10a6:20b:ab::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [79.183.38.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR05MB5702; 6:YLtuG70WMBGMjS6o5Jl72ZBUs1ln+fGDlThDEKrRNTz3GVV7JFTv8/pQOzvKF6bK6V3MmmsSSvBg0+d4G/KYhGIqSf1mdUD0kEiE9rXK8jjecqXFqS2nbD9Es0IcsxSxbLlUdOdESjwzahfuHYhUzTyljmlwfmZAK/VCJFfsVV0+v9yufZ9TCCMTYirD1IPyMmgYBlFXazDSKP7k5XQ2FcYuW5BUDP4TXyzI5l+2/kmEMN9afpzNk0InpTA3iQt2IKZ/pSn4QP9HURW4wQ0B0i898ZUOJjY9xKnzSYxclOfq4J9I/DlIfNBJUDNlQPa/eSPcWhIuwz7hAdYFZPCBVXDXNPURBL0V4lD+bHjCoq7QDHU6dH/nD8OxsVZ0w10lTkqbm94V334LFFwaQjdgS/IFXkl1ntyGsOSv1hwBUfMaMEiOQskGkv4Jwn9jG2e0dtyVVuNGanACwVDHimtsQg==; 5:JFuWT5djyOdo156c54C3tgzqRdK1Ptyshu0pWn2RaUQS12rABslDnm/t+auMkRIpefHMOPd1F22eX5Ju2wyjxhoaxPNPXHepjUdroCVacnW+5751s3LL9g+vZonog8AL3nk2evrBZAV24wh3/nN2ZP6wBV+OaMYnBLdzs3HF6eYwg/j/yhalJSw2CBNj1wfO0DG7aMI6adW+tYetbyYIqg==; 7:wAwA2EZDUCpZrr8pELVkeREoG+Q+hAAyMmW7fsHMAlQhC45rQvjTXR+I+JBXPTu+OD3ey79eCDe+RdApE3ms0NCg3EDUUD6rCdJ4DOWEPxpPgHZl7D0U9+Z7rtVQKUMNzQh2cY+FI7bU9F79C3ybyA== x-ms-office365-filtering-correlation-id: 11559779-4a21-4389-8df0-08d67d5db70e x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB5702; x-ms-traffictypediagnostic: AM6PR05MB5702: x-microsoft-antispam-prvs: x-forefront-prvs: 0921D55E4F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(366004)(39860400002)(376002)(346002)(396003)(199004)(189003)(5640700003)(86362001)(6116002)(99286004)(316002)(2351001)(1076003)(2501003)(71200400001)(54906003)(52116002)(256004)(71190400001)(3846002)(6436002)(6486002)(26005)(102836004)(36756003)(186003)(6916009)(5660300001)(14454004)(2906002)(106356001)(107886003)(7736002)(8936002)(486006)(478600001)(6506007)(2616005)(1730700003)(105586002)(476003)(305945005)(76176011)(8676002)(53936002)(446003)(11346002)(6512007)(50226002)(25786009)(97736004)(81156014)(68736007)(81166006)(4326008)(386003)(66066001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB5702; H:AM6PR05MB6056.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: uuS1rD3eEX1x9ey6+HXOFcPrZ9IgCQ7fSM1bF8MkxQPWHqbe0LyoXIxskIIe7j4Z9Sn+6D6s//0/xGliwhjlNyU4I45wWP9rlld3fp3HcMlNWcIJnv10CueN1c5pBcv1P07nIBteKBqRZX9thQPALFy4c3wqpjLU2EVG1aoKP4/vao0r2OAIwzs7WvJlTaZ8+zNQ/2GfQ4jB2PYbyIo62EVwx+E5svSaaaQ0/jt3dDM7Z3RCNBf4EY9cTgoel7uivzoaFkaI/OaqLRczZguCgk828bp1q2plA/YnSFt6fv9S35Q12rNg9I6UloUIK6bPB91X5kwV7iH05QH2xbAbuYljlAJR5FT+ad5YNjLLR6mWYUvkW+FyDlrS7TJuKuKznegmLOBZ68y5DeOXbgOu4512wMIfQQYgKoQoelTVwJo= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11559779-4a21-4389-8df0-08d67d5db70e X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2019 15:57:56.9614 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5702 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Nir Dotan Return an appropriate error in the case when the driver timeouts on waiting for firmware to go out of PCI reset. Fixes: 233fa44bd67a ("mlxsw: pci: Implement reset done check") Signed-off-by: Nir Dotan Acked-by: Jiri Pirko Signed-off-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c index 91bf294f7677..a2321fe8d6a0 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/pci.c +++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c @@ -1367,10 +1367,10 @@ static int mlxsw_pci_sw_reset(struct mlxsw_pci *mlxsw_pci, u32 val = mlxsw_pci_read32(mlxsw_pci, FW_READY); if ((val & MLXSW_PCI_FW_READY_MASK) == MLXSW_PCI_FW_READY_MAGIC) - break; + return 0; cond_resched(); } while (time_before(jiffies, end)); - return 0; + return -EBUSY; } static int mlxsw_pci_alloc_irq_vectors(struct mlxsw_pci *mlxsw_pci) From patchwork Fri Jan 18 15:57:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1027523 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="vibRdqWc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43h5G237Sgz9sBQ for ; Sat, 19 Jan 2019 02:58:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728002AbfARP6d (ORCPT ); Fri, 18 Jan 2019 10:58:33 -0500 Received: from mail-eopbgr140054.outbound.protection.outlook.com ([40.107.14.54]:20406 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727674AbfARP6c (ORCPT ); Fri, 18 Jan 2019 10:58:32 -0500 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:X-MS-Exchange-SenderADCheck; bh=WiZGfCXQBVKstj3zu3WE8wHYpMA+8rwDEHOVsPM6fcQ=; b=vibRdqWcBxFofkwjL0vR7eR4MO/DAcWmvHWcskLiQecm2cLs2ZdO4mhBEuM+Cn/xdsFFxTsitXqIYK70RTx0N/twrUjlKPLCsNCLArCL3/cVSCNR/2/06LHfOi/ZebspfaX+MTdVo9zWufcoSNy6N5XqCGf2Va+tyaD9nkFbglU= Received: from AM6PR05MB6056.eurprd05.prod.outlook.com (20.179.2.148) by AM6PR05MB6424.eurprd05.prod.outlook.com (20.179.6.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Fri, 18 Jan 2019 15:57:59 +0000 Received: from AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f]) by AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f%3]) with mapi id 15.20.1516.019; Fri, 18 Jan 2019 15:57:59 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Alexander Petrovskiy , Nir Dotan , Ido Schimmel Subject: [PATCH net 4/8] mlxsw: spectrum_fid: Update dummy FID index Thread-Topic: [PATCH net 4/8] mlxsw: spectrum_fid: Update dummy FID index Thread-Index: AQHUr0aVgF7WnLUYvkiVLkatIStwbQ== Date: Fri, 18 Jan 2019 15:57:59 +0000 Message-ID: <20190118155719.14827-5-idosch@mellanox.com> References: <20190118155719.14827-1-idosch@mellanox.com> In-Reply-To: <20190118155719.14827-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0032.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::45) To AM6PR05MB6056.eurprd05.prod.outlook.com (2603:10a6:20b:ab::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [79.183.38.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR05MB6424; 6:pEIeGaRuvb2kMp8M6I6K9adF98NygyYeqU/gF0OR7x9iUyAAxp1744Xedc7No0bypcWmsPfTSvWdnwcaYgd3xixvjJbJ01qARI4PBns05zIHOa30sbFfbtjAeQE3tishxryo0oz/IL5rwbPn1tj3hA/0W0TBxww3wJgRjHaeMN3GqH5GRYEtdh8MCE5uP0LoVPMr8loKAM1AepjltRrR8ITnq2gklMXVJjv0xhAufcioHExqdbszG+2v+C5kYAJwMM1Dpt2TB2PWaZfSeWFL2bWg9u+0tXwWwvZ7Pgx4zA+G+AYj/zbbikWhnWBCQSEAQbg8ABK8Lqs/NWIPm4qbDSEADI3ycSm0yTJiqWZ5PZoemxu7bkhcrHNaAQIcFL+wm9KnVZQqhgA/wfp46fUOgc8l7my5849jzDuP3iuST+xj/GNMpNK2wffcqdcGsIi8glSoMr/McV6lpNvgZMkZ4A==; 5:pAd6n9QUuXk2cqZiBHPHqGfwCs0mXKClP9W3rSvpSkAajMFANrdjGX2B1l5y9OSFqCaIOH9NsRrl+LXpMAa1PZlcISfVYmOZo4lU9MOR760LI63MchrcS4YTwtBZAiQGNGSpbmHqOFG0Zh4pmZiQna12T8peZwcuKtHKF054arjgHsUDc7ctOhkxltWry8dDHTn+AKRd1V8l2RLGl7hJ1w==; 7:/TRmn2V7PueonpguwEQTPFgg0pUdYSbAOQc9mwAO5zuWTIKMuaMvDTPgCySR+vzmlj5l3PTROScVSQoOTvY7Y8UQ2mCcC6EuPolrcsu2UHOJc69zU0uHFOhAjqzXVRNALpkE4bxzbuZ/JKR8Falamw== x-ms-office365-filtering-correlation-id: c6a0315b-fae0-4142-296a-08d67d5db7b3 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB6424; x-ms-traffictypediagnostic: AM6PR05MB6424: x-microsoft-antispam-prvs: x-forefront-prvs: 0921D55E4F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(136003)(346002)(39860400002)(189003)(199004)(81166006)(11346002)(256004)(86362001)(54906003)(106356001)(316002)(2616005)(5640700003)(105586002)(71190400001)(476003)(97736004)(71200400001)(486006)(99286004)(6436002)(446003)(2906002)(6486002)(14454004)(25786009)(2501003)(305945005)(7736002)(8936002)(26005)(5660300001)(1730700003)(81156014)(386003)(186003)(50226002)(102836004)(36756003)(8676002)(478600001)(4326008)(66066001)(6512007)(1076003)(53936002)(6506007)(2351001)(6916009)(6116002)(3846002)(76176011)(52116002)(68736007)(107886003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB6424; H:AM6PR05MB6056.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: KTg8fW6yJ3JM4Hz+tb3MhGz2+b9Y/f2Cu0F1I/eqq13cdDL0Ga7y4TjAesN114AC+gtyBqDOqnf2xRavfb1fooz5xUjVgEkZyIf1kXVPsP481PgFgnYpiY0NKBa1Cru2GNsyvpTo1WMYuBO5ONkdi4iscdTit4H3nXuyz/gFFN450zBIxXPRg0zll8zbrzhfK97CDfrxZVdaXd0/nH0gNMLtALoftBdWYNvxhBlywKe1LRr1Yh1Fs0HUIHs4Cl8hia0ZkYJX96T+8ePOHdsbxuna7tcr09+zf/aYmlJg31kWjAevhiBUqi5ufxSJda5s9UTJR45khsR/z8IWsiHZRd95VJDTgr9wdv8gmfoV/EZL7pzsdz3j5n1Zav6ugyvta9Iw86k7C0StkhH+KLtN6nhDDCxM14bGEs47r/iiwfU= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6a0315b-fae0-4142-296a-08d67d5db7b3 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2019 15:57:58.0391 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Nir Dotan When using a tc flower action of egress mirred redirect, the driver adds an implicit FID setting action. This implicit action sets a dummy FID to the packet and is used as part of a design for trapping unmatched flows in OVS. While this implicit FID setting action is supposed to be a NOP when a redirect action is added, in Spectrum-2 the FID record is consulted as the dummy FID index is an 802.1D FID index and the packet is dropped instead of being redirected. Set the dummy FID index value to be within 802.1Q range. This satisfies both Spectrum-1 which ignores the FID and Spectrum-2 which identifies it as an 802.1Q FID and will then follow the redirect action. Fixes: c3ab435466d5 ("mlxsw: spectrum: Extend to support Spectrum-2 ASIC") Signed-off-by: Nir Dotan Signed-off-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c index 055cc6943b34..9d9aa28684af 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c @@ -997,8 +997,8 @@ static const struct mlxsw_sp_fid_ops mlxsw_sp_fid_dummy_ops = { static const struct mlxsw_sp_fid_family mlxsw_sp_fid_dummy_family = { .type = MLXSW_SP_FID_TYPE_DUMMY, .fid_size = sizeof(struct mlxsw_sp_fid), - .start_index = MLXSW_SP_RFID_BASE - 1, - .end_index = MLXSW_SP_RFID_BASE - 1, + .start_index = VLAN_N_VID - 1, + .end_index = VLAN_N_VID - 1, .ops = &mlxsw_sp_fid_dummy_ops, }; From patchwork Fri Jan 18 15:58:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1027518 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="MJnUClCY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43h5FV3wm0z9sBQ for ; Sat, 19 Jan 2019 02:58:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727976AbfARP6F (ORCPT ); Fri, 18 Jan 2019 10:58:05 -0500 Received: from mail-eopbgr150073.outbound.protection.outlook.com ([40.107.15.73]:21666 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727491AbfARP6F (ORCPT ); Fri, 18 Jan 2019 10:58:05 -0500 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:X-MS-Exchange-SenderADCheck; bh=PlpRXaOWEXwcAymcf+Y5YrE93is1Hpea2xnnnNyhB2E=; b=MJnUClCYu7SeNBzz1CkgHr84/OxFadZAMlBrR/FnfFfDYqZUacWnmgV7hpHmpZZaLI3dd0JVHmQ9b5+HsmoC079Oybv12Au6EIXKmLEYoCanEY53INZjM+6DM5AdTEaYEegeiEyebmnhH2iLzUVmms2SRaFBvBADhG6/HRJDEW4= Received: from AM6PR05MB6056.eurprd05.prod.outlook.com (20.179.2.148) by AM6PR05MB5702.eurprd05.prod.outlook.com (20.178.86.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Fri, 18 Jan 2019 15:58:00 +0000 Received: from AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f]) by AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f%3]) with mapi id 15.20.1516.019; Fri, 18 Jan 2019 15:58:00 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Alexander Petrovskiy , Ido Schimmel , Roopa Prabhu , Nikolay Aleksandrov , "bridge@lists.linux-foundation.org" Subject: [PATCH net 5/8] net: bridge: Mark FDB entries that were added by user as such Thread-Topic: [PATCH net 5/8] net: bridge: Mark FDB entries that were added by user as such Thread-Index: AQHUr0aW1eVYfe4MDUaX4H0i7YnAfg== Date: Fri, 18 Jan 2019 15:58:00 +0000 Message-ID: <20190118155719.14827-6-idosch@mellanox.com> References: <20190118155719.14827-1-idosch@mellanox.com> In-Reply-To: <20190118155719.14827-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0032.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::45) To AM6PR05MB6056.eurprd05.prod.outlook.com (2603:10a6:20b:ab::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [79.183.38.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR05MB5702; 6:PCqaZpSQqWfqYFx7kpzd/6aIso31NOiHox+SNaMW/f6YPZIl5QCJjEjDgrPGQCeLCyGrWE/1NRCQmIDcZJPsqZNHGpVa6jvFxryHOfUNXHzxVzm1oQMQTgYZ9ajypcnlS/CVr1V3fGK7xs304zpzx6RIjUYaC/4OgxhRe7Zp2GPw/BKR1iIQ46ON82yoj8UBy9XWQVOQa/n4uyx2Nrt71Ocb9HGylZvNHC86ttRNojNkmoHI/74H8EEUmiKE8nFfQtChdmdhRsBgwcjh12l0DH/3+oyADJ5fdceHGZO9QjBYtpCmc1cUGUx8zyRZzdIj6Vg0FWcUbhISnEPQfSg1pZKaaW1k8hA96FSj4KwtlkC5y/7Ryo+JT4RIy8ezG9ourfDjBP63nXLS1JUAJeBLw4K0zVDOJjaF/AblZ8aNQwZehA4EhxlkEkwz6kd4wQbp5+0tCbbLKLbApevaaZacdQ==; 5:RuYLWyKXmlzH16xs2XZvUESyIJy9/ZH6xVBHf7JQPmNTEEONU+x4HN+lOUhSeXekfYRKMx+g0t2e2R3yY7aBYFE+1aADd48da4Yrx36ku4JsSkqM+X8t63TKSJG8py1eMhbJWu0zv2x5S3EOImAYfFSZcrt8AYHChJ7NtMgCQm0JmU8lvfjxWM9c3wE5HjIjwlTvuByLBK8HfMZpnJBvbg==; 7:JkfsTtlww/TAnZuPl0dfQbfuJTfngrVnq/8nIxyLPRxRb6Bk0FPq+OOk8WLJ7qZ7bbJ7M/WYifWX5/GEvDoCkSl7UeGui306sA8K1xL6YMvOobSZiBJwrIcDdnPAWrjz5aBH2J2K8YiYO17fByT8Yg== x-ms-office365-filtering-correlation-id: ffe88e87-fe49-42b6-56b0-08d67d5db872 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB5702; x-ms-traffictypediagnostic: AM6PR05MB5702: x-microsoft-antispam-prvs: x-forefront-prvs: 0921D55E4F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(366004)(39860400002)(376002)(346002)(396003)(199004)(189003)(5640700003)(86362001)(6116002)(99286004)(316002)(2351001)(1076003)(2501003)(71200400001)(54906003)(52116002)(256004)(71190400001)(3846002)(6436002)(6486002)(26005)(102836004)(36756003)(186003)(6916009)(5660300001)(14454004)(2906002)(106356001)(7736002)(8936002)(486006)(478600001)(6506007)(2616005)(1730700003)(105586002)(476003)(305945005)(76176011)(8676002)(53936002)(446003)(11346002)(6512007)(50226002)(25786009)(97736004)(81156014)(68736007)(81166006)(4326008)(386003)(66066001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB5702; H:AM6PR05MB6056.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: YHikKIa9EQknCupfkXeIIrZzOHhro6pSgU0gJ9mjc9KqeynG12zvNSQ62RPxTUnAP9cFxV/Gi8FwAlwbxkVg5JseUxM0rh4Mmr6tBuwNvFxPnKMT/L8OaxRmnqu8rJaTRLMhcIURqzqQyu9M1it9w1ZTcQp/N9C/fCGOZsH3jkvFAA11oxTp427rIhnm9sM2PCX2x9Zk4P3JHx6K8VOV5zdIS12jF/ws0WPigIDAEd0nLz2O6rg5fhLtM49VxnyIfLecPhtR6xbBeaausFDkiJ3cVH0b1QbIVpb9Pl7q/HI4FlCquezZ+X37/ixKpW/Pw2CwdZFuoQe8dyCtbF4b3mfoOSRrcbrylt9E4C076SQOQZnhWR6v5P0AlxDS1kDoEw6WvVt10GW4VrBx0lMXgIXewhQh+VJGwW7Ri0yA8Q8= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: ffe88e87-fe49-42b6-56b0-08d67d5db872 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2019 15:57:59.1369 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5702 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Externally learned entries can be added by a user or by a switch driver that is notifying the bridge driver about entries that were learned in hardware. In the first case, the entries are not marked with the 'added_by_user' flag, which causes switch drivers to ignore them and not offload them. The 'added_by_user' flag can be set on externally learned FDB entries based on the 'swdev_notify' parameter in br_fdb_external_learn_add(), which effectively means if the created / updated FDB entry was added by a user or not. Fixes: 816a3bed9549 ("switchdev: Add fdb.added_by_user to switchdev notifications") Signed-off-by: Ido Schimmel Reported-by: Alexander Petrovskiy Reviewed-by: Petr Machata Cc: Roopa Prabhu Cc: Nikolay Aleksandrov Cc: bridge@lists.linux-foundation.org --- net/bridge/br_fdb.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index fe3c758791ca..9e14767500ea 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -1128,6 +1128,8 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p, err = -ENOMEM; goto err_unlock; } + if (swdev_notify) + fdb->added_by_user = 1; fdb->added_by_external_learn = 1; fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify); } else { @@ -1147,6 +1149,9 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p, modified = true; } + if (swdev_notify) + fdb->added_by_user = 1; + if (modified) fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify); } From patchwork Fri Jan 18 15:58:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1027519 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="s6ejhfqU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43h5FY4DX5z9sBQ for ; Sat, 19 Jan 2019 02:58:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727987AbfARP6I (ORCPT ); Fri, 18 Jan 2019 10:58:08 -0500 Received: from mail-eopbgr150073.outbound.protection.outlook.com ([40.107.15.73]:21666 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727946AbfARP6G (ORCPT ); Fri, 18 Jan 2019 10:58:06 -0500 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:X-MS-Exchange-SenderADCheck; bh=YbTq9aDtoJ7y0Grp5IOydvV5uYYZVjNHO5+9adbWBzQ=; b=s6ejhfqU2AEdd/jcGLpAEfxuz0AEOt7rEfPuzSvAAK9rAKDV50ngCKBwpYcg+ri90iytjlErCIL4MMXN2zJHlGowhc0aecnexOV3GucNAejQrAZYBAz0WcoJ/GWFP3VwMwdc0IYWeMDB2n+qSAGZ2DV/L0uH3IFJntg9eZ+DEJ4= Received: from AM6PR05MB6056.eurprd05.prod.outlook.com (20.179.2.148) by AM6PR05MB5702.eurprd05.prod.outlook.com (20.178.86.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Fri, 18 Jan 2019 15:58:01 +0000 Received: from AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f]) by AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f%3]) with mapi id 15.20.1516.019; Fri, 18 Jan 2019 15:58:01 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Alexander Petrovskiy , Ido Schimmel Subject: [PATCH net 6/8] mlxsw: spectrum_switchdev: Do not treat static FDB entries as sticky Thread-Topic: [PATCH net 6/8] mlxsw: spectrum_switchdev: Do not treat static FDB entries as sticky Thread-Index: AQHUr0aWq9dkyTVRCUGzHijEF8sKxw== Date: Fri, 18 Jan 2019 15:58:01 +0000 Message-ID: <20190118155719.14827-7-idosch@mellanox.com> References: <20190118155719.14827-1-idosch@mellanox.com> In-Reply-To: <20190118155719.14827-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0032.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::45) To AM6PR05MB6056.eurprd05.prod.outlook.com (2603:10a6:20b:ab::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [79.183.38.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR05MB5702; 6:1RjP6efR/jtYDBd/23Jh2FUNhkSNQoeMukkXhbwdTmSUIMkVO0/TSQTNvl0RREJ30KxkIiz2ibv+CMItcnqoBKS7kEtHM8Xe1NuWTFa2kIhCyQswY6nB5/PhYn9JeTh3tMvS7f6ScFg5UQ0Zy3AzcK2VN6ARJLS86ymziT2gEwT9F/CH/4Ib+Xx6zgEQWBIuarjPdlTWlkQj5nJr5TJtrPnWTFF4gAywshiKavszthF/XrrPSE3wltluhwMClepmPorYkG7nTeYcnIQX/G8wbqvUBeBycer/JLCzy14KYJu7egIvJZto6ZhjIBdkGna3b2G7mo2k0luZJEZlxI+5e8tTccfUuIxDtdfGOWFElMgcCgwcR7rgGJLT80HryXyL6Uf/XKPtE0VxLzrC7RgDuZkNrzAf4p8IsolZCzgcZ9S847T8KnVIWO6Chg3wsEyaSFVi/Kcydw1vqmRAfPj6gw==; 5:thlohzjD0IdBghwFSlElkpqq1SEfQXEyteiq0LqZbvLPNOr5IVYsrUH5TclRvgHvzKlCTvRpXQ4mamJaeoEsQepMKWTxpfRQR8u3OUiGim7bRlFiXrZgqY7a6+Dh++YNLqJUNe6mvyBIiTb0FTYVRX9yktgEkU+p6LWCJeOSwpV0YiGOlxhWCFK3nPTwJHalIZHhkRnhOnyBlJUGERqg4Q==; 7:sZ0zj9b6ZVhHoSPPjlcdm2bpPKVoOPo8lzndLlxsblyUiRUP8EOwy1JduiQe/Fr22QWYH9hxlnQJ3rGsZ7i6MDuEzDx+jm6kfCzK5CnmsMeP0wiT7bo8fkd8YrW5PdrsQy/GhkGY3E5Ouo/RLZbsSQ== x-ms-office365-filtering-correlation-id: 18eef3c0-7ebd-4a72-7690-08d67d5db90f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB5702; x-ms-traffictypediagnostic: AM6PR05MB5702: x-microsoft-antispam-prvs: x-forefront-prvs: 0921D55E4F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(979002)(136003)(366004)(39860400002)(376002)(346002)(396003)(199004)(189003)(5640700003)(86362001)(6116002)(99286004)(316002)(2351001)(14444005)(1076003)(2501003)(71200400001)(54906003)(52116002)(256004)(71190400001)(3846002)(6436002)(6486002)(26005)(102836004)(36756003)(186003)(6916009)(5660300001)(14454004)(2906002)(106356001)(107886003)(7736002)(8936002)(486006)(478600001)(6506007)(2616005)(1730700003)(105586002)(476003)(305945005)(76176011)(8676002)(53936002)(446003)(11346002)(6512007)(50226002)(25786009)(97736004)(81156014)(68736007)(81166006)(4326008)(386003)(66066001)(66574012)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB5702; H:AM6PR05MB6056.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: pzDd/LZigSPUO+HXhi+If5HdgbfrlwxW5TRS+7d+Rq0YSqKCN8aXRNIwkO9IThmfJ1xJSfQElHTEVLsG/hQ1Ix39+tf0JsbVh67zRegccB8gtGAB1z3RMC6tG56KMuoVorPBpii0ozX5kDQN58Ly0T+3jcjE92z17WR09NJW0zEFgCsi5HdqXfsG120vtYMcmWY64PmjGcZQaXqUm+vrX12c+02WrvygfbrBohNL9QeFyukLTLbPwKoEwtc/zpa3OO6AAnsHp3TvgKmq6xzD2qkW/+i8NsdUTJyreERJGInq1W7Vfddfh9CzL8LA1hrExMRc95C0PYzm5cZDy+8rfJjnv6+HJcw4xTH6b8gZST/X8UmO+nVQCezKeOOcodShK2u+HCUSuJ9DNLFHguBn3pKhihHaCTC/kcKn7bOQXEg= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18eef3c0-7ebd-4a72-7690-08d67d5db90f X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2019 15:58:00.3938 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5702 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The driver currently treats static FDB entries as both static and sticky. This is incorrect and prevents such entries from being roamed to a different port via learning. Fix this by configuring static entries with ageing disabled and roaming enabled. In net-next we can add proper support for the newly introduced 'sticky' flag. Fixes: 56ade8fe3fe1 ("mlxsw: spectrum: Add initial support for Spectrum ASIC") Signed-off-by: Ido Schimmel Reported-by: Alexander Petrovskiy Reviewed-by: Petr Machata --- .../net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c index 0abbaa0fbf14..c772109b638d 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c @@ -1233,7 +1233,7 @@ mlxsw_sp_bridge_port_fdb_flush(struct mlxsw_sp *mlxsw_sp, static enum mlxsw_reg_sfd_rec_policy mlxsw_sp_sfd_rec_policy(bool dynamic) { return dynamic ? MLXSW_REG_SFD_REC_POLICY_DYNAMIC_ENTRY_INGRESS : - MLXSW_REG_SFD_REC_POLICY_STATIC_ENTRY; + MLXSW_REG_SFD_REC_POLICY_DYNAMIC_ENTRY_MLAG; } static enum mlxsw_reg_sfd_op mlxsw_sp_sfd_op(bool adding) @@ -1290,7 +1290,7 @@ static int mlxsw_sp_port_fdb_tunnel_uc_op(struct mlxsw_sp *mlxsw_sp, static int __mlxsw_sp_port_fdb_uc_op(struct mlxsw_sp *mlxsw_sp, u8 local_port, const char *mac, u16 fid, bool adding, enum mlxsw_reg_sfd_rec_action action, - bool dynamic) + enum mlxsw_reg_sfd_rec_policy policy) { char *sfd_pl; u8 num_rec; @@ -1301,8 +1301,7 @@ static int __mlxsw_sp_port_fdb_uc_op(struct mlxsw_sp *mlxsw_sp, u8 local_port, return -ENOMEM; mlxsw_reg_sfd_pack(sfd_pl, mlxsw_sp_sfd_op(adding), 0); - mlxsw_reg_sfd_uc_pack(sfd_pl, 0, mlxsw_sp_sfd_rec_policy(dynamic), - mac, fid, action, local_port); + mlxsw_reg_sfd_uc_pack(sfd_pl, 0, policy, mac, fid, action, local_port); num_rec = mlxsw_reg_sfd_num_rec_get(sfd_pl); err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sfd), sfd_pl); if (err) @@ -1321,7 +1320,8 @@ static int mlxsw_sp_port_fdb_uc_op(struct mlxsw_sp *mlxsw_sp, u8 local_port, bool dynamic) { return __mlxsw_sp_port_fdb_uc_op(mlxsw_sp, local_port, mac, fid, adding, - MLXSW_REG_SFD_REC_ACTION_NOP, dynamic); + MLXSW_REG_SFD_REC_ACTION_NOP, + mlxsw_sp_sfd_rec_policy(dynamic)); } int mlxsw_sp_rif_fdb_op(struct mlxsw_sp *mlxsw_sp, const char *mac, u16 fid, @@ -1329,7 +1329,7 @@ int mlxsw_sp_rif_fdb_op(struct mlxsw_sp *mlxsw_sp, const char *mac, u16 fid, { return __mlxsw_sp_port_fdb_uc_op(mlxsw_sp, 0, mac, fid, adding, MLXSW_REG_SFD_REC_ACTION_FORWARD_IP_ROUTER, - false); + MLXSW_REG_SFD_REC_POLICY_STATIC_ENTRY); } static int mlxsw_sp_port_fdb_uc_lag_op(struct mlxsw_sp *mlxsw_sp, u16 lag_id, From patchwork Fri Jan 18 15:58:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1027520 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="puHBXN1V"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43h5Fd1BKgz9sBQ for ; Sat, 19 Jan 2019 02:58:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727995AbfARP6M (ORCPT ); Fri, 18 Jan 2019 10:58:12 -0500 Received: from mail-eopbgr150073.outbound.protection.outlook.com ([40.107.15.73]:21666 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727491AbfARP6J (ORCPT ); Fri, 18 Jan 2019 10:58:09 -0500 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:X-MS-Exchange-SenderADCheck; bh=zmRBODw/LA6NsMu/W087xxGNGR8wIqaKO8bZ/iHxnzU=; b=puHBXN1VwUSoBz9laIHobOKLX+5wvqXvX62LX4p3CJi9mSJqcOPet8O1KyDbTJn3jSboO8pD2YtFdcwysKY5B5AuWNHX6FNdJxdUvEDVIc+VEW/BkUxxFq4UT2+eMSC0FwPUB9zJXf8GUN6R4TeR+FbTvc8G5+1tvKX4N/nO2pc= Received: from AM6PR05MB6056.eurprd05.prod.outlook.com (20.179.2.148) by AM6PR05MB5702.eurprd05.prod.outlook.com (20.178.86.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Fri, 18 Jan 2019 15:58:02 +0000 Received: from AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f]) by AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f%3]) with mapi id 15.20.1516.019; Fri, 18 Jan 2019 15:58:02 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Alexander Petrovskiy , Ido Schimmel Subject: [PATCH net 7/8] selftests: mlxsw: Test FDB offload indication Thread-Topic: [PATCH net 7/8] selftests: mlxsw: Test FDB offload indication Thread-Index: AQHUr0aX9iiDGzM7XE2X2H8jwpdo3w== Date: Fri, 18 Jan 2019 15:58:02 +0000 Message-ID: <20190118155719.14827-8-idosch@mellanox.com> References: <20190118155719.14827-1-idosch@mellanox.com> In-Reply-To: <20190118155719.14827-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0032.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::45) To AM6PR05MB6056.eurprd05.prod.outlook.com (2603:10a6:20b:ab::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [79.183.38.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR05MB5702; 6:2dURmzdX7KRmedPAOxozS7tEi/yEBeT+b4SobP7sc96TM0qqRz+MksewyCKsy2LoBOSkGJJ8e9Oth55Cv4r3BZPj7xLv9aQEARwjBrJ1OOQLw1HDRTK2PrWA/K2uhKIWHRG7K6yQ8+kHRcpWbWItXAH5FD00QvQBcL3aSTDTGTH19wJJieN/wCWRi3h42tcwSuKCCBpSuNZarSWFDozYpGY3V+l7BpIibkQ28Bb1GpcDIDIoeVb/hqt6pmUV7XQInr6kHVMAF0L1FgQllzYNmnhpHLO62Iim+b4fQXqh+n339blJivw5ebnskkgrp8zhfpP6RxaNAKjM9avCjyOYkIsoRdWcqiMm9WcujAQ5CrurFWkYeSTifoL6TOfixqEfCPTQ3dMT5gzKdRJ+AeP0kIBUcw3BV8yUYmT5HdqmtufcTLqD6BcGl6LAZILgqMYHdiIHsANuLCGl1YVzU4xsCw==; 5:YJQYxsiv0HhR0QGeAXfGvA/9Vaz5iiki0SQmrdvML7MCVhd0r0cvXguX95OgVfZ6HfENsm2jT4HgUGwlY33PH26g2H3oqVVtq7D7G1zy7DVnBNGYiDK3PZIM9/ldxoB4jjhhBWXlG1A474UJIcBKl7Smh7u6s6cLtuYu3rV5ur0lOUZuAY/YGAdfp1jTJZa/PWqX3/hgb/aG3DNdWxXgPA==; 7:NzHf7pfacOH7t8KnbZnieoYdupZBVCmofF1DnTrLTD3tdvRcdx4TTd9dOwwjj8I1Mh6BztdeU/7dwvmlo0B4oigKCZjEqSAkm+j5TWolVAaPuEA1F2SNk/3+snjQacXVc6YRn5Rg8auw1HazO29V6g== x-ms-office365-filtering-correlation-id: 38d4beae-125c-42fc-e8b4-08d67d5db9aa x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB5702; x-ms-traffictypediagnostic: AM6PR05MB5702: x-microsoft-antispam-prvs: x-forefront-prvs: 0921D55E4F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(366004)(39860400002)(376002)(346002)(396003)(199004)(189003)(5640700003)(86362001)(6116002)(99286004)(316002)(2351001)(14444005)(1076003)(2501003)(71200400001)(54906003)(52116002)(256004)(71190400001)(3846002)(6436002)(6486002)(26005)(102836004)(36756003)(186003)(6916009)(5660300001)(14454004)(2906002)(106356001)(107886003)(7736002)(8936002)(486006)(478600001)(6506007)(2616005)(1730700003)(105586002)(476003)(305945005)(76176011)(8676002)(53936002)(446003)(11346002)(6512007)(50226002)(25786009)(97736004)(81156014)(68736007)(81166006)(4326008)(386003)(66066001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB5702; H:AM6PR05MB6056.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: S6pNqvjoI5zZq/vpBxsZKq9daQV1IBbJxHAhr7iI0wDAaDyAJfIi7nhIq77mNPp5a6AIio7f8ezJUOu4G/ggPpgMSdtCXJplRPEaGPAYB0BYR9jcpQt3CT+hXdTzt+uCxNmNWYbAiDl8J+QVpo52KwJ0uOjsdfJGZ36sEciMN/z7pCFWGR0HmgZnmSE3hgh6Ak2PD5reK34tNJ4poiXFQdK3gAT3XVW7M5/eFk123bifQR+83yVFfG+4mDRXKkEPrbkKrXXN6YPwA8SOUMLNK6+6xRztv/l8r822Y+zSZFeEGwcsDE/xA/2fQ//W3xnUONrxvWctZ/E3DxlGp8usV+FPtWJ7sR4C5S2gZsoOiL2qs7rVeDx7wjzj/sAzyKqjLFQMfRONH9AkKi/t9ZrWoiBLJrT1jSnipGfjTydc8DI= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38d4beae-125c-42fc-e8b4-08d67d5db9aa X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2019 15:58:01.4135 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5702 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Test that externally learned FDB entries added from user space are marked as offloaded. Signed-off-by: Ido Schimmel Reviewed-by: Petr Machata --- .../selftests/drivers/net/mlxsw/rtnetlink.sh | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/testing/selftests/drivers/net/mlxsw/rtnetlink.sh b/tools/testing/selftests/drivers/net/mlxsw/rtnetlink.sh index 94fdbf215c14..c4cf6e6d800e 100755 --- a/tools/testing/selftests/drivers/net/mlxsw/rtnetlink.sh +++ b/tools/testing/selftests/drivers/net/mlxsw/rtnetlink.sh @@ -25,6 +25,7 @@ ALL_TESTS=" lag_unlink_slaves_test lag_dev_deletion_test vlan_interface_uppers_test + bridge_extern_learn_test devlink_reload_test " NUM_NETIFS=2 @@ -541,6 +542,25 @@ vlan_interface_uppers_test() ip link del dev br0 } +bridge_extern_learn_test() +{ + # Test that externally learned entries added from user space are + # marked as offloaded + RET=0 + + ip link add name br0 type bridge + ip link set dev $swp1 master br0 + + bridge fdb add de:ad:be:ef:13:37 dev $swp1 master extern_learn + + bridge fdb show brport $swp1 | grep de:ad:be:ef:13:37 | grep -q offload + check_err $? "fdb entry not marked as offloaded when should" + + log_test "externally learned fdb entry" + + ip link del dev br0 +} + devlink_reload_test() { # Test that after executing all the above configuration tests, a From patchwork Fri Jan 18 15:58:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1027521 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="otHa6wIA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43h5Fg5KLFz9sCs for ; Sat, 19 Jan 2019 02:58:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727999AbfARP6O (ORCPT ); Fri, 18 Jan 2019 10:58:14 -0500 Received: from mail-eopbgr150073.outbound.protection.outlook.com ([40.107.15.73]:21666 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727988AbfARP6N (ORCPT ); Fri, 18 Jan 2019 10:58:13 -0500 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:X-MS-Exchange-SenderADCheck; bh=ryr+1waXrjrIz09PmEvJSzeIrURjsMw9nhh138vDMNk=; b=otHa6wIAyb4co6x4nOd7dXj9l6Nwjyrcs0Baik+oPXj8B7+ziPSw+4cG2AOCkfNF/Gj0acPbVIH4v0vd/53ukzG/mKHwaGX54ZWg/0aPRx0PvFdsTaAFJv/mWes2vixhmR+P+cm3swbJFqKiDD8/YEdgf3B9akSGtERr41t88Zs= Received: from AM6PR05MB6056.eurprd05.prod.outlook.com (20.179.2.148) by AM6PR05MB5702.eurprd05.prod.outlook.com (20.178.86.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Fri, 18 Jan 2019 15:58:03 +0000 Received: from AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f]) by AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f%3]) with mapi id 15.20.1516.019; Fri, 18 Jan 2019 15:58:03 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Alexander Petrovskiy , Ido Schimmel Subject: [PATCH net 8/8] selftests: forwarding: Add a test case for externally learned FDB entries Thread-Topic: [PATCH net 8/8] selftests: forwarding: Add a test case for externally learned FDB entries Thread-Index: AQHUr0aY8kzjPVL8hEmz9VqfAAptAw== Date: Fri, 18 Jan 2019 15:58:03 +0000 Message-ID: <20190118155719.14827-9-idosch@mellanox.com> References: <20190118155719.14827-1-idosch@mellanox.com> In-Reply-To: <20190118155719.14827-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0032.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::45) To AM6PR05MB6056.eurprd05.prod.outlook.com (2603:10a6:20b:ab::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [79.183.38.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR05MB5702; 6:/4RGE1qYyN7s/SNHgmre4YqocUlPtzlfGT2XhwtsIv8ERvEcXszj8ivhy0cKfysRrhdtCMdOQoE6TXZ8uwsHgVRwyx9c4qRayl7iN4EG+KpwIhKaNxYF8tATZLRy5GNBqyjKZ4llzAsMIG4Qh8eJOzkKf3fX6Vzj/oWYl9JKHbVPQG1+YtJG2c4RkhpFanpzVkdb1WFkF+3GGY2puvRQQSRLXxGwDIsj4Gd1EICX3zm3Mz6w63ez4CXrVE7VrwH6UjvAnw6aGFrotIakr+Xui6dW5JSgpKiChf6kiiKGpVCvgslk17TgxHjUqWRd0g8izigrJ2UVm/c1GPTXDTcx47QitX/5D1Os8GjqQeFHK62WLWb9ujvFh1nk/ZZ8GB0GNw1IlPQefWyb7uB4fEOhjwud1wQZP74OB84dgIjSbHfaVdEMFNc+cjSyKngTVGA/bY7xjJQftqgdUxtY9mpCjQ==; 5:df+qzw9N90ZrEEQ1pjGIpU93N7x5alBbUdT3BSmelnrPMWcmc8wSv8a+RYr/qsI/xFsHZ4OdVTQ3KXxxfIsr/kqjDhZV19aLOwrXwgRBnsPbLmJVihukYucVkrOyv/C34J8uiswsnJeRXg644zqQsIuwwYrvbbqteSDNDTPEffcmZAEbrFFGcC3Jm4gtm3BEEXKe0EsXcpTB1TMwJt+63g==; 7:0cdS3fBwrBDat3Jsrlok8KbwwMpmVc+u1kGm6A6viCXP/ekHYRVTvFodrcNgOV6in4GrwnSSSgb6UJLSw7mMGiUF29iwK+orCGFI7qC0S8aw0rLvEpVYX8SQKjWe+VquE7l2jChfHJaH/Qxd1PPZlQ== x-ms-office365-filtering-correlation-id: 39e3fecd-3ab1-43ec-ffbc-08d67d5dba56 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB5702; x-ms-traffictypediagnostic: AM6PR05MB5702: x-microsoft-antispam-prvs: x-forefront-prvs: 0921D55E4F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(366004)(39860400002)(376002)(346002)(396003)(199004)(189003)(5640700003)(86362001)(6116002)(99286004)(316002)(2351001)(14444005)(1076003)(2501003)(71200400001)(54906003)(52116002)(256004)(71190400001)(3846002)(6436002)(6486002)(26005)(102836004)(36756003)(186003)(6916009)(5660300001)(14454004)(2906002)(106356001)(107886003)(7736002)(8936002)(486006)(478600001)(6506007)(2616005)(1730700003)(105586002)(476003)(305945005)(76176011)(8676002)(53936002)(446003)(11346002)(6512007)(50226002)(25786009)(97736004)(81156014)(68736007)(81166006)(4326008)(386003)(66066001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB5702; H:AM6PR05MB6056.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: i6pmtcYoSe7w4khwAnQ8k0gE7PCOykFuvto+8oIgzs0lh0gyhSyt0dx/4gcpzBhfobsXubDdXvKaRy9NbYmSyfTSnruENaocsANw5vpH44yJhn4okFtlzJygC0J869FE/QdS3hIgnl5grP1i4nBenm7nhQwxj/uQdZigey8NPlTvmSUWFQtY7qCmY8EfYKYsujivICZOtwbY1LwpRIZDsiaC3NFF77lfeoJaR8tWKUwY3D8abz6PEIl5ROwJK1fLHA7q/kNvBK1mJP5JQ1oKk6R6oSRKCQXZzMEscjK+PxS7uKI2UJxNoIydmf11m/ZcnIttA0ItenkvUqWqyIurHZDS8sKwjOQ150M9lFzOJDzUh9pC7Idj3teNifAZ3SYyqP8cTp3qq/Cm2A5IXzFsAgC9KJbYJsE3JUc9o5W1KlQ= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39e3fecd-3ab1-43ec-ffbc-08d67d5dba56 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2019 15:58:02.5393 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5702 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Test that externally learned FDB entries can roam, but not age out. Signed-off-by: Ido Schimmel Reviewed-by: Petr Machata --- .../net/forwarding/bridge_vlan_aware.sh | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/bridge_vlan_aware.sh b/tools/testing/selftests/net/forwarding/bridge_vlan_aware.sh index 04c6431b2bd8..b90dff8d3a94 100755 --- a/tools/testing/selftests/net/forwarding/bridge_vlan_aware.sh +++ b/tools/testing/selftests/net/forwarding/bridge_vlan_aware.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 -ALL_TESTS="ping_ipv4 ping_ipv6 learning flooding vlan_deletion" +ALL_TESTS="ping_ipv4 ping_ipv6 learning flooding vlan_deletion extern_learn" NUM_NETIFS=4 CHECK_TC="yes" source lib.sh @@ -109,6 +109,38 @@ vlan_deletion() ping_ipv6 } +extern_learn() +{ + local mac=de:ad:be:ef:13:37 + local ageing_time + + # Test that externally learned FDB entries can roam, but not age out + RET=0 + + bridge fdb add de:ad:be:ef:13:37 dev $swp1 master extern_learn vlan 1 + + bridge fdb show brport $swp1 | grep -q de:ad:be:ef:13:37 + check_err $? "Did not find FDB entry when should" + + # Wait for 10 seconds after the ageing time to make sure the FDB entry + # was not aged out + ageing_time=$(bridge_ageing_time_get br0) + sleep $((ageing_time + 10)) + + bridge fdb show brport $swp1 | grep -q de:ad:be:ef:13:37 + check_err $? "FDB entry was aged out when should not" + + $MZ $h2 -c 1 -p 64 -a $mac -t ip -q + + bridge fdb show brport $swp2 | grep -q de:ad:be:ef:13:37 + check_err $? "FDB entry did not roam when should" + + log_test "Externally learned FDB entry - ageing & roaming" + + bridge fdb del de:ad:be:ef:13:37 dev $swp2 master vlan 1 &> /dev/null + bridge fdb del de:ad:be:ef:13:37 dev $swp1 master vlan 1 &> /dev/null +} + trap cleanup EXIT setup_prepare