s390/net: updates 2018-04-26
Subsystems (4)
cover s390/net: updates 2018-04-26
Hi Dave,
please apply the following patches to net-next. There's the usual cleanups & small improvements, and Kittipon adds HW offload support for IPv6 checksumming.
Thanks,
Julian
Julian Wiedmann (6):
s390/qeth: skip QDIO queue handler indirection s390/qeth: convert vlan spinlock to mutex s390/qeth: don't worry about IPs on VLAN removal s390/qeth: extract csum offload helpers s390/qeth: disregard IPv4 header for RX csum offload s390/qeth: improve fallback to random MAC address
Kittipon Meesompop (6):
s390/qeth: de-indent else after return s390/qeth: add stats counter for RX csum offload s390/qeth: query IPv6 assists during hardsetup s390/qeth: extend Checksum Offload Assists for IPv6 s390/qeth: add IPv6 TX checksum offload support s390/qeth: add IPv6 RX checksum offload support
Ursula Braun (1):
s390/net: set HW port number in netdevice
drivers/s390/net/lcs.c | 3 + drivers/s390/net/qeth_core.h | 61 ++++++++--- drivers/s390/net/qeth_core_main.c | 148 +++++++++++++++++---------- drivers/s390/net/qeth_core_mpc.h | 2 + drivers/s390/net/qeth_core_sys.c | 2 + drivers/s390/net/qeth_l2_main.c | 98 ++++++++---------- drivers/s390/net/qeth_l3_main.c | 207 +++++++------------------------------- 7 files changed, 229 insertions(+), 292 deletions(-)
Signature · 1 line
2.13.5
PATCH 1/13 s390/qeth: skip QDIO queue handler indirection
From: Julian Wiedmann <[email protected]>
Both qeth sub drivers use the same QDIO queue handlers, there's no need to expose them via the driver's discipline. No functional change.
--- drivers/s390/net/qeth_core.h | 9 --------- drivers/s390/net/qeth_core_main.c | 29 +++++++++++++---------------- drivers/s390/net/qeth_l2_main.c | 3 --- drivers/s390/net/qeth_l3_main.c | 3 --- 4 files changed, 13 insertions(+), 31 deletions(-)
drivers/s390/net/qeth_core.h +0 -9
@@ -712,9 +712,6 @@ enum qeth_discipline_id {struct qeth_discipline {const struct device_type *devtype; -void (*start_poll)(struct ccw_device *,int ,unsigned long ); -qdio_handler_t *input_handler; -qdio_handler_t *output_handler;int (*process_rx_buffer)(struct qeth_card *card,int budget,int *done);int (*recover)(void *ptr);int (*setup) (struct ccwgroup_device *);
@@ -921,13 +918,7 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *, struct qeth_qdio_buffer *, struct qdio_buffer_element **, int *, struct qeth_hdr **);void qeth_schedule_recovery (struct qeth_card *); -void qeth_qdio_start_poll (struct ccw_device *,int ,unsigned long );int qeth_poll (struct napi_struct *napi,int budget); -void qeth_qdio_input_handler (struct ccw_device *, -unsigned int ,unsigned int ,int , -int ,unsigned long ); -void qeth_qdio_output_handler (struct ccw_device *,unsigned int , -int ,int ,int ,unsigned long );void qeth_clear_ipacmd_list (struct qeth_card *);int qeth_qdio_clear_card (struct qeth_card *,int );void qeth_clear_working_pool_list (struct qeth_card *);
drivers/s390/net/qeth_core_main.c +13 -16
@@ -3588,15 +3588,14 @@ static void qeth_check_outbound_queue(struct qeth_qdio_out_q *queue) } } -void qeth_qdio_start_poll (struct ccw_device *ccwdev,int queue, -unsigned long card_ptr) +static void qeth_qdio_start_poll (struct ccw_device *ccwdev,int queue, +unsigned long card_ptr) {struct qeth_card *card = (struct qeth_card *)card_ptr;if (card->dev && (card->dev->flags &IFF_UP ))napi_schedule (&card->napi); } -EXPORT_SYMBOL_GPL (qeth_qdio_start_poll);int qeth_configure_cq (struct qeth_card *card,enum qeth_cq cq) {
@@ -3698,9 +3697,10 @@ static void qeth_qdio_cq_handler(struct qeth_card *card,return ; } -void qeth_qdio_input_handler (struct ccw_device *ccwdev,unsigned int qdio_err, -unsigned int queue,int first_elem,int count, -unsigned long card_ptr) +static void qeth_qdio_input_handler (struct ccw_device *ccwdev, +unsigned int qdio_err,int queue, +int first_elem,int count, +unsigned long card_ptr) {struct qeth_card *card = (struct qeth_card *)card_ptr;
@@ -3711,14 +3711,12 @@ void qeth_qdio_input_handler(struct ccw_device *ccwdev, unsigned int qdio_err,qeth_qdio_cq_handler (card, qdio_err, queue, first_elem, count); else if (qdio_err)qeth_schedule_recovery (card); - - } -EXPORT_SYMBOL_GPL (qeth_qdio_input_handler); -void qeth_qdio_output_handler(struct ccw_device *ccwdev, - unsigned int qdio_error, int __queue, int first_element, - int count, unsigned long card_ptr) +static void qeth_qdio_output_handler(struct ccw_device *ccwdev, + unsigned int qdio_error, int __queue, + int first_element, int count, + unsigned long card_ptr) {struct qeth_card *card = (struct qeth_card *) card_ptr;struct qeth_qdio_out_q *queue = card->qdio.out_qs[__queue];
@@ -3787,7 +3785,6 @@ void qeth_qdio_output_handler(struct ccw_device *ccwdev, card->perf_stats.outbound_handler_time +=qeth_get_micros () - card->perf_stats.outbound_handler_start_time; } -EXPORT_SYMBOL_GPL (qeth_qdio_output_handler);/* We cannot use outbound queue 3 for unicast packets on HiperSockets */ static inline int qeth_cut_iqd_prio (struct qeth_card *card,int queue_num)
@@ -4995,7 +4992,7 @@ static int qeth_qdio_establish(struct qeth_card *card) goto out_free_in_sbals; }for (i =0 ; i < card->qdio.no_in_queues; ++i) - queue_start_poll[i] = card->discipline->start_poll; + queue_start_poll[i] = qeth_qdio_start_poll;qeth_qdio_establish_cq (card, in_sbal_ptrs, queue_start_poll);
@@ -5019,8 +5016,8 @@ static int qeth_qdio_establish(struct qeth_card *card) init_data.qib_param_field = qib_param_field; init_data.no_input_qs = card->qdio.no_in_queues; init_data.no_output_qs = card->qdio.no_out_queues; - init_data.input_handler = card->discipline->input_handler; - init_data.output_handler = card->discipline->output_handler; + init_data.input_handler = qeth_qdio_input_handler; + init_data.output_handler = qeth_qdio_output_handler; init_data.queue_start_poll_array = queue_start_poll; init_data.int_parm = (unsigned long ) card; init_data.input_sbal_addr_array = (void **) in_sbal_ptrs;
drivers/s390/net/qeth_l2_main.c +0 -3
@@ -1315,9 +1315,6 @@ static int qeth_l2_control_event(struct qeth_card *card,struct qeth_discipline qeth_l2_discipline = { .devtype = &qeth_l2_devtype, - .start_poll = qeth_qdio_start_poll, - .input_handler = (qdio_handler_t *) qeth_qdio_input_handler, - .output_handler = (qdio_handler_t *) qeth_qdio_output_handler, .process_rx_buffer = qeth_l2_process_inbound_buffer, .recover = qeth_l2_recover, .setup = qeth_l2_probe_device,
drivers/s390/net/qeth_l3_main.c +0 -3
@@ -2960,9 +2960,6 @@ static int qeth_l3_control_event(struct qeth_card *card,struct qeth_discipline qeth_l3_discipline = { .devtype = &qeth_l3_devtype, - .start_poll = qeth_qdio_start_poll, - .input_handler = (qdio_handler_t *) qeth_qdio_input_handler, - .output_handler = (qdio_handler_t *) qeth_qdio_output_handler, .process_rx_buffer = qeth_l3_process_inbound_buffer, .recover = qeth_l3_recover, .setup = qeth_l3_probe_device,
Signature · 1 line
2.13.5
PATCH 2/13 s390/qeth: convert vlan spinlock to mutex
In reply to Julian WiedmannFrom: Julian Wiedmann <[email protected]>
As the vid_list is only accessed from process context, there's no need to protect it with a spinlock.
--- drivers/s390/net/qeth_core.h | 2 +- drivers/s390/net/qeth_core_main.c | 2 +- drivers/s390/net/qeth_l2_main.c | 15 ++++++++------- 3 files changed, 10 insertions(+), 9 deletions(-)
drivers/s390/net/qeth_core.h +1 -1
@@ -777,9 +777,9 @@ struct qeth_card {struct qeth_card_options options;wait_queue_head_t wait_q; -spinlock_t vlanlock;spinlock_t mclock;unsigned long active_vlans[BITS_TO_LONGS (VLAN_N_VID )]; +struct mutex vid_list_mutex;/* vid_list */ struct list_head vid_list;DECLARE_HASHTABLE (mac_htable,4 );DECLARE_HASHTABLE (ip_htable,4 );
drivers/s390/net/qeth_core_main.c +1 -1
@@ -1467,13 +1467,13 @@ static int qeth_setup_card(struct qeth_card *card) card->lan_online =0 ; card->read_or_write_problem =0 ; card->dev =NULL ; -spin_lock_init (&card->vlanlock);spin_lock_init (&card->mclock);spin_lock_init (&card->lock);spin_lock_init (&card->ip_lock);spin_lock_init (&card->thread_mask_lock);mutex_init (&card->conf_mutex);mutex_init (&card->discipline_mutex); +mutex_init (&card->vid_list_mutex); card->thread_start_mask =0 ; card->thread_allowed_mask =0 ; card->thread_running_mask =0 ;
drivers/s390/net/qeth_l2_main.c +8 -7
@@ -297,12 +297,13 @@ static int qeth_l2_send_setdelvlan(struct qeth_card *card, __u16 i,static void qeth_l2_process_vlans (struct qeth_card *card) {struct qeth_vlan_vid *id; +QETH_CARD_TEXT (card,3 ,"L2prcvln" ); -spin_lock_bh (&card->vlanlock); +mutex_lock (&card->vid_list_mutex);list_for_each_entry (id, &card->vid_list, list) {qeth_l2_send_setdelvlan (card, id->vid,IPA_CMD_SETVLAN ); } -spin_unlock_bh (&card->vlanlock); +mutex_unlock (&card->vid_list_mutex); } static int qeth_l2_vlan_rx_add_vid(struct net_device *dev,
@@ -319,7 +320,7 @@ static int qeth_l2_vlan_rx_add_vid(struct net_device *dev,QETH_CARD_TEXT (card,3 ,"aidREC" );return 0 ; } - id =kmalloc (sizeof (struct qeth_vlan_vid ),GFP_ATOMIC ); + id =kmalloc (sizeof (*id),GFP_KERNEL );if (id) { id->vid = vid; rc =qeth_l2_send_setdelvlan (card, vid,IPA_CMD_SETVLAN );
@@ -327,9 +328,9 @@ static int qeth_l2_vlan_rx_add_vid(struct net_device *dev,kfree (id);return rc; } -spin_lock_bh (&card->vlanlock); +mutex_lock (&card->vid_list_mutex);list_add_tail (&id->list, &card->vid_list); -spin_unlock_bh (&card->vlanlock); +mutex_unlock (&card->vid_list_mutex); }else {return -ENOMEM ; }
@@ -348,7 +349,7 @@ static int qeth_l2_vlan_rx_kill_vid(struct net_device *dev,QETH_CARD_TEXT (card,3 ,"kidREC" );return 0 ; } -spin_lock_bh (&card->vlanlock); +mutex_lock (&card->vid_list_mutex);list_for_each_entry (id, &card->vid_list, list) {if (id->vid == vid) {list_del (&id->list);
@@ -356,7 +357,7 @@ static int qeth_l2_vlan_rx_kill_vid(struct net_device *dev,break ; } } -spin_unlock_bh (&card->vlanlock); +mutex_unlock (&card->vid_list_mutex);if (tmpid) { rc =qeth_l2_send_setdelvlan (card, vid,IPA_CMD_DELVLAN );kfree (tmpid);
Signature · 1 line
2.13.5
PATCH 3/13 s390/qeth: don't worry about IPs on VLAN removal
In reply to Julian WiedmannFrom: Julian Wiedmann <[email protected]>
When removing a VLAN ID on a L3 device, the driver currently attempts to walk and unregister the VLAN device's IP addresses.
This can be safely removed - before qeth_l3_vlan_rx_kill_vid() even gets called, we receive an inet[6]addr event for each IP on the device and qeth_l3_handle_ip_event() unregisters the address accordingly.
--- drivers/s390/net/qeth_l3_main.c | 87 ----------------------------------------- 1 file changed, 87 deletions(-)
drivers/s390/net/qeth_l3_main.c +0 -87
@@ -1293,91 +1293,6 @@ static void qeth_l3_add_multicast_ipv6(struct qeth_card *card)in6_dev_put (in6_dev); } -static void qeth_l3_free_vlan_addresses4 (struct qeth_card *card, -unsigned short vid) -{ -struct in_device *in_dev; -struct in_ifaddr *ifa; -struct qeth_ipaddr *addr; -struct net_device *netdev; - -QETH_CARD_TEXT (card,4 ,"frvaddr4" ); - - netdev =__vlan_find_dev_deep_rcu (card->dev,htons (ETH_P_8021Q ), vid); -if (!netdev) -return ; - in_dev =in_dev_get (netdev); -if (!in_dev) -return ; - - addr =qeth_l3_get_addr_buffer (QETH_PROT_IPV4 ); -if (!addr) - goto out; - -spin_lock_bh (&card->ip_lock); - -for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) { - addr->u.a4.addr =be32_to_cpu (ifa->ifa_address); - addr->u.a4.mask =be32_to_cpu (ifa->ifa_mask); - addr->type =QETH_IP_TYPE_NORMAL ; -qeth_l3_delete_ip (card, addr); - } - -spin_unlock_bh (&card->ip_lock); - -kfree (addr); -out: -in_dev_put (in_dev); -} - -static void qeth_l3_free_vlan_addresses6 (struct qeth_card *card, -unsigned short vid) -{ -struct inet6_dev *in6_dev; -struct inet6_ifaddr *ifa; -struct qeth_ipaddr *addr; -struct net_device *netdev; - -QETH_CARD_TEXT (card,4 ,"frvaddr6" ); - - netdev =__vlan_find_dev_deep_rcu (card->dev,htons (ETH_P_8021Q ), vid); -if (!netdev) -return ; - - in6_dev =in6_dev_get (netdev); -if (!in6_dev) -return ; - - addr =qeth_l3_get_addr_buffer (QETH_PROT_IPV6 ); -if (!addr) - goto out; - -spin_lock_bh (&card->ip_lock); - -list_for_each_entry (ifa, &in6_dev->addr_list, if_list) { -memcpy (&addr->u.a6.addr, &ifa->addr, -sizeof (struct in6_addr )); - addr->u.a6.pfxlen = ifa->prefix_len; - addr->type =QETH_IP_TYPE_NORMAL ; -qeth_l3_delete_ip (card, addr); - } - -spin_unlock_bh (&card->ip_lock); - -kfree (addr); -out: -in6_dev_put (in6_dev); -} - -static void qeth_l3_free_vlan_addresses (struct qeth_card *card, -unsigned short vid) -{ -rcu_read_lock (); -qeth_l3_free_vlan_addresses4 (card, vid); -qeth_l3_free_vlan_addresses6 (card, vid); -rcu_read_unlock (); -} -static int qeth_l3_vlan_rx_add_vid (struct net_device *dev,__be16 proto,u16 vid) {
@@ -1398,8 +1313,6 @@ static int qeth_l3_vlan_rx_kill_vid(struct net_device *dev,QETH_CARD_TEXT (card,3 ,"kidREC" );return 0 ; } -/* unregister IP addresses of vlan device */ -qeth_l3_free_vlan_addresses (card, vid);clear_bit (vid, card->active_vlans);qeth_l3_set_rx_mode (dev);return 0 ;
Signature · 1 line
2.13.5
PATCH 4/13 s390/net: set HW port number in netdevice
In reply to Julian WiedmannFrom: Ursula Braun <[email protected]>
struct net_device contains a dev_port field. Store the OSA port number in this field.
--- drivers/s390/net/lcs.c | 3 +++ drivers/s390/net/qeth_core_sys.c | 2 ++ drivers/s390/net/qeth_l2_main.c | 1 + drivers/s390/net/qeth_l3_main.c | 1 + 4 files changed, 7 insertions(+)
drivers/s390/net/lcs.c +3 -0
@@ -1928,6 +1928,8 @@ lcs_portno_store (struct device *dev, struct device_attribute *attr, const charreturn -EINVAL ;/* TODO: sanity checks */ card->portno = value; +if (card->dev) + card->dev->dev_port = card->portno;return count;
@@ -2158,6 +2160,7 @@ lcs_new_device(struct ccwgroup_device *ccwgdev) card->dev = dev; card->dev->ml_priv = card; card->dev->netdev_ops = &lcs_netdev_ops; + card->dev->dev_port = card->portno;memcpy (card->dev->dev_addr, card->mac,LCS_MAC_LENGTH );#ifdef CONFIG_IP_MULTICAST if (!lcs_check_multicast_support (card))
drivers/s390/net/qeth_core_sys.c +2 -0
@@ -144,6 +144,8 @@ static ssize_t qeth_dev_portno_store(struct device *dev, goto out; } card->info.portno = portno; +if (card->dev) + card->dev->dev_port = portno; out:mutex_unlock (&card->conf_mutex);return rc ? rc : count;
drivers/s390/net/qeth_l2_main.c +1 -0
@@ -984,6 +984,7 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) card->dev->mtu = card->info.initial_mtu; card->dev->min_mtu =64 ; card->dev->max_mtu =ETH_MAX_MTU ; + card->dev->dev_port = card->info.portno; card->dev->netdev_ops = &qeth_l2_netdev_ops;if (card->info.type ==QETH_CARD_TYPE_OSN ) { card->dev->ethtool_ops = &qeth_l2_osn_ops;
drivers/s390/net/qeth_l3_main.c +1 -0
@@ -2576,6 +2576,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card) card->dev->mtu = card->info.initial_mtu; card->dev->min_mtu =64 ; card->dev->max_mtu =ETH_MAX_MTU ; + card->dev->dev_port = card->info.portno; card->dev->ethtool_ops = &qeth_l3_ethtool_ops; card->dev->features |=NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |
Signature · 1 line
2.13.5
PATCH 5/13 s390/qeth: de-indent else after return
In reply to Julian WiedmannFrom: Kittipon Meesompop <[email protected]>
Trivial cleanup, in preparation for a subsequent patch.
--- drivers/s390/net/qeth_l3_main.c | 43 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 22 deletions(-)
drivers/s390/net/qeth_l3_main.c +21 -22
@@ -2533,28 +2533,27 @@ static int qeth_l3_setup_netdev(struct qeth_card *card) (card->info.link_type == QETH_LINK_TYPE_HSTR)) {pr_info ("qeth_l3: ignoring TR device\n" );return -ENODEV ; - } else { - card->dev =alloc_etherdev (0 ); -if (!card->dev) -return -ENODEV ; - card->dev->netdev_ops = &qeth_l3_osa_netdev_ops; - -/*IPv6 address autoconfiguration stuff*/ -qeth_l3_get_unique_id (card); -if (!(card->info.unique_id &UNIQUE_ID_NOT_BY_CARD )) - card->dev->dev_id = card->info.unique_id & -0xffff ; - - card->dev->hw_features |=NETIF_F_SG ; - card->dev->vlan_features |=NETIF_F_SG ; - -if (!card->info.guestlan) { - card->dev->features |=NETIF_F_SG ; - card->dev->hw_features |=NETIF_F_TSO | -NETIF_F_RXCSUM |NETIF_F_IP_CSUM ; - card->dev->vlan_features |=NETIF_F_TSO | -NETIF_F_RXCSUM |NETIF_F_IP_CSUM ; - } + } + + card->dev =alloc_etherdev (0 ); +if (!card->dev) +return -ENODEV ; + card->dev->netdev_ops = &qeth_l3_osa_netdev_ops; + +/*IPv6 address autoconfiguration stuff*/ +qeth_l3_get_unique_id (card); +if (!(card->info.unique_id &UNIQUE_ID_NOT_BY_CARD )) + card->dev->dev_id = card->info.unique_id &0xffff ; + + card->dev->hw_features |=NETIF_F_SG ; + card->dev->vlan_features |=NETIF_F_SG ; + +if (!card->info.guestlan) { + card->dev->features |=NETIF_F_SG ; + card->dev->hw_features |=NETIF_F_TSO | +NETIF_F_RXCSUM |NETIF_F_IP_CSUM ; + card->dev->vlan_features |=NETIF_F_TSO | +NETIF_F_RXCSUM |NETIF_F_IP_CSUM ; } }else if (card->info.type ==QETH_CARD_TYPE_IQD ) { card->dev = alloc_netdev(0, "hsi%d", NET_NAME_UNKNOWN,
Signature · 1 line
2.13.5
PATCH 6/13 s390/qeth: extract csum offload helpers
In reply to Julian WiedmannFrom: Julian Wiedmann <[email protected]>
This consolidates the checksum offload code that was duplicated over the two qeth subdrivers.
--- drivers/s390/net/qeth_core.h | 21 +++++++++++++++++++++ drivers/s390/net/qeth_l2_main.c | 35 ++++++----------------------------- drivers/s390/net/qeth_l3_main.c | 36 ++++++------------------------------ 3 files changed, 33 insertions(+), 59 deletions(-)
drivers/s390/net/qeth_core.h +21 -0
@@ -864,6 +864,27 @@ static inline int qeth_get_ip_version(struct sk_buff *skb) } } +static inline void qeth_rx_csum (struct qeth_card *card,struct sk_buff *skb, +u8 flags) +{ +if ((card->dev->features &NETIF_F_RXCSUM ) && + (flags &QETH_HDR_EXT_CSUM_HDR_REQ ) && + (flags &QETH_HDR_EXT_CSUM_TRANSP_REQ )) + skb->ip_summed =CHECKSUM_UNNECESSARY ; +else + skb->ip_summed =CHECKSUM_NONE ; +} + +static inline void qeth_tx_csum (struct sk_buff *skb,u8 *flags) +{ + *flags |=QETH_HDR_EXT_CSUM_TRANSP_REQ ; +if (ip_hdr (skb)->protocol ==IPPROTO_UDP ) + *flags |=QETH_HDR_EXT_UDP ; +/* some HW requires combined L3+L4 csum offload: */ + *flags |=QETH_HDR_EXT_CSUM_HDR_REQ ; +ip_hdr (skb)->check =0 ; +} +static inline void qeth_put_buffer_pool_entry (struct qeth_card *card,struct qeth_buffer_pool_entry *entry) {
drivers/s390/net/qeth_l2_main.c +6 -29
@@ -17,7 +17,6 @@#include <linux/kernel.h> #include <linux/slab.h> #include <linux/etherdevice.h> -#include <linux/ip.h> #include <linux/list.h> #include <linux/hash.h> #include <linux/hashtable.h>
@@ -195,23 +194,6 @@ static int qeth_l2_get_cast_type(struct qeth_card *card, struct sk_buff *skb)return RTN_UNSPEC ; } -static void qeth_l2_hdr_csum (struct qeth_card *card,struct qeth_hdr *hdr, -struct sk_buff *skb) -{ -struct iphdr *iph =ip_hdr (skb); - -/* tcph->check contains already the pseudo hdr checksum -* so just set the header flags -*/ -if (iph->protocol ==IPPROTO_UDP ) - hdr->hdr.l2.flags[1 ] |=QETH_HDR_EXT_UDP ; - hdr->hdr.l2.flags[1 ] |=QETH_HDR_EXT_CSUM_TRANSP_REQ | -QETH_HDR_EXT_CSUM_HDR_REQ ; - iph->check =0 ; -if (card->options.performance_stats) - card->perf_stats.tx_csum++; -} -static void qeth_l2_fill_header (struct qeth_hdr *hdr,struct sk_buff *skb,int cast_type,unsigned int data_len) {
@@ -424,15 +406,7 @@ static int qeth_l2_process_inbound_buffer(struct qeth_card *card,switch (hdr->hdr.l2.id) {case QETH_HEADER_TYPE_LAYER2 : skb->protocol =eth_type_trans (skb, skb->dev); -if ((card->dev->features &NETIF_F_RXCSUM ) - && ((hdr->hdr.l2.flags[1 ] & - (QETH_HDR_EXT_CSUM_HDR_REQ | -QETH_HDR_EXT_CSUM_TRANSP_REQ )) == - (QETH_HDR_EXT_CSUM_HDR_REQ | -QETH_HDR_EXT_CSUM_TRANSP_REQ ))) - skb->ip_summed =CHECKSUM_UNNECESSARY ; -else - skb->ip_summed =CHECKSUM_NONE ; +qeth_rx_csum (card, skb, hdr->hdr.l2.flags[1 ]);if (skb->protocol ==htons (ETH_P_802_2 )) *((__u32 *)skb->cb) = ++card->seqno.pkt_seqno; len = skb->len;
@@ -724,8 +698,11 @@ static int qeth_l2_xmit_osa(struct qeth_card *card, struct sk_buff *skb, hdr_elements =1 ; }qeth_l2_fill_header (hdr, skb, cast_type, skb->len - push_len); -if (skb->ip_summed ==CHECKSUM_PARTIAL ) -qeth_l2_hdr_csum (card, hdr, skb); +if (skb->ip_summed ==CHECKSUM_PARTIAL ) { +qeth_tx_csum (skb, &hdr->hdr.l2.flags[1 ]); +if (card->options.performance_stats) + card->perf_stats.tx_csum++; + } elements =qeth_get_elements_no (card, skb, hdr_elements,0 );if (!elements) {
drivers/s390/net/qeth_l3_main.c +6 -30
@@ -1367,17 +1367,7 @@ static void qeth_l3_rebuild_skb(struct qeth_card *card, struct sk_buff *skb,__vlan_hwaccel_put_tag (skb,htons (ETH_P_8021Q ), tag); } -if (card->dev->features &NETIF_F_RXCSUM ) { -if ((hdr->hdr.l3.ext_flags & - (QETH_HDR_EXT_CSUM_HDR_REQ | -QETH_HDR_EXT_CSUM_TRANSP_REQ )) == - (QETH_HDR_EXT_CSUM_HDR_REQ | -QETH_HDR_EXT_CSUM_TRANSP_REQ )) - skb->ip_summed =CHECKSUM_UNNECESSARY ; -else - skb->ip_summed =CHECKSUM_NONE ; - }else - skb->ip_summed =CHECKSUM_NONE ; +qeth_rx_csum (card, skb, hdr->hdr.l3.ext_flags); } static int qeth_l3_process_inbound_buffer(struct qeth_card *card,
@@ -2123,23 +2113,6 @@ static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,rcu_read_unlock (); } -static void qeth_l3_hdr_csum (struct qeth_card *card,struct qeth_hdr *hdr, -struct sk_buff *skb) -{ -struct iphdr *iph =ip_hdr (skb); - -/* tcph->check contains already the pseudo hdr checksum -* so just set the header flags -*/ -if (iph->protocol ==IPPROTO_UDP ) - hdr->hdr.l3.ext_flags |=QETH_HDR_EXT_UDP ; - hdr->hdr.l3.ext_flags |=QETH_HDR_EXT_CSUM_TRANSP_REQ | -QETH_HDR_EXT_CSUM_HDR_REQ ; - iph->check =0 ; -if (card->options.performance_stats) - card->perf_stats.tx_csum++; -} -static void qeth_tso_fill_header (struct qeth_card *card,struct qeth_hdr *qhdr,struct sk_buff *skb) {
@@ -2331,8 +2304,11 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb, } } -if (skb->ip_summed ==CHECKSUM_PARTIAL ) -qeth_l3_hdr_csum (card, hdr, new_skb); +if (new_skb->ip_summed ==CHECKSUM_PARTIAL ) { +qeth_tx_csum (new_skb, &hdr->hdr.l3.ext_flags); +if (card->options.performance_stats) + card->perf_stats.tx_csum++; + } } elements = use_tso ?
Signature · 1 line
2.13.5
PATCH 7/13 s390/qeth: disregard IPv4 header for RX csum offload
In reply to Julian WiedmannFrom: Julian Wiedmann <[email protected]>
The kernel does its own validation of the IPv4 header checksum, drivers/HW are not required to handle this.
--- drivers/s390/net/qeth_core.h | 1 - 1 file changed, 1 deletion(-)
drivers/s390/net/qeth_core.h +0 -1
@@ -868,7 +868,6 @@ static inline void qeth_rx_csum(struct qeth_card *card, struct sk_buff *skb, u8 flags) {if ((card->dev->features &NETIF_F_RXCSUM ) && - (flags &QETH_HDR_EXT_CSUM_HDR_REQ ) && (flags &QETH_HDR_EXT_CSUM_TRANSP_REQ )) skb->ip_summed =CHECKSUM_UNNECESSARY ;else
Signature · 1 line
2.13.5
PATCH 8/13 s390/qeth: add stats counter for RX csum offload
In reply to Julian WiedmannFrom: Kittipon Meesompop <[email protected]>
This matches the statistics we gather for the TX offload path.
--- drivers/s390/net/qeth_core.h | 8 ++++++-- drivers/s390/net/qeth_core_main.c | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-)
drivers/s390/net/qeth_core.h +6 -2
@@ -148,6 +148,7 @@ struct qeth_perf_stats {unsigned int tx_csum;unsigned int tx_lin;unsigned int tx_linfail; +unsigned int rx_csum; };/* Routing stuff */
@@ -868,10 +869,13 @@ static inline void qeth_rx_csum(struct qeth_card *card, struct sk_buff *skb, u8 flags) {if ((card->dev->features &NETIF_F_RXCSUM ) && - (flags &QETH_HDR_EXT_CSUM_TRANSP_REQ )) + (flags &QETH_HDR_EXT_CSUM_TRANSP_REQ )) { skb->ip_summed =CHECKSUM_UNNECESSARY ; -else +if (card->options.performance_stats) + card->perf_stats.rx_csum++; + }else { skb->ip_summed =CHECKSUM_NONE ; + } }static inline void qeth_tx_csum (struct sk_buff *skb,u8 *flags)
drivers/s390/net/qeth_core_main.c +3 -1
@@ -6005,7 +6005,8 @@ static struct { {"tx lin"}, {"tx linfail"}, {"cq handler count"}, - {"cq handler time"} + {"cq handler time"}, + {"rx csum"} };int qeth_core_get_sset_count (struct net_device *dev,int stringset)
@@ -6067,6 +6068,7 @@ void qeth_core_get_ethtool_stats(struct net_device *dev, data[35 ] = card->perf_stats.tx_linfail; data[36 ] = card->perf_stats.cq_cnt; data[37 ] = card->perf_stats.cq_time; + data[38 ] = card->perf_stats.rx_csum; }EXPORT_SYMBOL_GPL (qeth_core_get_ethtool_stats);
Signature · 1 line
2.13.5
PATCH 9/13 s390/qeth: query IPv6 assists during hardsetup
In reply to Julian WiedmannFrom: Kittipon Meesompop <[email protected]>
For new functionality, the L2 subdriver will start using IPv6 assists. So move the query from the L3 subdriver into the common setup path.
--- drivers/s390/net/qeth_core_main.c | 5 +++++ drivers/s390/net/qeth_l3_main.c | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-)
drivers/s390/net/qeth_core_main.c +5 -0
@@ -5201,6 +5201,11 @@ int qeth_core_hardsetup_card(struct qeth_card *card) rc =qeth_query_ipassists (card,QETH_PROT_IPV4 );if (rc == -ENOMEM ) goto out; +if (qeth_is_supported (card,IPA_IPV6 )) { + rc =qeth_query_ipassists (card,QETH_PROT_IPV6 ); +if (rc == -ENOMEM ) + goto out; + }if (qeth_is_supported (card,IPA_SETADAPTERPARMS )) { rc =qeth_query_setadapterparms (card);if (rc <0 ) {
drivers/s390/net/qeth_l3_main.c +0 -8
@@ -851,14 +851,6 @@ static int qeth_l3_softsetup_ipv6(struct qeth_card *card)QETH_CARD_TEXT (card,3 ,"softipv6" ); - rc =qeth_query_ipassists (card,QETH_PROT_IPV6 ); -if (rc) { -dev_err (&card->gdev->dev, -"Activating IPv6 support for %s failed\n" , -QETH_CARD_IFNAME (card)); -return rc; - } -if (card->info.type ==QETH_CARD_TYPE_IQD ) goto out;
Signature · 1 line
2.13.5
PATCH 10/13 s390/qeth: extend Checksum Offload Assists for IPv6
In reply to Julian WiedmannFrom: Kittipon Meesompop <[email protected]>
Add some wrappers to make the protocol-specific Assist code a little more generic, and use them for sending protocol-agnostic commands in the Checksum Offload Assist code.
--- drivers/s390/net/qeth_core.h | 23 ++++++++++++-- drivers/s390/net/qeth_core_main.c | 65 +++++++++++++++++++++------------------ drivers/s390/net/qeth_l3_main.c | 24 +++------------ 3 files changed, 60 insertions(+), 52 deletions(-)
drivers/s390/net/qeth_core.h +21 -2
@@ -900,6 +900,27 @@ static inline int qeth_is_diagass_supported(struct qeth_card *card,return card->info.diagass_support & (__u32 )cmd; } +int qeth_send_simple_setassparms_prot (struct qeth_card *card, +enum qeth_ipa_funcs ipa_func, +u16 cmd_code,long data, +enum qeth_prot_versions prot); +/* IPv4 variant */ +static inline int qeth_send_simple_setassparms (struct qeth_card *card, +enum qeth_ipa_funcs ipa_func, +u16 cmd_code,long data) +{ +return qeth_send_simple_setassparms_prot (card, ipa_func, cmd_code, + data,QETH_PROT_IPV4 ); +} + +static inline int qeth_send_simple_setassparms_v6 (struct qeth_card *card, +enum qeth_ipa_funcs ipa_func, +u16 cmd_code,long data) +{ +return qeth_send_simple_setassparms_prot (card, ipa_func, cmd_code, + data,QETH_PROT_IPV6 ); +} +extern struct qeth_discipline qeth_l2_discipline;extern struct qeth_discipline qeth_l3_discipline;extern const struct attribute_group *qeth_generic_attr_groups[];
@@ -994,8 +1015,6 @@ int qeth_hw_trap(struct qeth_card *, enum qeth_diags_trap_action);int qeth_query_ipassists (struct qeth_card *,enum qeth_prot_versions prot);void qeth_trace_features (struct qeth_card *);void qeth_close_dev (struct qeth_card *); -int qeth_send_simple_setassparms (struct qeth_card *,enum qeth_ipa_funcs , -__u16 ,long ); int qeth_send_setassparms(struct qeth_card *, struct qeth_cmd_buffer *, __u16, long, int (*reply_cb)(struct qeth_card *,
drivers/s390/net/qeth_core_main.c +35 -30
142 lines not on this page · raw message
drivers/s390/net/qeth_l3_main.c +4 -20
@@ -735,22 +735,6 @@ static int qeth_l3_setadapter_parms(struct qeth_card *card)return rc; } -static int qeth_l3_send_simple_setassparms_ipv6 (struct qeth_card *card, -enum qeth_ipa_funcs ipa_func,__u16 cmd_code) -{ -int rc; -struct qeth_cmd_buffer *iob; - -QETH_CARD_TEXT (card,4 ,"simassp6" ); - iob =qeth_get_setassparms_cmd (card, ipa_func, cmd_code, -0 ,QETH_PROT_IPV6 ); -if (!iob) -return -ENOMEM ; - rc =qeth_send_setassparms (card, iob,0 ,0 , - qeth_setassparms_cb,NULL ); -return rc; -} -static int qeth_l3_start_ipa_arp_processing (struct qeth_card *card) {int rc;
@@ -862,16 +846,16 @@ static int qeth_l3_softsetup_ipv6(struct qeth_card *card) QETH_CARD_IFNAME(card));return rc; } - rc =qeth_l3_send_simple_setassparms_ipv6 (card,IPA_IPV6 , -IPA_CMD_ASS_START ); + rc =qeth_send_simple_setassparms_v6 (card,IPA_IPV6 , +IPA_CMD_ASS_START ,0 );if (rc) {dev_err (&card->gdev->dev,"Activating IPv6 support for %s failed\n" ,QETH_CARD_IFNAME (card));return rc; } - rc =qeth_l3_send_simple_setassparms_ipv6 (card,IPA_PASSTHRU , -IPA_CMD_ASS_START ); + rc =qeth_send_simple_setassparms_v6 (card,IPA_PASSTHRU , +IPA_CMD_ASS_START ,0 );if (rc) { dev_warn(&card->gdev->dev, "Enabling the passthrough mode for %s failed\n",
Signature · 1 line
2.13.5
PATCH 11/13 s390/qeth: add IPv6 TX checksum offload support
In reply to Julian WiedmannFrom: Kittipon Meesompop <[email protected]>
Check if a qeth device supports IPv6 TX checksum offload, and advertise NETIF_F_IPV6_CSUM accordingly. Add support for setting the relevant bits in IPv6 packet descriptors.
Currently this has only limited use (ie. UDP, or Jumbo Frames). For any TCP traffic with a standard MSS, the TCP checksum gets calculated as part of the linear GSO segmentation.
--- drivers/s390/net/qeth_core.h | 13 ++++++++----- drivers/s390/net/qeth_core_main.c | 18 +++++++++++++----- drivers/s390/net/qeth_core_mpc.h | 1 + drivers/s390/net/qeth_l2_main.c | 14 ++++++++++---- drivers/s390/net/qeth_l3_main.c | 7 ++++++- 5 files changed, 38 insertions(+), 15 deletions(-)
drivers/s390/net/qeth_core.h +8 -5
@@ -878,14 +878,17 @@ static inline void qeth_rx_csum(struct qeth_card *card, struct sk_buff *skb, } } -static inline void qeth_tx_csum (struct sk_buff *skb,u8 *flags) +static inline void qeth_tx_csum (struct sk_buff *skb,u8 *flags,int ipv) { *flags |=QETH_HDR_EXT_CSUM_TRANSP_REQ ; -if (ip_hdr (skb)->protocol ==IPPROTO_UDP ) +if ((ipv ==4 &&ip_hdr (skb)->protocol ==IPPROTO_UDP ) || + (ipv ==6 &&ipv6_hdr (skb)->nexthdr ==IPPROTO_UDP )) *flags |=QETH_HDR_EXT_UDP ; -/* some HW requires combined L3+L4 csum offload: */ - *flags |=QETH_HDR_EXT_CSUM_HDR_REQ ; -ip_hdr (skb)->check =0 ; +if (ipv ==4 ) { +/* some HW requires combined L3+L4 csum offload: */ + *flags |=QETH_HDR_EXT_CSUM_HDR_REQ ; +ip_hdr (skb)->check =0 ; + } } static inline void qeth_put_buffer_pool_entry(struct qeth_card *card,
drivers/s390/net/qeth_core_main.c +13 -5
@@ -6349,12 +6349,12 @@ static int qeth_ipa_checksum_run_cmd(struct qeth_card *card,static int qeth_send_checksum_on (struct qeth_card *card,int cstype,enum qeth_prot_versions prot) { -const __u32 required_features =QETH_IPA_CHECKSUM_IP_HDR | -QETH_IPA_CHECKSUM_UDP | -QETH_IPA_CHECKSUM_TCP ; +u32 required_features =QETH_IPA_CHECKSUM_UDP |QETH_IPA_CHECKSUM_TCP ;struct qeth_checksum_cmd chksum_cb;int rc; +if (prot ==QETH_PROT_IPV4 ) + required_features |=QETH_IPA_CHECKSUM_IP_HDR ; rc =qeth_ipa_checksum_run_cmd (card, cstype,IPA_CMD_ASS_START ,0 , &chksum_cb, prot);if (!rc) {
@@ -6430,8 +6430,8 @@ static int qeth_set_ipa_tso(struct qeth_card *card, int on)return rc; } -#define QETH_HW_FEATURES (NETIF_F_RXCSUM | NETIF_F_IP_CSUM | NETIF_F_TSO) - +#define QETH_HW_FEATURES (NETIF_F_RXCSUM | NETIF_F_IP_CSUM | NETIF_F_TSO | \ + NETIF_F_IPV6_CSUM)/** * qeth_recover_features() - Restore device features after recovery * @dev: the recovering net_device
@@ -6471,6 +6471,12 @@ int qeth_set_features(struct net_device *dev, netdev_features_t features)if (rc) changed ^=NETIF_F_IP_CSUM ; } +if (changed &NETIF_F_IPV6_CSUM ) { + rc =qeth_set_ipa_csum (card, features &NETIF_F_IPV6_CSUM , +IPA_OUTBOUND_CHECKSUM ,QETH_PROT_IPV6 ); +if (rc) + changed ^=NETIF_F_IPV6_CSUM ; + }if ((changed &NETIF_F_RXCSUM )) { rc =qeth_set_ipa_csum (card, features &NETIF_F_RXCSUM ,IPA_INBOUND_CHECKSUM ,QETH_PROT_IPV4 );
@@ -6500,6 +6506,8 @@ netdev_features_t qeth_fix_features(struct net_device *dev,QETH_DBF_TEXT (SETUP ,2 ,"fixfeat" );if (!qeth_is_supported (card,IPA_OUTBOUND_CHECKSUM )) features &= ~NETIF_F_IP_CSUM ; +if (!qeth_is_supported6 (card,IPA_OUTBOUND_CHECKSUM_V6 )) + features &= ~NETIF_F_IPV6_CSUM ;if (!qeth_is_supported (card,IPA_INBOUND_CHECKSUM )) features &= ~NETIF_F_RXCSUM ;if (!qeth_is_supported (card,IPA_OUTBOUND_TSO ))
drivers/s390/net/qeth_core_mpc.h +1 -0
@@ -246,6 +246,7 @@ enum qeth_ipa_funcs {IPA_QUERY_ARP_ASSIST =0x00040000L ,IPA_INBOUND_TSO =0x00080000L ,IPA_OUTBOUND_TSO =0x00100000L , + IPA_OUTBOUND_CHECKSUM_V6 = 0x00800000L, };/* SETIP/DELIP IPA Command: ***************************************************/
drivers/s390/net/qeth_l2_main.c +10 -4
@@ -660,7 +660,8 @@ static int qeth_l2_xmit_iqd(struct qeth_card *card, struct sk_buff *skb, }static int qeth_l2_xmit_osa (struct qeth_card *card,struct sk_buff *skb, -struct qeth_qdio_out_q *queue,int cast_type) +struct qeth_qdio_out_q *queue,int cast_type, +int ipv) {int push_len =sizeof (struct qeth_hdr );unsigned int elements, nr_frags;
@@ -699,7 +700,7 @@ static int qeth_l2_xmit_osa(struct qeth_card *card, struct sk_buff *skb, }qeth_l2_fill_header (hdr, skb, cast_type, skb->len - push_len);if (skb->ip_summed ==CHECKSUM_PARTIAL ) { -qeth_tx_csum (skb, &hdr->hdr.l2.flags[1 ]); +qeth_tx_csum (skb, &hdr->hdr.l2.flags[1 ], ipv);if (card->options.performance_stats) card->perf_stats.tx_csum++; }
@@ -754,6 +755,7 @@ static netdev_tx_t qeth_l2_hard_start_xmit(struct sk_buff *skb, {struct qeth_card *card = dev->ml_priv;int cast_type =qeth_l2_get_cast_type (card, skb); +int ipv =qeth_get_ip_version (skb);struct qeth_qdio_out_q *queue;int tx_bytes = skb->len;int rc;
@@ -761,7 +763,7 @@ static netdev_tx_t qeth_l2_hard_start_xmit(struct sk_buff *skb,if (card->qdio.do_prio_queueing || (cast_type && card->info.is_multicast_different)) queue = card->qdio.out_qs[qeth_get_priority_queue (card, skb, -qeth_get_ip_version (skb), cast_type)]; + ipv, cast_type)];else queue = card->qdio.out_qs[card->qdio.default_out_queue];
@@ -784,7 +786,7 @@ static netdev_tx_t qeth_l2_hard_start_xmit(struct sk_buff *skb, rc =qeth_l2_xmit_iqd (card, skb, queue, cast_type);break ;default : - rc =qeth_l2_xmit_osa (card, skb, queue, cast_type); + rc =qeth_l2_xmit_osa (card, skb, queue, cast_type, ipv); }if (!rc) {
@@ -995,6 +997,10 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) card->dev->vlan_features |=NETIF_F_RXCSUM ; } } +if (qeth_is_supported6 (card,IPA_OUTBOUND_CHECKSUM_V6 )) { + card->dev->hw_features |=NETIF_F_IPV6_CSUM ; + card->dev->vlan_features |=NETIF_F_IPV6_CSUM ; + } card->info.broadcast_capable =1 ;qeth_l2_request_initial_mac (card);
drivers/s390/net/qeth_l3_main.c +6 -1
@@ -2281,7 +2281,7 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb, }if (new_skb->ip_summed ==CHECKSUM_PARTIAL ) { -qeth_tx_csum (new_skb, &hdr->hdr.l3.ext_flags); +qeth_tx_csum (new_skb, &hdr->hdr.l3.ext_flags, ipv);if (card->options.performance_stats) card->perf_stats.tx_csum++; }
@@ -2507,6 +2507,11 @@ static int qeth_l3_setup_netdev(struct qeth_card *card) card->dev->vlan_features |=NETIF_F_TSO |NETIF_F_RXCSUM |NETIF_F_IP_CSUM ; } + +if (qeth_is_supported6 (card,IPA_OUTBOUND_CHECKSUM_V6 )) { + card->dev->hw_features |=NETIF_F_IPV6_CSUM ; + card->dev->vlan_features |=NETIF_F_IPV6_CSUM ; + } }else if (card->info.type ==QETH_CARD_TYPE_IQD ) { card->dev =alloc_netdev (0 ,"hsi%d" ,NET_NAME_UNKNOWN , ether_setup);
Signature · 1 line
2.13.5
PATCH 12/13 s390/qeth: add IPv6 RX checksum offload support
In reply to Julian WiedmannFrom: Kittipon Meesompop <[email protected]>
Check if a qeth device supports IPv6 RX checksum offload, and hook it up into the existing NETIF_F_RXCSUM support.
As NETIF_F_RXCSUM is now backed by a combination of HW Assists, we need to be a little smarter when dealing with errors during a configuration change:
- switching on NETIF_F_RXCSUM only makes sense if at least one HW Assist was enabled successfully.
- for switching off NETIF_F_RXCSUM, all available HW Assists need to be deactivated.
--- drivers/s390/net/qeth_core_main.c | 31 +++++++++++++++++++++++++++---- drivers/s390/net/qeth_core_mpc.h | 1 + drivers/s390/net/qeth_l2_main.c | 9 +++++---- 3 files changed, 33 insertions(+), 8 deletions(-)
drivers/s390/net/qeth_core_main.c +27 -4
@@ -6430,6 +6430,29 @@ static int qeth_set_ipa_tso(struct qeth_card *card, int on)return rc; } +static int qeth_set_ipa_rx_csum (struct qeth_card *card,bool on) +{ +int rc_ipv4 = (on) ? -EOPNOTSUPP :0 ; +int rc_ipv6; + +if (qeth_is_supported (card,IPA_INBOUND_CHECKSUM )) + rc_ipv4 =qeth_set_ipa_csum (card, on,IPA_INBOUND_CHECKSUM , +QETH_PROT_IPV4 ); +if (!qeth_is_supported6 (card,IPA_INBOUND_CHECKSUM_V6 )) +/* no/one Offload Assist available, so the rc is trivial */ +return rc_ipv4; + + rc_ipv6 =qeth_set_ipa_csum (card, on,IPA_INBOUND_CHECKSUM , +QETH_PROT_IPV6 ); + +if (on) +/* enable: success if any Assist is active */ +return (rc_ipv6) ? rc_ipv4 :0 ; + +/* disable: failure if any Assist is still active */ +return (rc_ipv6) ? rc_ipv6 : rc_ipv4; +} +#define QETH_HW_FEATURES (NETIF_F_RXCSUM | NETIF_F_IP_CSUM | NETIF_F_TSO | \ NETIF_F_IPV6_CSUM)/**
@@ -6477,9 +6500,8 @@ int qeth_set_features(struct net_device *dev, netdev_features_t features)if (rc) changed ^=NETIF_F_IPV6_CSUM ; } -if ((changed &NETIF_F_RXCSUM )) { - rc =qeth_set_ipa_csum (card, features &NETIF_F_RXCSUM , -IPA_INBOUND_CHECKSUM ,QETH_PROT_IPV4 ); +if (changed &NETIF_F_RXCSUM ) { + rc =qeth_set_ipa_rx_csum (card, features &NETIF_F_RXCSUM );if (rc) changed ^=NETIF_F_RXCSUM ; }
@@ -6508,7 +6530,8 @@ netdev_features_t qeth_fix_features(struct net_device *dev, features &= ~NETIF_F_IP_CSUM ;if (!qeth_is_supported6 (card,IPA_OUTBOUND_CHECKSUM_V6 )) features &= ~NETIF_F_IPV6_CSUM ; -if (!qeth_is_supported (card,IPA_INBOUND_CHECKSUM )) +if (!qeth_is_supported (card,IPA_INBOUND_CHECKSUM ) && + !qeth_is_supported6 (card,IPA_INBOUND_CHECKSUM_V6 )) features &= ~NETIF_F_RXCSUM ;if (!qeth_is_supported (card,IPA_OUTBOUND_TSO )) features &= ~NETIF_F_TSO ;
drivers/s390/net/qeth_core_mpc.h +1 -0
@@ -246,6 +246,7 @@ enum qeth_ipa_funcs {IPA_QUERY_ARP_ASSIST =0x00040000L ,IPA_INBOUND_TSO =0x00080000L ,IPA_OUTBOUND_TSO =0x00100000L , +IPA_INBOUND_CHECKSUM_V6 =0x00400000L , IPA_OUTBOUND_CHECKSUM_V6 = 0x00800000L, };
drivers/s390/net/qeth_l2_main.c +5 -4
@@ -992,15 +992,16 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) card->dev->hw_features |=NETIF_F_IP_CSUM ; card->dev->vlan_features |=NETIF_F_IP_CSUM ; } -if (qeth_is_supported (card,IPA_INBOUND_CHECKSUM )) { - card->dev->hw_features |=NETIF_F_RXCSUM ; - card->dev->vlan_features |=NETIF_F_RXCSUM ; - } }if (qeth_is_supported6 (card,IPA_OUTBOUND_CHECKSUM_V6 )) { card->dev->hw_features |=NETIF_F_IPV6_CSUM ; card->dev->vlan_features |=NETIF_F_IPV6_CSUM ; } +if (qeth_is_supported (card,IPA_INBOUND_CHECKSUM ) || +qeth_is_supported6 (card,IPA_INBOUND_CHECKSUM_V6 )) { + card->dev->hw_features |=NETIF_F_RXCSUM ; + card->dev->vlan_features |=NETIF_F_RXCSUM ; + } card->info.broadcast_capable =1 ;qeth_l2_request_initial_mac (card);
Signature · 1 line
2.13.5
PATCH 13/13 s390/qeth: improve fallback to random MAC address
In reply to Julian WiedmannFrom: Julian Wiedmann <[email protected]>
If READ MAC fails to fetch a valid MAC address, allow some more device types (IQD and z/VM OSD) to fall back to a random address. Also use eth_hw_addr_random(), for indicating to userspace that the address type is NET_ADDR_RANDOM.
Note that while z/VM has various protection schemes to prohibit custom addresses on its NICs, they are all optional. So we should at least give it a try.
--- drivers/s390/net/qeth_l2_main.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/s390/net/qeth_l2_main.c +13 -10
@@ -439,7 +439,6 @@ static int qeth_l2_process_inbound_buffer(struct qeth_card *card,static int qeth_l2_request_initial_mac (struct qeth_card *card) {int rc =0 ; -char vendor_pre[] = {0x02 ,0x00 ,0x00 };QETH_DBF_TEXT (SETUP ,2 ,"l2reqmac" );QETH_DBF_TEXT_ (SETUP ,2 ,"doL2%s" ,CARD_BUS_ID (card));
@@ -459,16 +458,20 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) card->info.type == QETH_CARD_TYPE_OSX || card->info.guestlan) { rc =qeth_setadpparms_change_macaddr (card); -if (rc) { -QETH_DBF_MESSAGE (2 ,"couldn't get MAC address on " -"device %s: x%x\n" ,CARD_BUS_ID (card), rc); -QETH_DBF_TEXT_ (SETUP ,2 ,"1err%04x" , rc); -return rc; - } - } else { -eth_random_addr (card->dev->dev_addr); -memcpy (card->dev->dev_addr, vendor_pre,3 ); +if (!rc) + goto out; +QETH_DBF_MESSAGE (2 ,"READ_MAC Assist failed on device %s: x%x\n" , +CARD_BUS_ID (card), rc); +QETH_DBF_TEXT_ (SETUP ,2 ,"1err%04x" , rc); +/* fall back once more: */ } + +/* some devices don't support a custom MAC address: */ +if (card->info.type ==QETH_CARD_TYPE_OSM || + card->info.type ==QETH_CARD_TYPE_OSX ) +return (rc) ? rc : -EADDRNOTAVAIL ; +eth_hw_addr_random (card->dev); + out:QETH_DBF_HEX (SETUP ,2 , card->dev->dev_addr, card->dev->addr_len);return 0 ;
Signature · 1 line
2.13.5
David Miller
maintainerFrom: Julian Wiedmann <[email protected]>
Date: Thu, 26 Apr 2018 09:42:11 +0200
Quoted 3 lines
please apply the following patches to net-next. There's the usual cleanups & small improvements, and Kittipon adds HW offload support for IPv6 checksumming.
Series applied, thanks Julian.