bonding: netlink errors and cleanup
Subsystems (3)
PATCH v2 1/2 bonding: netlink error message support for options
In reply to Jonathan ToppinsAdd support for reporting errors via extack in both bond_newlink and bond_changelink.
Instead of having to look in the kernel log for why an option was not correct just report the error to the user via the extack variable.
What is currently reported today:
ip link add bond0 type bond
ip link set bond0 up
ip link set bond0 type bond mode 4
RTNETLINK answers: Device or resource busy
After this change:
ip link add bond0 type bond
ip link set bond0 up
ip link set bond0 type bond mode 4
Error: unable to set option because the bond is up.
---
Notes:
Removed the printf support and just added static messages for various error events.
drivers/net/bonding/bond_netlink.c | 101 +++++++++++++++++++---------- drivers/net/bonding/bond_options.c | 32 +++++++-- include/net/bond_options.h | 3 +- 3 files changed, 95 insertions(+), 41 deletions(-)
drivers/net/bonding/bond_netlink.c +68 -33
@@ -151,7 +151,8 @@ static int bond_slave_changelink(struct net_device *bond_dev,snprintf (queue_id_str,sizeof (queue_id_str),"%s:%u\n" , slave_dev->name, queue_id);bond_opt_initstr (&newval, queue_id_str); - err =__bond_opt_set (bond,BOND_OPT_QUEUE_ID , &newval); + err =__bond_opt_set (bond,BOND_OPT_QUEUE_ID , &newval, + data[IFLA_BOND_SLAVE_QUEUE_ID ], extack);if (err)return err; }
@@ -175,7 +176,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],int mode =nla_get_u8 (data[IFLA_BOND_MODE ]);bond_opt_initval (&newval, mode); - err =__bond_opt_set (bond,BOND_OPT_MODE , &newval); + err =__bond_opt_set (bond,BOND_OPT_MODE , &newval, + data[IFLA_BOND_MODE ], extack);if (err)return err; }
@@ -192,7 +194,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[], active_slave = slave_dev->name; }bond_opt_initstr (&newval, active_slave); - err =__bond_opt_set (bond,BOND_OPT_ACTIVE_SLAVE , &newval); + err =__bond_opt_set (bond,BOND_OPT_ACTIVE_SLAVE , &newval, + data[IFLA_BOND_ACTIVE_SLAVE ], extack);if (err)return err; }
@@ -200,7 +203,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[], miimon =nla_get_u32 (data[IFLA_BOND_MIIMON ]);bond_opt_initval (&newval, miimon); - err =__bond_opt_set (bond,BOND_OPT_MIIMON , &newval); + err =__bond_opt_set (bond,BOND_OPT_MIIMON , &newval, + data[IFLA_BOND_MIIMON ], extack);if (err)return err; }
@@ -208,7 +212,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],int updelay =nla_get_u32 (data[IFLA_BOND_UPDELAY ]);bond_opt_initval (&newval, updelay); - err =__bond_opt_set (bond,BOND_OPT_UPDELAY , &newval); + err =__bond_opt_set (bond,BOND_OPT_UPDELAY , &newval, + data[IFLA_BOND_UPDELAY ], extack);if (err)return err; }
@@ -216,7 +221,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],int downdelay =nla_get_u32 (data[IFLA_BOND_DOWNDELAY ]);bond_opt_initval (&newval, downdelay); - err =__bond_opt_set (bond,BOND_OPT_DOWNDELAY , &newval); + err =__bond_opt_set (bond,BOND_OPT_DOWNDELAY , &newval, + data[IFLA_BOND_DOWNDELAY ], extack);if (err)return err; }
@@ -224,7 +230,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],int delay =nla_get_u32 (data[IFLA_BOND_PEER_NOTIF_DELAY ]);bond_opt_initval (&newval, delay); - err =__bond_opt_set (bond,BOND_OPT_PEER_NOTIF_DELAY , &newval); + err =__bond_opt_set (bond,BOND_OPT_PEER_NOTIF_DELAY , &newval, + data[IFLA_BOND_PEER_NOTIF_DELAY ], extack);if (err)return err; }
@@ -232,7 +239,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],int use_carrier =nla_get_u8 (data[IFLA_BOND_USE_CARRIER ]);bond_opt_initval (&newval, use_carrier); - err =__bond_opt_set (bond,BOND_OPT_USE_CARRIER , &newval); + err =__bond_opt_set (bond,BOND_OPT_USE_CARRIER , &newval, + data[IFLA_BOND_USE_CARRIER ], extack);if (err)return err; }
@@ -240,12 +248,14 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],int arp_interval =nla_get_u32 (data[IFLA_BOND_ARP_INTERVAL ]);if (arp_interval && miimon) { -netdev_err (bond->dev,"ARP monitoring cannot be used with MII monitoring\n" ); +NL_SET_ERR_MSG_ATTR (extack, data[IFLA_BOND_ARP_INTERVAL ], +"ARP monitoring cannot be used with MII monitoring" );return -EINVAL ; }bond_opt_initval (&newval, arp_interval); - err =__bond_opt_set (bond,BOND_OPT_ARP_INTERVAL , &newval); + err =__bond_opt_set (bond,BOND_OPT_ARP_INTERVAL , &newval, + data[IFLA_BOND_ARP_INTERVAL ], extack);if (err)return err; }
@@ -264,7 +274,9 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],bond_opt_initval (&newval, (__force u64 )target); err =__bond_opt_set (bond,BOND_OPT_ARP_TARGETS , - &newval); + &newval, + data[IFLA_BOND_ARP_IP_TARGET ], + extack);if (err)break ; i++;
@@ -292,7 +304,9 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],bond_opt_initextra (&newval, &addr6,sizeof (addr6)); err =__bond_opt_set (bond,BOND_OPT_NS_TARGETS , - &newval); + &newval, + data[IFLA_BOND_NS_IP6_TARGET ], + extack);if (err)break ; i++;
@@ -307,12 +321,14 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],int arp_validate =nla_get_u32 (data[IFLA_BOND_ARP_VALIDATE ]);if (arp_validate && miimon) { -netdev_err (bond->dev,"ARP validating cannot be used with MII monitoring\n" ); +NL_SET_ERR_MSG_ATTR (extack, data[IFLA_BOND_ARP_INTERVAL ], +"ARP validating cannot be used with MII monitoring" );return -EINVAL ; }bond_opt_initval (&newval, arp_validate); - err =__bond_opt_set (bond,BOND_OPT_ARP_VALIDATE , &newval); + err =__bond_opt_set (bond,BOND_OPT_ARP_VALIDATE , &newval, + data[IFLA_BOND_ARP_VALIDATE ], extack);if (err)return err; }
@@ -321,7 +337,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],nla_get_u32 (data[IFLA_BOND_ARP_ALL_TARGETS ]);bond_opt_initval (&newval, arp_all_targets); - err =__bond_opt_set (bond,BOND_OPT_ARP_ALL_TARGETS , &newval); + err =__bond_opt_set (bond,BOND_OPT_ARP_ALL_TARGETS , &newval, + data[IFLA_BOND_ARP_ALL_TARGETS ], extack);if (err)return err; }
@@ -335,7 +352,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[], primary = dev->name;bond_opt_initstr (&newval, primary); - err =__bond_opt_set (bond,BOND_OPT_PRIMARY , &newval); + err =__bond_opt_set (bond,BOND_OPT_PRIMARY , &newval, + data[IFLA_BOND_PRIMARY ], extack);if (err)return err; }
@@ -344,7 +362,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],nla_get_u8 (data[IFLA_BOND_PRIMARY_RESELECT ]);bond_opt_initval (&newval, primary_reselect); - err =__bond_opt_set (bond,BOND_OPT_PRIMARY_RESELECT , &newval); + err =__bond_opt_set (bond,BOND_OPT_PRIMARY_RESELECT , &newval, + data[IFLA_BOND_PRIMARY_RESELECT ], extack);if (err)return err; }
@@ -353,7 +372,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],nla_get_u8 (data[IFLA_BOND_FAIL_OVER_MAC ]);bond_opt_initval (&newval, fail_over_mac); - err =__bond_opt_set (bond,BOND_OPT_FAIL_OVER_MAC , &newval); + err =__bond_opt_set (bond,BOND_OPT_FAIL_OVER_MAC , &newval, + data[IFLA_BOND_FAIL_OVER_MAC ], extack);if (err)return err; }
@@ -362,7 +382,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],nla_get_u8 (data[IFLA_BOND_XMIT_HASH_POLICY ]);bond_opt_initval (&newval, xmit_hash_policy); - err =__bond_opt_set (bond,BOND_OPT_XMIT_HASH , &newval); + err =__bond_opt_set (bond,BOND_OPT_XMIT_HASH , &newval, + data[IFLA_BOND_XMIT_HASH_POLICY ], extack);if (err)return err; }
@@ -371,7 +392,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],nla_get_u32 (data[IFLA_BOND_RESEND_IGMP ]);bond_opt_initval (&newval, resend_igmp); - err =__bond_opt_set (bond,BOND_OPT_RESEND_IGMP , &newval); + err =__bond_opt_set (bond,BOND_OPT_RESEND_IGMP , &newval, + data[IFLA_BOND_RESEND_IGMP ], extack);if (err)return err; }
@@ -380,7 +402,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],nla_get_u8 (data[IFLA_BOND_NUM_PEER_NOTIF ]);bond_opt_initval (&newval, num_peer_notif); - err =__bond_opt_set (bond,BOND_OPT_NUM_PEER_NOTIF , &newval); + err =__bond_opt_set (bond,BOND_OPT_NUM_PEER_NOTIF , &newval, + data[IFLA_BOND_NUM_PEER_NOTIF ], extack);if (err)return err; }
@@ -389,7 +412,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],nla_get_u8 (data[IFLA_BOND_ALL_SLAVES_ACTIVE ]);bond_opt_initval (&newval, all_slaves_active); - err =__bond_opt_set (bond,BOND_OPT_ALL_SLAVES_ACTIVE , &newval); + err =__bond_opt_set (bond,BOND_OPT_ALL_SLAVES_ACTIVE , &newval, + data[IFLA_BOND_ALL_SLAVES_ACTIVE ], extack);if (err)return err; }
@@ -398,7 +422,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],nla_get_u32 (data[IFLA_BOND_MIN_LINKS ]);bond_opt_initval (&newval, min_links); - err =__bond_opt_set (bond,BOND_OPT_MINLINKS , &newval); + err =__bond_opt_set (bond,BOND_OPT_MINLINKS , &newval, + data[IFLA_BOND_MIN_LINKS ], extack);if (err)return err; }
@@ -407,7 +432,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],nla_get_u32 (data[IFLA_BOND_LP_INTERVAL ]);bond_opt_initval (&newval, lp_interval); - err =__bond_opt_set (bond,BOND_OPT_LP_INTERVAL , &newval); + err =__bond_opt_set (bond,BOND_OPT_LP_INTERVAL , &newval, + data[IFLA_BOND_LP_INTERVAL ], extack);if (err)return err; }
@@ -416,7 +442,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],nla_get_u32 (data[IFLA_BOND_PACKETS_PER_SLAVE ]);bond_opt_initval (&newval, packets_per_slave); - err =__bond_opt_set (bond,BOND_OPT_PACKETS_PER_SLAVE , &newval); + err =__bond_opt_set (bond,BOND_OPT_PACKETS_PER_SLAVE , &newval, + data[IFLA_BOND_PACKETS_PER_SLAVE ], extack);if (err)return err; }
@@ -425,7 +452,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],int lacp_active =nla_get_u8 (data[IFLA_BOND_AD_LACP_ACTIVE ]);bond_opt_initval (&newval, lacp_active); - err =__bond_opt_set (bond,BOND_OPT_LACP_ACTIVE , &newval); + err =__bond_opt_set (bond,BOND_OPT_LACP_ACTIVE , &newval, + data[IFLA_BOND_AD_LACP_ACTIVE ], extack);if (err)return err; }
@@ -435,7 +463,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],nla_get_u8 (data[IFLA_BOND_AD_LACP_RATE ]);bond_opt_initval (&newval, lacp_rate); - err =__bond_opt_set (bond,BOND_OPT_LACP_RATE , &newval); + err =__bond_opt_set (bond,BOND_OPT_LACP_RATE , &newval, + data[IFLA_BOND_AD_LACP_RATE ], extack);if (err)return err; }
@@ -444,7 +473,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],nla_get_u8 (data[IFLA_BOND_AD_SELECT ]);bond_opt_initval (&newval, ad_select); - err =__bond_opt_set (bond,BOND_OPT_AD_SELECT , &newval); + err =__bond_opt_set (bond,BOND_OPT_AD_SELECT , &newval, + data[IFLA_BOND_AD_SELECT ], extack);if (err)return err; }
@@ -453,7 +483,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],nla_get_u16 (data[IFLA_BOND_AD_ACTOR_SYS_PRIO ]);bond_opt_initval (&newval, actor_sys_prio); - err =__bond_opt_set (bond,BOND_OPT_AD_ACTOR_SYS_PRIO , &newval); + err =__bond_opt_set (bond,BOND_OPT_AD_ACTOR_SYS_PRIO , &newval, + data[IFLA_BOND_AD_ACTOR_SYS_PRIO ], extack);if (err)return err; }
@@ -462,7 +493,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],nla_get_u16 (data[IFLA_BOND_AD_USER_PORT_KEY ]);bond_opt_initval (&newval, port_key); - err =__bond_opt_set (bond,BOND_OPT_AD_USER_PORT_KEY , &newval); + err =__bond_opt_set (bond,BOND_OPT_AD_USER_PORT_KEY , &newval, + data[IFLA_BOND_AD_USER_PORT_KEY ], extack);if (err)return err; }
@@ -472,7 +504,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],bond_opt_initval (&newval,nla_get_u64 (data[IFLA_BOND_AD_ACTOR_SYSTEM ])); - err =__bond_opt_set (bond,BOND_OPT_AD_ACTOR_SYSTEM , &newval); + err =__bond_opt_set (bond,BOND_OPT_AD_ACTOR_SYSTEM , &newval, + data[IFLA_BOND_AD_ACTOR_SYSTEM ], extack);if (err)return err; }
@@ -480,7 +513,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],int dynamic_lb =nla_get_u8 (data[IFLA_BOND_TLB_DYNAMIC_LB ]);bond_opt_initval (&newval, dynamic_lb); - err =__bond_opt_set (bond,BOND_OPT_TLB_DYNAMIC_LB , &newval); + err =__bond_opt_set (bond,BOND_OPT_TLB_DYNAMIC_LB , &newval, + data[IFLA_BOND_TLB_DYNAMIC_LB ], extack);if (err)return err; }
@@ -489,7 +523,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],int missed_max =nla_get_u8 (data[IFLA_BOND_MISSED_MAX ]);bond_opt_initval (&newval, missed_max); - err =__bond_opt_set (bond,BOND_OPT_MISSED_MAX , &newval); + err =__bond_opt_set (bond,BOND_OPT_MISSED_MAX , &newval, + data[IFLA_BOND_MISSED_MAX ], extack);if (err)return err; }
drivers/net/bonding/bond_options.c +25 -7
@@ -632,27 +632,35 @@ static int bond_opt_check_deps(struct bonding *bond, }static void bond_opt_dep_print (struct bonding *bond, -const struct bond_option *opt) +const struct bond_option *opt, +struct nlattr *bad_attr, +struct netlink_ext_ack *extack) {const struct bond_opt_value *modeval;struct bond_params *params; params = &bond->params; modeval =bond_opt_get_val (BOND_OPT_MODE , params->mode); -if (test_bit (params->mode, &opt->unsuppmodes)) +if (test_bit (params->mode, &opt->unsuppmodes)) {netdev_err (bond->dev,"option %s: mode dependency failed, not supported in mode %s(%llu)\n" , opt->name, modeval->string, modeval->value); +NL_SET_ERR_MSG_ATTR (extack, bad_attr, +"option not supported in mode" ); + } }static void bond_opt_error_interpret (struct bonding *bond,const struct bond_option *opt, -int error,const struct bond_opt_value *val) +int error,const struct bond_opt_value *val, +struct nlattr *bad_attr, +struct netlink_ext_ack *extack) {const struct bond_opt_value *minval, *maxval;char *p;switch (error) {case -EINVAL : +NL_SET_ERR_MSG_ATTR (extack, bad_attr,"invalid option value" );if (val) {if (val->string) {/* sometimes RAWVAL opts may have new lines */
@@ -674,13 +682,17 @@ static void bond_opt_error_interpret(struct bonding *bond, opt->name, minval ? minval->value : 0, maxval->value);break ;case -EACCES : -bond_opt_dep_print (bond, opt); +bond_opt_dep_print (bond, opt, bad_attr, extack);break ;case -ENOTEMPTY : +NL_SET_ERR_MSG_ATTR (extack, bad_attr, +"unable to set option because the bond device has slaves" );netdev_err (bond->dev,"option %s: unable to set because the bond device has slaves\n" , opt->name);break ;case -EBUSY : +NL_SET_ERR_MSG_ATTR (extack, bad_attr, +"unable to set option because the bond is up" );netdev_err (bond->dev,"option %s: unable to set because the bond device is up\n" , opt->name);break ;
@@ -691,6 +703,8 @@ static void bond_opt_error_interpret(struct bonding *bond, *p ='\0' ;netdev_err (bond->dev,"option %s: interface %s does not exist!\n" , opt->name, val->string); +NL_SET_ERR_MSG_ATTR (extack, bad_attr, +"interface does not exist" ); }break ;default :
@@ -703,13 +717,17 @@ static void bond_opt_error_interpret(struct bonding *bond,* @bond: target bond device * @option: option to set * @val: value to set it to +* @bad_attr: netlink attribue that caused the error +* @extack: extended netlink error structure, used when an error message +* needs to be returned to the caller via netlink * * This function is used to change the bond's option value, 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 (struct bonding *bond, -unsigned int option,struct bond_opt_value *val) +unsigned int option,struct bond_opt_value *val, +struct nlattr *bad_attr,struct netlink_ext_ack *extack) {const struct bond_opt_value *retval =NULL ;const struct bond_option *opt;
@@ -731,7 +749,7 @@ int __bond_opt_set(struct bonding *bond, ret = opt->set (bond, retval); out:if (ret) -bond_opt_error_interpret (bond, opt, ret, val); +bond_opt_error_interpret (bond, opt, ret, val, bad_attr, extack);return ret; }
@@ -753,7 +771,7 @@ int __bond_opt_set_notify(struct bonding *bond,ASSERT_RTNL (); - ret =__bond_opt_set (bond, option, val); + ret =__bond_opt_set (bond, option, val,NULL ,NULL );if (!ret && (bond->dev->reg_state ==NETREG_REGISTERED ))call_netdevice_notifiers (NETDEV_CHANGEINFODATA , bond->dev);
include/net/bond_options.h +2 -1
@@ -107,7 +107,8 @@ struct bond_option { };int __bond_opt_set (struct bonding *bond,unsigned int option, -struct bond_opt_value *val); +struct bond_opt_value *val, +struct nlattr *bad_attr,struct netlink_ext_ack *extack);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);
Signature · 1 line
2.27.0
PATCH v2 2/2 bonding: cleanup bond_create
In reply to Jonathan ToppinsSetting RLB_NULL_INDEX is not needed as this is done in bond_alb_initialize which is called by bond_open.
Also reduce the number of rtnl_unlock calls by just using the standard goto cleanup path.
--- drivers/net/bonding/bond_main.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)
drivers/net/bonding/bond_main.c +6 -18
@@ -6218,45 +6218,33 @@ int bond_create(struct net *net, const char *name) {struct net_device *bond_dev;struct bonding *bond; -struct alb_bond_info *bond_info; -int res; +int res = -ENOMEM ;rtnl_lock (); bond_dev =alloc_netdev_mq (sizeof (struct bonding ), name ? name :"bond%d" ,NET_NAME_UNKNOWN , bond_setup, tx_queues); -if (!bond_dev) { -pr_err ("%s: eek! can't alloc netdev!\n" , name); -rtnl_unlock (); -return -ENOMEM ; - } +if (!bond_dev) + goto out; -/* -* Initialize rx_hashtbl_used_head to RLB_NULL_INDEX. -* It is set to 0 by default which is wrong. -*/ bond =netdev_priv (bond_dev); - bond_info = &(BOND_ALB_INFO (bond)); - bond_info->rx_hashtbl_used_head =RLB_NULL_INDEX ; -dev_net_set (bond_dev, net); bond_dev->rtnl_link_ops = &bond_link_ops; res =register_netdevice (bond_dev);if (res <0 ) {free_netdev (bond_dev); -rtnl_unlock (); - -return res; + goto out; }netif_carrier_off (bond_dev);bond_work_init_all (bond); +out:rtnl_unlock (); -return 0 ; +return res; }static int __net_init bond_net_init (struct net *net)
Signature · 1 line
2.27.0
v2 cover bonding: netlink errors and cleanup
The first patch attempts to set helpful error messages when configuring bonds via netlink. The second patch removes redundant init code for RLB mode which is already done in bond_open.
v2:
* rebased to latest net-next
* fixed kernel doc header for __bond_opt_set
Jonathan Toppins (2):
bonding: netlink error message support for options
bonding: cleanup bond_create
drivers/net/bonding/bond_main.c | 24 ++----- drivers/net/bonding/bond_netlink.c | 101 +++++++++++++++++++---------- drivers/net/bonding/bond_options.c | 32 +++++++-- include/net/bond_options.h | 3 +- 4 files changed, 101 insertions(+), 59 deletions(-)
Signature · 1 line
2.27.0
Re: [net-next v2 2/2] bonding: cleanup bond_create
In reply to Jonathan ToppinsQuoted 7 lines · Jonathan Toppins
Setting
RLB_NULL_INDEXis not needed as this is done inbond_alb_initializewhich is called bybond_open.Also reduce the number of
rtnl_unlockcalls by just using the standard goto cleanup path.Signed-off-by Jonathan Toppins <[email protected]>
Quoted 63 lines
---
drivers/net/bonding/bond_main.c| 24 ++++++------------------1 file changed, 6 insertions(+), 18 deletions(-)drivers/net/bonding/bond_main.c +6
-18@@ -6218,45 +6218,33 @@ int bond_create(struct net *net, const char *name) {struct net_device *bond_dev;struct bonding *bond; -struct alb_bond_info *bond_info; -int res; +int res = -ENOMEM ;rtnl_lock (); bond_dev =alloc_netdev_mq (sizeof (struct bonding ), name ? name :"bond%d" ,NET_NAME_UNKNOWN , bond_setup, tx_queues); -if (!bond_dev) { -pr_err ("%s: eek! can't alloc netdev!\n" , name); -rtnl_unlock (); -return -ENOMEM ; - } +if (!bond_dev) + goto out; -/* -* Initialize rx_hashtbl_used_head to RLB_NULL_INDEX. -* It is set to 0 by default which is wrong. -*/ bond =netdev_priv (bond_dev); - bond_info = &(BOND_ALB_INFO (bond)); - bond_info->rx_hashtbl_used_head =RLB_NULL_INDEX ; -dev_net_set (bond_dev, net); bond_dev->rtnl_link_ops = &bond_link_ops; res =register_netdevice (bond_dev);if (res <0 ) {free_netdev (bond_dev); -rtnl_unlock (); - -return res; + goto out; }netif_carrier_off (bond_dev);bond_work_init_all (bond); +out:rtnl_unlock (); -return 0 ; +return res; }static int __net_init bond_net_init (struct net *net)Signature · 1 line
2.27.0
Re: [net-next v2 1/2] bonding: netlink error message support for options
In reply to Jonathan ToppinsQuoted 12 lines · Jonathan Toppins
Add support for reporting errors via extack in both
bond_newlinkandbond_changelink.Instead of having to look in the kernel log for why an option was not correct just report the error to the user via the extack variable.
What is currently reported today:
ip link add bond0 type bond
ip link set bond0 up
ip link set bond0 type bond mode 4
RTNETLINK answers: Device or resource busy
Quoted 7 lines
After this change:
ip link add bond0 type bond
ip link set bond0 up
ip link set bond0 type bond mode 4
Error: unable to set option because the bond is up.Signed-off-by Jonathan Toppins <[email protected]>
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Wed, 8 Jun 2022 14:14:55 -0400 you wrote:
The first patch attempts to set helpful error messages when configuring bonds via netlink. The second patch removes redundant init code for RLB mode which is already done in
bond_open.v2:
* rebased to latest net-next
* fixed kernel doc header for__bond_opt_set[...]
Here is the summary with links:
- [net-next,v2,1/2] bonding: netlink error message support for options
https://git.kernel.org/netdev/net-next/c/2bff369b2354 - [net-next,v2,2/2] bonding: cleanup bond_create https://git.kernel.org/netdev/net-next/c/2fa3ee93d13c
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html