[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <9ea38811-4297-424d-b82c-855ee75579f0@moroto.mountain>
Date: Wed, 28 Feb 2024 20:58:07 +0300
From: Dan Carpenter <dan.carpenter@...aro.org>
To: Lukasz Majewski <lukma@...x.de>
Cc: Oleksij Rempel <o.rempel@...gutronix.de>, Andrew Lunn <andrew@...n.ch>,
Eric Dumazet <edumazet@...gle.com>,
Florian Fainelli <f.fainelli@...il.com>,
Vladimir Oltean <olteanv@...il.com>,
"David S. Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>, netdev@...r.kernel.org,
Tristram.Ha@...rochip.com,
Sebastian Andrzej Siewior <bigeasy@...utronix.de>,
Paolo Abeni <pabeni@...hat.com>,
Ravi Gunasekaran <r-gunasekaran@...com>,
Simon Horman <horms@...nel.org>,
Wojciech Drewek <wojciech.drewek@...el.com>,
Nikita Zhandarovich <n.zhandarovich@...tech.ru>,
Murali Karicheri <m-karicheri2@...com>,
Ziyang Xuan <william.xuanziyang@...wei.com>,
Kristian Overskeid <koverskeid@...il.com>,
Matthieu Baerts <matttbe@...nel.org>, linux-kernel@...r.kernel.org
Subject: Re: [RFC] net: hsr: Provide RedBox support
On Wed, Feb 28, 2024 at 04:07:35PM +0100, Lukasz Majewski wrote:
> void hsr_debugfs_rename(struct net_device *dev)
> {
> @@ -95,6 +114,19 @@ void hsr_debugfs_init(struct hsr_priv *priv, struct net_device *hsr_dev)
> priv->node_tbl_root = NULL;
> return;
> }
> +
> + if (!priv->redbox)
> + return;
> +
> + de = debugfs_create_file("proxy_node_table", S_IFREG | 0444,
> + priv->node_tbl_root, priv,
> + &hsr_proxy_node_table_fops);
> + if (IS_ERR(de)) {
> + pr_err("Cannot create hsr proxy node_table file\n");
Debugfs functions are not supposed to be checked. This will print a
warning when CONFIG_DEBUGFS is disabled. Just leave all the clean up
out. If debugfs can't allocate enough memory then probably this one
debugfs_remove() is not going to save us.
> + debugfs_remove(priv->node_tbl_root);
> + priv->node_tbl_root = NULL;
> + return;
> + }
> }
>
> /* hsr_debugfs_term - Tear down debugfs intrastructure
[ snip ]
> @@ -545,8 +558,8 @@ static const unsigned char def_multicast_addr[ETH_ALEN] __aligned(2) = {
> };
>
> int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],
> - unsigned char multicast_spec, u8 protocol_version,
> - struct netlink_ext_ack *extack)
> + struct net_device *interlink, unsigned char multicast_spec,
> + u8 protocol_version, struct netlink_ext_ack *extack)
> {
> bool unregister = false;
> struct hsr_priv *hsr;
> @@ -555,6 +568,7 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],
> hsr = netdev_priv(hsr_dev);
> INIT_LIST_HEAD(&hsr->ports);
> INIT_LIST_HEAD(&hsr->node_db);
> + INIT_LIST_HEAD(&hsr->proxy_node_db);
> spin_lock_init(&hsr->list_lock);
>
> eth_hw_addr_set(hsr_dev, slave[0]->dev_addr);
> @@ -615,6 +629,18 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],
> if (res)
> goto err_unregister;
>
> + if (interlink) {
> + res = hsr_add_port(hsr, interlink, HSR_PT_INTERLINK, extack);
> + if (res)
> + goto err_unregister;
You need to add the iterlink port to hsr_del_ports() to avoid a leak in
the remove() function.
regards,
dan carpenter
> +
> + hsr->redbox = true;
> + ether_addr_copy(hsr->macaddress_redbox, interlink->dev_addr);
> + timer_setup(&hsr->prune_proxy_timer, hsr_prune_proxy_nodes, 0);
> + mod_timer(&hsr->prune_proxy_timer,
> + jiffies + msecs_to_jiffies(PRUNE_PROXY_PERIOD));
> + }
> +
> hsr_debugfs_init(hsr, hsr_dev);
> mod_timer(&hsr->prune_timer, jiffies + msecs_to_jiffies(PRUNE_PERIOD));
>
Powered by blists - more mailing lists