From: John Daley <johndale@cisco.com>
To: dev@dpdk.org
Cc: bruce.richarsdon@intel.com, John Daley <johndale@cisco.com>
Subject: [dpdk-dev] [PATCH v3 05/13] enic: remove some unused functions in Tx path
Date: Thu, 2 Jun 2016 17:22:49 -0700 [thread overview]
Message-ID: <1464913377-30879-6-git-send-email-johndale@cisco.com> (raw)
In-Reply-To: <1464913377-30879-1-git-send-email-johndale@cisco.com>
Functions existed which were never called. Removed them. Also
rename the 'pmd' from the name of the Tx function to improve clarity.
Signed-off-by: John Daley <johndale@cisco.com>
---
drivers/net/enic/base/vnic_wq.h | 45 ------------------------
drivers/net/enic/enic.h | 5 ++-
drivers/net/enic/enic_ethdev.c | 2 +-
drivers/net/enic/enic_res.h | 78 -----------------------------------------
drivers/net/enic/enic_rxtx.c | 2 +-
5 files changed, 4 insertions(+), 128 deletions(-)
diff --git a/drivers/net/enic/base/vnic_wq.h b/drivers/net/enic/base/vnic_wq.h
index c23de62..d8660e4 100644
--- a/drivers/net/enic/base/vnic_wq.h
+++ b/drivers/net/enic/base/vnic_wq.h
@@ -191,51 +191,6 @@ static inline u64 vnic_cached_posted_index(dma_addr_t addr, unsigned int len,
PI_PREFETCH_ADDR_MASK) << PI_PREFETCH_ADDR_OFF);
}
-static inline void vnic_wq_post(struct vnic_wq *wq,
- void *os_buf, dma_addr_t dma_addr,
- unsigned int len, int sop, int eop,
- uint8_t desc_skip_cnt, uint8_t cq_entry,
- uint8_t compressed_send, uint64_t wrid)
-{
- struct vnic_wq_buf *buf = wq->to_use;
-
- buf->sop = sop;
- buf->cq_entry = cq_entry;
- buf->compressed_send = compressed_send;
- buf->desc_skip_cnt = desc_skip_cnt;
- buf->os_buf = os_buf;
- buf->dma_addr = dma_addr;
- buf->len = len;
- buf->wr_id = wrid;
-
- buf = buf->next;
- if (eop) {
-#ifdef DO_PREFETCH
- uint64_t wr = vnic_cached_posted_index(dma_addr, len,
- buf->index);
-#endif
- /* Adding write memory barrier prevents compiler and/or CPU
- * reordering, thus avoiding descriptor posting before
- * descriptor is initialized. Otherwise, hardware can read
- * stale descriptor fields.
- */
- wmb();
-#ifdef DO_PREFETCH
- /* Intel chipsets seem to limit the rate of PIOs that we can
- * push on the bus. Thus, it is very important to do a single
- * 64 bit write here. With two 32-bit writes, my maximum
- * pkt/sec rate was cut almost in half. -AJF
- */
- iowrite64((uint64_t)wr, &wq->ctrl->posted_index);
-#else
- iowrite32(buf->index, &wq->ctrl->posted_index);
-#endif
- }
- wq->to_use = buf;
-
- wq->ring.desc_avail -= desc_skip_cnt;
-}
-
static inline void vnic_wq_service(struct vnic_wq *wq,
struct cq_desc *cq_desc, u16 completed_index,
void (*buf_service)(struct vnic_wq *wq,
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 62a8c12..5b58a65 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -207,8 +207,7 @@ extern int enic_clsf_init(struct enic *enic);
extern void enic_clsf_destroy(struct enic *enic);
uint16_t enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts);
-
-uint16_t enicpmd_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
- uint16_t nb_pkts);
+uint16_t enic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
+ uint16_t nb_pkts);
void enic_free_wq_buf(__rte_unused struct vnic_wq *wq, struct vnic_wq_buf *buf);
#endif /* _ENIC_H_ */
diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index fab8124..697ff82 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -577,7 +577,7 @@ static int eth_enicpmd_dev_init(struct rte_eth_dev *eth_dev)
enic->rte_dev = eth_dev;
eth_dev->dev_ops = &enicpmd_eth_dev_ops;
eth_dev->rx_pkt_burst = &enic_recv_pkts;
- eth_dev->tx_pkt_burst = &enicpmd_xmit_pkts;
+ eth_dev->tx_pkt_burst = &enic_xmit_pkts;
pdev = eth_dev->pci_dev;
rte_eth_copy_pci_info(eth_dev, pdev);
diff --git a/drivers/net/enic/enic_res.h b/drivers/net/enic/enic_res.h
index 00fa71d..955db71 100644
--- a/drivers/net/enic/enic_res.h
+++ b/drivers/net/enic/enic_res.h
@@ -57,84 +57,6 @@
#define ENIC_SETTING(enic, f) ((enic->config.flags & VENETF_##f) ? 1 : 0)
-static inline void enic_queue_wq_desc_ex(struct vnic_wq *wq,
- void *os_buf, dma_addr_t dma_addr, unsigned int len,
- unsigned int mss_or_csum_offset, unsigned int hdr_len,
- int vlan_tag_insert, unsigned int vlan_tag,
- int offload_mode, int cq_entry, int sop, int eop, int loopback)
-{
- struct wq_enet_desc *desc = vnic_wq_next_desc(wq);
- u8 desc_skip_cnt = 1;
- u8 compressed_send = 0;
- u64 wrid = 0;
-
- wq_enet_desc_enc(desc,
- (u64)dma_addr | VNIC_PADDR_TARGET,
- (u16)len,
- (u16)mss_or_csum_offset,
- (u16)hdr_len, (u8)offload_mode,
- (u8)eop, (u8)cq_entry,
- 0, /* fcoe_encap */
- (u8)vlan_tag_insert,
- (u16)vlan_tag,
- (u8)loopback);
-
- vnic_wq_post(wq, os_buf, dma_addr, len, sop, eop, desc_skip_cnt,
- (u8)cq_entry, compressed_send, wrid);
-}
-
-static inline void enic_queue_wq_desc_cont(struct vnic_wq *wq,
- void *os_buf, dma_addr_t dma_addr, unsigned int len,
- int eop, int loopback)
-{
- enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
- 0, 0, 0, 0, 0,
- eop, 0 /* !SOP */, eop, loopback);
-}
-
-static inline void enic_queue_wq_desc(struct vnic_wq *wq, void *os_buf,
- dma_addr_t dma_addr, unsigned int len, int vlan_tag_insert,
- unsigned int vlan_tag, int eop, int loopback)
-{
- enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
- 0, 0, vlan_tag_insert, vlan_tag,
- WQ_ENET_OFFLOAD_MODE_CSUM,
- eop, 1 /* SOP */, eop, loopback);
-}
-
-static inline void enic_queue_wq_desc_csum(struct vnic_wq *wq,
- void *os_buf, dma_addr_t dma_addr, unsigned int len,
- int ip_csum, int tcpudp_csum, int vlan_tag_insert,
- unsigned int vlan_tag, int eop, int loopback)
-{
- enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
- (ip_csum ? 1 : 0) + (tcpudp_csum ? 2 : 0),
- 0, vlan_tag_insert, vlan_tag,
- WQ_ENET_OFFLOAD_MODE_CSUM,
- eop, 1 /* SOP */, eop, loopback);
-}
-
-static inline void enic_queue_wq_desc_csum_l4(struct vnic_wq *wq,
- void *os_buf, dma_addr_t dma_addr, unsigned int len,
- unsigned int csum_offset, unsigned int hdr_len,
- int vlan_tag_insert, unsigned int vlan_tag, int eop, int loopback)
-{
- enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
- csum_offset, hdr_len, vlan_tag_insert, vlan_tag,
- WQ_ENET_OFFLOAD_MODE_CSUM_L4,
- eop, 1 /* SOP */, eop, loopback);
-}
-
-static inline void enic_queue_wq_desc_tso(struct vnic_wq *wq,
- void *os_buf, dma_addr_t dma_addr, unsigned int len,
- unsigned int mss, unsigned int hdr_len, int vlan_tag_insert,
- unsigned int vlan_tag, int eop, int loopback)
-{
- enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
- mss, hdr_len, vlan_tag_insert, vlan_tag,
- WQ_ENET_OFFLOAD_MODE_TSO,
- eop, 1 /* SOP */, eop, loopback);
-}
struct enic;
diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c
index 056a297..530e8a3 100644
--- a/drivers/net/enic/enic_rxtx.c
+++ b/drivers/net/enic/enic_rxtx.c
@@ -416,7 +416,7 @@ void enic_send_pkt(struct enic *enic, struct vnic_wq *wq,
0 /*wrid*/);
}
-uint16_t enicpmd_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
+uint16_t enic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts)
{
uint16_t index;
--
2.7.0
next prev parent reply other threads:[~2016-06-03 0:23 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-24 6:32 [dpdk-dev] [PATCH v2 00/11] enic counter fixes and Tx optimization John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 01/11] enic: fix Rx drop counters John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 02/11] enic: drop bad packets and remove unused Rx error flag John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 03/11] enic: count truncated packets John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 04/11] enic: put Tx and Rx functions into same file John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 05/11] enic: remove some unused functions in Tx path John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 06/11] enic: streamline mbuf handling " John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 07/11] enic: use Tx completion messages instead of descriptors John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 08/11] enic: refactor Tx mbuf recycling John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 09/11] enic: optimize the Tx function John Daley
2016-05-30 10:05 ` Azarewicz, PiotrX T
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 10/11] enic: remove unused files and functions and variables John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 11/11] enic: add an enic assert macro John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 00/13] enic counter fixes and Tx optimization John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 01/13] enic: fix Rx drop counters John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 02/13] enic: drop bad packets and remove unused Rx error flag John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 03/13] enic: count truncated packets John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 04/13] enic: put Tx and Rx functions into same file John Daley
2016-06-03 0:22 ` John Daley [this message]
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 06/13] enic: streamline mbuf handling in Tx path John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 07/13] enic: use Tx completion messages instead of descriptors John Daley
2016-06-10 21:18 ` Bruce Richardson
2016-06-10 22:28 ` John Daley (johndale)
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 08/13] enic: refactor Tx mbuf recycling John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 09/13] enic: optimize the Tx function John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 10/13] enic: remove unused files and functions and variables John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 11/13] enic: add an enic assert macro John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 12/13] enic: expand local Tx mbuf flags variable to 64-bits John Daley
2016-06-03 8:05 ` Azarewicz, PiotrX T
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 13/13] enic: fix Tx IP and UDP/TCP checksum offload John Daley
2016-06-10 22:38 ` [dpdk-dev] [PATCH v3 00/13] enic counter fixes and Tx optimization Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464913377-30879-6-git-send-email-johndale@cisco.com \
--to=johndale@cisco.com \
--cc=bruce.richarsdon@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).