From patchwork Mon Apr 22 22:42:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 1088968 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=kernel.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="zpxGkgc7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44p1lZ62Xyz9s7T for ; Tue, 23 Apr 2019 08:41:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729938AbfDVWl3 (ORCPT ); Mon, 22 Apr 2019 18:41:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:57200 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728965AbfDVWl2 (ORCPT ); Mon, 22 Apr 2019 18:41:28 -0400 Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com [216.129.126.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 368B42073F; Mon, 22 Apr 2019 22:41:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555972888; bh=MPtsgjsdY97684Ny3uwXXPERYoEPUQUWJwRSg5sQ4GQ=; h=From:To:Cc:Subject:Date:From; b=zpxGkgc7c7bvnv+mmxnogC0rKirkLoGkQfDkPNA1kwxrlMZ+7waBVbIj3fpvOSGs5 Ya9oxP7V58WEqRm0Zm/E+zz7WrFfUiOsfBzKmoR224VADrReRv6f70q755kUoMUjFK tb75PQwxEMbd+5aMLsYjIfYtbVHJHJTpe9ZDiAkA= From: David Ahern To: davem@davemloft.net Cc: netdev@vger.kernel.org, idosch@mellanox.com, David Ahern Subject: [PATCH net-next] mlxsw: spectrum_router: Do not allow ipv6 gateway with v4 route via replace Date: Mon, 22 Apr 2019 15:42:14 -0700 Message-Id: <20190422224214.17245-1-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern mlxsw currently does not support v6 gateways with v4 routes. Commit 19a9d136f198 ("ipv4: Flag fib_info with a fib_nh using IPv6 gateway") prevents a route from being added, but nothing stops the replace. Add a catch for it too. $ ip ro add 172.16.2.0/24 via 10.99.1.2 $ ip ro replace 172.16.2.0/24 via inet6 fe80::202:ff:fe00:b dev swp1s0 Error: mlxsw_spectrum: IPv6 gateway with IPv4 route is not supported. Signed-off-by: David Ahern --- drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index 34d9053e5cf0..d21b73236971 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -6109,6 +6109,8 @@ static int mlxsw_sp_router_fib_event(struct notifier_block *nb, NL_SET_ERR_MSG_MOD(info->extack, "FIB offload was aborted. Not configuring route"); return notifier_from_errno(-EINVAL); } + /* fall through */ + case FIB_EVENT_ENTRY_REPLACE: if (info->family == AF_INET) { struct fib_entry_notifier_info *fen_info = ptr;