Display adjacent switch port's attributes
Subsystems (5)
cover Display adjacent switch port's attributes
This patch series adds a new option to ethtool to display the adjacent switch port's attributes, as perceived by the NIC, e.g. through respective LLDP message exchanges.
A patch for the qeth device driver provides a sample exploiter for the new functionality.
Best regards,
Stefan Raspl
PATCH 3/3 qeth: Display adjacent switch port attributes in ethtool
Add support for get_switch_port_attrs() callback in ethtool to display adjacent switch port's attributes.
--- drivers/s390/net/qeth_core.h | 2 drivers/s390/net/qeth_core_main.c | 79 ++++++++++++++++++++++++++++++++++++++ drivers/s390/net/qeth_core_mpc.h | 17 ++++++++ drivers/s390/net/qeth_l2_main.c | 1 drivers/s390/net/qeth_l3_main.c | 1 5 files changed, 100 insertions(+)
drivers/s390/net/qeth_core.h +2 -0
@@ -914,6 +914,8 @@ struct qeth_cmd_buffer *qeth_wait_for_buint qeth_mdio_read (struct net_device *,int ,int );int qeth_snmp_command (struct qeth_card *,char __user *);int qeth_query_oat_command (struct qeth_card *,char __user *); +int qeth_core_ethtool_get_switch_port_attrs (struct net_device *, +struct ethtool_swport_attrs *);int qeth_send_control_data (struct qeth_card *,int ,struct qeth_cmd_buffer *,int (*reply_cb)(struct qeth_card *,struct qeth_reply *,unsigned long ),void *reply_param);
drivers/s390/net/qeth_core_main.c +79 -0
91 lines not on this page · raw message
drivers/s390/net/qeth_core_mpc.h +17 -0
@@ -240,6 +240,7 @@ enum qeth_ipa_setadp_cmd {IPA_SETADP_SET_DIAG_ASSIST =0x00002000L ,IPA_SETADP_SET_ACCESS_CONTROL =0x00010000L ,IPA_SETADP_QUERY_OAT =0x00080000L , + IPA_SETADP_QUERY_SWITCH_ATTRIBUTES = 0x00100000L, };enum qeth_ipa_mac_ops { CHANGE_ADDR_READ_MAC = 0,
@@ -404,6 +405,21 @@ struct qeth_qoat_priv {char *buffer; }; +#define QETH_SWITCH_FORW_802_1 0x00000001 +#define QETH_SWITCH_FORW_REFL_RELAY 0x00000002 +#define QETH_SWITCH_CAP_RTE 0x00000004 +#define QETH_SWITCH_CAP_ECP 0x00000008 +#define QETH_SWITCH_CAP_VDP 0x00000010 + +struct qeth_query_switch_attributes { +__u8 version; +__u8 reserved1; +__u16 reserved2; +__u32 capabilities; +__u32 settings; +__u8 reserved3[8 ]; +}; +struct qeth_ipacmd_setadpparms_hdr {__u32 supp_hw_cmds;__u32 reserved1;
@@ -424,6 +440,7 @@ struct qeth_ipacmd_setadpparms {struct qeth_snmp_cmd snmp;struct qeth_set_access_ctrl set_access_ctrl;struct qeth_query_oat query_oat; +struct qeth_query_switch_attributes query_switch_attributes;__u32 mode; } data; } __attribute__ ((packed));
drivers/s390/net/qeth_l2_main.c +1 -0
@@ -911,6 +911,7 @@ static const struct ethtool_ops qeth_l2_ .get_sset_count = qeth_core_get_sset_count, .get_drvinfo = qeth_core_get_drvinfo, .get_settings = qeth_core_ethtool_get_settings, + .get_switch_port_attrs = qeth_core_ethtool_get_switch_port_attrs, };static const struct ethtool_ops qeth_l2_osn_ops = {
drivers/s390/net/qeth_l3_main.c +1 -0
@@ -3198,6 +3198,7 @@ static const struct ethtool_ops qeth_l3_ .get_sset_count = qeth_core_get_sset_count, .get_drvinfo = qeth_core_get_drvinfo, .get_settings = qeth_core_ethtool_get_settings, + .get_switch_port_attrs = qeth_core_ethtool_get_switch_port_attrs, };/*
drivers/s390/net/qeth_core.h +5 -0
@@ -738,6 +738,11 @@ struct qeth_rx {int qdio_err; }; +struct qeth_switch_info { +__u32 capabilities; +__u32 settings; +}; +#define QETH_NAPI_WEIGHT NAPI_POLL_WEIGHTstruct qeth_card {
PATCH 1/3 ethtool: Add callback to indicate adjacent switch port attributes
In reply to [email protected]Switches supporting LLDP can communicate port attributes to connected devices. Device drivers capable of accessing this information from the devices can use the new callback get_switch_port_attrs() to report supported and enabled settings in the card's adjacent switch port for display in ethtool. Implementors have to use the respective SUPPORTED_SP_* and ENABLED_SP_* defines to indicate the current settings.
--- include/linux/ethtool.h | 3 +++ include/uapi/linux/ethtool.h | 35 +++++++++++++++++++++++++++++++++++ net/core/ethtool.c | 22 ++++++++++++++++++++++ 3 files changed, 60 insertions(+)
include/linux/ethtool.h +3 -0
@@ -177,6 +177,7 @@ static inline u32 ethtool_rxfh_indir_def* @get_module_eeprom: Get the eeprom information from the plug-in module * @get_eee: Get Energy-Efficient (EEE) supported and status. * @set_eee: Set EEE status (enable/disable) as well as LPI timers. +* @get_switch_port_attrs: Get adjacent switch port attributes. * * All operations are optional (i.e. the function pointer may be set * to %NULL) and callers must take this into account. Callers must
@@ -245,6 +246,8 @@ struct ethtool_ops { struct ethtool_eeprom *, u8 *);int (*get_eee)(struct net_device *,struct ethtool_eee *);int (*set_eee)(struct net_device *,struct ethtool_eee *); +int (*get_switch_port_attrs)(struct net_device *, +struct ethtool_swport_attrs *); };
include/uapi/linux/ethtool.h +35 -0
@@ -136,6 +136,22 @@ struct ethtool_eeprom { };/** +* struct ethtool_swport_attrs - query adjacent switch port attributes +* @cmd: ETHTOOL_GPORT +* @port_rc: Use GPORT_RC_* as appropriate. +* @supported: Forwarding modes and capabilities supported by the switch port, +* see SUPPORTED_SP_* flags. +* @enabled: Forwarding modes and capabilities currently activated at the +* adjacent switch port, see ENABLED_SP_* flags. +*/ +struct ethtool_swport_attrs { +__u32 cmd; +__u32 port_rc; +__u32 supported; +__u32 enabled; +}; + +/** * struct ethtool_eee - Energy Efficient Ethernet information * @cmd: ETHTOOL_{G,S}EEE * @supported: Mask of %SUPPORTED_* flags for the speed/duplex combinations
@@ -900,6 +916,7 @@ enum ethtool_sfeatures_retval_bits {#define ETHTOOL_GMODULEEEPROM 0x00000043/* Get plug-in module eeprom */ #define ETHTOOL_GEEE 0x00000044/* Get EEE settings */ #define ETHTOOL_SEEE 0x00000045/* Set EEE settings */ +#define ETHTOOL_GPORT 0x00000046/* Get switch port attributes */ /* compatibility with older code */ #define SPARC_ETH_GSET ETHTOOL_GSET
@@ -1067,6 +1084,24 @@ enum ethtool_sfeatures_retval_bits {#define ETH_MODULE_SFF_8472 0x2#define ETH_MODULE_SFF_8472_LEN 512 +/* Bad return codes for switch ports */ +#define GPORT_RC_LLDP_UNSUP 1/* switch port doesn't support */ +/* required LLDP EVB TLV */ + +/* Indicates what features the adjacent switch port supports. */ +#define SUPPORTED_SP_FWD_802_1 (1 << 0) +#define SUPPORTED_SP_FWD_RR (1 << 1) +#define SUPPORTED_SP_CAP_RTE (1 << 9) +#define SUPPORTED_SP_CAP_ECP (1 << 10) +#define SUPPORTED_SP_CAP_VDP (1 << 11) + +/* Indicates what features the adjacent switch port has enabled. */ +#define ENABLED_SP_FWD_802_1 (1 << 0) +#define ENABLED_SP_FWD_RR (1 << 1) +#define ENABLED_SP_CAP_RTE (1 << 9) +#define ENABLED_SP_CAP_ECP (1 << 10) +#define ENABLED_SP_CAP_VDP (1 << 11) +/* Reset flags */ /* The reset() operation must clear the flags for the components which * were actually reset. On successful return, the flags indicate the
net/core/ethtool.c +22 -0
@@ -1446,6 +1446,25 @@ static int ethtool_get_module_eeprom(str modinfo.eeprom_len); } +static int ethtool_get_switch_port_attrs (struct net_device *dev, +void __user *useraddr) +{ +struct ethtool_swport_attrs attrs = {ETHTOOL_GPORT }; +int rc; + +if (!dev->ethtool_ops->get_switch_port_attrs) +return -EOPNOTSUPP ; + + rc = dev->ethtool_ops->get_switch_port_attrs (dev, &attrs); +if (rc) +return rc; + +if (copy_to_user (useraddr, &attrs,sizeof (attrs))) +return -EFAULT ; + +return 0 ; +} +/* The main entry point in this file. Called from net/core/dev_ioctl.c */ int dev_ethtool (struct net *net,struct ifreq *ifr)
@@ -1675,6 +1694,9 @@ int dev_ethtool(struct net *net, structcase ETHTOOL_GMODULEEEPROM : rc =ethtool_get_module_eeprom (dev, useraddr);break ; +case ETHTOOL_GPORT : + rc =ethtool_get_switch_port_attrs (dev, useraddr); +break ;default : rc = -EOPNOTSUPP ; }
PATCH 2/3 ethtool: Add option -q to display adjacent switch ports attributes
In reply to [email protected]Add new option '-q|--query-switch-port' to display information on the adjacent switch port's settings as perceived by the respective NIC. In the output,
- unsupported attributes are indicated as such ('unsupported'),
- supported but disabled attributes display 'no', and
- enabled attributes display 'yes'.
Attributes supported by this patch are
- forwarding modes:
standard (802.1) and reflective relay (RR) aka hairpin
- edge virtual bridging (EVB) related capabilities:
edge control protocol (ECP), VSI discovery and configuration protocol (VDP), and retransmission timer exponent (RTE).
--- ethtool-copy.h | 35 +++++++++++++++++++++++++++++ ethtool.8 | 6 +++++ ethtool.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+)
ethtool-copy.h +35 -0
@@ -348,6 +348,22 @@ struct ethtool_pauseparam {__u32 tx_pause; }; +/** +* struct ethtool_swport_attrs - query adjacent switch port attributes +* @cmd: ETHTOOL_GPORT +* @port_rc: Use GPORT_RC_* as appropriate. +* @supported: Forwarding modes and capabilities supported by the switch port, +* see SUPPORTED_SP_* flags. +* @enabled: Forwarding modes and capabilities currently activated at the +* adjacent switch port, see ENABLED_SP_* flags. +*/ +struct ethtool_swport_attrs { +__u32 cmd; +__u32 port_rc; +__u32 supported; +__u32 enabled; +}; +#define ETH_GSTRING_LEN 32enum ethtool_stringset {ETH_SS_TEST =0 ,
@@ -900,6 +916,7 @@ enum ethtool_sfeatures_retval_bits {#define ETHTOOL_GMODULEEEPROM 0x00000043/* Get plug-in module eeprom */ #define ETHTOOL_GEEE 0x00000044/* Get EEE settings */ #define ETHTOOL_SEEE 0x00000045/* Set EEE settings */ +#define ETHTOOL_GPORT 0x00000046/* Get switch port attributes */ /* compatibility with older code */ #define SPARC_ETH_GSET ETHTOOL_GSET
@@ -1067,6 +1084,24 @@ enum ethtool_sfeatures_retval_bits {#define ETH_MODULE_SFF_8472 0x2#define ETH_MODULE_SFF_8472_LEN 512 +/* Bad return codes for switch ports */ +#define GPORT_RC_LLDP_UNSUP 1/* switch port doesn't support */ +/* required LLDP EVB TLV */ + +/* Indicates what features the adjacent switch port supports. */ +#define SUPPORTED_SP_FWD_802_1 (1 << 0) +#define SUPPORTED_SP_FWD_RR (1 << 1) +#define SUPPORTED_SP_CAP_RTE (1 << 9) +#define SUPPORTED_SP_CAP_ECP (1 << 10) +#define SUPPORTED_SP_CAP_VDP (1 << 11) + +/* Indicates what features the adjacent switch port has enabled. */ +#define ENABLED_SP_FWD_802_1 (1 << 0) +#define ENABLED_SP_FWD_RR (1 << 1) +#define ENABLED_SP_CAP_RTE (1 << 9) +#define ENABLED_SP_CAP_ECP (1 << 10) +#define ENABLED_SP_CAP_VDP (1 << 11) +/* Reset flags */ /* The reset() operation must clear the flags for the components which * were actually reset. On successful return, the flags indicate the
ethtool.8 +6 -0
@@ -214,6 +214,9 @@ ethtool \- query or control network driv .B ethtool \-P|\-\-show\-permaddr .I devname .HP +.B ethtool \-q|\-\-query-switch-port +.I devname +.HP .B ethtool \-r|\-\-negotiate .I devname .HP
@@ -485,6 +488,9 @@ Length of time to perform phys-id, in se .B \-P \-\-show\-permaddr Queries the specified network device for permanent hardware address. .TP +.B \-q \-\-query-switch-port +Queries the specified Ethernet device for adjacent switch port's attributes. +.TP .B \-r \-\-negotiate Restarts auto-negotiation on the specified Ethernet device, if auto-negotiation is enabled.
ethtool.c +68 -0
86 lines not on this page · raw message
Am 09.12.2013 07:31, schrieb [email protected]:
Quoted 6 lines
This patch series adds a new option to ethtool to display the adjacent switch port's attributes, as perceived by the NIC, e.g. through respective LLDP message exchanges.
A patch for the qeth device driver provides a sample exploiter for the new functionality.
Quoted 7 lines
Best regards,
Stefan Raspl--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please ignore this stray patch series - the one posted 12/12 is the real thing.
Regards
Stefan Raspl