swconfig: add SWITCH_TYPE_LINK and support sending link info to user space

So far we were sending link data as a string. It got some drawbacks:
1) Didn't allow writing clean user space apps reading link state. It was
   needed to do some screen scraping.
2) Forced whole PORT_LINK communication to be string based. Adding
   support for *setting* port link required passing string and parting
   it in the kernel space.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 47997

diff --git a/target/linux/generic/files/drivers/net/phy/swconfig.c b/target/linux/generic/files/drivers/net/phy/swconfig.c
index 6bb3be13485e6221d1b058dd274bae50f99d4e44..ef218bd984bf0692522a876b694d088fcb79e292 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/swconfig.c
+++ b/target/linux/generic/files/drivers/net/phy/swconfig.c
@@ -770,6 +770,53 @@ done:
        return err;
 }
 
        return err;
 }
 

+static int
+swconfig_send_link(struct sk_buff *msg, struct genl_info *info, int attr,
+                  const struct switch_port_link *link)
+{
+       struct nlattr *p = NULL;
+       int err = 0;
+
+       p = nla_nest_start(msg, attr);
+       if (link->link) {
+               if (nla_put_flag(msg, SWITCH_LINK_FLAG_LINK))
+                       goto nla_put_failure;
+       }
+       if (link->duplex) {
+               if (nla_put_flag(msg, SWITCH_LINK_FLAG_DUPLEX))
+                       goto nla_put_failure;
+       }
+       if (link->aneg) {
+               if (nla_put_flag(msg, SWITCH_LINK_FLAG_ANEG))
+                       goto nla_put_failure;
+       }
+       if (link->tx_flow) {
+               if (nla_put_flag(msg, SWITCH_LINK_FLAG_TX_FLOW))
+                       goto nla_put_failure;
+       }
+       if (link->rx_flow) {
+               if (nla_put_flag(msg, SWITCH_LINK_FLAG_RX_FLOW))
+                       goto nla_put_failure;
+       }
+       if (nla_put_u32(msg, SWITCH_LINK_SPEED, link->speed))
+               goto nla_put_failure;
+       if (link->eee & ADVERTISED_100baseT_Full) {
+               if (nla_put_flag(msg, SWITCH_LINK_FLAG_EEE_100BASET))
+                       goto nla_put_failure;
+       }
+       if (link->eee & ADVERTISED_1000baseT_Full) {
+               if (nla_put_flag(msg, SWITCH_LINK_FLAG_EEE_1000BASET))
+                       goto nla_put_failure;
+       }
+       nla_nest_end(msg, p);
+
+       return err;
+
+nla_put_failure:
+       nla_nest_cancel(msg, p);
+       return -1;
+}
+

 static int
 swconfig_get_attr(struct sk_buff *skb, struct genl_info *info)
 {
 static int
 swconfig_get_attr(struct sk_buff *skb, struct genl_info *info)
 {


@@ -794,6 +841,9 @@ swconfig_get_attr(struct sk_buff *skb, struct genl_info *info)
                val.value.ports = dev->portbuf;
                memset(dev->portbuf, 0,
                        sizeof(struct switch_port) * dev->ports);
                val.value.ports = dev->portbuf;
                memset(dev->portbuf, 0,
                        sizeof(struct switch_port) * dev->ports);

+       } else if (attr->type == SWITCH_TYPE_LINK) {
+               val.value.link = &dev->linkbuf;
+               memset(&dev->linkbuf, 0, sizeof(struct switch_port_link));

        }
 
        err = attr->get(dev, attr, &val);
        }
 
        err = attr->get(dev, attr, &val);


@@ -824,6 +874,12 @@ swconfig_get_attr(struct sk_buff *skb, struct genl_info *info)
                if (err < 0)
                        goto nla_put_failure;
                break;
                if (err < 0)
                        goto nla_put_failure;
                break;

+       case SWITCH_TYPE_LINK:
+               err = swconfig_send_link(msg, info,
+                                        SWITCH_ATTR_OP_VALUE_LINK, val.value.link);
+               if (err < 0)
+                       goto nla_put_failure;
+               break;

        default:
                pr_debug("invalid type in attribute\n");
                err = -EINVAL;
        default:
                pr_debug("invalid type in attribute\n");
                err = -EINVAL;

diff --git a/target/linux/generic/files/include/linux/switch.h b/target/linux/generic/files/include/linux/switch.h
index 42913645629a401724f2cba511b5e31f7185d714..eac35f91359f3db9196855f5579d0a0bddf35901 100644 (file)
--- a/target/linux/generic/files/include/linux/switch.h
+++ b/target/linux/generic/files/include/linux/switch.h
@@ -122,6 +122,7 @@ struct switch_dev {
        struct mutex sw_mutex;
        struct switch_port *portbuf;
        struct switch_portmap *portmap;
        struct mutex sw_mutex;
        struct switch_port *portbuf;
        struct switch_portmap *portmap;

+       struct switch_port_link linkbuf;

 
        char buf[128];
 
 
        char buf[128];
 


@@ -148,6 +149,7 @@ struct switch_val {
                const char *s;
                u32 i;
                struct switch_port *ports;
                const char *s;
                u32 i;
                struct switch_port *ports;

+               struct switch_port_link *link;

        } value;
 };
 
        } value;
 };
 

diff --git a/target/linux/generic/files/include/uapi/linux/switch.h b/target/linux/generic/files/include/uapi/linux/switch.h
index a59b23953a0fb7c86c5fcd993b19097bb7d0b5cf..c0071a415af988a1fbe61fb49933a0cfd4cb2d4b 100644 (file)
--- a/target/linux/generic/files/include/uapi/linux/switch.h
+++ b/target/linux/generic/files/include/uapi/linux/switch.h
@@ -50,6 +50,7 @@ enum {
        SWITCH_ATTR_OP_VALUE_INT,
        SWITCH_ATTR_OP_VALUE_STR,
        SWITCH_ATTR_OP_VALUE_PORTS,
        SWITCH_ATTR_OP_VALUE_INT,
        SWITCH_ATTR_OP_VALUE_STR,
        SWITCH_ATTR_OP_VALUE_PORTS,

+       SWITCH_ATTR_OP_VALUE_LINK,

        SWITCH_ATTR_OP_DESCRIPTION,
        /* port lists */
        SWITCH_ATTR_PORT,
        SWITCH_ATTR_OP_DESCRIPTION,
        /* port lists */
        SWITCH_ATTR_PORT,


@@ -86,6 +87,7 @@ enum switch_val_type {
        SWITCH_TYPE_INT,
        SWITCH_TYPE_STRING,
        SWITCH_TYPE_PORTS,
        SWITCH_TYPE_INT,
        SWITCH_TYPE_STRING,
        SWITCH_TYPE_PORTS,

+       SWITCH_TYPE_LINK,

        SWITCH_TYPE_NOVAL,
 };
 
        SWITCH_TYPE_NOVAL,
 };
 


@@ -97,6 +99,20 @@ enum {
        SWITCH_PORT_ATTR_MAX
 };
 
        SWITCH_PORT_ATTR_MAX
 };
 

+/* link nested attributes */
+enum {
+       SWITCH_LINK_UNSPEC,
+       SWITCH_LINK_FLAG_LINK,
+       SWITCH_LINK_FLAG_DUPLEX,
+       SWITCH_LINK_FLAG_ANEG,
+       SWITCH_LINK_FLAG_TX_FLOW,
+       SWITCH_LINK_FLAG_RX_FLOW,
+       SWITCH_LINK_SPEED,
+       SWITCH_LINK_FLAG_EEE_100BASET,
+       SWITCH_LINK_FLAG_EEE_1000BASET,
+       SWITCH_LINK_ATTR_MAX,
+};
+

 #define SWITCH_ATTR_DEFAULTS_OFFSET    0x1000
 
 
 #define SWITCH_ATTR_DEFAULTS_OFFSET    0x1000