Commit da3c1639 authored by Yevhen Orlov's avatar Yevhen Orlov Committed by David S. Miller
Browse files

net: marvell: prestera: Register inetaddr stub notifiers 



Initial implementation of notification handlers. For now this is just
stub.
So that we can move forward and add prestera_router_hw's objects
manipulations.

We support several addresses on interface. We just have nothing to do for
second address, because rif is already enabled on this interface, after
first one.

Co-developed-by: default avatarTaras Chornyi <tchornyi@marvell.com>
Signed-off-by: default avatarTaras Chornyi <tchornyi@marvell.com>
Co-developed-by: default avatarOleksandr Mazur <oleksandr.mazur@plvision.eu>
Signed-off-by: default avatarOleksandr Mazur <oleksandr.mazur@plvision.eu>
Signed-off-by: default avatarYevhen Orlov <yevhen.orlov@plvision.eu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bca5859b

drivers/net/ethernet/marvell/prestera/prestera.h

+4 −0
Original line number Diff line number Diff line
@@ -281,6 +281,8 @@ struct prestera_router { 
	struct prestera_switch *sw;

	struct list_head vr_list;

	struct list_head rif_entry_list;

	struct notifier_block inetaddr_nb;

	struct notifier_block inetaddr_valid_nb;

	bool aborted;

};
@@ -328,6 +330,8 @@ int prestera_port_pvid_set(struct prestera_port *port, u16 vid); 


bool prestera_netdev_check(const struct net_device *dev);



int prestera_is_valid_mac_addr(struct prestera_port *port, const u8 *addr);



bool prestera_port_is_lag_member(const struct prestera_port *port);



struct prestera_lag *prestera_lag_by_id(struct prestera_switch *sw, u16 id);

drivers/net/ethernet/marvell/prestera/prestera_main.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static netdev_tx_t prestera_port_xmit(struct sk_buff *skb, 
	return prestera_rxtx_xmit(netdev_priv(dev), skb);

}



static int prestera_is_valid_mac_addr(struct prestera_port *port, u8 *addr)

int prestera_is_valid_mac_addr(struct prestera_port *port, const u8 *addr)

{

	if (!is_valid_ether_addr(addr))

		return -EADDRNOTAVAIL;

drivers/net/ethernet/marvell/prestera/prestera_router.c

+105 −0
Original line number Diff line number Diff line
@@ -3,10 +3,98 @@ 


#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/inetdevice.h>



#include "prestera.h"

#include "prestera_router_hw.h"



static int __prestera_inetaddr_port_event(struct net_device *port_dev,

					  unsigned long event,

					  struct netlink_ext_ack *extack)

{

	struct prestera_port *port = netdev_priv(port_dev);

	int err;



	err = prestera_is_valid_mac_addr(port, port_dev->dev_addr);

	if (err) {

		NL_SET_ERR_MSG_MOD(extack, "RIF MAC must have the same prefix");

		return err;

	}



	switch (event) {

	case NETDEV_UP:

	case NETDEV_DOWN:

		break;

	}



	return 0;

}



static int __prestera_inetaddr_event(struct prestera_switch *sw,

				     struct net_device *dev,

				     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);



	return 0;

}



static int __prestera_inetaddr_cb(struct notifier_block *nb,

				  unsigned long event, void *ptr)

{

	struct in_ifaddr *ifa = (struct in_ifaddr *)ptr;

	struct net_device *dev = ifa->ifa_dev->dev;

	struct prestera_router *router = container_of(nb,

						      struct prestera_router,

						      inetaddr_nb);

	struct in_device *idev;

	int err = 0;



	if (event != NETDEV_DOWN)

		goto out;



	/* Ignore if this is not latest address */

	idev = __in_dev_get_rtnl(dev);

	if (idev && idev->ifa_list)

		goto out;



	err = __prestera_inetaddr_event(router->sw, dev, event, NULL);

out:

	return notifier_from_errno(err);

}



static int __prestera_inetaddr_valid_cb(struct notifier_block *nb,

					unsigned long event, void *ptr)

{

	struct in_validator_info *ivi = (struct in_validator_info *)ptr;

	struct net_device *dev = ivi->ivi_dev->dev;

	struct prestera_router *router = container_of(nb,

						      struct prestera_router,

						      inetaddr_valid_nb);

	struct in_device *idev;

	int err = 0;



	if (event != NETDEV_UP)

		goto out;



	/* Ignore if this is not first address */

	idev = __in_dev_get_rtnl(dev);

	if (idev && idev->ifa_list)

		goto out;



	if (ipv4_is_multicast(ivi->ivi_addr)) {

		err = -EINVAL;

		goto out;

	}



	err = __prestera_inetaddr_event(router->sw, dev, event, ivi->extack);

out:

	return notifier_from_errno(err);

}



int prestera_router_init(struct prestera_switch *sw)

{

	struct prestera_router *router;
@@ -23,8 +111,22 @@ int prestera_router_init(struct prestera_switch *sw) 
	if (err)

		goto err_router_lib_init;



	router->inetaddr_valid_nb.notifier_call = __prestera_inetaddr_valid_cb;

	err = register_inetaddr_validator_notifier(&router->inetaddr_valid_nb);

	if (err)

		goto err_register_inetaddr_validator_notifier;



	router->inetaddr_nb.notifier_call = __prestera_inetaddr_cb;

	err = register_inetaddr_notifier(&router->inetaddr_nb);

	if (err)

		goto err_register_inetaddr_notifier;



	return 0;



err_register_inetaddr_notifier:

	unregister_inetaddr_validator_notifier(&router->inetaddr_valid_nb);

err_register_inetaddr_validator_notifier:

	/* prestera_router_hw_fini */

err_router_lib_init:

	kfree(sw->router);

	return err;
@@ -32,6 +134,9 @@ int prestera_router_init(struct prestera_switch *sw) 


void prestera_router_fini(struct prestera_switch *sw)

{

	unregister_inetaddr_notifier(&sw->router->inetaddr_nb);

	unregister_inetaddr_validator_notifier(&sw->router->inetaddr_valid_nb);

	/* router_hw_fini */

	kfree(sw->router);

	sw->router = NULL;

}