s390/qeth: updates 2019-10-31
Subsystems (5)
cover s390/qeth: updates 2019-10-31
Hi Dave,
please apply the following series of spooky qeth updates for net-next.
The first two patches add support for an enhanced TX doorbell, which enables us to do more xmit_more-based bulking.
Note that this requires one patch for the s390/qdio base layer, which has been graciously acked by Heiko to go through your tree.
The remaining patches are just the usual minor cleanups/improvements.
Thanks,
Julian
Julian Wiedmann (8):
s390/qdio: implement IQD Multi-Write
s390/qeth: use IQD Multi-Write
s390/qeth: use QDIO_BUFNR()
s390/qeth: keep IRQ disabled until NAPI is really done s390/qeth: consolidate some duplicated HW cmd code s390/qeth: don't set card state in qeth_qdio_clear_card() s390/qeth: use helpers for IP address hashing s390/qeth: don't cache MAC addresses for multicast IPs
drivers/s390/cio/qdio.h | 1 + drivers/s390/cio/qdio_main.c | 31 +++++---- drivers/s390/net/qeth_core.h | 9 +++ drivers/s390/net/qeth_core_main.c | 108 ++++++++++++++++++++---------- drivers/s390/net/qeth_core_mpc.h | 4 +- drivers/s390/net/qeth_l2_main.c | 21 ------ drivers/s390/net/qeth_l3.h | 24 ++----- drivers/s390/net/qeth_l3_main.c | 41 ++++-------- 8 files changed, 120 insertions(+), 119 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/8 s390/qdio: implement IQD Multi-Write
This allows IQD drivers to send out multiple SBALs with a single SIGA instruction.
--- drivers/s390/cio/qdio.h | 1 + drivers/s390/cio/qdio_main.c | 31 +++++++++++++++---------------- 2 files changed, 16 insertions(+), 16 deletions(-)
drivers/s390/cio/qdio.h +1 -0
@@ -82,6 +82,7 @@ enum qdio_irq_states {#define QDIO_SIGA_WRITE 0x00#define QDIO_SIGA_READ 0x01#define QDIO_SIGA_SYNC 0x02 +#define QDIO_SIGA_WRITEM 0x03#define QDIO_SIGA_WRITEQ 0x04#define QDIO_SIGA_QEBSM_FLAG 0x80
drivers/s390/cio/qdio_main.c +15 -16
@@ -310,18 +310,19 @@ static inline int qdio_siga_sync_q(struct qdio_q *q)return qdio_siga_sync (q, q->mask,0 ); } -static int qdio_siga_output (struct qdio_q *q,unsigned int *busy_bit, -unsigned long aob) +static int qdio_siga_output (struct qdio_q *q,unsigned int count, +unsigned int *busy_bit,unsigned long aob) {unsigned long schid = *((u32 *) &q->irq_ptr->schid);unsigned int fc =QDIO_SIGA_WRITE ;u64 start_time =0 ;int retries =0 , cc; -unsigned long laob =0 ; -if (aob) { - fc =QDIO_SIGA_WRITEQ ; - laob = aob; +if (queue_type (q) ==QDIO_IQDIO_QFMT && !multicast_outbound (q)) { +if (count >1 ) + fc =QDIO_SIGA_WRITEM ; +else if (aob) + fc =QDIO_SIGA_WRITEQ ; }if (is_qebsm (q)) {
@@ -329,7 +330,7 @@ static int qdio_siga_output(struct qdio_q *q, unsigned int *busy_bit, fc |=QDIO_SIGA_QEBSM_FLAG ; } again: - cc =do_siga_output (schid, q->mask, busy_bit, fc, laob); + cc =do_siga_output (schid, q->mask, busy_bit, fc, aob);/* hipersocket busy condition */ if (unlikely (*busy_bit)) {
@@ -781,7 +782,8 @@ static inline int qdio_outbound_q_moved(struct qdio_q *q, unsigned int start)return count; } -static int qdio_kick_outbound_q (struct qdio_q *q,unsigned long aob) +static int qdio_kick_outbound_q (struct qdio_q *q,unsigned int count, +unsigned long aob) {int retries =0 , cc;unsigned int busy_bit;
@@ -793,7 +795,7 @@ static int qdio_kick_outbound_q(struct qdio_q *q, unsigned long aob) retry:qperf_inc (q, siga_write); - cc =qdio_siga_output (q, &busy_bit, aob); + cc =qdio_siga_output (q, count, &busy_bit, aob);switch (cc) {case 0 :break ;
@@ -1526,7 +1528,7 @@ static int handle_inbound(struct qdio_q *q, unsigned int callflags,* @count: how many buffers are filled */ static int handle_outbound (struct qdio_q *q,unsigned int callflags, -int bufnr,int count) +unsigned int bufnr,unsigned int count) {const unsigned int scan_threshold = q->irq_ptr->scan_threshold;unsigned char state =0 ;
@@ -1549,13 +1551,10 @@ static int handle_outbound(struct qdio_q *q, unsigned int callflags,if (queue_type (q) ==QDIO_IQDIO_QFMT ) {unsigned long phys_aob =0 ; -/* One SIGA-W per buffer required for unicast HSI */ -WARN_ON_ONCE (count >1 && !multicast_outbound (q)); - -if (q->u.out.use_cq) +if (q->u.out.use_cq && count ==1 ) phys_aob =qdio_aob_for_buffer (&q->u.out, bufnr); - rc =qdio_kick_outbound_q (q, phys_aob); + rc =qdio_kick_outbound_q (q, count, phys_aob); }else if (need_siga_sync (q)) { rc =qdio_siga_sync_q (q); } else if (count < QDIO_MAX_BUFFERS_PER_Q &&
@@ -1564,7 +1563,7 @@ static int handle_outbound(struct qdio_q *q, unsigned int callflags,/* The previous buffer is not processed yet, tack on. */ qperf_inc (q, fast_requeue); }else { - rc =qdio_kick_outbound_q (q,0 ); + rc =qdio_kick_outbound_q (q, count,0 ); }/* Let drivers implement their own completion scanning: */
Signature · 1 line
2.17.1
PATCH 2/8 s390/qeth: use IQD Multi-Write
In reply to Julian WiedmannFor IQD devices with Multi-Write support, we can defer the queue-flush further and transmit multiple IO buffers with a single TX doorbell. The same-target restriction still applies.
--- drivers/s390/net/qeth_core.h | 9 ++++++ drivers/s390/net/qeth_core_main.c | 54 +++++++++++++++++++++++++------ 2 files changed, 53 insertions(+), 10 deletions(-)
drivers/s390/net/qeth_core.h +9 -0
@@ -532,6 +532,8 @@ struct qeth_qdio_out_q {struct timer_list timer;struct qeth_hdr *prev_hdr;u8 bulk_start; +u8 bulk_count; +u8 bulk_max; };#define qeth_for_each_output_queue (card, q, i) \
@@ -878,6 +880,13 @@ static inline u16 qeth_iqd_translate_txq(struct net_device *dev, u16 txq)return txq; } +static inline bool qeth_iqd_is_mcast_queue (struct qeth_card *card, +struct qeth_qdio_out_q *queue) +{ +return qeth_iqd_translate_txq (card->dev, queue->queue_no) == +QETH_IQD_MCAST_TXQ ; +} +static inline void qeth_scrub_qdio_buffer (struct qdio_buffer *buf,unsigned int elements) {
drivers/s390/net/qeth_core_main.c +44 -10
107 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 3/8 s390/qeth: use QDIO_BUFNR()
In reply to Julian Wiedmannqdio.h recently gained a new helper macro that handles wrap-around on a QDIO queue, consistently use it across all of qeth.
--- drivers/s390/net/qeth_core_main.c | 37 ++++++++++++++----------------- 1 file changed, 17 insertions(+), 20 deletions(-)
drivers/s390/net/qeth_core_main.c +17 -20
@@ -3121,7 +3121,7 @@ static void qeth_queue_input_buffer(struct qeth_card *card, int index)for (i = queue->next_buf_to_init; i < queue->next_buf_to_init + count; ++i) {if (qeth_init_input_buffer (card, - &queue->bufs[i %QDIO_MAX_BUFFERS_PER_Q ])) { + &queue->bufs[QDIO_BUFNR (i)])) {break ; }else { newcount++;
@@ -3163,8 +3163,8 @@ static void qeth_queue_input_buffer(struct qeth_card *card, int index)if (rc) {QETH_CARD_TEXT (card,2 ,"qinberr" ); } - queue->next_buf_to_init = (queue->next_buf_to_init + count) % -QDIO_MAX_BUFFERS_PER_Q ; + queue->next_buf_to_init =QDIO_BUFNR (queue->next_buf_to_init + + count); } }
@@ -3212,7 +3212,7 @@ static int qeth_prep_flush_pack_buffer(struct qeth_qdio_out_q *queue)/* it's a packing buffer */ atomic_set (&buffer->state,QETH_QDIO_BUF_PRIMED ); queue->next_buf_to_fill = - (queue->next_buf_to_fill +1 ) %QDIO_MAX_BUFFERS_PER_Q ; +QDIO_BUFNR (queue->next_buf_to_fill +1 );return 1 ; }return 0 ;
@@ -3266,7 +3266,8 @@ static void qeth_flush_buffers(struct qeth_qdio_out_q *queue, int index,unsigned int qdio_flags;for (i = index; i < index + count; ++i) { -int bidx = i %QDIO_MAX_BUFFERS_PER_Q ; +unsigned int bidx =QDIO_BUFNR (i); + buf = queue->bufs[bidx]; buf->buffer->element[buf->next_element_to_fill -1 ].eflags |=SBAL_EFLAGS_LAST_ENTRY ;
@@ -3434,8 +3435,7 @@ static void qeth_qdio_cq_handler(struct qeth_card *card, unsigned int qdio_err, }for (i = first_element; i < first_element + count; ++i) { -int bidx = i %QDIO_MAX_BUFFERS_PER_Q ; -struct qdio_buffer *buffer = cq->qdio_bufs[bidx]; +struct qdio_buffer *buffer = cq->qdio_bufs[QDIO_BUFNR (i)];int e =0 ; while ((e < QDIO_MAX_ELEMENTS_PER_BUFFER) &&
@@ -3456,8 +3456,8 @@ static void qeth_qdio_cq_handler(struct qeth_card *card, unsigned int qdio_err, "QDIO reported an error, rc=%i\n", rc);QETH_CARD_TEXT (card,2 ,"qcqherr" ); } - card->qdio.c_q->next_buf_to_init = (card->qdio.c_q->next_buf_to_init - + count) %QDIO_MAX_BUFFERS_PER_Q ; + + cq->next_buf_to_init =QDIO_BUFNR (cq->next_buf_to_init + count); } static void qeth_qdio_input_handler(struct ccw_device *ccwdev,
@@ -3483,7 +3483,6 @@ static void qeth_qdio_output_handler(struct ccw_device *ccwdev, {struct qeth_card *card = (struct qeth_card *) card_ptr;struct qeth_qdio_out_q *queue = card->qdio.out_qs[__queue]; -struct qeth_qdio_out_buffer *buffer;struct net_device *dev = card->dev;struct netdev_queue *txq;int i;
@@ -3497,10 +3496,10 @@ static void qeth_qdio_output_handler(struct ccw_device *ccwdev, }for (i = first_element; i < (first_element + count); ++i) { -int bidx = i %QDIO_MAX_BUFFERS_PER_Q ; - buffer = queue->bufs[bidx]; -qeth_handle_send_error (card, buffer, qdio_error); -qeth_clear_output_buffer (queue, buffer, qdio_error,0 ); +struct qeth_qdio_out_buffer *buf = queue->bufs[QDIO_BUFNR (i)]; + +qeth_handle_send_error (card, buf, qdio_error); +qeth_clear_output_buffer (queue, buf, qdio_error,0 ); }atomic_sub (count, &queue->used_buffers);
@@ -3932,8 +3931,7 @@ int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,atomic_set (&buffer->state,QETH_QDIO_BUF_PRIMED ); flush_count++; queue->next_buf_to_fill = - (queue->next_buf_to_fill +1 ) % -QDIO_MAX_BUFFERS_PER_Q ; +QDIO_BUFNR (queue->next_buf_to_fill +1 ); buffer = queue->bufs[queue->next_buf_to_fill];/* We stepped forward, so sanity-check again: */
@@ -3966,8 +3964,8 @@ int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,if (!queue->do_pack || stopped || next_element >= queue->max_elements) { flush_count++;atomic_set (&buffer->state,QETH_QDIO_BUF_PRIMED ); - queue->next_buf_to_fill = (queue->next_buf_to_fill +1 ) % -QDIO_MAX_BUFFERS_PER_Q ; + queue->next_buf_to_fill = +QDIO_BUFNR (queue->next_buf_to_fill +1 ); }if (flush_count)
@@ -5199,8 +5197,7 @@ int qeth_poll(struct napi_struct *napi, int budget) card->rx.b_count--;if (card->rx.b_count) { card->rx.b_index = - (card->rx.b_index +1 ) % -QDIO_MAX_BUFFERS_PER_Q ; +QDIO_BUFNR (card->rx.b_index +1 ); card->rx.b_element = &card->qdio.in_q ->bufs[card->rx.b_index]
Signature · 1 line
2.17.1
PATCH 4/8 s390/qeth: keep IRQ disabled until NAPI is really done
In reply to Julian WiedmannWhen napi_complete_done() returns false, the NAPI instance is still active and we can keep the IRQ disabled a little longer.
--- drivers/s390/net/qeth_core_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/s390/net/qeth_core_main.c +3 -3
@@ -5213,9 +5213,9 @@ int qeth_poll(struct napi_struct *napi, int budget) } } -napi_complete_done (napi, work_done); -if (qdio_start_irq (card->data.ccwdev,0 )) -napi_schedule (&card->napi); +if (napi_complete_done (napi, work_done) && +qdio_start_irq (CARD_DDEV (card),0 )) +napi_schedule (napi); out:return work_done; }
Signature · 1 line
2.17.1
PATCH 5/8 s390/qeth: consolidate some duplicated HW cmd code
In reply to Julian WiedmannWhen setting a device online, both subdrivers have the same code to program the HW trap and Isolation mode. Move that code into a single place.
--- drivers/s390/net/qeth_core_main.c | 10 +++++++++- drivers/s390/net/qeth_l2_main.c | 21 --------------------- drivers/s390/net/qeth_l3_main.c | 9 --------- 3 files changed, 9 insertions(+), 31 deletions(-)
drivers/s390/net/qeth_core_main.c +9 -1
@@ -4293,7 +4293,6 @@ int qeth_set_access_ctrl_online(struct qeth_card *card, int fallback) }return rc; } -EXPORT_SYMBOL_GPL (qeth_set_access_ctrl_online);void qeth_tx_timeout (struct net_device *dev) {
@@ -5009,6 +5008,15 @@ int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok) goto out; } } + +if (!qeth_is_diagass_supported (card,QETH_DIAGS_CMD_TRAP ) || + (card->info.hwtrap &&qeth_hw_trap (card,QETH_DIAGS_TRAP_ARM ))) + card->info.hwtrap =0 ; + + rc =qeth_set_access_ctrl_online (card,0 ); +if (rc) + goto out; +return 0 ; out: dev_warn(&card->gdev->dev, "The qeth device driver failed to recover "
drivers/s390/net/qeth_l2_main.c +0 -21
@@ -759,14 +759,6 @@ static int qeth_l2_setup_netdev(struct qeth_card *card, bool carrier_ok)return rc; } -static int qeth_l2_start_ipassists (struct qeth_card *card) -{ -/* configure isolation level */ -if (qeth_set_access_ctrl_online (card,0 )) -return -ENODEV ; -return 0 ; -} -static void qeth_l2_trace_features (struct qeth_card *card) {/* Set BridgePort features */
@@ -797,13 +789,6 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev) goto out_remove; } -if (qeth_is_diagass_supported (card,QETH_DIAGS_CMD_TRAP )) { -if (card->info.hwtrap && -qeth_hw_trap (card,QETH_DIAGS_TRAP_ARM )) - card->info.hwtrap =0 ; - }else - card->info.hwtrap =0 ; -qeth_bridgeport_query_support (card);if (card->options.sbp.supported_funcs) dev_info(&card->gdev->dev,
@@ -825,12 +810,6 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev)/* softsetup */ QETH_CARD_TEXT (card,2 ,"softsetp" ); -if (IS_OSD (card) ||IS_OSX (card)) { - rc =qeth_l2_start_ipassists (card); -if (rc) - goto out_remove; - } - rc =qeth_init_qdio_queues (card);if (rc) {QETH_CARD_TEXT_ (card,2 ,"6err%d" , rc);
drivers/s390/net/qeth_l3_main.c +0 -9
@@ -953,8 +953,6 @@ static int qeth_l3_start_ipassists(struct qeth_card *card) {QETH_CARD_TEXT (card,3 ,"strtipas" ); -if (qeth_set_access_ctrl_online (card,0 )) -return -EIO ;qeth_l3_start_ipa_arp_processing (card);/* go on*/ qeth_l3_start_ipa_source_mac (card);/* go on*/ qeth_l3_start_ipa_vlan (card);/* go on*/
@@ -2313,13 +2311,6 @@ static int qeth_l3_set_online(struct ccwgroup_device *gdev) goto out_remove; } -if (qeth_is_diagass_supported (card,QETH_DIAGS_CMD_TRAP )) { -if (card->info.hwtrap && -qeth_hw_trap (card,QETH_DIAGS_TRAP_ARM )) - card->info.hwtrap =0 ; - }else - card->info.hwtrap =0 ; - card->state =CARD_STATE_HARDSETUP ;qeth_print_status_message (card);
Signature · 1 line
2.17.1
PATCH 6/8 s390/qeth: don't set card state in qeth_qdio_clear_card()
In reply to Julian WiedmannAny change to the card state should only be driven by qeth_l?_set_online() and qeth_l?_stop_card().
qeth_qdio_clear_card() currently also gets called from
(a) qeth_core_shutdown(), where we haven't walked through the whole teardown sequence. So changing the state to DOWN is not accurate.
(b) qeth_core_hardsetup_card(), which is only called while the card is still in DOWN state. No change in behaviour here.
--- drivers/s390/net/qeth_core_main.c | 1 - 1 file changed, 1 deletion(-)
drivers/s390/net/qeth_core_main.c +0 -1
@@ -1513,7 +1513,6 @@ int qeth_qdio_clear_card(struct qeth_card *card, int use_halt) rc =qeth_clear_halt_card (card, use_halt);if (rc)QETH_CARD_TEXT_ (card,3 ,"2err%d" , rc); - card->state =CARD_STATE_DOWN ;return rc; }EXPORT_SYMBOL_GPL (qeth_qdio_clear_card);
Signature · 1 line
2.17.1
PATCH 7/8 s390/qeth: use helpers for IP address hashing
In reply to Julian WiedmannReplace our custom implementations with the stack's version of IP address hashing.
--- drivers/s390/net/qeth_l3.h | 21 ++++++--------------- drivers/s390/net/qeth_l3_main.c | 8 ++++---- 2 files changed, 10 insertions(+), 19 deletions(-)
drivers/s390/net/qeth_l3.h +6 -15
@@ -37,7 +37,7 @@ struct qeth_ipaddr {enum qeth_prot_versions proto;union {struct { -unsigned int addr; +__be32 addr;unsigned int mask; } a4;struct {
@@ -89,21 +89,12 @@ static inline bool qeth_l3_addr_match_all(struct qeth_ipaddr *a1,return a1->u.a4.mask == a2->u.a4.mask; } -static inline u64 qeth_l3_ipaddr_hash (struct qeth_ipaddr *addr) +static inline u32 qeth_l3_ipaddr_hash (struct qeth_ipaddr *addr) { -u64 ret =0 ; -u8 *point; - -if (addr->proto ==QETH_PROT_IPV6 ) { - point = (u8 *) &addr->u.a6.addr; - ret =get_unaligned ((u64 *)point) ^ -get_unaligned ((u64 *) (point +8 )); - } -if (addr->proto ==QETH_PROT_IPV4 ) { - point = (u8 *) &addr->u.a4.addr; - ret =get_unaligned ((u32 *) point); - } -return ret; +if (addr->proto ==QETH_PROT_IPV6 ) +return ipv6_addr_hash (&addr->u.a6.addr); +else +return ipv4_addr_hash (addr->u.a4.addr); }struct qeth_ipato_entry {
drivers/s390/net/qeth_l3_main.c +4 -4
@@ -76,7 +76,7 @@ static struct qeth_ipaddr *qeth_l3_get_addr_buffer(enum qeth_prot_versions prot)static struct qeth_ipaddr *qeth_l3_find_addr_by_ip (struct qeth_card *card,struct qeth_ipaddr *query) { -u64 key =qeth_l3_ipaddr_hash (query); +u32 key =qeth_l3_ipaddr_hash (query);struct qeth_ipaddr *addr;if (query->is_multicast) {
@@ -1128,7 +1128,7 @@ qeth_l3_add_mc_to_hash(struct qeth_card *card, struct in_device *in4_dev)for (im4 =rcu_dereference (in4_dev->mc_list); im4 !=NULL ; im4 =rcu_dereference (im4->next_rcu)) {ip_eth_mc_map (im4->multiaddr, tmp->mac); - tmp->u.a4.addr =be32_to_cpu (im4->multiaddr); + tmp->u.a4.addr = im4->multiaddr; tmp->is_multicast =1 ; ipm =qeth_l3_find_addr_by_ip (card, tmp);
@@ -1140,7 +1140,7 @@ qeth_l3_add_mc_to_hash(struct qeth_card *card, struct in_device *in4_dev)if (!ipm)continue ;ether_addr_copy (ipm->mac, tmp->mac); - ipm->u.a4.addr =be32_to_cpu (im4->multiaddr); + ipm->u.a4.addr = im4->multiaddr; ipm->is_multicast =1 ; ipm->disp_flag =QETH_DISP_ADDR_ADD ; hash_add(card->ip_mc_htable,
@@ -2548,7 +2548,7 @@ static int qeth_l3_ip_event(struct notifier_block *this,QETH_CARD_TEXT (card,3 ,"ipevent" );qeth_l3_init_ipaddr (&addr,QETH_IP_TYPE_NORMAL ,QETH_PROT_IPV4 ); - addr.u.a4.addr =be32_to_cpu (ifa->ifa_address); + addr.u.a4.addr = ifa->ifa_address; addr.u.a4.mask =be32_to_cpu (ifa->ifa_mask);return qeth_l3_handle_ip_event (card, &addr, event);
Signature · 1 line
2.17.1
PATCH 8/8 s390/qeth: don't cache MAC addresses for multicast IPs
In reply to Julian WiedmannInstead of storing the multicast-mapped MAC address in an IP address object, just calculate the MAC address when actually building a cmd for the IP address.
While at it, also clean up some rather verbose copying of IP addresses.
--- drivers/s390/net/qeth_core_mpc.h | 4 ++-- drivers/s390/net/qeth_l3.h | 3 --- drivers/s390/net/qeth_l3_main.c | 24 ++++++++++-------------- 3 files changed, 12 insertions(+), 19 deletions(-)
drivers/s390/net/qeth_core_mpc.h +2 -2
@@ -11,6 +11,7 @@#include <asm/qeth.h> #include <uapi/linux/if_ether.h> +#include <uapi/linux/in6.h> #define IPA_PDU_HEADER_SIZE 0x40#define QETH_IPA_PDU_LEN_TOTAL (buffer) (buffer + 0x0e)
@@ -365,8 +366,7 @@ struct qeth_ipacmd_setdelip6 {struct qeth_ipacmd_setdelipm {__u8 mac[6 ];__u8 padding[2 ]; -__u8 ip6[12 ]; -__u8 ip4[4 ]; +struct in6_addr ip; } __attribute__ ((packed));struct qeth_ipacmd_layer2setdelmac {
drivers/s390/net/qeth_l3.h +0 -3
@@ -24,7 +24,6 @@ enum qeth_ip_types {struct qeth_ipaddr {struct hlist_node hnode;enum qeth_ip_types type; -unsigned char mac[ETH_ALEN ];u8 is_multicast:1 ;u8 in_progress:1 ;u8 disp_flag:2 ;
@@ -74,12 +73,10 @@ static inline bool qeth_l3_addr_match_all(struct qeth_ipaddr *a1,* so 'proto' and 'addr' match for sure. * * For ucast: -* - 'mac' is always 0. * - 'mask'/'pfxlen' for RXIP/VIPA is always 0. For NORMAL, matching * values are required to avoid mixups in takeover eligibility. * * For mcast, -* - 'mac' is mapped from the IP, and thus always matches. * - 'mask'/'pfxlen' is always 0. */ if (a1->type != a2->type)
drivers/s390/net/qeth_l3_main.c +10 -14
@@ -381,12 +381,13 @@ static int qeth_l3_send_setdelmc(struct qeth_card *card,if (!iob)return -ENOMEM ; cmd =__ipa_cmd (iob); -ether_addr_copy (cmd->data.setdelipm.mac, addr->mac); -if (addr->proto ==QETH_PROT_IPV6 ) -memcpy (cmd->data.setdelipm.ip6, &addr->u.a6.addr, -sizeof (struct in6_addr )); -else -memcpy (&cmd->data.setdelipm.ip4, &addr->u.a4.addr,4 ); +if (addr->proto ==QETH_PROT_IPV6 ) { + cmd->data.setdelipm.ip = addr->u.a6.addr; +ipv6_eth_mc_map (&addr->u.a6.addr, cmd->data.setdelipm.mac); + }else { + cmd->data.setdelipm.ip.s6_addr32[3 ] = addr->u.a4.addr; +ip_eth_mc_map (addr->u.a4.addr, cmd->data.setdelipm.mac); + }return qeth_send_ipa_cmd (card, iob, qeth_l3_setdelip_cb,NULL ); }
@@ -1127,7 +1128,6 @@ qeth_l3_add_mc_to_hash(struct qeth_card *card, struct in_device *in4_dev)for (im4 =rcu_dereference (in4_dev->mc_list); im4 !=NULL ; im4 =rcu_dereference (im4->next_rcu)) { -ip_eth_mc_map (im4->multiaddr, tmp->mac); tmp->u.a4.addr = im4->multiaddr; tmp->is_multicast =1 ;
@@ -1139,7 +1139,7 @@ qeth_l3_add_mc_to_hash(struct qeth_card *card, struct in_device *in4_dev) ipm =qeth_l3_get_addr_buffer (QETH_PROT_IPV4 );if (!ipm)continue ; -ether_addr_copy (ipm->mac, tmp->mac); + ipm->u.a4.addr = im4->multiaddr; ipm->is_multicast =1 ; ipm->disp_flag =QETH_DISP_ADDR_ADD ;
@@ -1207,9 +1207,7 @@ static void qeth_l3_add_mc6_to_hash(struct qeth_card *card,return ;for (im6 = in6_dev->mc_list; im6 !=NULL ; im6 = im6->next) { -ipv6_eth_mc_map (&im6->mca_addr, tmp->mac); -memcpy (&tmp->u.a6.addr, &im6->mca_addr.s6_addr, -sizeof (struct in6_addr )); + tmp->u.a6.addr = im6->mca_addr; tmp->is_multicast =1 ; ipm =qeth_l3_find_addr_by_ip (card, tmp);
@@ -1223,9 +1221,7 @@ static void qeth_l3_add_mc6_to_hash(struct qeth_card *card,if (!ipm)continue ; -ether_addr_copy (ipm->mac, tmp->mac); -memcpy (&ipm->u.a6.addr, &im6->mca_addr.s6_addr, -sizeof (struct in6_addr )); + ipm->u.a6.addr = im6->mca_addr; ipm->is_multicast =1 ; ipm->disp_flag =QETH_DISP_ADDR_ADD ; hash_add(card->ip_mc_htable,
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Julian Wiedmann <[email protected]>
Date: Thu, 31 Oct 2019 13:42:13 +0100
Quoted 1 line
please apply the following series of spooky qeth updates for net-next.
I hear that if you hack on S390, every day is like Halloween.
Quoted 6 lines
The first two patches add support for an enhanced TX doorbell, which enables us to do more xmit_more-based bulking.
Note that this requires one patch for the s390/qdio base layer, which has been graciously acked by Heiko to go through your tree.The remaining patches are just the usual minor cleanups/improvements.
Series applied to net-next, thank you.