s390/qeth: updates 2017-09-18
Subsystems (4)
cover s390/qeth: updates 2017-09-18
Hi Dave,
first batch of patches for 4.15. One larger item in there is Hans' addition of new configuration options for flexible packet processing ('VNIC characteristics'). The patch descriptions have all the details. Please apply.
Thanks,
Julian
Hans Wippel (3):
s390/qeth: add basic VNICC support
s390/qeth: add VNICC enable/disable support
s390/qeth: add VNICC get/set timeout support
Jens Remus (1):
s390/qeth: tidy up parameter naming for qeth_do_send_packet()
Julian Wiedmann (5):
s390/qeth: remove unused code in qdio_establish_cq() s390/qeth: don't take queue lock in send_packet_fast() s390/qeth: simplify L3 sysfs group management s390/qeth: translate SETVLAN/DELVLAN errors s390/qeth: fold VLAN handling into l3_rebuild_skb()
drivers/s390/net/qeth_core.h | 22 +- drivers/s390/net/qeth_core_main.c | 23 +- drivers/s390/net/qeth_core_mpc.c | 4 +- drivers/s390/net/qeth_core_mpc.h | 72 ++++++ drivers/s390/net/qeth_l2.h | 6 + drivers/s390/net/qeth_l2_main.c | 517 ++++++++++++++++++++++++++++++++++++-- drivers/s390/net/qeth_l2_sys.c | 202 +++++++++++++-- drivers/s390/net/qeth_l3_main.c | 31 +-- drivers/s390/net/qeth_l3_sys.c | 45 +--- 9 files changed, 819 insertions(+), 103 deletions(-)
Signature · 1 line
2.13.5
PATCH 1/9 s390/qeth: add basic VNICC support
From: Hans Wippel <[email protected]>
VNIC Characteristics (VNICC) are features of HiperSockets that define how packets are handled by the underlying network hardware. For example, if the VNICC flooding is configured on a qeth device, ethernet frames to unknown destination MAC addresses are received.
Currently, there is support for seven VNICCs: flooding, multicast flooding, receive broadcast, learning, takeover learning, takeover setvmac, bridge invisible. Also, six IPA commands exist for configuring VNICCs on a qeth device: query characteristics, query commands, enable characteristic, disable characteristic, set timeout, get timeout.
This patch adds the basic code infrastructure for VNICC support to qeth. It allows querying VNICC support from the underlying hardware. To this end, it adds:
* basic message formats for IPA commands
* basic data structures
* basic error handling
* query characteristics IPA command support
The query characteristics IPA command allows requesting the currently supported and currently enabled VNIC characteristics from the underlying hardware.
Support for the other IPA commands and for the configuration of VNICCs is added in follow-up patches together with the respective user interface functions.
--- drivers/s390/net/qeth_core.h | 7 ++ drivers/s390/net/qeth_core_mpc.c | 4 +- drivers/s390/net/qeth_core_mpc.h | 29 +++++++++ drivers/s390/net/qeth_l2_main.c | 136 ++++++++++++++++++++++++++++++++++++++- 4 files changed, 172 insertions(+), 4 deletions(-)
drivers/s390/net/qeth_core.h +7 -0
@@ -182,6 +182,12 @@ struct qeth_sbp_info { __u32 reflect_promisc_primary:1; }; +struct qeth_vnicc_info { +/* supported/currently configured VNICCs; updated in IPA exchanges */ +u32 sup_chars; +u32 cur_chars; +}; +static inline int qeth_is_ipa_supported (struct qeth_ipa_info *ipa,enum qeth_ipa_funcs func) {
@@ -673,6 +679,7 @@ struct qeth_card_options {struct qeth_routing_info route6;struct qeth_ipa_info ipa6;struct qeth_sbp_info sbp;/* SETBRIDGEPORT options */ +struct qeth_vnicc_info vnicc;/* VNICC options */ int fake_broadcast;int layer2;int performance_stats;
drivers/s390/net/qeth_core_mpc.c +3 -1
@@ -167,7 +167,7 @@ static struct ipa_rc_msg qeth_ipa_rc_msg[] = { {IPA_RC_IP_TABLE_FULL, "Add Addr IP Table Full - ipv6"}, {IPA_RC_UNKNOWN_ERROR, "IPA command failed - reason unknown"}, {IPA_RC_UNSUPPORTED_COMMAND, "Command not supported"}, - {IPA_RC_TRACE_ALREADY_ACTIVE, "trace already active"}, + {IPA_RC_VNICC_OOSEQ, "Command issued out of sequence"}, {IPA_RC_INVALID_FORMAT, "invalid format or length"}, {IPA_RC_DUP_IPV6_REMOTE, "ipv6 address already registered remote"}, {IPA_RC_SBP_IQD_NOT_CONFIGURED, "Not configured for bridgeport"},
@@ -193,6 +193,7 @@ static struct ipa_rc_msg qeth_ipa_rc_msg[] = { {IPA_RC_L2_INVALID_VLAN_ID, "L2 invalid vlan id"}, {IPA_RC_L2_DUP_VLAN_ID, "L2 duplicate vlan id"}, {IPA_RC_L2_VLAN_ID_NOT_FOUND, "L2 vlan id not found"}, + {IPA_RC_VNICC_VNICBP, "VNIC is BridgePort"}, {IPA_RC_SBP_OSA_NOT_CONFIGURED, "Not configured for bridgeport"}, {IPA_RC_SBP_OSA_OS_MISMATCH, "OS mismatch"}, {IPA_RC_SBP_OSA_ANO_DEV_PRIMARY, "Primary bridgeport exists already"},
@@ -253,6 +254,7 @@ static struct ipa_cmd_names qeth_ipa_cmd_names[] = { {IPA_CMD_DELGMAC, "delgmac"}, {IPA_CMD_SETVLAN, "setvlan"}, {IPA_CMD_DELVLAN, "delvlan"}, + {IPA_CMD_VNICC, "vnic_characteristics"}, {IPA_CMD_SETBRIDGEPORT_OSA, "set_bridge_port(osa)"}, {IPA_CMD_SETCCID, "setccid"}, {IPA_CMD_DELCCID, "delccid"},
drivers/s390/net/qeth_core_mpc.h +29 -0
@@ -90,6 +90,7 @@ enum qeth_ipa_cmds {IPA_CMD_DELGMAC =0x24 ,IPA_CMD_SETVLAN =0x25 ,IPA_CMD_DELVLAN =0x26 , +IPA_CMD_VNICC =0x2a ,IPA_CMD_SETBRIDGEPORT_OSA =0x2b ,IPA_CMD_SETCCID =0x41 , IPA_CMD_DELCCID = 0x42,
@@ -165,6 +166,7 @@ enum qeth_ipa_return_codes {IPA_RC_L2_INVALID_VLAN_ID =0x2015 ,IPA_RC_L2_DUP_VLAN_ID =0x2016 ,IPA_RC_L2_VLAN_ID_NOT_FOUND =0x2017 , +IPA_RC_VNICC_VNICBP =0x20B0 ,IPA_RC_SBP_OSA_NOT_CONFIGURED =0x2B0C ,IPA_RC_SBP_OSA_OS_MISMATCH =0x2B10 , IPA_RC_SBP_OSA_ANO_DEV_PRIMARY = 0x2B14,
@@ -197,6 +199,9 @@ enum qeth_ipa_return_codes {IPA_RC_ENOMEM =0xfffe , IPA_RC_FFFF = 0xffff }; +/* for VNIC Characteristics */ +#define IPA_RC_VNICC_OOSEQ 0x0005 +/* for SET_DIAGNOSTIC_ASSIST */ #define IPA_RC_INVALID_SUBCMD IPA_RC_IP_TABLE_FULL#define IPA_RC_HARDWARE_AUTH_ERROR IPA_RC_UNKNOWN_ERROR
@@ -551,6 +556,29 @@ struct qeth_ipacmd_diagass {__u8 cdata[64 ]; } __attribute__ ((packed)); +/* VNIC Characteristics IPA Command: *****************************************/ +/* IPA commands/sub commands for VNICC */ +#define IPA_VNICC_QUERY_CHARS 0x00000000L + +/* VNICC header */ +struct qeth_ipacmd_vnicc_hdr { +u32 sup; +u32 cur; +}; + +/* VNICC sub command header */ +struct qeth_vnicc_sub_hdr { +u16 data_length; +u16 reserved; +u32 sub_command; +}; + +/* complete VNICC IPA command message */ +struct qeth_ipacmd_vnicc { +struct qeth_ipacmd_vnicc_hdr hdr; +struct qeth_vnicc_sub_hdr sub_hdr; +}; +/* SETBRIDGEPORT IPA Command: *********************************************/ enum qeth_ipa_sbp_cmd {IPA_SBP_QUERY_COMMANDS_SUPPORTED =0x00000000L ,
@@ -692,6 +720,7 @@ struct qeth_ipa_cmd {struct qeth_ipacmd_diagass diagass;struct qeth_ipacmd_setbridgeport sbp;struct qeth_ipacmd_addr_change addrchange; +struct qeth_ipacmd_vnicc vnicc; } data; } __attribute__ ((packed));
drivers/s390/net/qeth_l2_main.c +133 -3
168 lines not on this page · raw message
Signature · 1 line
2.13.5
PATCH 2/9 s390/qeth: add VNICC enable/disable support
In reply to Julian WiedmannFrom: Hans Wippel <[email protected]>
HiperSocket devices allow enabling and disabling so called VNIC Characteristics (VNICC) that influence how the underlying hardware handles packets. These VNICCs are:
* Flooding VNICC: Flooding allows specifying if packets to unknown destination MAC addresses are received by the qeth device.
* Multicast flooding VNICC: Multicast flooding allows specifying if packets to multicast MAC addresses are received by the qeth device.
* Learning VNICC: If learning is enabled on a qeth device, the device learns the source MAC addresses of outgoing packets and incoming packets to those learned MAC addresses are received.
* Takeover setvmac VNICC: If takeover setvmac is configured on a qeth device, the MAC address of this device can be configured on a different qeth device with the setvmac IPA command.
* Takeover by learning VNICC: If takeover learning is enabled on a qeth device, the MAC address of this device can be learned (learning VNICC) on a different qeth device.
* BridgePort invisible VNICC: If BridgePort invisible is enabled on a qeth device, (1) packets from this device are not sent to a BridgePort enabled qeth device and (2) packets coming from a BridgePort enabled qeth device are not received by this device.
* Receive broadcast VNICC: Receive broadcast allows configuring if a qeth device receives packets with the broadcast destination MAC address.
This patch adds support for the IPA commands that are required to enable and disable these VNIC characteristics on qeth devices. As a prerequisite, it also adds the query commands IPA command.
The query commands IPA command allows requesting the supported commands for each characteristic from the underlying hardware.
Additionally, this patch provides users with a sysfs user interface to enable/disable the VNICCs mentioned above.
--- drivers/s390/net/qeth_core.h | 6 ++ drivers/s390/net/qeth_core_mpc.h | 31 ++++++ drivers/s390/net/qeth_l2.h | 4 + drivers/s390/net/qeth_l2_main.c | 207 +++++++++++++++++++++++++++++++++++++++ drivers/s390/net/qeth_l2_sys.c | 158 +++++++++++++++++++++++++++--- 5 files changed, 392 insertions(+), 14 deletions(-)
drivers/s390/net/qeth_core.h +6 -0
@@ -186,6 +186,12 @@ struct qeth_vnicc_info {/* supported/currently configured VNICCs; updated in IPA exchanges */ u32 sup_chars;u32 cur_chars; +/* supported commands: bitmasks which VNICCs support respective cmd */ +u32 set_char_sup; +/* characteristics wanted/configured by user */ +u32 wanted_chars; +/* has user explicitly enabled rx_bcast while online? */ +bool rx_bcast_enabled; }; static inline int qeth_is_ipa_supported(struct qeth_ipa_info *ipa,
drivers/s390/net/qeth_core_mpc.h +31 -0
@@ -559,6 +559,22 @@ struct qeth_ipacmd_diagass {/* VNIC Characteristics IPA Command: *****************************************/ /* IPA commands/sub commands for VNICC */ #define IPA_VNICC_QUERY_CHARS 0x00000000L +#define IPA_VNICC_QUERY_CMDS 0x00000001L +#define IPA_VNICC_ENABLE 0x00000002L +#define IPA_VNICC_DISABLE 0x00000004L + +/* VNICC flags */ +#define QETH_VNICC_FLOODING 0x80000000 +#define QETH_VNICC_MCAST_FLOODING 0x40000000 +#define QETH_VNICC_LEARNING 0x20000000 +#define QETH_VNICC_TAKEOVER_SETVMAC 0x10000000 +#define QETH_VNICC_TAKEOVER_LEARNING 0x08000000 +#define QETH_VNICC_BRIDGE_INVISIBLE 0x04000000 +#define QETH_VNICC_RX_BCAST 0x02000000 + +/* VNICC default values */ +#define QETH_VNICC_ALL 0xff000000 +#define QETH_VNICC_DEFAULT QETH_VNICC_RX_BCAST/* VNICC header */ struct qeth_ipacmd_vnicc_hdr {
@@ -573,10 +589,25 @@ struct qeth_vnicc_sub_hdr {u32 sub_command; }; +/* query supported commands for VNIC characteristic */ +struct qeth_vnicc_query_cmds { +u32 vnic_char; +u32 sup_cmds; +}; + +/* enable/disable VNIC characteristic */ +struct qeth_vnicc_set_char { +u32 vnic_char; +}; +/* complete VNICC IPA command message */ struct qeth_ipacmd_vnicc {struct qeth_ipacmd_vnicc_hdr hdr;struct qeth_vnicc_sub_hdr sub_hdr; +union { +struct qeth_vnicc_query_cmds query_cmds; +struct qeth_vnicc_set_char set_char; + }; };/* SETBRIDGEPORT IPA Command: *********************************************/
drivers/s390/net/qeth_l2.h +4 -0
@@ -14,6 +14,10 @@ int qeth_l2_create_device_attributes(struct device *);void qeth_l2_remove_device_attributes (struct device *);void qeth_l2_setup_bridgeport_attrs (struct qeth_card *card); +int qeth_l2_vnicc_set_state (struct qeth_card *card,u32 vnicc,bool state); +int qeth_l2_vnicc_get_state (struct qeth_card *card,u32 vnicc,bool *state); +bool qeth_l2_vnicc_is_in_use (struct qeth_card *card); +struct qeth_mac {u8 mac_addr[OSA_ADDR_LEN ];u8 is_uc:1 ;
drivers/s390/net/qeth_l2_main.c +207 -0
264 lines not on this page · raw message
drivers/s390/net/qeth_l2_sys.c +144 -14
221 lines not on this page · raw message
Signature · 1 line
2.13.5
PATCH 3/9 s390/qeth: add VNICC get/set timeout support
In reply to Julian WiedmannFrom: Hans Wippel <[email protected]>
HiperSockets allow configuring so called VNIC Characteristics (VNICC) that influence how the underlying hardware handles packets. For VNICCs, additional commands for getting and setting timeouts are available. Currently, the learning VNICC uses these commands.
* Learning VNICC: If learning is enabled on a qeth device, the device learns the source MAC addresses of outgoing packets and incoming packets to those learned MAC addresses are received.
For learning, the timeout specifies the idle period in seconds, after which the underlying hardware removes a learned MAC address again.
This patch adds support for the IPA commands that are required to get and set the current timeout values for the learning VNIC characteristic. Also, it introduces the sysfs interface that allows users to configure the timeout.
--- drivers/s390/net/qeth_core.h | 3 + drivers/s390/net/qeth_core_mpc.h | 11 ++++ drivers/s390/net/qeth_l2.h | 2 + drivers/s390/net/qeth_l2_main.c | 135 +++++++++++++++++++++++++++++++++++++-- drivers/s390/net/qeth_l2_sys.c | 44 +++++++++++++ 5 files changed, 190 insertions(+), 5 deletions(-)
drivers/s390/net/qeth_core.h +3 -0
@@ -188,6 +188,9 @@ struct qeth_vnicc_info {u32 cur_chars;/* supported commands: bitmasks which VNICCs support respective cmd */ u32 set_char_sup; +u32 getset_timeout_sup; +/* timeout value for the learning characteristic */ +u32 learning_timeout;/* characteristics wanted/configured by user */ u32 wanted_chars;/* has user explicitly enabled rx_bcast while online? */
drivers/s390/net/qeth_core_mpc.h +11 -0
@@ -562,6 +562,8 @@ struct qeth_ipacmd_diagass {#define IPA_VNICC_QUERY_CMDS 0x00000001L#define IPA_VNICC_ENABLE 0x00000002L#define IPA_VNICC_DISABLE 0x00000004L +#define IPA_VNICC_SET_TIMEOUT 0x00000008L +#define IPA_VNICC_GET_TIMEOUT 0x00000010L/* VNICC flags */ #define QETH_VNICC_FLOODING 0x80000000
@@ -575,6 +577,8 @@ struct qeth_ipacmd_diagass {/* VNICC default values */ #define QETH_VNICC_ALL 0xff000000#define QETH_VNICC_DEFAULT QETH_VNICC_RX_BCAST +/* default VNICC timeout in seconds */ +#define QETH_VNICC_DEFAULT_TIMEOUT 600/* VNICC header */ struct qeth_ipacmd_vnicc_hdr {
@@ -600,6 +604,12 @@ struct qeth_vnicc_set_char {u32 vnic_char; }; +/* get/set timeout for VNIC characteristic */ +struct qeth_vnicc_getset_timeout { +u32 vnic_char; +u32 timeout; +}; +/* complete VNICC IPA command message */ struct qeth_ipacmd_vnicc {struct qeth_ipacmd_vnicc_hdr hdr;
@@ -607,6 +617,7 @@ struct qeth_ipacmd_vnicc {union {struct qeth_vnicc_query_cmds query_cmds;struct qeth_vnicc_set_char set_char; +struct qeth_vnicc_getset_timeout getset_timeout; }; };
drivers/s390/net/qeth_l2.h +2 -0
@@ -16,6 +16,8 @@ void qeth_l2_setup_bridgeport_attrs(struct qeth_card *card);int qeth_l2_vnicc_set_state (struct qeth_card *card,u32 vnicc,bool state);int qeth_l2_vnicc_get_state (struct qeth_card *card,u32 vnicc,bool *state); +int qeth_l2_vnicc_set_timeout (struct qeth_card *card,u32 timeout); +int qeth_l2_vnicc_get_timeout (struct qeth_card *card,u32 *timeout);bool qeth_l2_vnicc_is_in_use (struct qeth_card *card);struct qeth_mac {
drivers/s390/net/qeth_l2_main.c +130 -5
216 lines not on this page · raw message
drivers/s390/net/qeth_l2_sys.c +44 -0
62 lines not on this page · raw message
Signature · 1 line
2.13.5
PATCH 4/9 s390/qeth: remove unused code in qdio_establish_cq()
In reply to Julian WiedmannStoring the number of input buffers into 'i' has no effect, it is immediately re-assigned in the next line.
--- drivers/s390/net/qeth_core_main.c | 1 - 1 file changed, 1 deletion(-)
drivers/s390/net/qeth_core_main.c +0 -1
@@ -4923,7 +4923,6 @@ static void qeth_qdio_establish_cq(struct qeth_card *card,if (card->options.cq ==QETH_CQ_ENABLED ) {int offset =QDIO_MAX_BUFFERS_PER_Q * (card->qdio.no_in_queues -1 ); - i =QDIO_MAX_BUFFERS_PER_Q * (card->qdio.no_in_queues -1 );for (i =0 ; i <QDIO_MAX_BUFFERS_PER_Q ; ++i) { in_sbal_ptrs[offset + i] = (struct qdio_buffer *)virt_to_phys (card->qdio.c_q->bufs[i].buffer);
Signature · 1 line
2.13.5
PATCH 5/9 s390/qeth: don't take queue lock in send_packet_fast()
In reply to Julian WiedmannLocking the output queue prior to TX is needed on OSA devices, to synchronize against a packing flush from the TX completion code (via qeth_check_outbound_queue()).
But send_packet_fast() is only used for IQDs, which don't do packing. So remove the locking, and apply some easy cleanups.
--- drivers/s390/net/qeth_core.h | 3 +-- drivers/s390/net/qeth_core_main.c | 22 +++++----------------- drivers/s390/net/qeth_l2_main.c | 2 +- drivers/s390/net/qeth_l3_main.c | 4 ++-- 4 files changed, 9 insertions(+), 22 deletions(-)
drivers/s390/net/qeth_core.h +1 -2
@@ -962,8 +962,7 @@ int qeth_get_priority_queue(struct qeth_card *, struct sk_buff *, int, int);int qeth_get_elements_no (struct qeth_card *card,struct sk_buff *skb,int extra_elems,int data_offset);int qeth_get_elements_for_frags (struct sk_buff *); -int qeth_do_send_packet_fast (struct qeth_card *card, -struct qeth_qdio_out_q *queue,struct sk_buff *skb, +int qeth_do_send_packet_fast (struct qeth_qdio_out_q *queue,struct sk_buff *skb,struct qeth_hdr *hdr,unsigned int offset,unsigned int hd_len); int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,
drivers/s390/net/qeth_core_main.c +5 -17
@@ -4040,35 +4040,23 @@ static int qeth_fill_buffer(struct qeth_qdio_out_q *queue,return flush_cnt; } -int qeth_do_send_packet_fast (struct qeth_card *card, -struct qeth_qdio_out_q *queue,struct sk_buff *skb, +int qeth_do_send_packet_fast (struct qeth_qdio_out_q *queue,struct sk_buff *skb,struct qeth_hdr *hdr,unsigned int offset,unsigned int hd_len) { -struct qeth_qdio_out_buffer *buffer; -int index; +int index = queue->next_buf_to_fill; +struct qeth_qdio_out_buffer *buffer = queue->bufs[index]; -/* spin until we get the queue ... */ -while (atomic_cmpxchg (&queue->state,QETH_OUT_Q_UNLOCKED , -QETH_OUT_Q_LOCKED ) !=QETH_OUT_Q_UNLOCKED ); -/* ... now we've got the queue */ - index = queue->next_buf_to_fill; - buffer = queue->bufs[queue->next_buf_to_fill];/* * check if buffer is empty to make sure that we do not 'overtake' * ourselves and try to fill a buffer that is already primed */ if (atomic_read (&buffer->state) !=QETH_QDIO_BUF_EMPTY ) - goto out; - queue->next_buf_to_fill = (queue->next_buf_to_fill +1 ) % -QDIO_MAX_BUFFERS_PER_Q ; -atomic_set (&queue->state,QETH_OUT_Q_UNLOCKED ); +return -EBUSY ; + queue->next_buf_to_fill = (index +1 ) %QDIO_MAX_BUFFERS_PER_Q ;qeth_fill_buffer (queue, buffer, skb, hdr, offset, hd_len);qeth_flush_buffers (queue, index,1 );return 0 ; -out: -atomic_set (&queue->state,QETH_OUT_Q_UNLOCKED ); -return -EBUSY ; }EXPORT_SYMBOL_GPL (qeth_do_send_packet_fast);
drivers/s390/net/qeth_l2_main.c +1 -1
@@ -698,7 +698,7 @@ static int qeth_l2_xmit_iqd(struct qeth_card *card, struct sk_buff *skb, rc = -E2BIG ; goto out; } - rc =qeth_do_send_packet_fast (card, queue, skb, hdr, data_offset, + rc =qeth_do_send_packet_fast (queue, skb, hdr, data_offset,sizeof (*hdr) + data_offset); out:if (rc)
drivers/s390/net/qeth_l3_main.c +2 -2
@@ -2771,8 +2771,8 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb, rc =qeth_do_send_packet (card, queue, new_skb, hdr, hd_len, hd_len, elements); }else - rc =qeth_do_send_packet_fast (card, queue, new_skb, hdr, - data_offset, hd_len); + rc =qeth_do_send_packet_fast (queue, new_skb, hdr, data_offset, + hd_len);if (!rc) { card->stats.tx_packets++;
Signature · 1 line
2.13.5
PATCH 6/9 s390/qeth: simplify L3 sysfs group management
In reply to Julian WiedmannUse the right helpers to create/remove all attribute groups in one go.
--- drivers/s390/net/qeth_l3_sys.c | 45 +++++++++++------------------------------- 1 file changed, 12 insertions(+), 33 deletions(-)
drivers/s390/net/qeth_l3_sys.c +12 -33
@@ -1028,52 +1028,31 @@ static const struct attribute_group qeth_device_rxip_group = { .attrs = qeth_rxip_device_attrs, }; +static const struct attribute_group *qeth_l3_only_attr_groups[] = { + &qeth_l3_device_attr_group, + &qeth_device_ipato_group, + &qeth_device_vipa_group, + &qeth_device_rxip_group, +NULL , +}; +int qeth_l3_create_device_attributes (struct device *dev) { -int ret; - - ret =sysfs_create_group (&dev->kobj, &qeth_l3_device_attr_group); -if (ret) -return ret; - - ret =sysfs_create_group (&dev->kobj, &qeth_device_ipato_group); -if (ret) { -sysfs_remove_group (&dev->kobj, &qeth_l3_device_attr_group); -return ret; - } - - ret =sysfs_create_group (&dev->kobj, &qeth_device_vipa_group); -if (ret) { -sysfs_remove_group (&dev->kobj, &qeth_l3_device_attr_group); -sysfs_remove_group (&dev->kobj, &qeth_device_ipato_group); -return ret; - } - - ret =sysfs_create_group (&dev->kobj, &qeth_device_rxip_group); -if (ret) { -sysfs_remove_group (&dev->kobj, &qeth_l3_device_attr_group); -sysfs_remove_group (&dev->kobj, &qeth_device_ipato_group); -sysfs_remove_group (&dev->kobj, &qeth_device_vipa_group); -return ret; - } -return 0 ; +return sysfs_create_groups (&dev->kobj, qeth_l3_only_attr_groups); }void qeth_l3_remove_device_attributes (struct device *dev) { -sysfs_remove_group (&dev->kobj, &qeth_l3_device_attr_group); -sysfs_remove_group (&dev->kobj, &qeth_device_ipato_group); -sysfs_remove_group (&dev->kobj, &qeth_device_vipa_group); -sysfs_remove_group (&dev->kobj, &qeth_device_rxip_group); +sysfs_remove_groups (&dev->kobj, qeth_l3_only_attr_groups); }const struct attribute_group *qeth_l3_attr_groups[] = { &qeth_device_attr_group, &qeth_device_blkt_group, -/* l3 specific, see l3_{create,remove}_device_attributes(): */ +/* l3 specific, see qeth_l3_only_attr_groups: */ &qeth_l3_device_attr_group, &qeth_device_ipato_group, &qeth_device_vipa_group, &qeth_device_rxip_group, -NULL , +NULL , };
Signature · 1 line
2.13.5
PATCH 7/9 s390/qeth: translate SETVLAN/DELVLAN errors
In reply to Julian WiedmannProperly return any error encountered during VLAN processing to the the caller.
Resulting change in behaviour: if SETVLAN fails while registering a new VLAN ID, the stack no longer creates the corresponding vlan device.
--- drivers/s390/net/qeth_core_mpc.h | 1 + drivers/s390/net/qeth_l2_main.c | 47 ++++++++++++++++++++++++++++++---------- 2 files changed, 36 insertions(+), 12 deletions(-)
drivers/s390/net/qeth_core_mpc.h +1 -0
@@ -166,6 +166,7 @@ enum qeth_ipa_return_codes {IPA_RC_L2_INVALID_VLAN_ID =0x2015 ,IPA_RC_L2_DUP_VLAN_ID =0x2016 ,IPA_RC_L2_VLAN_ID_NOT_FOUND =0x2017 , +IPA_RC_L2_VLAN_ID_NOT_ALLOWED =0x2050 ,IPA_RC_VNICC_VNICBP =0x20B0 ,IPA_RC_SBP_OSA_NOT_CONFIGURED =0x2B0C , IPA_RC_SBP_OSA_OS_MISMATCH = 0x2B10,
drivers/s390/net/qeth_l2_main.c +35 -12
82 lines not on this page · raw message
Signature · 1 line
2.13.5
PATCH 8/9 s390/qeth: fold VLAN handling into l3_rebuild_skb()
In reply to Julian WiedmannMove the overly complicated VLAN processing from the L3 RX handler into its l3_rebuild_skb() helper. No change in functionality.
--- drivers/s390/net/qeth_l3_main.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)
drivers/s390/net/qeth_l3_main.c +11 -16
@@ -1646,13 +1646,12 @@ static int qeth_l3_vlan_rx_kill_vid(struct net_device *dev,return 0 ; } -static int qeth_l3_rebuild_skb (struct qeth_card *card,struct sk_buff *skb, -struct qeth_hdr *hdr,unsigned short *vlan_id) +static void qeth_l3_rebuild_skb (struct qeth_card *card,struct sk_buff *skb, +struct qeth_hdr *hdr) {__u16 prot;struct iphdr *ip_hdr;unsigned char tg_addr[MAX_ADDR_LEN ]; -int is_vlan =0 ;if (!(hdr->hdr.l3.flags &QETH_HDR_PASSTHRU )) { prot = (hdr->hdr.l3.flags & QETH_HDR_IPV6) ? ETH_P_IPV6 :
@@ -1706,11 +1705,14 @@ static int qeth_l3_rebuild_skb(struct qeth_card *card, struct sk_buff *skb, skb->protocol =eth_type_trans (skb, card->dev); -if (hdr->hdr.l3.ext_flags & - (QETH_HDR_EXT_VLAN_FRAME |QETH_HDR_EXT_INCLUDE_VLAN_TAG )) { - *vlan_id = (hdr->hdr.l3.ext_flags &QETH_HDR_EXT_VLAN_FRAME ) ? - hdr->hdr.l3.vlan_id : *((u16 *)&hdr->hdr.l3.dest_addr[12 ]); - is_vlan =1 ; +/* copy VLAN tag from hdr into skb */ +if (!card->options.sniffer && + (hdr->hdr.l3.ext_flags & (QETH_HDR_EXT_VLAN_FRAME | +QETH_HDR_EXT_INCLUDE_VLAN_TAG ))) { +u16 tag = (hdr->hdr.l3.ext_flags &QETH_HDR_EXT_VLAN_FRAME ) ? + hdr->hdr.l3.vlan_id : + *((u16 *)&hdr->hdr.l3.dest_addr[12 ]); +__vlan_hwaccel_put_tag (skb,htons (ETH_P_8021Q ), tag); }if (card->dev->features &NETIF_F_RXCSUM ) {
@@ -1724,7 +1726,6 @@ static int qeth_l3_rebuild_skb(struct qeth_card *card, struct sk_buff *skb, skb->ip_summed =CHECKSUM_NONE ; }else skb->ip_summed =CHECKSUM_NONE ; -return is_vlan; } static int qeth_l3_process_inbound_buffer(struct qeth_card *card,
@@ -1733,8 +1734,6 @@ static int qeth_l3_process_inbound_buffer(struct qeth_card *card,int work_done =0 ;struct sk_buff *skb;struct qeth_hdr *hdr; -__u16 vlan_tag =0 ; -int is_vlan;unsigned int len;__u16 magic;
@@ -1764,12 +1763,8 @@ static int qeth_l3_process_inbound_buffer(struct qeth_card *card, card->dev->addr_len);netif_receive_skb (skb); }else { - is_vlan =qeth_l3_rebuild_skb (card, skb, hdr, - &vlan_tag); +qeth_l3_rebuild_skb (card, skb, hdr); len = skb->len; -if (is_vlan && !card->options.sniffer) -__vlan_hwaccel_put_tag (skb, -htons (ETH_P_8021Q ), vlan_tag);napi_gro_receive (&card->napi, skb); }break ;
Signature · 1 line
2.13.5
PATCH 9/9 s390/qeth: tidy up parameter naming for qeth_do_send_packet()
In reply to Julian WiedmannFrom: Jens Remus <[email protected]>
Cppcheck reports the following for drivers/s390/net/qeth_core.h:
warning - line 1560 - Function 'qeth_do_send_packet' argument order different:
declaration 'card, queue, skb, hdr, hd_len, offset, elements' definition 'card, queue, skb, hdr, offset, hd_len, elements_needed'.
Match the naming in the function's declaration against its definition.
--- drivers/s390/net/qeth_core.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/s390/net/qeth_core.h +2 -1
@@ -967,7 +967,8 @@ int qeth_do_send_packet_fast(struct qeth_qdio_out_q *queue, struct sk_buff *skb, unsigned int hd_len);int qeth_do_send_packet (struct qeth_card *card,struct qeth_qdio_out_q *queue,struct sk_buff *skb,struct qeth_hdr *hdr, -unsigned int hd_len,unsigned int offset,int elements); +unsigned int offset,unsigned int hd_len, +int elements_needed);int qeth_do_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);int qeth_core_get_sset_count (struct net_device *,int ); void qeth_core_get_ethtool_stats(struct net_device *,
Signature · 1 line
2.13.5
David Miller
maintainerFrom: Julian Wiedmann <[email protected]>
Date: Mon, 18 Sep 2017 21:18:13 +0200
Quoted 4 lines
first batch of patches for 4.15. One larger item in there is Hans' addition of new configuration options for flexible packet processing ('VNIC characteristics'). The patch descriptions have all the details. Please apply.
Series applied, thanks.