From patchwork Sat Sep 2 21:49:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 809163 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 (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="wNIiYQnt"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xl8tH0cyCz9s8J for ; Sun, 3 Sep 2017 07:50:31 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752922AbdIBVu3 (ORCPT ); Sat, 2 Sep 2017 17:50:29 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:37568 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752827AbdIBVt6 (ORCPT ); Sat, 2 Sep 2017 17:49:58 -0400 Received: by mail-wr0-f194.google.com with SMTP id y15so1123156wrc.4 for ; Sat, 02 Sep 2017 14:49:57 -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=Dx3fYMK2dX4EgRBibUGuc5AeAN3+U6EJ0BQGBJaGX7w=; b=wNIiYQntoQWGH0bPY9rIlcnv2ZmPrCtI0STRsjS9PaIAVqQaQjcQh4umGfl28SNPdr Z1l7K5B6hHRf6YVMwQMbsGRje5lJQBZBU0bH9QDz+wBeUFnDzXQjhflwCL5SQQv3cRv4 9tLesEE/kcXce3p0SG5LeEKQvYUmWoGKrri3B8oGilSGp87wOfaacNPPk6mI7YCQBvYo zoRPfN/R06OSax8BK6/ymHB7gZ8Gjf79DSIvx0Rvmh86JAeXhb6yc4cHechrT6XmNxT5 agFG2qv/w+CL/UlamF3MaL+4r4gdb5pEWOusxZSyAMALrBPu9d54UGYSeyk2GHiUbS78 tXcA== 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=Dx3fYMK2dX4EgRBibUGuc5AeAN3+U6EJ0BQGBJaGX7w=; b=AHlzBQbn0W7oCCUk68lp6vf0cdj6vgPlIkFAXBSonAcx99CL6XmabffBOgC8GD7yj6 cKfhxJN7ZOpVHXuEohnixixJQHroWgy2ysog5QUAVMycLTPio92S1tOolKc8RICGwxad rBf7s3OAJq9TBhtTMnX5Dg9BBmwOiCl2cz1Zr/HgWFCUfJn2BuFxU6H5pHasBT+dftib 3yX5Wk2nhwtC55nYL3POlTSViqqYzDjMMfZka929rqVNXRq/wFOoblH+4eHOLSPhf8iO hhg8ClJJhTigTP/wINv5iGgVpRjvaGH7fvmpleqIj4qZLyBYyNjS/ItZG9Gc8OvUHesM 7QZw== X-Gm-Message-State: AHPjjUjtyre8LavX5ayQZbZ3D8j6BRQT03YGdC3mY8BrGRFe3dLI12rN OEk1bQc+4eDz9mvE8N8= X-Google-Smtp-Source: ADKCNb6U+ypHTwq/eKThERYYTwlsg70ADNc1S3Qgc6YAO4u7tusP2HpT54INI9D+iAHTArDPVcZ0WA== X-Received: by 10.223.143.22 with SMTP id p22mr351866wrb.261.1504388996888; Sat, 02 Sep 2017 14:49:56 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id t135sm1592443wmt.30.2017.09.02.14.49.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 02 Sep 2017 14:49:56 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, petrm@mellanox.com, idosch@mellanox.com, mlxsw@mellanox.com Subject: [patch net-next v2 16/21] mlxsw: spectrum_router: Support IPv6 overlay encap Date: Sat, 2 Sep 2017 23:49:24 +0200 Message-Id: <20170902214929.2890-17-jiri@resnulli.us> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170902214929.2890-1-jiri@resnulli.us> References: <20170902214929.2890-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Petr Machata Add the missing bits to recognize IPv6 next hops as IPIP ones to enable offloading of IPv6 overlay encapsulation. Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel Signed-off-by: Jiri Pirko --- .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index 231b597..05afd53 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -3757,15 +3757,32 @@ mlxsw_sp_fib6_entry_rt_find(const struct mlxsw_sp_fib6_entry *fib6_entry, return NULL; } +static bool mlxsw_sp_nexthop6_ipip_type(const struct mlxsw_sp *mlxsw_sp, + const struct rt6_info *rt, + enum mlxsw_sp_ipip_type *ret) +{ + return rt->dst.dev && + mlxsw_sp_netdev_ipip_type(mlxsw_sp, rt->dst.dev, ret); +} + static int mlxsw_sp_nexthop6_type_init(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_nexthop_group *nh_grp, struct mlxsw_sp_nexthop *nh, const struct rt6_info *rt) { + struct mlxsw_sp_router *router = mlxsw_sp->router; struct net_device *dev = rt->dst.dev; + enum mlxsw_sp_ipip_type ipipt; struct mlxsw_sp_rif *rif; int err; + if (mlxsw_sp_nexthop6_ipip_type(mlxsw_sp, rt, &ipipt) && + router->ipip_ops_arr[ipipt]->can_offload(mlxsw_sp, dev, + MLXSW_SP_L3_PROTO_IPV6)) { + nh->type = MLXSW_SP_NEXTHOP_TYPE_IPIP; + return mlxsw_sp_nexthop_ipip_init(mlxsw_sp, ipipt, nh, dev); + } + nh->type = MLXSW_SP_NEXTHOP_TYPE_ETH; rif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, dev); if (!rif) @@ -3815,7 +3832,8 @@ static void mlxsw_sp_nexthop6_fini(struct mlxsw_sp *mlxsw_sp, static bool mlxsw_sp_rt6_is_gateway(const struct mlxsw_sp *mlxsw_sp, const struct rt6_info *rt) { - return rt->rt6i_flags & RTF_GATEWAY; + return rt->rt6i_flags & RTF_GATEWAY || + mlxsw_sp_nexthop6_ipip_type(mlxsw_sp, rt, NULL); } static struct mlxsw_sp_nexthop_group *