From patchwork Thu Mar 16 08:08:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 739682 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 3vkLjd2ctFz9rxw for ; Thu, 16 Mar 2017 19:09:41 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="rkxl0IPm"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751851AbdCPIJU (ORCPT ); Thu, 16 Mar 2017 04:09:20 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:33001 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751448AbdCPIIq (ORCPT ); Thu, 16 Mar 2017 04:08:46 -0400 Received: by mail-wr0-f193.google.com with SMTP id g10so4821616wrg.0 for ; Thu, 16 Mar 2017 01:08:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Bik9juGYr3Zhpdgzw2XGy6BdWwyxYqbVSLn2pQTiy3g=; b=rkxl0IPm2oHLYgsKJL64PJZdQLQ13lHQv4x8KZKNU5d1+vjiwHCPXNlTj1ueX7oAn2 QR8FaX3coCARrGUDSDLMgmDXC4rvsGzYzL9qIWRBsJp7rue55lC70ljVTtOS56/zlgRM 0WJbG+J/V2TQzXDOtg9hKlkp+GaNkkSZdk5q7ogUJXBRsjX1xD0akAObjMBKW6a+HxUY PfpNd0HdSoWy1g0Eu3/rkl5jAdnyyKloyuPDlg8OWa+73EcGniyWhgtm1LNEzOpL3Ojw Ke2Jb7rU1nmRWoK8Arjfdbz5aPNV1qwAEbGU3E21vFU1nUhc9OW7kyPjxh0oBpZ/23g2 hgnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Bik9juGYr3Zhpdgzw2XGy6BdWwyxYqbVSLn2pQTiy3g=; b=iB8c+6QFDOTKaOIfyWIECRt0+M8ukcn2YkBExbQ20xUr+q46lLsmW2G+52JP/t2+eD I4QOsoBjpp3YHRegnPEn2jtJ528MiOngFk7O1RvQSrs+JvL0emhICButbucMMQe1NigW qx6bNp3Jt12X/bTTnArILvjLNqyExdNTTNYny+ITtamQjrXJkN3HRerN4WiezZkFvYFA tcTO0eW+Fx62IveetYrzc6xvWPKcxDg25SqvnHKNRnxePBFaOFLr9EGJgaa55xykQIkm 81yfpnnXiv17w2ZP2mK1rVx9TIxiU2Pg0/D47rbeq3EQvPRFbPNWjCDN2KuMcu9H3EzE mqiw== X-Gm-Message-State: AFeK/H3PawyKNXc9U6RjRvhG9fmaoI8VqI34/WFnpcg1WPwPIwYtqKNLBH0k9C5KtyKKEQ== X-Received: by 10.223.160.162 with SMTP id m31mr6933399wrm.54.1489651712511; Thu, 16 Mar 2017 01:08:32 -0700 (PDT) Received: from localhost (ip-78-45-162-92.net.upcbroadband.cz. [78.45.162.92]) by smtp.gmail.com with ESMTPSA id g45sm5202245wrd.11.2017.03.16.01.08.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Mar 2017 01:08:32 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, idosch@mellanox.com, mlxsw@mellanox.com, dsa@cumulusnetworks.com, shm@cumulusnetworks.com, kuznet@ms2.inr.ac.ru, jmorris@namei.org, yoshfuji@linux-ipv6.org, kaber@trash.net, lorenzo@google.com, mateusz.bajorski@nokia.com Subject: [patch net-next v3 9/9] mlxsw: spectrum_router: Don't abort on l3mdev rules Date: Thu, 16 Mar 2017 09:08:20 +0100 Message-Id: <1489651700-3586-10-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1489651700-3586-1-git-send-email-jiri@resnulli.us> References: <1489651700-3586-1-git-send-email-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ido Schimmel Now that port netdevs can be enslaved to a VRF master we need to make sure the device's routing tables won't be flushed upon the insertion of a l3mdev rule. Note that we assume the notified l3mdev rule is a simple rule as used by the VRF master. We don't check for the presence of other selectors such as 'iif' and 'oif'. Signed-off-by: Ido Schimmel Signed-off-by: Jiri Pirko --- drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index c89f4b4..488bc1f 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -2554,7 +2554,7 @@ static void mlxsw_sp_router_fib_event_work(struct work_struct *work) case FIB_EVENT_RULE_ADD: /* fall through */ case FIB_EVENT_RULE_DEL: rule = fib_work->fr_info.rule; - if (!fib4_rule_default(rule)) + if (!fib4_rule_default(rule) && !rule->l3mdev) mlxsw_sp_router_fib4_abort(mlxsw_sp); fib_rule_put(rule); break;