s390/qeth: updates 2019-12-23
Subsystems (4)
cover s390/qeth: updates 2019-12-23
Hi Dave,
please apply the following patch series for qeth to your net-next tree.
This reworks the RX code to use napi_gro_frags() when building non-linear skbs, along with some consolidation and cleanups.
Happy holidays - and many thanks for all the effort & support over the past year, to both Jakub and you. It's much appreciated.
Thanks,
Julian
Julian Wiedmann (3):
s390/qeth: consolidate RX code
s390/qeth: use napi_gro_frags() for SG skbs
s390/qeth: remove QETH_RX_PULL_LEN
drivers/s390/net/qeth_core.h | 17 --- drivers/s390/net/qeth_core_main.c | 239 +++++++++++++++++++++++++----- drivers/s390/net/qeth_l2_main.c | 40 ----- drivers/s390/net/qeth_l3_main.c | 91 ------------ 4 files changed, 200 insertions(+), 187 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/3 s390/qeth: consolidate RX code
To reduce the path length and levels of indirection, move the RX processing from the sub-drivers into the core.
--- drivers/s390/net/qeth_core.h | 16 --- drivers/s390/net/qeth_core_main.c | 180 +++++++++++++++++++++++++----- drivers/s390/net/qeth_l2_main.c | 40 ------- drivers/s390/net/qeth_l3_main.c | 91 --------------- 4 files changed, 153 insertions(+), 174 deletions(-)
drivers/s390/net/qeth_core.h +0 -16
@@ -728,7 +728,6 @@ struct qeth_osn_info {struct qeth_discipline {const struct device_type *devtype; -int (*process_rx_buffer)(struct qeth_card *card,int budget,int *done);int (*recover)(void *ptr);int (*setup) (struct ccwgroup_device *);void (*remove) (struct ccwgroup_device *);
@@ -923,18 +922,6 @@ static inline struct dst_entry *qeth_dst_check_rcu(struct sk_buff *skb, int ipv)return dst; } -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 )) { - skb->ip_summed =CHECKSUM_UNNECESSARY ; -QETH_CARD_STAT_INC (card, rx_skb_csum); - }else { - skb->ip_summed =CHECKSUM_NONE ; - } -} -static inline void qeth_tx_csum (struct sk_buff *skb,u8 *flags,int ipv) { *flags |=QETH_HDR_EXT_CSUM_TRANSP_REQ ;
@@ -1031,9 +1018,6 @@ struct qeth_cmd_buffer *qeth_get_diag_cmd(struct qeth_card *card,void qeth_notify_cmd (struct qeth_cmd_buffer *iob,int reason);void qeth_put_cmd (struct qeth_cmd_buffer *iob); -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 *);int qeth_poll (struct napi_struct *napi,int budget);void qeth_clear_ipacmd_list (struct qeth_card *);
drivers/s390/net/qeth_core_main.c +153 -27
270 lines not on this page · raw message
drivers/s390/net/qeth_l2_main.c +0 -40
@@ -298,45 +298,6 @@ static void qeth_l2_stop_card(struct qeth_card *card) card->info.promisc_mode =0 ; } -static int qeth_l2_process_inbound_buffer (struct qeth_card *card, -int budget,int *done) -{ -int work_done =0 ; -struct sk_buff *skb; -struct qeth_hdr *hdr; -unsigned int len; - - *done =0 ; -WARN_ON_ONCE (!budget); -while (budget) { - skb =qeth_core_get_next_skb (card, - &card->qdio.in_q->bufs[card->rx.b_index], - &card->rx.b_element, &card->rx.e_offset, &hdr); -if (!skb) { - *done =1 ; -break ; - } - -if (hdr->hdr.l2.id ==QETH_HEADER_TYPE_LAYER2 ) { - skb->protocol =eth_type_trans (skb, skb->dev); -qeth_rx_csum (card, skb, hdr->hdr.l2.flags[1 ]); - len = skb->len; -napi_gro_receive (&card->napi, skb); - }else { -skb_push (skb,sizeof (*hdr)); -skb_copy_to_linear_data (skb, hdr,sizeof (*hdr)); - len = skb->len; - card->osn_info.data_cb (skb); - } - - work_done++; - budget--; -QETH_CARD_STAT_INC (card, rx_packets); -QETH_CARD_STAT_ADD (card, rx_bytes, len); - } -return work_done; -} -static int qeth_l2_request_initial_mac (struct qeth_card *card) {int rc =0 ;
@@ -961,7 +922,6 @@ static int qeth_l2_control_event(struct qeth_card *card,struct qeth_discipline qeth_l2_discipline = { .devtype = &qeth_l2_devtype, - .process_rx_buffer = qeth_l2_process_inbound_buffer, .recover = qeth_l2_recover, .setup = qeth_l2_probe_device, .remove = qeth_l2_remove_device,
drivers/s390/net/qeth_l3_main.c +0 -91
103 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 2/3 s390/qeth: use napi_gro_frags() for SG skbs
In reply to Julian WiedmannFor non-linear packets, get the skb for attaching the page fragments from napi_get_frags() so that it can be recycled during GRO.
--- drivers/s390/net/qeth_core_main.c | 67 +++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 17 deletions(-)
drivers/s390/net/qeth_core_main.c +50 -17
@@ -5106,8 +5106,9 @@ static void qeth_l3_rebuild_skb(struct qeth_card *card, struct sk_buff *skb,#endif static void qeth_receive_skb (struct qeth_card *card,struct sk_buff *skb, -struct qeth_hdr *hdr) +struct qeth_hdr *hdr,bool uses_frags) { +struct napi_struct *napi = &card->napi;bool is_cso;switch (hdr->hdr.l2.id) {
@@ -5130,7 +5131,10 @@ static void qeth_receive_skb(struct qeth_card *card, struct sk_buff *skb,break ;default :/* never happens */ -dev_kfree_skb_any (skb); +if (uses_frags) +napi_free_frags (napi); +else +dev_kfree_skb_any (skb);return ; }
@@ -5141,8 +5145,6 @@ static void qeth_receive_skb(struct qeth_card *card, struct sk_buff *skb, skb->ip_summed =CHECKSUM_NONE ; } - skb->protocol =eth_type_trans (skb, skb->dev); -QETH_CARD_STAT_ADD (card, rx_bytes, skb->len);QETH_CARD_STAT_INC (card, rx_packets);if (skb_is_nonlinear (skb)) {
@@ -5151,7 +5153,12 @@ static void qeth_receive_skb(struct qeth_card *card, struct sk_buff *skb, skb_shinfo(skb)->nr_frags); } -napi_gro_receive (&card->napi, skb); +if (uses_frags) { +napi_gro_frags (napi); + }else { + skb->protocol =eth_type_trans (skb, skb->dev); +napi_gro_receive (napi, skb); + } }static void qeth_create_skb_frag (struct sk_buff *skb,char *data,int data_len)
@@ -5177,7 +5184,9 @@ static int qeth_extract_skb(struct qeth_card *card, {struct qdio_buffer_element *element = *__element;struct qdio_buffer *buffer = qethbuffer->buffer; +struct napi_struct *napi = &card->napi;unsigned int linear_len =0 ; +bool uses_frags = false;int offset = *__offset;bool use_rx_sg = false;unsigned int headroom;
@@ -5253,21 +5262,42 @@ static int qeth_extract_skb(struct qeth_card *card, !atomic_read (&card->force_alloc_skb) && !IS_OSN(card)); -if (use_rx_sg && qethbuffer->rx_skb) { +if (use_rx_sg) {/* QETH_CQ_ENABLED only: */ - skb = qethbuffer->rx_skb; - qethbuffer->rx_skb =NULL ; - }else { -if (!use_rx_sg) - linear_len = skb_len; - skb =napi_alloc_skb (&card->napi, linear_len + headroom); +if (qethbuffer->rx_skb) { + skb = qethbuffer->rx_skb; + qethbuffer->rx_skb =NULL ; + goto use_skb; + } + + skb =napi_get_frags (napi); +if (!skb) { +/* -ENOMEM, no point in falling back further. */ +QETH_CARD_STAT_INC (card, rx_dropped_nomem); + goto walk_packet; + } + +if (skb_tailroom (skb) >= linear_len + headroom) { + uses_frags = true; + goto use_skb; + } + +netdev_info_once (card->dev, +"Insufficient linear space in NAPI frags skb, need %u but have %u\n" , + linear_len + headroom,skb_tailroom (skb)); +/* Shouldn't happen. Don't optimize, fall back to linear skb. */ } -if (!skb) + linear_len = skb_len; + skb =napi_alloc_skb (napi, linear_len + headroom); +if (!skb) {QETH_CARD_STAT_INC (card, rx_dropped_nomem); -else if (headroom) -skb_reserve (skb, headroom); + goto walk_packet; + } +use_skb: +if (headroom) +skb_reserve (skb, headroom); walk_packet:while (skb_len) {int data_len =min (skb_len, (int )(element->length - offset));
@@ -5300,7 +5330,10 @@ static int qeth_extract_skb(struct qeth_card *card,QETH_CARD_TEXT (card,4 ,"unexeob" );QETH_CARD_HEX (card,2 , buffer,sizeof (void *));if (skb) { -dev_kfree_skb_any (skb); +if (uses_frags) +napi_free_frags (napi); +else +dev_kfree_skb_any (skb);QETH_CARD_STAT_INC (card, rx_length_errors); }
@@ -5318,7 +5351,7 @@ static int qeth_extract_skb(struct qeth_card *card, *__element = element; *__offset = offset; -qeth_receive_skb (card, skb, hdr); +qeth_receive_skb (card, skb, hdr, uses_frags);return 0 ; }
Signature · 1 line
2.17.1
PATCH 3/3 s390/qeth: remove QETH_RX_PULL_LEN
In reply to Julian WiedmannSince commit f677fcb9aeb6 ("s390/qeth: ensure linear access to packet headers"), the CQ-specific skbs are allocated with a slightly bigger linear part than necessary. Shrink it down to the maximum that's needed by qeth_extract_skb().
--- drivers/s390/net/qeth_core.h | 1 - drivers/s390/net/qeth_core_main.c | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/s390/net/qeth_core.h +0 -1
@@ -221,7 +221,6 @@ struct qeth_vnicc_info {/* large receive scatter gather copy break */ #define QETH_RX_SG_CB (PAGE_SIZE >> 1) -#define QETH_RX_PULL_LEN 256struct qeth_hdr_layer3 {__u8 id;
drivers/s390/net/qeth_core_main.c +4 -2
@@ -2627,7 +2627,8 @@ static int qeth_init_input_buffer(struct qeth_card *card,if ((card->options.cq ==QETH_CQ_ENABLED ) && (!buf->rx_skb)) { buf->rx_skb =netdev_alloc_skb (card->dev, -QETH_RX_PULL_LEN +ETH_HLEN ); +ETH_HLEN + +sizeof (struct ipv6hdr ));if (!buf->rx_skb)return 1 ; }
@@ -5264,7 +5265,8 @@ static int qeth_extract_skb(struct qeth_card *card,if (use_rx_sg) {/* QETH_CQ_ENABLED only: */ -if (qethbuffer->rx_skb) { +if (qethbuffer->rx_skb && +skb_tailroom (qethbuffer->rx_skb) >= linear_len + headroom) { skb = qethbuffer->rx_skb; qethbuffer->rx_skb =NULL ; goto use_skb;
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Julian Wiedmann <[email protected]>
Date: Mon, 23 Dec 2019 15:22:24 +0100
Quoted 4 lines
please apply the following patch series for qeth to your net-next tree.
This reworks the RX code to use
napi_gro_frags()when building non-linear skbs, along with some consolidation and cleanups.
Series applied to net-next.
Quoted 2 lines
Happy holidays - and many thanks for all the effort & support over the past year, to both Jakub and you. It's much appreciated.
No problem :)