Merge branch 'bonding_option_api'

Nikolay Aleksandrov says:

====================
bonding: introduce new option API

This patchset's goal is to introduce a new option API which should be used
to properly describe the bonding options with their mode dependcies and
requirements. With this patchset applied we get centralized option
manipulation, automatic RTNL acquire per option setting, automatic option
range checking, mode dependcy checking and other various flags which are
described in detail in patch 01's commit message and comments.
Also the parameter passing is changed to use a specialized structure which
is initialized to a value depending on the needs.
The main exported functions are:
 __bond_opt_set() - set an option (RTNL should be acquired prior)
 bond_opt_init(val|str) - init a bond_opt_value struct for value or string
                          parameter passing
 bond_opt_tryset_rtnl() - function which tries to acquire rtnl, mainly used
                          for sysfs
 bond_opt_parse - used to parse or check for valid values
 bond_opt_get - retrieve a pointer to bond_option struct for some option
 bond_opt_get_val - retrieve a pointer to a bond_opt_value struct for
                    some value

The same functions are used to set an option via sysfs and netlink, just
the parameter that's passed is usually initialized in a different way.
The converted options have multiple style fixes, there're some longer
lines but they looked either ugly or were strings/pr_warnings, if you
think some line would be better broken just let me know :-) there're
also a few sscanf false-positive warnings.
I decided to keep the "unsuppmodes" way of mode dep checking since it's
straight forward, if we make a more general way for checking dependencies
it'll be easy to change it.

Future plans for this work include:
 - Automatic sysfs generation from the bond_opts[].
 - Use of the API in bond_check_params() and thus cleaning it up (this has
   actually started, I'll take care of the rest in a separate patch)
 - Clean up all option-unrelated files of option definitions and functions

I've tried to leave as much documentation as possible, if there's anything
unclear please let me know. One more thing, I haven't moved all
option-related functions from bonding.h to the new bond_options.h, this
will be done in a separate patch, it's in my todo list.

This patchset has been tested by setting each converted option via sysfs
and netlink to a couple of wrong values, a couple of correct values and
some random values, also for the opts that have flags they have been
tested as well.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

7 files changed, 1217 insertions, 883 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index f100bd958b88..2ca949f6e995 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -86,13 +86,11 @@
 /*---------------------------- Module parameters ----------------------------*/
 
 /* monitor all links that often (in milliseconds). <=0 disables monitoring */
-#define BOND_LINK_MON_INTERV    0
-#define BOND_LINK_ARP_INTERV    0
 
 static int max_bonds    = BOND_DEFAULT_MAX_BONDS;
 static int tx_queues    = BOND_DEFAULT_TX_QUEUES;
 static int num_peer_notif = 1;
-static int miimon       = BOND_LINK_MON_INTERV;
+static int miimon;
 static int updelay;
 static int downdelay;
 static int use_carrier  = 1;
@@ -103,7 +101,7 @@ static char *lacp_rate;
 static int min_links;
 static char *ad_select;
 static char *xmit_hash_policy;
-static int arp_interval = BOND_LINK_ARP_INTERV;
+static int arp_interval;
 static char *arp_ip_target[BOND_MAX_ARP_TARGETS];
 static char *arp_validate;
 static char *arp_all_targets;
@@ -208,67 +206,6 @@ static int bond_mode	= BOND_MODE_ROUNDROBIN;
 static int xmit_hashtype = BOND_XMIT_POLICY_LAYER2;
 static int lacp_fast;
 
-const struct bond_parm_tbl bond_lacp_tbl[] = {
-{       "slow",         AD_LACP_SLOW},
-{       "fast",         AD_LACP_FAST},
-{       NULL,           -1},
-};
-
-const struct bond_parm_tbl bond_mode_tbl[] = {
-{       "balance-rr",           BOND_MODE_ROUNDROBIN},
-{       "active-backup",        BOND_MODE_ACTIVEBACKUP},
-{       "balance-xor",          BOND_MODE_XOR},
-{       "broadcast",            BOND_MODE_BROADCAST},
-{       "802.3ad",              BOND_MODE_8023AD},
-{       "balance-tlb",          BOND_MODE_TLB},
-{       "balance-alb",          BOND_MODE_ALB},
-{       NULL,                   -1},
-};
-
-const struct bond_parm_tbl xmit_hashtype_tbl[] = {
-{       "layer2",               BOND_XMIT_POLICY_LAYER2},
-{       "layer3+4",             BOND_XMIT_POLICY_LAYER34},
-{       "layer2+3",             BOND_XMIT_POLICY_LAYER23},
-{       "encap2+3",             BOND_XMIT_POLICY_ENCAP23},
-{       "encap3+4",             BOND_XMIT_POLICY_ENCAP34},
-{       NULL,                   -1},
-};
-
-const struct bond_parm_tbl arp_all_targets_tbl[] = {
-{       "any",                  BOND_ARP_TARGETS_ANY},
-{       "all",                  BOND_ARP_TARGETS_ALL},
-{       NULL,                   -1},
-};
-
-const struct bond_parm_tbl arp_validate_tbl[] = {
-{       "none",                 BOND_ARP_VALIDATE_NONE},
-{       "active",               BOND_ARP_VALIDATE_ACTIVE},
-{       "backup",               BOND_ARP_VALIDATE_BACKUP},
-{       "all",                  BOND_ARP_VALIDATE_ALL},
-{       NULL,                   -1},
-};
-
-const struct bond_parm_tbl fail_over_mac_tbl[] = {
-{       "none",                 BOND_FOM_NONE},
-{       "active",               BOND_FOM_ACTIVE},
-{       "follow",               BOND_FOM_FOLLOW},
-{       NULL,                   -1},
-};
-
-const struct bond_parm_tbl pri_reselect_tbl[] = {
-{       "always",               BOND_PRI_RESELECT_ALWAYS},
-{       "better",               BOND_PRI_RESELECT_BETTER},
-{       "failure",              BOND_PRI_RESELECT_FAILURE},
-{       NULL,                   -1},
-};
-
-struct bond_parm_tbl ad_select_tbl[] = {
-{       "stable",       BOND_AD_STABLE},
-{       "bandwidth",    BOND_AD_BANDWIDTH},
-{       "count",        BOND_AD_COUNT},
-{       NULL,           -1},
-};
-
 /*-------------------------- Forward declarations ---------------------------*/
 
 static int bond_init(struct net_device *bond_dev);
@@ -3186,6 +3123,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
         struct ifslave k_sinfo;
         struct ifslave __user *u_sinfo = NULL;
         struct mii_ioctl_data *mii = NULL;
+        struct bond_opt_value newval;
         struct net *net;
         int res = 0;
 
@@ -3281,7 +3219,8 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
                 break;
         case BOND_CHANGE_ACTIVE_OLD:
         case SIOCBONDCHANGEACTIVE:
-                res = bond_option_active_slave_set(bond, slave_dev);
+                bond_opt_initstr(&newval, slave_dev->name);
+                res = __bond_opt_set(bond, BOND_OPT_ACTIVE_SLAVE, &newval);
                 break;
         default:
                 res = -EOPNOTSUPP;
@@ -4028,18 +3967,20 @@ int bond_parse_parm(const char *buf, const struct bond_parm_tbl *tbl)
 static int bond_check_params(struct bond_params *params)
 {
         int arp_validate_value, fail_over_mac_value, primary_reselect_value, i;
+        struct bond_opt_value newval, *valptr;
         int arp_all_targets_value;
 
         /*
          * Convert string parameters.
          */
         if (mode) {
-                bond_mode = bond_parse_parm(mode, bond_mode_tbl);
-                if (bond_mode == -1) {
-                        pr_err("Error: Invalid bonding mode \"%s\"\n",
-                               mode == NULL ? "NULL" : mode);
+                bond_opt_initstr(&newval, mode);
+                valptr = bond_opt_parse(bond_opt_get(BOND_OPT_MODE), &newval);
+                if (!valptr) {
+                        pr_err("Error: Invalid bonding mode \"%s\"\n", mode);
                         return -EINVAL;
                 }
+                bond_mode = valptr->value;
         }
 
         if (xmit_hash_policy) {
@@ -4048,14 +3989,15 @@ static int bond_check_params(struct bond_params *params)
                         pr_info("xmit_hash_policy param is irrelevant in mode %s\n",
                                bond_mode_name(bond_mode));
                 } else {
-                        xmit_hashtype = bond_parse_parm(xmit_hash_policy,
-                                                        xmit_hashtype_tbl);
+                        bond_opt_initstr(&newval, xmit_hash_policy);
+                        valptr = bond_opt_parse(bond_opt_get(BOND_OPT_XMIT_HASH),