From:   Yevhen Orlov <yevhen.orlov@plvision.eu>
To:     netdev@vger.kernel.org, stephen@networkplumber.org, andrew@lunn.ch,
        idosch@idosch.org
Cc:     Volodymyr Mytnyk <volodymyr.mytnyk@plvision.eu>,
        Taras Chornyi <taras.chornyi@plvision.eu>,
        Mickey Rachamim <mickeyr@marvell.com>,
        Serhiy Pshyk <serhiy.pshyk@plvision.eu>,
        Yevhen Orlov <yevhen.orlov@plvision.eu>,
        Taras Chornyi <tchornyi@marvell.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>, linux-kernel@vger.kernel.org
Subject: [PATCH net-next] net: marvell: prestera: Refactor router functions
Date:   Tue, 11 Jan 2022 03:10:51 +0200
Message-Id: <20220111011051.4941-1-yevhen.orlov@plvision.eu>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?d6PT0N2x+RLhD5hxAnsGQpFAn0eRf+NXjt7QUso+7fcrsogv+K7PXNr24S4R?=
 =?us-ascii?Q?AEXK9RPEP2n0bjKxBsutPl+QJkUMA8fWGglpylh1u2+mumcl2cMEDuUoLR0Z?=
 =?us-ascii?Q?4jCIPL0XX/zdhHyTdLnvOn/A/fXEOnDZb/FkNL9Qg8H92/CZChYGjge/5nff?=
 =?us-ascii?Q?w1LrdoKQjvAko/HHZzPCan0lGS0RnGLNGluKlrxfar5Q4FMEkz8lpfEvbWJa?=
 =?us-ascii?Q?cFeLX9bAk3gkLt5aZM2xvqMgzeKE33h+6F7bvMdOp8Ku+1t3GoWs+9KKwXaj?=
 =?us-ascii?Q?Ls83v4hzfiM/XZKI8chORqBMQ9iPFAV/i7typfzwzqKRany066fyHPbOscqj?=
 =?us-ascii?Q?2aOgjZStECe/bE87hsqAWdUY/4S4JAXU3kjFYhhiTvn7d+0VfoITDpLnsmjM?=
 =?us-ascii?Q?PZLb600LxvZov+ZIXbYGMPit6X0+jFaL6/CWEtiJEOPxPtvVGtcYsyEzUrrx?=
 =?us-ascii?Q?jGvzbCO26c65+37h8Qj/d9wkjNibPIjxukRHL2ap2y7hAqIGcXkUl3OJ4rtZ?=
 =?us-ascii?Q?BlPZ7giKifjx9DMARY60sQ1r6HMoYdNVpT5LatvbUhG+VDyn931BbtHm6FlI?=
 =?us-ascii?Q?LBNzOBYRhAEqz38W/9Nxcf4OXPJE0Jx8ZVth+JrJKkiJcEIZBvrsCI8pUuPn?=
 =?us-ascii?Q?yu0g/m+gq4ANM9UHSYl8xcdGA6DpqS5UdsOva6yM3dXkB7/GBKAjtgNQQpGy?=
 =?us-ascii?Q?xG5xoHhN7noOyMZyUw+qErdGmX1RELjBvMQipM6QtAGcSg4PtCjL+wtYLLdD?=
 =?us-ascii?Q?E6H5A7cBZQO2M7qSJdMBc7jYNDbUYhjQNJGCRTMWkkVEhK3+2BPfnXmPLwmT?=
 =?us-ascii?Q?xu7fG1n9U+HUQklvqW7nCXwF9odbIefvb12s3nKNxQjKHHu/7upHTddzYfUE?=
 =?us-ascii?Q?AzcWA5BHgx3D2ii7K9D5bXI22Pb/S50/904DS3MR3FfRzYS2I94ds3mRkPPi?=
 =?us-ascii?Q?ctcOCs4YfADMKt3PFM9PxcVRd7Mj9RnBAo3lcAKK16pjDxgGqn2PwC6+QXbu?=
 =?us-ascii?Q?myzMIhAl3BeyIGtz1P8+VpfhSsS7IkbNfzo2FXLcCUz5J68SQZJT1hJotHow?=
 =?us-ascii?Q?ep9gdVkINJq0KcQ8ZG9frIzepBE/aReuiNFQxfjUz1UEAxVPmoZ23x6nCsLw?=
 =?us-ascii?Q?rMwXG7h9aS+zRClZi1OPEEgjH9uOpXE0HPxHKqjCyVmrEq+is/BCW77Aen5B?=
 =?us-ascii?Q?21XM+JlMAEMDwHyLpzpCPGjhcVwVKJm0nQp3+saxUr2yvPfVFJ3sT3ccXtDX?=
 =?us-ascii?Q?4Zt15ojSsAdUJ7IzAGmxs2odi0ezBQOTVe8W5kxoylM1wjGCscnESARpEVGZ?=
 =?us-ascii?Q?MzD1EpnTS06X/u6A3vZSp5XmSmSmQFYEBsNyeNTeS/+nPkXLXzB0ZYVdNvnY?=
 =?us-ascii?Q?bp+KcKRjb2q/1ZqOT4TNF0bbcJfFyZAjt1SdUd2IkkqLvskOUBvaUCw3LGod?=
 =?us-ascii?Q?wyZr0+JOgzSJ/vpKk0Fgjo7dbLD7ZXeNBdPX7OKS/UEc/Qr5g025YjpZFG2S?=
 =?us-ascii?Q?2kmMqq2/uHz5buzjnF/eqyKbL5X8ysG4WvNIbKAZm1tLLXX72njLWOAgfelw?=
 =?us-ascii?Q?77G51xYVrBR3mfjIim11WwEvsi6PQlg4mqn6alB0hiqiUKXX0AiDtS8tmJWU?=
 =?us-ascii?Q?f2Jdo9kRUwXR7K4AAFv6SoZF/Oq3p7Km740DGjio3QHCtw6xLm2MKA4GJBXX?=
 =?us-ascii?Q?y8aHhQ=3D=3D?=
X-OriginatorOrg: plvision.eu
X-MS-Exchange-CrossTenant-Network-Message-Id: f5182fdb-b4ae-4d1c-39ea-08d9d49f3bff
X-MS-Exchange-CrossTenant-AuthSource: AM9P190MB1122.EURP190.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 01:11:02.2200
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 03707b74-30f3-46b6-a0e0-ff0a7438c9c4
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: xCodLYW0X/fKZnPbkGLaG+dKlMa3qWyH9Va1iY7/PEQMlAez4CHt5u+E0rROOReHfeqp9bCsozzu+rrBc2qc6yJSCOQ6E6rUYMcySkMFnVE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0P190MB0753
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

* Reverse xmas tree variables order
* User friendly messages on error paths
* Refactor __prestera_inetaddr_event to use early return

Signed-off-by: Yevhen Orlov <yevhen.orlov@plvision.eu>
---
 .../ethernet/marvell/prestera/prestera_hw.c   |  4 ++--
 .../marvell/prestera/prestera_router.c        | 20 ++++++++++---------
 .../marvell/prestera/prestera_router_hw.c     |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_hw.c b/drivers/net/ethernet/marvell/prestera/prestera_hw.c
index 51fc841b1e7a..e6bfadc874c5 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_hw.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_hw.c
@@ -1831,8 +1831,8 @@ static int prestera_iface_to_msg(struct prestera_iface *iface,
 int prestera_hw_rif_create(struct prestera_switch *sw,
 			   struct prestera_iface *iif, u8 *mac, u16 *rif_id)
 {
-	struct prestera_msg_rif_req req;
 	struct prestera_msg_rif_resp resp;
+	struct prestera_msg_rif_req req;
 	int err;
 
 	memcpy(req.mac, mac, ETH_ALEN);
@@ -1868,9 +1868,9 @@ int prestera_hw_rif_delete(struct prestera_switch *sw, u16 rif_id,
 
 int prestera_hw_vr_create(struct prestera_switch *sw, u16 *vr_id)
 {
-	int err;
 	struct prestera_msg_vr_resp resp;
 	struct prestera_msg_vr_req req;
+	int err;
 
 	err = prestera_cmd_ret(sw, PRESTERA_CMD_TYPE_ROUTER_VR_CREATE,
 			       &req.cmd, sizeof(req), &resp.ret, sizeof(resp));
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_router.c b/drivers/net/ethernet/marvell/prestera/prestera_router.c
index 8a3b7b664358..607b88bfa451 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_router.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_router.c
@@ -25,10 +25,10 @@ static int __prestera_inetaddr_port_event(struct net_device *port_dev,
 					  struct netlink_ext_ack *extack)
 {
 	struct prestera_port *port = netdev_priv(port_dev);
-	int err;
-	struct prestera_rif_entry *re;
 	struct prestera_rif_entry_key re_key = {};
+	struct prestera_rif_entry *re;
 	u32 kern_tb_id;
+	int err;
 
 	err = prestera_is_valid_mac_addr(port, port_dev->dev_addr);
 	if (err) {
@@ -45,21 +45,21 @@ static int __prestera_inetaddr_port_event(struct net_device *port_dev,
 	switch (event) {
 	case NETDEV_UP:
 		if (re) {
-			NL_SET_ERR_MSG_MOD(extack, "rif_entry already exist");
+			NL_SET_ERR_MSG_MOD(extack, "RIF already exist");
 			return -EEXIST;
 		}
 		re = prestera_rif_entry_create(port->sw, &re_key,
 					       prestera_fix_tb_id(kern_tb_id),
 					       port_dev->dev_addr);
 		if (!re) {
-			NL_SET_ERR_MSG_MOD(extack, "Can't create rif_entry");
+			NL_SET_ERR_MSG_MOD(extack, "Can't create RIF");
 			return -EINVAL;
 		}
 		dev_hold(port_dev);
 		break;
 	case NETDEV_DOWN:
 		if (!re) {
-			NL_SET_ERR_MSG_MOD(extack, "rif_entry not exist");
+			NL_SET_ERR_MSG_MOD(extack, "Can't find RIF");
 			return -EEXIST;
 		}
 		prestera_rif_entry_destroy(port->sw, re);
@@ -75,11 +75,11 @@ static int __prestera_inetaddr_event(struct prestera_switch *sw,
 				     unsigned long event,
 				     struct netlink_ext_ack *extack)
 {
-	if (prestera_netdev_check(dev) && !netif_is_bridge_port(dev) &&
-	    !netif_is_lag_port(dev) && !netif_is_ovs_port(dev))
-		return __prestera_inetaddr_port_event(dev, event, extack);
+	if (!prestera_netdev_check(dev) || netif_is_bridge_port(dev) ||
+	    netif_is_lag_port(dev) || netif_is_ovs_port(dev))
+		return 0;
 
-	return 0;
+	return __prestera_inetaddr_port_event(dev, event, extack);
 }
 
 static int __prestera_inetaddr_cb(struct notifier_block *nb,
@@ -126,6 +126,8 @@ static int __prestera_inetaddr_valid_cb(struct notifier_block *nb,
 		goto out;
 
 	if (ipv4_is_multicast(ivi->ivi_addr)) {
+		NL_SET_ERR_MSG_MOD(ivi->extack,
+				   "Multicast addr on RIF is not supported");
 		err = -EINVAL;
 		goto out;
 	}
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c b/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c
index d5befd1d1440..490e9b61fd8d 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c
@@ -123,7 +123,7 @@ __prestera_rif_entry_key_copy(const struct prestera_rif_entry_key *in,
 		out->iface.vlan_id = in->iface.vlan_id;
 		break;
 	default:
-		pr_err("Unsupported iface type");
+		WARN(1, "Unsupported iface type");
 		return -EINVAL;
 	}
 
-- 
2.17.1