* [PATCH v2 0/2] BQL support and fix for a regression issue
@ 2016-09-23 9:12 sunil.kovvuri
2016-09-23 9:12 ` [PATCH v2 1/2] net: thunderx: Fix issue with IRQ namimg sunil.kovvuri
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: sunil.kovvuri @ 2016-09-23 9:12 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel, linux-arm-kernel, Sunil Goutham
From: Sunil Goutham <sgoutham@cavium.com>
These patches add byte queue limit support and also fixes a regression
issue introduced by commit
'net: thunderx: Use netdev's name for naming VF's interrupts'
Changes from v1:
- As suggested added 'Fixes' tag with commit id of previous commit
which cuased issue.
- Also fixed the missing netdev_tx_reset_queue() function call in
byte queue limits support patch.
Sunil Goutham (2):
net: thunderx: Fix issue with IRQ namimg
net: thunderx: Support for byte queue limits
drivers/net/ethernet/cavium/thunder/nic.h | 2 +-
drivers/net/ethernet/cavium/thunder/nicvf_main.c | 14 ++++++++--
drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 30 ++++++++++++++--------
3 files changed, 33 insertions(+), 13 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v2 1/2] net: thunderx: Fix issue with IRQ namimg 2016-09-23 9:12 [PATCH v2 0/2] BQL support and fix for a regression issue sunil.kovvuri @ 2016-09-23 9:12 ` sunil.kovvuri 2016-09-23 9:12 ` [PATCH v2 2/2] net: thunderx: Support for byte queue limits sunil.kovvuri 2016-09-24 12:47 ` [PATCH v2 0/2] BQL support and fix for a regression issue David Miller 2 siblings, 0 replies; 4+ messages in thread From: sunil.kovvuri @ 2016-09-23 9:12 UTC (permalink / raw) To: netdev; +Cc: linux-kernel, linux-arm-kernel, Sunil Goutham From: Sunil Goutham <sgoutham@cavium.com> This patch fixes a regression caused by previous commit when irq name exceeds 20 byte array if interface's name size is large. Fixes: e412621394fa ("net: thunderx: Use netdev's name for naming VF's interrupts") Signed-off-by: Sunil Goutham <sgoutham@cavium.com> --- drivers/net/ethernet/cavium/thunder/nic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cavium/thunder/nic.h b/drivers/net/ethernet/cavium/thunder/nic.h index 18d12d3..3042610 100644 --- a/drivers/net/ethernet/cavium/thunder/nic.h +++ b/drivers/net/ethernet/cavium/thunder/nic.h @@ -305,7 +305,7 @@ struct nicvf { bool msix_enabled; u8 num_vec; struct msix_entry msix_entries[NIC_VF_MSIX_VECTORS]; - char irq_name[NIC_VF_MSIX_VECTORS][20]; + char irq_name[NIC_VF_MSIX_VECTORS][IFNAMSIZ + 15]; bool irq_allocated[NIC_VF_MSIX_VECTORS]; cpumask_var_t affinity_mask[NIC_VF_MSIX_VECTORS]; -- 2.7.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] net: thunderx: Support for byte queue limits 2016-09-23 9:12 [PATCH v2 0/2] BQL support and fix for a regression issue sunil.kovvuri 2016-09-23 9:12 ` [PATCH v2 1/2] net: thunderx: Fix issue with IRQ namimg sunil.kovvuri @ 2016-09-23 9:12 ` sunil.kovvuri 2016-09-24 12:47 ` [PATCH v2 0/2] BQL support and fix for a regression issue David Miller 2 siblings, 0 replies; 4+ messages in thread From: sunil.kovvuri @ 2016-09-23 9:12 UTC (permalink / raw) To: netdev; +Cc: linux-kernel, linux-arm-kernel, Sunil Goutham From: Sunil Goutham <sgoutham@cavium.com> This patch adds support for byte queue limits Signed-off-by: Sunil Goutham <sgoutham@cavium.com> --- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 14 ++++++++-- drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 30 ++++++++++++++-------- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c index 7d00162..45a13f7 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c @@ -516,7 +516,8 @@ static int nicvf_init_resources(struct nicvf *nic) static void nicvf_snd_pkt_handler(struct net_device *netdev, struct cmp_queue *cq, struct cqe_send_t *cqe_tx, - int cqe_type, int budget) + int cqe_type, int budget, + unsigned int *tx_pkts, unsigned int *tx_bytes) { struct sk_buff *skb = NULL; struct nicvf *nic = netdev_priv(netdev); @@ -547,6 +548,8 @@ static void nicvf_snd_pkt_handler(struct net_device *netdev, } nicvf_put_sq_desc(sq, hdr->subdesc_cnt + 1); prefetch(skb); + (*tx_pkts)++; + *tx_bytes += skb->len; napi_consume_skb(skb, budget); sq->skbuff[cqe_tx->sqe_ptr] = (u64)NULL; } else { @@ -662,6 +665,7 @@ static int nicvf_cq_intr_handler(struct net_device *netdev, u8 cq_idx, struct cmp_queue *cq = &qs->cq[cq_idx]; struct cqe_rx_t *cq_desc; struct netdev_queue *txq; + unsigned int tx_pkts = 0, tx_bytes = 0; spin_lock_bh(&cq->lock); loop: @@ -701,7 +705,7 @@ loop: case CQE_TYPE_SEND: nicvf_snd_pkt_handler(netdev, cq, (void *)cq_desc, CQE_TYPE_SEND, - budget); + budget, &tx_pkts, &tx_bytes); tx_done++; break; case CQE_TYPE_INVALID: @@ -730,6 +734,9 @@ done: netdev = nic->pnicvf->netdev; txq = netdev_get_tx_queue(netdev, nicvf_netdev_qidx(nic, cq_idx)); + if (tx_pkts) + netdev_tx_completed_queue(txq, tx_pkts, tx_bytes); + nic = nic->pnicvf; if (netif_tx_queue_stopped(txq) && netif_carrier_ok(netdev)) { netif_tx_start_queue(txq); @@ -1160,6 +1167,9 @@ int nicvf_stop(struct net_device *netdev) netif_tx_disable(netdev); + for (qidx = 0; qidx < netdev->num_tx_queues; qidx++) + netdev_tx_reset_queue(netdev_get_tx_queue(netdev, qidx)); + /* Free resources */ nicvf_config_data_transfer(nic, false); diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c index 178c5c7..a4fc501 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c @@ -1082,6 +1082,24 @@ static inline void nicvf_sq_add_cqe_subdesc(struct snd_queue *sq, int qentry, imm->len = 1; } +static inline void nicvf_sq_doorbell(struct nicvf *nic, struct sk_buff *skb, + int sq_num, int desc_cnt) +{ + struct netdev_queue *txq; + + txq = netdev_get_tx_queue(nic->pnicvf->netdev, + skb_get_queue_mapping(skb)); + + netdev_tx_sent_queue(txq, skb->len); + + /* make sure all memory stores are done before ringing doorbell */ + smp_wmb(); + + /* Inform HW to xmit all TSO segments */ + nicvf_queue_reg_write(nic, NIC_QSET_SQ_0_7_DOOR, + sq_num, desc_cnt); +} + /* Segment a TSO packet into 'gso_size' segments and append * them to SQ for transfer */ @@ -1141,12 +1159,8 @@ static int nicvf_sq_append_tso(struct nicvf *nic, struct snd_queue *sq, /* Save SKB in the last segment for freeing */ sq->skbuff[hdr_qentry] = (u64)skb; - /* make sure all memory stores are done before ringing doorbell */ - smp_wmb(); + nicvf_sq_doorbell(nic, skb, sq_num, desc_cnt); - /* Inform HW to xmit all TSO segments */ - nicvf_queue_reg_write(nic, NIC_QSET_SQ_0_7_DOOR, - sq_num, desc_cnt); nic->drv_stats.tx_tso++; return 1; } @@ -1219,12 +1233,8 @@ doorbell: nicvf_sq_add_cqe_subdesc(sq, qentry, tso_sqe, skb); } - /* make sure all memory stores are done before ringing doorbell */ - smp_wmb(); + nicvf_sq_doorbell(nic, skb, sq_num, subdesc_cnt); - /* Inform HW to xmit new packet */ - nicvf_queue_reg_write(nic, NIC_QSET_SQ_0_7_DOOR, - sq_num, subdesc_cnt); return 1; append_fail: -- 2.7.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 0/2] BQL support and fix for a regression issue 2016-09-23 9:12 [PATCH v2 0/2] BQL support and fix for a regression issue sunil.kovvuri 2016-09-23 9:12 ` [PATCH v2 1/2] net: thunderx: Fix issue with IRQ namimg sunil.kovvuri 2016-09-23 9:12 ` [PATCH v2 2/2] net: thunderx: Support for byte queue limits sunil.kovvuri @ 2016-09-24 12:47 ` David Miller 2 siblings, 0 replies; 4+ messages in thread From: David Miller @ 2016-09-24 12:47 UTC (permalink / raw) To: sunil.kovvuri; +Cc: netdev, linux-kernel, linux-arm-kernel, sgoutham From: sunil.kovvuri@gmail.com Date: Fri, 23 Sep 2016 14:42:26 +0530 > From: Sunil Goutham <sgoutham@cavium.com> > > These patches add byte queue limit support and also fixes a regression > issue introduced by commit > 'net: thunderx: Use netdev's name for naming VF's interrupts' > > Changes from v1: > - As suggested added 'Fixes' tag with commit id of previous commit > which cuased issue. > - Also fixed the missing netdev_tx_reset_queue() function call in > byte queue limits support patch. Series applied to net-next, thanks. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-24 12:47 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-09-23 9:12 [PATCH v2 0/2] BQL support and fix for a regression issue sunil.kovvuri 2016-09-23 9:12 ` [PATCH v2 1/2] net: thunderx: Fix issue with IRQ namimg sunil.kovvuri 2016-09-23 9:12 ` [PATCH v2 2/2] net: thunderx: Support for byte queue limits sunil.kovvuri 2016-09-24 12:47 ` [PATCH v2 0/2] BQL support and fix for a regression issue David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).