diff mbox

[OpenWrt-Devel,2/3] swconfig: support receiving SWITCH_TYPE_LINK from kernel

Message ID 1450286343-5514-2-git-send-email-zajec5@gmail.com
State Changes Requested
Headers show

Commit Message

Rafał Miłecki Dec. 16, 2015, 5:19 p.m. UTC 
When using cli, print link state the same way kernel used to do it.
This will allow kernel switching PORT_LINK from SWITCH_TYPE_STRING.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
 package/network/config/swconfig/src/cli.c   | 33 +++++++++++++++++++++++
 package/network/config/swconfig/src/swlib.c | 42 +++++++++++++++++++++++++++++
 package/network/config/swconfig/src/swlib.h | 17 ++++++++++++
 3 files changed, 92 insertions(+)

Comments

Florian Fainelli Dec. 20, 2015, 9:56 p.m. UTC | #1 
Le 16 déc. 2015 09:21, "Rafał Miłecki" <zajec5@gmail.com> a écrit :
>
> When using cli, print link state the same way kernel used to do it.
> This will allow kernel switching PORT_LINK from SWITCH_TYPE_STRING.
>
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> ---
[snip]
> +                               link->eee &
SWLIB_LINK_FLAG_ADVERTISED_100BASET_FULL ? "eee100 " : "",
> +                               link->eee &
SWLIB_LINK_FLAG_ADVERTISED_1000BASET_FULL ? "eee1000 " : "",

EEE needs to be advertised, supported, and enabled on both link partners to
be used,what you are printing here is not very clear, as this is just the
advertised side

> +                               link->aneg ? "auto" : "");
> +               else
> +                       printf("port:%d link:down", val->port_vlan);
> +               break;
>         default:
>                 printf("?unknown-type?");
>         }
> diff --git a/package/network/config/swconfig/src/swlib.c
b/package/network/config/swconfig/src/swlib.c
> index 0dbace5..5239bf7 100644
> --- a/package/network/config/swconfig/src/swlib.c
> +++ b/package/network/config/swconfig/src/swlib.c
> @@ -51,6 +51,15 @@ static struct nla_policy
portmap_policy[SWITCH_PORTMAP_MAX] = {
>         [SWITCH_PORTMAP_VIRT] = { .type = NLA_U32 },
>  };
>
> +static struct nla_policy link_policy[SWITCH_LINK_ATTR_MAX] = {
> +       [SWITCH_LINK_LINK] = { .type = NLA_U32 },
> +       [SWITCH_LINK_DUPLEX] = { .type = NLA_U32 },
> +       [SWITCH_LINK_ANEG] = { .type = NLA_U32 },
> +       [SWITCH_LINK_SPEED] = { .type = NLA_U32 },

As mentioned in patch 1, some of this fits in a boolean.
--
Florian
Rafał Miłecki Dec. 21, 2015, 6:31 a.m. UTC | #2 
On 20 December 2015 at 22:56, Florian Fainelli <florian@openwrt.org> wrote:
> Le 16 déc. 2015 09:21, "Rafał Miłecki" <zajec5@gmail.com> a écrit :
>>
>> When using cli, print link state the same way kernel used to do it.
>> This will allow kernel switching PORT_LINK from SWITCH_TYPE_STRING.
>>
>> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
>> ---
> [snip]
>> +                               link->eee &
>> SWLIB_LINK_FLAG_ADVERTISED_100BASET_FULL ? "eee100 " : "",
>> +                               link->eee &
>> SWLIB_LINK_FLAG_ADVERTISED_1000BASET_FULL ? "eee1000 " : "",
>
> EEE needs to be advertised, supported, and enabled on both link partners to
> be used,what you are printing here is not very clear, as this is just the
> advertised side

This behavior is copied from the current implementation. This is what
kernel was putting in a string so far and sending to the user space.
Do we want to change it? Should I handle it in this patch or separated
one? I hope there aren't send screen scraping tools using "get link".
diff mbox

Patch

diff --git a/package/network/config/swconfig/src/cli.c b/package/network/config/swconfig/src/cli.c
index d472086..d3d0127 100644
--- a/package/network/config/swconfig/src/cli.c
+++ b/package/network/config/swconfig/src/cli.c
@@ -84,9 +84,27 @@  list_attributes(struct switch_dev *dev)
 	print_attrs(dev->port_ops);
 }
 
+static const char *
+speed_str(int speed)
+{
+	switch (speed) {
+	case 10:
+		return "10baseT";
+	case 100:
+		return "100baseT";
+	case 1000:
+		return "1000baseT";
+	default:
+		break;
+	}
+
+	return "unknown";
+}
+
 static void
 print_attr_val(const struct switch_attr *attr, const struct switch_val *val)
 {
+	struct switch_port_link *link;
 	int i;
 
 	switch (attr->type) {
@@ -104,6 +122,21 @@  print_attr_val(const struct switch_attr *attr, const struct switch_val *val)
 				 SWLIB_PORT_FLAG_TAGGED) ? "t" : "");
 		}
 		break;
+	case SWITCH_TYPE_LINK:
+		link = val->value.link;
+		if (link->link)
+			printf("port:%d link:up speed:%s %s-duplex %s%s%s%s%s",
+				val->port_vlan,
+				speed_str(link->speed),
+				link->duplex ? "full" : "half",
+				link->tx_flow ? "txflow " : "",
+				link->rx_flow ? "rxflow " : "",
+				link->eee & SWLIB_LINK_FLAG_ADVERTISED_100BASET_FULL ? "eee100 " : "",
+				link->eee & SWLIB_LINK_FLAG_ADVERTISED_1000BASET_FULL ? "eee1000 " : "",
+				link->aneg ? "auto" : "");
+		else
+			printf("port:%d link:down", val->port_vlan);
+		break;
 	default:
 		printf("?unknown-type?");
 	}
diff --git a/package/network/config/swconfig/src/swlib.c b/package/network/config/swconfig/src/swlib.c
index 0dbace5..5239bf7 100644
--- a/package/network/config/swconfig/src/swlib.c
+++ b/package/network/config/swconfig/src/swlib.c
@@ -51,6 +51,15 @@  static struct nla_policy portmap_policy[SWITCH_PORTMAP_MAX] = {
 	[SWITCH_PORTMAP_VIRT] = { .type = NLA_U32 },
 };
 
+static struct nla_policy link_policy[SWITCH_LINK_ATTR_MAX] = {
+	[SWITCH_LINK_LINK] = { .type = NLA_U32 },
+	[SWITCH_LINK_DUPLEX] = { .type = NLA_U32 },
+	[SWITCH_LINK_ANEG] = { .type = NLA_U32 },
+	[SWITCH_LINK_SPEED] = { .type = NLA_U32 },
+	[SWITCH_LINK_FLAG_ADVERTISED_100BASET_FULL] = { .type = NLA_FLAG },
+	[SWITCH_LINK_FLAG_ADVERTISED_1000BASET_FULL] = { .type = NLA_FLAG },
+};
+
 static inline void *
 swlib_alloc(size_t size)
 {
@@ -202,6 +211,37 @@  out:
 }
 
 static int
+store_link_val(struct nl_msg *msg, struct nlattr *nla, struct switch_val *val)
+{
+	struct nlattr *tb[SWITCH_LINK_ATTR_MAX + 1];
+	struct switch_port_link *link;
+	int err = 0;
+
+	if (!val->value.link)
+		val->value.link = malloc(sizeof(struct switch_port_link));
+
+	err = nla_parse_nested(tb, SWITCH_LINK_ATTR_MAX, nla, link_policy);
+	if (err < 0)
+		goto out;
+
+	link = val->value.link;
+	link->link = nla_get_u32(tb[SWITCH_LINK_LINK]);
+	link->duplex = nla_get_u32(tb[SWITCH_LINK_DUPLEX]);
+	link->aneg = nla_get_u32(tb[SWITCH_LINK_ANEG]);
+	link->tx_flow = nla_get_u32(tb[SWITCH_LINK_TX_FLOW]);
+	link->rx_flow = nla_get_u32(tb[SWITCH_LINK_RX_FLOW]);
+	link->speed = nla_get_u32(tb[SWITCH_LINK_SPEED]);
+	link->eee = 0;
+	if (tb[SWITCH_LINK_FLAG_ADVERTISED_100BASET_FULL])
+		link->eee |= SWLIB_LINK_FLAG_ADVERTISED_100BASET_FULL;
+	if (tb[SWITCH_LINK_FLAG_ADVERTISED_1000BASET_FULL])
+		link->eee |= SWLIB_LINK_FLAG_ADVERTISED_1000BASET_FULL;
+
+out:
+	return err;
+}
+
+static int
 store_val(struct nl_msg *msg, void *arg)
 {
 	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
@@ -221,6 +261,8 @@  store_val(struct nl_msg *msg, void *arg)
 		val->value.s = strdup(nla_get_string(tb[SWITCH_ATTR_OP_VALUE_STR]));
 	else if (tb[SWITCH_ATTR_OP_VALUE_PORTS])
 		val->err = store_port_val(msg, tb[SWITCH_ATTR_OP_VALUE_PORTS], val);
+	else if (tb[SWITCH_ATTR_OP_VALUE_LINK])
+		val->err = store_link_val(msg, tb[SWITCH_ATTR_OP_VALUE_LINK], val);
 
 	val->err = 0;
 	return 0;
diff --git a/package/network/config/swconfig/src/swlib.h b/package/network/config/swconfig/src/swlib.h
index 7edece3..6edd1e7 100644
--- a/package/network/config/swconfig/src/swlib.h
+++ b/package/network/config/swconfig/src/swlib.h
@@ -105,11 +105,16 @@  enum swlib_port_flags {
 	SWLIB_PORT_FLAG_TAGGED = (1 << 0),
 };
 
+enum swlib_link_flags {
+	SWLIB_LINK_FLAG_ADVERTISED_100BASET_FULL = (1 << 0),
+	SWLIB_LINK_FLAG_ADVERTISED_1000BASET_FULL = (1 << 1),
+};
 
 struct switch_dev;
 struct switch_attr;
 struct switch_port;
 struct switch_port_map;
+struct switch_port_link;
 struct switch_val;
 struct uci_package;
 
@@ -138,6 +143,7 @@  struct switch_val {
 		char *s;
 		int i;
 		struct switch_port *ports;
+		struct switch_port_link *link;
 	} value;
 };
 
@@ -161,6 +167,17 @@  struct switch_portmap {
 	char *segment;
 };
 
+struct switch_port_link {
+	int link;
+	int duplex;
+	int aneg;
+	int tx_flow;
+	int rx_flow;
+	int speed;
+	/* in ethtool adv_t format */
+	uint32_t eee;
+};
+
 /**
  * swlib_list: list all switches
  */