Commit 5f1d258d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'rtnetlink-Updates-to-rtnetlink_event' 



Vladislav Yasevich says:

====================
rtnetlink: Updates to rtnetlink_event()

First is the patch to add IFLA_EVENT attribute to the netlink message.  It
supports only currently white-listed events.
Like before, this is just an attribute that gets added to the rtnetlink
message only when the messaged was generated as a result of a netdev event.
In my case, this is necessary since I want to trap NETDEV_NOTIFY_PEERS
event (also possibly NETDEV_RESEND_IGMP event) and perform certain actions
in user space.  This is not possible since the messages generated as
a result of netdev events do not usually contain any changed data.  They
are just notifications.  This patch exposes this notification type to
userspace.

Second, I remove duplicate messages that a result of a change to bonding
options.  If netlink is used to configure bonding options, 2 messages
are generated, one as a result NETDEV_CHANGEINFODATA event triggered by
bonding code and one a result of device state changes triggered by
netdev_state_change (called from do_setlink).

V6: Updated names and refactored to make it less tied to netdev events.
    (From David Ahern)
V5: Rebased.  Added iproute2 patch to the series.
V4:
  * Removed the patch the removed NETDEV_CHANGENAME from event whitelist.
    It doesn't trigger duplicate messages since name changes can only be
    done while device is down and netdev_state_change() doesn't report
    changes while device is down.
  * Added a patch to clean-up duplicate messages on bonding option changes.

V3: Rebased.  Cleaned-up duplicate event.

V2: Added missed events (from David Ahern)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 34aa83c2 7a7e96e0

drivers/net/bonding/bond_main.c

+2 −1
Original line number Diff line number Diff line
@@ -3488,7 +3488,8 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd 
	case BOND_CHANGE_ACTIVE_OLD:

	case SIOCBONDCHANGEACTIVE:

		bond_opt_initstr(&newval, slave_dev->name);

		res = __bond_opt_set(bond, BOND_OPT_ACTIVE_SLAVE, &newval);

		res = __bond_opt_set_notify(bond, BOND_OPT_ACTIVE_SLAVE,

					    &newval);

		break;

	default:

		res = -EOPNOTSUPP;

drivers/net/bonding/bond_options.c

+25 −2
Original line number Diff line number Diff line
@@ -673,7 +673,30 @@ int __bond_opt_set(struct bonding *bond, 
out:

	if (ret)

		bond_opt_error_interpret(bond, opt, ret, val);

	else if (bond->dev->reg_state == NETREG_REGISTERED)



	return ret;

}

/**

 * __bond_opt_set_notify - set a bonding option

 * @bond: target bond device

 * @option: option to set

 * @val: value to set it to

 *

 * This function is used to change the bond's option value and trigger

 * a notification to user sapce. It can be used for both enabling/changing

 * an option and for disabling it. RTNL lock must be obtained before calling

 * this function.

 */

int __bond_opt_set_notify(struct bonding *bond,

			  unsigned int option, struct bond_opt_value *val)

{

	int ret = -ENOENT;



	ASSERT_RTNL();



	ret = __bond_opt_set(bond, option, val);



	if (!ret && (bond->dev->reg_state == NETREG_REGISTERED))

		call_netdevice_notifiers(NETDEV_CHANGEINFODATA, bond->dev);



	return ret;
@@ -696,7 +719,7 @@ int bond_opt_tryset_rtnl(struct bonding *bond, unsigned int option, char *buf) 
	if (!rtnl_trylock())

		return restart_syscall();

	bond_opt_initstr(&optval, buf);

	ret = __bond_opt_set(bond, option, &optval);

	ret = __bond_opt_set_notify(bond, option, &optval);

	rtnl_unlock();



	return ret;

include/linux/rtnetlink.h

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ extern int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, 


void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change, gfp_t flags);

struct sk_buff *rtmsg_ifinfo_build_skb(int type, struct net_device *dev,

				       unsigned change, gfp_t flags);

				       unsigned change, u32 event,

				       gfp_t flags);

void rtmsg_ifinfo_send(struct sk_buff *skb, struct net_device *dev,

		       gfp_t flags);

include/net/bond_options.h

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ struct bond_option { 


int __bond_opt_set(struct bonding *bond, unsigned int option,

		   struct bond_opt_value *val);

int __bond_opt_set_notify(struct bonding *bond, unsigned int option,

			  struct bond_opt_value *val);

int bond_opt_tryset_rtnl(struct bonding *bond, unsigned int option, char *buf);



const struct bond_opt_value *bond_opt_parse(const struct bond_option *opt,

include/uapi/linux/if_link.h

+11 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ enum { 
	IFLA_GSO_MAX_SIZE,

	IFLA_PAD,

	IFLA_XDP,

	IFLA_EVENT,

	__IFLA_MAX

};
@@ -911,4 +912,14 @@ enum { 


#define IFLA_XDP_MAX (__IFLA_XDP_MAX - 1)



enum {

	IFLA_EVENT_NONE,

	IFLA_EVENT_REBOOT,		/* internal reset / reboot */

	IFLA_EVENT_FEATURES,		/* change in offload features */

	IFLA_EVENT_BONDING_FAILOVER,	/* change in active slave */

	IFLA_EVENT_NOTIFY_PEERS,	/* re-sent grat. arp/ndisc */

	IFLA_EVENT_IGMP_RESEND,		/* re-sent IGMP JOIN */

	IFLA_EVENT_BONDING_OPTIONS,	/* change in bonding options */

};



#endif /* _UAPI_LINUX_IF_LINK_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE