s390/qeth: fixes 2019-12-05
Subsystems (4)
cover s390/qeth: fixes 2019-12-05
Hi Dave,
please apply the following fixes to your net tree.
The first two patches target the RX data path, the third fixes a memory leak when shutting down a qeth device.
Thanks,
Julian
Julian Wiedmann (3):
s390/qeth: guard against runt packets s390/qeth: ensure linear access to packet headers s390/qeth: fix dangling IO buffers after halt/clear
drivers/s390/net/qeth_core.h | 4 + drivers/s390/net/qeth_core_main.c | 158 +++++++++++++++++++----------- drivers/s390/net/qeth_core_mpc.h | 14 --- drivers/s390/net/qeth_ethtool.c | 1 + drivers/s390/net/qeth_l2_main.c | 12 +-- drivers/s390/net/qeth_l3_main.c | 13 +-- 6 files changed, 119 insertions(+), 83 deletions(-)
Signature · 1 line
2.17.1
PATCH 2/3 s390/qeth: ensure linear access to packet headers
When the RX path builds non-linear skbs, the packet headers can currently spill over into page fragments. Depending on the packet type and what fields we need to access in the headers, this could cause us to go past the end of skb->data.
So for non-linear packets, copy precisely the length of the necessary headers ('linear_len') into skb->data.
And don't copy more, upper-level protocols will peel whatever additional packet headers they need.
--- drivers/s390/net/qeth_core_main.c | 64 +++++++++++++++---------------- 1 file changed, 31 insertions(+), 33 deletions(-)
drivers/s390/net/qeth_core_main.c +31 -33
@@ -5028,27 +5028,15 @@ int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok) }EXPORT_SYMBOL_GPL (qeth_core_hardsetup_card); -static void qeth_create_skb_frag (struct qdio_buffer_element *element, -struct sk_buff *skb,int offset,int data_len) +static void qeth_create_skb_frag (struct sk_buff *skb,char *data,int data_len) { -struct page *page =virt_to_page (element->addr); +struct page *page =virt_to_page (data);unsigned int next_frag; -/* first fill the linear space */ -if (!skb->len) { -unsigned int linear =min (data_len,skb_tailroom (skb)); - -skb_put_data (skb, element->addr + offset, linear); - data_len -= linear; -if (!data_len) -return ; - offset += linear; -/* fall through to add page frag for remaining data */ - } - next_frag =skb_shinfo (skb)->nr_frags;get_page (page); -skb_add_rx_frag (skb, next_frag, page, offset, data_len, data_len); +skb_add_rx_frag (skb, next_frag, page,offset_in_page (data), data_len, + data_len); }static inline int qeth_is_last_sbale (struct qdio_buffer_element *sbale)
@@ -5063,13 +5051,12 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card, {struct qdio_buffer_element *element = *__element;struct qdio_buffer *buffer = qethbuffer->buffer; -unsigned int headroom, linear_len; +unsigned int linear_len =0 ;int offset = *__offset;bool use_rx_sg = false; +unsigned int headroom;struct sk_buff *skb;int skb_len =0 ; -void *data_ptr; -int data_len; next_packet:/* qeth_hdr must not cross element boundaries */
@@ -5144,9 +5131,9 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card, skb = qethbuffer->rx_skb; qethbuffer->rx_skb =NULL ; }else { -unsigned int linear = (use_rx_sg) ?QETH_RX_PULL_LEN : skb_len; - - skb =napi_alloc_skb (&card->napi, linear + headroom); +if (!use_rx_sg) + linear_len = skb_len; + skb =napi_alloc_skb (&card->napi, linear_len + headroom); }if (!skb)
@@ -5155,18 +5142,32 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card,skb_reserve (skb, headroom); walk_packet: - data_ptr = element->addr + offset;while (skb_len) { - data_len =min (skb_len, (int )(element->length - offset)); +int data_len =min (skb_len, (int )(element->length - offset)); +char *data = element->addr + offset; + + skb_len -= data_len; + offset += data_len; +/* Extract data from current element: */ if (skb && data_len) { -if (use_rx_sg) -qeth_create_skb_frag (element, skb, offset, - data_len); -else -skb_put_data (skb, data_ptr, data_len); +if (linear_len) { +unsigned int copy_len; + + copy_len = min_t(unsigned int, linear_len, + data_len); + +skb_put_data (skb, data, copy_len); + linear_len -= copy_len; + data_len -= copy_len; + data += copy_len; + } + +if (data_len) +qeth_create_skb_frag (skb, data, data_len); } - skb_len -= data_len; + +/* Step forward to next element: */ if (skb_len) {if (qeth_is_last_sbale (element)) {QETH_CARD_TEXT (card,4 ,"unexeob" );
@@ -5180,9 +5181,6 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card, } element++; offset =0 ; - data_ptr = element->addr; - }else { - offset += data_len; } }
Signature · 1 line
2.17.1
PATCH 3/3 s390/qeth: fix dangling IO buffers after halt/clear
In reply to Julian WiedmannThe cio layer's intparm logic does not align itself well with how qeth manages cmd IOs. When an active IO gets terminated via halt/clear, the corresponding IRQ's intparm does not reflect the cmd buffer but rather the intparm that was passed to ccw_device_halt() / ccw_device_clear(). This behaviour was recently clarified in
commit b91d9e67e50b ("s390/cio: fix intparm documentation").
As a result, qeth_irq() currently doesn't cancel a cmd that was terminated via halt/clear. This primarily causes us to leak card->read_cmd after the qeth device is removed, since our IO path still holds a refcount for this cmd.
For qeth this means that we need to keep track of which IO is pending on a device ('active_cmd'), and use this as the intparm when calling halt/clear. Otherwise qeth_irq() can't match the subsequent IRQ to its cmd buffer.
Since we now keep track of the _expected_ intparm, we can also detect any mismatch; this would constitute a bug somewhere in the lower layers. In this case cancel the active cmd - we effectively "lost" the IRQ and should not expect any further notification for this IO.
--- drivers/s390/net/qeth_core.h | 3 ++ drivers/s390/net/qeth_core_main.c | 71 ++++++++++++++++++++++--------- drivers/s390/net/qeth_core_mpc.h | 14 ------ drivers/s390/net/qeth_l2_main.c | 12 +++--- drivers/s390/net/qeth_l3_main.c | 13 +++--- 5 files changed, 67 insertions(+), 46 deletions(-)
drivers/s390/net/qeth_core.h +3 -0
@@ -628,6 +628,7 @@ struct qeth_ipato {struct qeth_channel {struct ccw_device *ccwdev; +struct qeth_cmd_buffer *active_cmd;enum qeth_channel_states state;atomic_t irq_pending; };
@@ -1038,6 +1039,8 @@ int qeth_do_run_thread(struct qeth_card *, unsigned long);void qeth_clear_thread_start_bit (struct qeth_card *,unsigned long );void qeth_clear_thread_running_bit (struct qeth_card *,unsigned long );int qeth_core_hardsetup_card (struct qeth_card *card,bool *carrier_ok); +int qeth_stop_channel (struct qeth_channel *channel); +void qeth_print_status_message (struct qeth_card *);int qeth_init_qdio_queues (struct qeth_card *); int qeth_send_ipa_cmd(struct qeth_card *, struct qeth_cmd_buffer *,
drivers/s390/net/qeth_core_main.c +51 -20
135 lines not on this page · raw message
drivers/s390/net/qeth_core_mpc.h +0 -14
@@ -29,20 +29,6 @@ extern unsigned char IPA_PDU_HEADER[];#define QETH_TIMEOUT (10 * HZ)#define QETH_IPA_TIMEOUT (45 * HZ) -#define QETH_CLEAR_CHANNEL_PARM -10 -#define QETH_HALT_CHANNEL_PARM -11 - -static inline bool qeth_intparm_is_iob (unsigned long intparm) -{ -switch (intparm) { -case QETH_CLEAR_CHANNEL_PARM : -case QETH_HALT_CHANNEL_PARM : -case 0 : -return false; - } -return true; -} -/*****************************************************************************/ /* IP Assist related definitions */ /*****************************************************************************/
drivers/s390/net/qeth_l2_main.c +6 -6
@@ -845,9 +845,9 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev) out_remove:qeth_l2_stop_card (card); -ccw_device_set_offline (CARD_DDEV (card)); -ccw_device_set_offline (CARD_WDEV (card)); -ccw_device_set_offline (CARD_RDEV (card)); +qeth_stop_channel (&card->data); +qeth_stop_channel (&card->write); +qeth_stop_channel (&card->read);qdio_free (CARD_DDEV (card));mutex_unlock (&card->conf_mutex);
@@ -878,9 +878,9 @@ static int __qeth_l2_set_offline(struct ccwgroup_device *cgdev,rtnl_unlock ();qeth_l2_stop_card (card); - rc =ccw_device_set_offline (CARD_DDEV (card)); - rc2 =ccw_device_set_offline (CARD_WDEV (card)); - rc3 =ccw_device_set_offline (CARD_RDEV (card)); + rc =qeth_stop_channel (&card->data); + rc2 =qeth_stop_channel (&card->write); + rc3 =qeth_stop_channel (&card->read);if (!rc) rc = (rc2) ? rc2 : rc3;if (rc)
drivers/s390/net/qeth_l3_main.c +7 -6
@@ -2259,9 +2259,9 @@ static int qeth_l3_set_online(struct ccwgroup_device *gdev)return 0 ; out_remove:qeth_l3_stop_card (card); -ccw_device_set_offline (CARD_DDEV (card)); -ccw_device_set_offline (CARD_WDEV (card)); -ccw_device_set_offline (CARD_RDEV (card)); +qeth_stop_channel (&card->data); +qeth_stop_channel (&card->write); +qeth_stop_channel (&card->read);qdio_free (CARD_DDEV (card));mutex_unlock (&card->conf_mutex);
@@ -2297,9 +2297,10 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev,call_netdevice_notifiers (NETDEV_REBOOT , card->dev);rtnl_unlock (); } - rc =ccw_device_set_offline (CARD_DDEV (card)); - rc2 =ccw_device_set_offline (CARD_WDEV (card)); - rc3 =ccw_device_set_offline (CARD_RDEV (card)); + + rc =qeth_stop_channel (&card->data); + rc2 =qeth_stop_channel (&card->write); + rc3 =qeth_stop_channel (&card->read);if (!rc) rc = (rc2) ? rc2 : rc3;if (rc)
Signature · 1 line
2.17.1
PATCH 1/3 s390/qeth: guard against runt packets
In reply to Julian WiedmannDepending on a packet's type, the RX path needs to access fields in the packet headers and thus requires a minimum packet length. Enforce this length when building the skb.
On the other hand a single runt packet is no reason to drop the whole RX buffer. So just skip it, and continue processing on the next packet.
--- drivers/s390/net/qeth_core.h | 1 + drivers/s390/net/qeth_core_main.c | 27 +++++++++++++++++++++------ drivers/s390/net/qeth_ethtool.c | 1 + 3 files changed, 23 insertions(+), 6 deletions(-)
drivers/s390/net/qeth_core.h +1 -0
@@ -480,6 +480,7 @@ struct qeth_card_stats {u64 rx_dropped_nomem;u64 rx_dropped_notsupp; +u64 rx_dropped_runt;/* rtnl_link_stats64 */ u64 rx_packets;
drivers/s390/net/qeth_core_main.c +21 -6
@@ -5063,9 +5063,9 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card, {struct qdio_buffer_element *element = *__element;struct qdio_buffer *buffer = qethbuffer->buffer; +unsigned int headroom, linear_len;int offset = *__offset;bool use_rx_sg = false; -unsigned int headroom;struct sk_buff *skb;int skb_len =0 ;void *data_ptr;
@@ -5082,29 +5082,41 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card, *hdr = element->addr + offset; offset +=sizeof (struct qeth_hdr ); + skb =NULL ; +switch ((*hdr)->hdr.l2.id) {case QETH_HEADER_TYPE_LAYER2 : skb_len = (*hdr)->hdr.l2.pkt_length; + linear_len =ETH_HLEN ; headroom =0 ;break ;case QETH_HEADER_TYPE_LAYER3 : skb_len = (*hdr)->hdr.l3.length;if (!IS_LAYER3 (card)) {QETH_CARD_STAT_INC (card, rx_dropped_notsupp); - skb =NULL ; goto walk_packet; } +if ((*hdr)->hdr.l3.flags &QETH_HDR_PASSTHRU ) { + linear_len =ETH_HLEN ; + headroom =0 ; +break ; + } + +if ((*hdr)->hdr.l3.flags &QETH_HDR_IPV6 ) + linear_len =sizeof (struct ipv6hdr ); +else + linear_len =sizeof (struct iphdr ); headroom =ETH_HLEN ;break ;case QETH_HEADER_TYPE_OSN : skb_len = (*hdr)->hdr.osn.pdu_length;if (!IS_OSN (card)) {QETH_CARD_STAT_INC (card, rx_dropped_notsupp); - skb =NULL ; goto walk_packet; } + linear_len = skb_len; headroom =sizeof (struct qeth_hdr );break ;default :
@@ -5117,8 +5129,10 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card,return NULL ; } -if (!skb_len) -return NULL ; +if (skb_len < linear_len) { +QETH_CARD_STAT_INC (card, rx_dropped_runt); + goto walk_packet; + } use_rx_sg = (card->options.cq == QETH_CQ_ENABLED) || ((skb_len >= card->options.rx_sg_cb) &&
@@ -6268,7 +6282,8 @@ void qeth_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) card->stats.rx_frame_errors + card->stats.rx_fifo_errors; stats->rx_dropped = card->stats.rx_dropped_nomem + - card->stats.rx_dropped_notsupp; + card->stats.rx_dropped_notsupp + + card->stats.rx_dropped_runt; stats->multicast = card->stats.rx_multicast; stats->rx_length_errors = card->stats.rx_length_errors; stats->rx_frame_errors = card->stats.rx_frame_errors;
drivers/s390/net/qeth_ethtool.c +1 -0
@@ -51,6 +51,7 @@ static const struct qeth_stats card_stats[] = {QETH_CARD_STAT ("rx0 SG page allocs" , rx_sg_alloc_page),QETH_CARD_STAT ("rx0 dropped, no memory" , rx_dropped_nomem),QETH_CARD_STAT ("rx0 dropped, bad format" , rx_dropped_notsupp), + QETH_CARD_STAT("rx0 dropped, runt", rx_dropped_runt), };#define TXQ_STATS_LEN ARRAY_SIZE(txq_stats)
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Julian Wiedmann <[email protected]>
Date: Thu, 5 Dec 2019 14:33:01 +0100
Quoted 4 lines
please apply the following fixes to your net tree.
The first two patches target the RX data path, the third fixes a memory leak when shutting down a qeth device.
Series applied, thanks Julian.