{"id":833732,"url":"http://patchwork.ozlabs.org/api/1.2/patches/833732/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171103090344.19444-5-jiri@resnulli.us/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20171103090344.19444-5-jiri@resnulli.us>","list_archive_url":null,"date":"2017-11-03T09:03:32","name":"[net-next,04/16] mlxsw: spectrum_ipip: Split accessor functions","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"857c2a3e2638100fb71ab924068c74b6e255ebc7","submitter":{"id":15321,"url":"http://patchwork.ozlabs.org/api/1.2/people/15321/?format=json","name":"Jiri Pirko","email":"jiri@resnulli.us"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20171103090344.19444-5-jiri@resnulli.us/mbox/","series":[{"id":11677,"url":"http://patchwork.ozlabs.org/api/1.2/series/11677/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=11677","date":"2017-11-03T09:03:28","name":"mlxsw: Handle changes in GRE configuration","version":1,"mbox":"http://patchwork.ozlabs.org/series/11677/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/833732/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/833732/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=resnulli-us.20150623.gappssmtp.com\n\theader.i=@resnulli-us.20150623.gappssmtp.com\n\theader.b=\"WXbA9fSD\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3ySwyK52Y7z9sNV\n\tfor ;\n\tFri, 3 Nov 2017 20:04:57 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1755849AbdKCJE4 (ORCPT );\n\tFri, 3 Nov 2017 05:04:56 -0400","from mail-wm0-f67.google.com ([74.125.82.67]:51054 \"EHLO\n\tmail-wm0-f67.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932187AbdKCJDt (ORCPT\n\t); Fri, 3 Nov 2017 05:03:49 -0400","by mail-wm0-f67.google.com with SMTP id s66so3503198wmf.5\n\tfor ; Fri, 03 Nov 2017 02:03:49 -0700 (PDT)","from localhost (ip-94-113-127-32.net.upcbroadband.cz.\n\t[94.113.127.32]) by smtp.gmail.com with ESMTPSA id\n\tw4sm5274171wrc.17.2017.11.03.02.03.47\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tFri, 03 Nov 2017 02:03:47 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=resnulli-us.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=QEI1/8Vnr74J4Gyg0dQjnxYqm24pLLbNlQGA9O5r6rw=;\n\tb=WXbA9fSD88O3hyGNAvKj1y9HzM0Yw/q6/+nPVfdZQayvG/+XETms4v/tXW4+6tTc7r\n\tT1YT9f8X7Pu0ibYG1okCMxYBM372RHoT/HM104w8HLEyC/pB1loyP06/J+EzGgyXUFWK\n\tiuuxIn1r8wwg80roTea4Z0G4mxvhnhhdNt5j2v+Z8tI3NPAZCzlqe05GAzeTSfdl/JM/\n\tgGG7JMi5RqAhkAZQfooKzBVwP6maeRH8oVXzt6JPXwWC6LzQUsUh3ZhNzOIrqIoAd34C\n\t/p/zDGdby/EVQNK+lyOaTKr7LSyrnMm6XCpxYhNw0Ob/AVUGX2OPz6OVWCB+wVvYQrIN\n\tjTsw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=QEI1/8Vnr74J4Gyg0dQjnxYqm24pLLbNlQGA9O5r6rw=;\n\tb=Fvvrjz+jaRmSjQIc7e3u4d1VaFv3KaGsVyStuLLCSwsT5kRjFjQJqNnNI1NAnatfEQ\n\tpqiIIbwSMqYmWaIa3RhfVzVFIUhC3zXFNAsYKt3S/dhE4w90swDy93c5d+pN2ZtM8QzE\n\tqYHv91uXzIXFtJPadehFeY/j0fQG5+1PmXykuyr6GHDkVhUuQwupPSviaJjbUY0Y86d3\n\tpHRbMdjXIv0p6W+sdUEt2z4XmBfsAb2oG03IUaYjouM96hMlywr7CdKD8PUh2MLHIBFr\n\tJ4BBxoXpRvMlNsAMov7djAbHhOnUQuNyfJEKx1BNLoAIcsGHoBt24xuDHBAfr9ipUkzu\n\tSQNA==","X-Gm-Message-State":"AMCzsaWiEmnGkA1soBI0SDRl70j0zLC6VSvdUXJ4H03eFE9vY9X1bGmC\n\tm7tIaBeMt8+iVCKDRRBgSSxCACDZ","X-Google-Smtp-Source":"ABhQp+QQR4TIFgpTqJfQamtSXB8D+BBF63YYjNNl9quTEaxK2UCzfdbA6LYOURMfYRXpmqUBqr03CQ==","X-Received":"by 10.28.37.195 with SMTP id l186mr4038235wml.144.1509699828250; \n\tFri, 03 Nov 2017 02:03:48 -0700 (PDT)","From":"Jiri Pirko ","To":"netdev@vger.kernel.org","Cc":"davem@davemloft.net, petrm@mellanox.com, idosch@mellanox.com,\n\tmlxsw@mellanox.com","Subject":"[patch net-next 04/16] mlxsw: spectrum_ipip: Split accessor\n\tfunctions","Date":"Fri, 3 Nov 2017 10:03:32 +0100","Message-Id":"<20171103090344.19444-5-jiri@resnulli.us>","X-Mailer":"git-send-email 2.9.5","In-Reply-To":"<20171103090344.19444-1-jiri@resnulli.us>","References":"<20171103090344.19444-1-jiri@resnulli.us>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Petr Machata \n\nTo implement NETDEV_CHANGE notifications on IP-in-IP tunnels, the\nhandler needs to figure out what actually changed, to understand how\nexactly to update the offloads. It will do so by storing struct\nip_tunnel_parm with previous configuration, and comparing that to the\nnew version.\n\nTo facilitate these comparisons, extract the code that operates on\nstruct ip_tunnel_parm from the existing accessor functions, and make\nthose a thin wrapper that extracts tunnel parameters and dispatches.\n\nSigned-off-by: Petr Machata \nReviewed-by: Ido Schimmel \nSigned-off-by: Jiri Pirko \n---\n .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 100 ++++++++++++++-------\n .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 3 +\n 2 files changed, 70 insertions(+), 33 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c\nindex 8a9fbb6..1850080 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c\n@@ -36,54 +36,49 @@\n \n #include \"spectrum_ipip.h\"\n \n-static bool\n-mlxsw_sp_ipip_netdev_has_ikey(const struct net_device *ol_dev)\n+struct ip_tunnel_parm\n+mlxsw_sp_ipip_netdev_parms(const struct net_device *ol_dev)\n {\n \tstruct ip_tunnel *tun = netdev_priv(ol_dev);\n \n-\treturn !!(tun->parms.i_flags & TUNNEL_KEY);\n+\treturn tun->parms;\n }\n \n-static bool\n-mlxsw_sp_ipip_netdev_has_okey(const struct net_device *ol_dev)\n+static bool mlxsw_sp_ipip_parms_has_ikey(struct ip_tunnel_parm parms)\n {\n-\tstruct ip_tunnel *tun = netdev_priv(ol_dev);\n-\n-\treturn !!(tun->parms.o_flags & TUNNEL_KEY);\n+\treturn !!(parms.i_flags & TUNNEL_KEY);\n }\n \n-static u32 mlxsw_sp_ipip_netdev_ikey(const struct net_device *ol_dev)\n+static bool mlxsw_sp_ipip_parms_has_okey(struct ip_tunnel_parm parms)\n {\n-\tstruct ip_tunnel *tun = netdev_priv(ol_dev);\n-\n-\treturn mlxsw_sp_ipip_netdev_has_ikey(ol_dev) ?\n-\t\tbe32_to_cpu(tun->parms.i_key) : 0;\n+\treturn !!(parms.o_flags & TUNNEL_KEY);\n }\n \n-static u32 mlxsw_sp_ipip_netdev_okey(const struct net_device *ol_dev)\n+static u32 mlxsw_sp_ipip_parms_ikey(struct ip_tunnel_parm parms)\n {\n-\tstruct ip_tunnel *tun = netdev_priv(ol_dev);\n-\n-\treturn mlxsw_sp_ipip_netdev_has_okey(ol_dev) ?\n-\t\tbe32_to_cpu(tun->parms.o_key) : 0;\n+\treturn mlxsw_sp_ipip_parms_has_ikey(parms) ?\n+\t\tbe32_to_cpu(parms.i_key) : 0;\n }\n \n-static __be32\n-mlxsw_sp_ipip_netdev_saddr4(const struct net_device *ol_dev)\n+static u32 mlxsw_sp_ipip_parms_okey(struct ip_tunnel_parm parms)\n {\n-\tstruct ip_tunnel *tun = netdev_priv(ol_dev);\n+\treturn mlxsw_sp_ipip_parms_has_okey(parms) ?\n+\t\tbe32_to_cpu(parms.o_key) : 0;\n+}\n \n-\treturn tun->parms.iph.saddr;\n+static __be32 mlxsw_sp_ipip_parms_saddr4(struct ip_tunnel_parm parms)\n+{\n+\treturn parms.iph.saddr;\n }\n \n-union mlxsw_sp_l3addr\n-mlxsw_sp_ipip_netdev_saddr(enum mlxsw_sp_l3proto proto,\n-\t\t\t const struct net_device *ol_dev)\n+static union mlxsw_sp_l3addr\n+mlxsw_sp_ipip_parms_saddr(enum mlxsw_sp_l3proto proto,\n+\t\t\t struct ip_tunnel_parm parms)\n {\n \tswitch (proto) {\n \tcase MLXSW_SP_L3_PROTO_IPV4:\n \t\treturn (union mlxsw_sp_l3addr) {\n-\t\t\t.addr4 = mlxsw_sp_ipip_netdev_saddr4(ol_dev),\n+\t\t\t.addr4 = mlxsw_sp_ipip_parms_saddr4(parms),\n \t\t};\n \tcase MLXSW_SP_L3_PROTO_IPV6:\n \t\tbreak;\n@@ -95,21 +90,19 @@ mlxsw_sp_ipip_netdev_saddr(enum mlxsw_sp_l3proto proto,\n \t};\n }\n \n-static __be32 mlxsw_sp_ipip_netdev_daddr4(const struct net_device *ol_dev)\n+static __be32 mlxsw_sp_ipip_parms_daddr4(struct ip_tunnel_parm parms)\n {\n-\tstruct ip_tunnel *tun = netdev_priv(ol_dev);\n-\n-\treturn tun->parms.iph.daddr;\n+\treturn parms.iph.daddr;\n }\n \n static union mlxsw_sp_l3addr\n-mlxsw_sp_ipip_netdev_daddr(enum mlxsw_sp_l3proto proto,\n-\t\t\t const struct net_device *ol_dev)\n+mlxsw_sp_ipip_parms_daddr(enum mlxsw_sp_l3proto proto,\n+\t\t\t struct ip_tunnel_parm parms)\n {\n \tswitch (proto) {\n \tcase MLXSW_SP_L3_PROTO_IPV4:\n \t\treturn (union mlxsw_sp_l3addr) {\n-\t\t\t.addr4 = mlxsw_sp_ipip_netdev_daddr4(ol_dev),\n+\t\t\t.addr4 = mlxsw_sp_ipip_parms_daddr4(parms),\n \t\t};\n \tcase MLXSW_SP_L3_PROTO_IPV6:\n \t\tbreak;\n@@ -121,6 +114,47 @@ mlxsw_sp_ipip_netdev_daddr(enum mlxsw_sp_l3proto proto,\n \t};\n }\n \n+static bool mlxsw_sp_ipip_netdev_has_ikey(const struct net_device *ol_dev)\n+{\n+\treturn mlxsw_sp_ipip_parms_has_ikey(mlxsw_sp_ipip_netdev_parms(ol_dev));\n+}\n+\n+static bool mlxsw_sp_ipip_netdev_has_okey(const struct net_device *ol_dev)\n+{\n+\treturn mlxsw_sp_ipip_parms_has_okey(mlxsw_sp_ipip_netdev_parms(ol_dev));\n+}\n+\n+static u32 mlxsw_sp_ipip_netdev_ikey(const struct net_device *ol_dev)\n+{\n+\treturn mlxsw_sp_ipip_parms_ikey(mlxsw_sp_ipip_netdev_parms(ol_dev));\n+}\n+\n+static u32 mlxsw_sp_ipip_netdev_okey(const struct net_device *ol_dev)\n+{\n+\treturn mlxsw_sp_ipip_parms_okey(mlxsw_sp_ipip_netdev_parms(ol_dev));\n+}\n+\n+union mlxsw_sp_l3addr\n+mlxsw_sp_ipip_netdev_saddr(enum mlxsw_sp_l3proto proto,\n+\t\t\t const struct net_device *ol_dev)\n+{\n+\treturn mlxsw_sp_ipip_parms_saddr(proto,\n+\t\t\t\t\t mlxsw_sp_ipip_netdev_parms(ol_dev));\n+}\n+\n+static __be32 mlxsw_sp_ipip_netdev_daddr4(const struct net_device *ol_dev)\n+{\n+\treturn mlxsw_sp_ipip_parms_daddr4(mlxsw_sp_ipip_netdev_parms(ol_dev));\n+}\n+\n+static union mlxsw_sp_l3addr\n+mlxsw_sp_ipip_netdev_daddr(enum mlxsw_sp_l3proto proto,\n+\t\t\t const struct net_device *ol_dev)\n+{\n+\treturn mlxsw_sp_ipip_parms_daddr(proto,\n+\t\t\t\t\t mlxsw_sp_ipip_netdev_parms(ol_dev));\n+}\n+\n static int\n mlxsw_sp_ipip_nexthop_update_gre4(struct mlxsw_sp *mlxsw_sp, u32 adj_index,\n \t\t\t\t struct mlxsw_sp_ipip_entry *ipip_entry)\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h\nindex 87becd1..918d74b 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h\n@@ -38,6 +38,9 @@\n #include \"spectrum_router.h\"\n #include \n \n+struct ip_tunnel_parm\n+mlxsw_sp_ipip_netdev_parms(const struct net_device *ol_dev);\n+\n union mlxsw_sp_l3addr\n mlxsw_sp_ipip_netdev_saddr(enum mlxsw_sp_l3proto proto,\n \t\t\t const struct net_device *ol_dev);\n","prefixes":["net-next","04/16"]}