* [PATCH 1/3] vmxnet3: support mult-segment receive
2015-12-04 1:05 [PATCH 0/3] vmxnet3: bugfix and enhancements Stephen Hemminger
@ 2015-12-04 1:05 ` Stephen Hemminger
2015-12-22 19:51 ` Yong Wang
2015-12-04 1:05 ` [PATCH 2/3] vmxnet3: don't clear vf_table on restart Stephen Hemminger
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Stephen Hemminger @ 2015-12-04 1:05 UTC (permalink / raw)
To: yongwang; +Cc: dev, Stephen Hemminger
From: Stephen Hemminger <shemming@brocade.com>
The vmxnet3 interface specification supports having multiple
receive rings. The first ring has buffers of BTYPE_HEAD which
are used for the start of the packet, the second ring has buffers
of type BTYPE_BODY which are used only if the received packet
exceeds the available space of the head buffer. There can
zero or more body buffers for one packet.
What the driver does is post mbuf's to both rings. If a jumbo
frame is received; then a multi-segment mbuf is created and this
is returned. The previous version of the driver was filling both
rings, but the second ring was never used. It would error out
if it ever received a multi-segment mbuf.
The logic is very similar to existing methods used in other
OS's. This patch has been used internally by several companies
and users for several releases and tested with Jumbo frames.
Signed-off-by: Stephen Hemminger <shemming@brocade.com>
---
drivers/net/vmxnet3/vmxnet3_ring.h | 2 +
drivers/net/vmxnet3/vmxnet3_rxtx.c | 78 +++++++++++++++++++-------------------
2 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_ring.h b/drivers/net/vmxnet3/vmxnet3_ring.h
index 612487e..55ceadf 100644
--- a/drivers/net/vmxnet3/vmxnet3_ring.h
+++ b/drivers/net/vmxnet3/vmxnet3_ring.h
@@ -171,6 +171,8 @@ typedef struct vmxnet3_rx_queue {
uint32_t qid1;
uint32_t qid2;
Vmxnet3_RxQueueDesc *shared;
+ struct rte_mbuf *start_seg;
+ struct rte_mbuf *last_seg;
struct vmxnet3_rxq_stats stats;
bool stopped;
uint16_t queue_id; /**< Device RX queue index. */
diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index 4de5d89..00980a5 100644
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -575,35 +575,11 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
rxd = (Vmxnet3_RxDesc *)rxq->cmd_ring[ring_idx].base + idx;
rbi = rxq->cmd_ring[ring_idx].buf_info + idx;
- if (unlikely(rcd->sop != 1 || rcd->eop != 1)) {
- rte_pktmbuf_free_seg(rbi->m);
- PMD_RX_LOG(DEBUG, "Packet spread across multiple buffers\n)");
- goto rcd_done;
- }
-
PMD_RX_LOG(DEBUG, "rxd idx: %d ring idx: %d.", idx, ring_idx);
VMXNET3_ASSERT(rcd->len <= rxd->len);
VMXNET3_ASSERT(rbi->m);
- if (unlikely(rcd->len == 0)) {
- PMD_RX_LOG(DEBUG, "Rx buf was skipped. rxring[%d][%d]\n)",
- ring_idx, idx);
- VMXNET3_ASSERT(rcd->sop && rcd->eop);
- rte_pktmbuf_free_seg(rbi->m);
- goto rcd_done;
- }
-
- /* Assuming a packet is coming in a single packet buffer */
- if (unlikely(rxd->btype != VMXNET3_RXD_BTYPE_HEAD)) {
- PMD_RX_LOG(DEBUG,
- "Alert : Misbehaving device, incorrect "
- " buffer type used. iPacket dropped.");
- rte_pktmbuf_free_seg(rbi->m);
- goto rcd_done;
- }
- VMXNET3_ASSERT(rxd->btype == VMXNET3_RXD_BTYPE_HEAD);
-
/* Get the packet buffer pointer from buf_info */
rxm = rbi->m;
@@ -615,7 +591,7 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
rxq->cmd_ring[ring_idx].next2comp = idx;
/* For RCD with EOP set, check if there is frame error */
- if (unlikely(rcd->err)) {
+ if (unlikely(rcd->eop && rcd->err)) {
rxq->stats.drop_total++;
rxq->stats.drop_err++;
@@ -641,9 +617,45 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
rxm->ol_flags = 0;
rxm->vlan_tci = 0;
- vmxnet3_rx_offload(rcd, rxm);
+ /*
+ * If this is the first buffer of the received packet,
+ * set the pointer to the first mbuf of the packet
+ * Otherwise, update the total length and the number of segments
+ * of the current scattered packet, and update the pointer to
+ * the last mbuf of the current packet.
+ */
+ if (rcd->sop) {
+ VMXNET3_ASSERT(!rxq->start_seg);
+ VMXNET3_ASSERT(rxd->btype == VMXNET3_RXD_BTYPE_HEAD);
+
+ if (unlikely(rcd->len == 0)) {
+ PMD_RX_LOG(DEBUG,
+ "Rx buf was skipped. rxring[%d][%d])",
+ ring_idx, idx);
+ rte_pktmbuf_free_seg(rxm);
+ goto rcd_done;
+ }
+
+ rxq->start_seg = rxm;
+ vmxnet3_rx_offload(rcd, rxm);
+ } else {
+ struct rte_mbuf *start = rxq->start_seg;
+
+ VMXNET3_ASSERT(rxd->btype == VMXNET3_RXD_BTYPE_BODY);
+ VMXNET3_ASSERT(start != NULL);
+
+ start->pkt_len += rxm->data_len;
+ start->nb_segs++;
+
+ rxq->last_seg->next = rxm;
+ }
+ rxq->last_seg = rxm;
+
+ if (rcd->eop) {
+ rx_pkts[nb_rx++] = rxq->start_seg;
+ rxq->start_seg = NULL;
+ }
- rx_pkts[nb_rx++] = rxm;
rcd_done:
rxq->cmd_ring[ring_idx].next2comp = idx;
VMXNET3_INC_RING_IDX_ONLY(rxq->cmd_ring[ring_idx].next2comp, rxq->cmd_ring[ring_idx].size);
@@ -812,20 +824,9 @@ vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev,
int size;
uint8_t i;
char mem_name[32];
- uint16_t buf_size;
PMD_INIT_FUNC_TRACE();
- buf_size = rte_pktmbuf_data_room_size(mp) -
- RTE_PKTMBUF_HEADROOM;
-
- if (dev->data->dev_conf.rxmode.max_rx_pkt_len > buf_size) {
- PMD_INIT_LOG(ERR, "buf_size = %u, max_pkt_len = %u, "
- "VMXNET3 don't support scatter packets yet",
- buf_size, dev->data->dev_conf.rxmode.max_rx_pkt_len);
- return -EINVAL;
- }
-
rxq = rte_zmalloc("ethdev_rx_queue", sizeof(struct vmxnet3_rx_queue), RTE_CACHE_LINE_SIZE);
if (rxq == NULL) {
PMD_INIT_LOG(ERR, "Can not allocate rx queue structure");
@@ -944,6 +945,7 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev)
}
}
rxq->stopped = FALSE;
+ rxq->start_seg = NULL;
}
for (i = 0; i < dev->data->nb_tx_queues; i++) {
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/3] vmxnet3: support mult-segment receive
2015-12-04 1:05 ` [PATCH 1/3] vmxnet3: support mult-segment receive Stephen Hemminger
@ 2015-12-22 19:51 ` Yong Wang
0 siblings, 0 replies; 8+ messages in thread
From: Yong Wang @ 2015-12-22 19:51 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev, Stephen Hemminger
On 12/3/15, 5:05 PM, "Stephen Hemminger" <stephen@networkplumber.org> wrote:
>From: Stephen Hemminger <shemming@brocade.com>
>
>The vmxnet3 interface specification supports having multiple
>receive rings. The first ring has buffers of BTYPE_HEAD which
>are used for the start of the packet, the second ring has buffers
>of type BTYPE_BODY which are used only if the received packet
>exceeds the available space of the head buffer. There can
>zero or more body buffers for one packet.
>
>What the driver does is post mbuf's to both rings. If a jumbo
>frame is received; then a multi-segment mbuf is created and this
>is returned. The previous version of the driver was filling both
>rings, but the second ring was never used. It would error out
>if it ever received a multi-segment mbuf.
>
>The logic is very similar to existing methods used in other
>OS's. This patch has been used internally by several companies
>and users for several releases and tested with Jumbo frames.
I am fine with this change but just want to point it out that
the logic here deviates from the other OSes somewhat as they
populate the two rings differently:
The first ring has type (HEAD, BODY, BODY, HEAD, BODY, BODY)
assuming 3 descriptors are needed to hold a pkt of MTU size.
The 2nd ring is all BODY type. Only if BODY type from 1st ring
runs out will the 2nd ring be used.
Here the first ring is exclusively of HEAD type and any pkts
that cannot hold in the HEAD descriptor will go to the 2nd
ring. This will work but then the number of descriptors that
actually are needed from the first ring is smaller. If we
populates the 1st ring based on MTU as other OSes do, then
we just need 1 ring to handle jumbo frame, which ends up with
smaller working set, etc.
>
>Signed-off-by: Stephen Hemminger <shemming@brocade.com>
>---
> drivers/net/vmxnet3/vmxnet3_ring.h | 2 +
> drivers/net/vmxnet3/vmxnet3_rxtx.c | 78 +++++++++++++++++++-------------------
> 2 files changed, 42 insertions(+), 38 deletions(-)
>
>diff --git a/drivers/net/vmxnet3/vmxnet3_ring.h b/drivers/net/vmxnet3/vmxnet3_ring.h
>index 612487e..55ceadf 100644
>--- a/drivers/net/vmxnet3/vmxnet3_ring.h
>+++ b/drivers/net/vmxnet3/vmxnet3_ring.h
>@@ -171,6 +171,8 @@ typedef struct vmxnet3_rx_queue {
> uint32_t qid1;
> uint32_t qid2;
> Vmxnet3_RxQueueDesc *shared;
>+ struct rte_mbuf *start_seg;
>+ struct rte_mbuf *last_seg;
> struct vmxnet3_rxq_stats stats;
> bool stopped;
> uint16_t queue_id; /**< Device RX queue index. */
>diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
>index 4de5d89..00980a5 100644
>--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
>+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
>@@ -575,35 +575,11 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
> rxd = (Vmxnet3_RxDesc *)rxq->cmd_ring[ring_idx].base + idx;
> rbi = rxq->cmd_ring[ring_idx].buf_info + idx;
>
>- if (unlikely(rcd->sop != 1 || rcd->eop != 1)) {
>- rte_pktmbuf_free_seg(rbi->m);
>- PMD_RX_LOG(DEBUG, "Packet spread across multiple buffers\n)");
>- goto rcd_done;
>- }
>-
> PMD_RX_LOG(DEBUG, "rxd idx: %d ring idx: %d.", idx, ring_idx);
>
> VMXNET3_ASSERT(rcd->len <= rxd->len);
> VMXNET3_ASSERT(rbi->m);
>
>- if (unlikely(rcd->len == 0)) {
>- PMD_RX_LOG(DEBUG, "Rx buf was skipped. rxring[%d][%d]\n)",
>- ring_idx, idx);
>- VMXNET3_ASSERT(rcd->sop && rcd->eop);
>- rte_pktmbuf_free_seg(rbi->m);
>- goto rcd_done;
>- }
>-
>- /* Assuming a packet is coming in a single packet buffer */
>- if (unlikely(rxd->btype != VMXNET3_RXD_BTYPE_HEAD)) {
>- PMD_RX_LOG(DEBUG,
>- "Alert : Misbehaving device, incorrect "
>- " buffer type used. iPacket dropped.");
>- rte_pktmbuf_free_seg(rbi->m);
>- goto rcd_done;
>- }
>- VMXNET3_ASSERT(rxd->btype == VMXNET3_RXD_BTYPE_HEAD);
>-
> /* Get the packet buffer pointer from buf_info */
> rxm = rbi->m;
>
>@@ -615,7 +591,7 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
> rxq->cmd_ring[ring_idx].next2comp = idx;
>
> /* For RCD with EOP set, check if there is frame error */
>- if (unlikely(rcd->err)) {
>+ if (unlikely(rcd->eop && rcd->err)) {
> rxq->stats.drop_total++;
> rxq->stats.drop_err++;
>
>@@ -641,9 +617,45 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
> rxm->ol_flags = 0;
> rxm->vlan_tci = 0;
>
>- vmxnet3_rx_offload(rcd, rxm);
>+ /*
>+ * If this is the first buffer of the received packet,
>+ * set the pointer to the first mbuf of the packet
>+ * Otherwise, update the total length and the number of segments
>+ * of the current scattered packet, and update the pointer to
>+ * the last mbuf of the current packet.
>+ */
>+ if (rcd->sop) {
>+ VMXNET3_ASSERT(!rxq->start_seg);
nit: change this to VMXNET3(rxq->start_seg == NULL) to be consistent
with the check for start != NULL in the else block.
>+ VMXNET3_ASSERT(rxd->btype == VMXNET3_RXD_BTYPE_HEAD);
>+
>+ if (unlikely(rcd->len == 0)) {
>+ PMD_RX_LOG(DEBUG,
>+ "Rx buf was skipped. rxring[%d][%d])",
>+ ring_idx, idx);
Can you add back the assert VMXNET3_ASSERT(rcd->sop && rcd->top) here.
>+ rte_pktmbuf_free_seg(rxm);
>+ goto rcd_done;
>+ }
>+
>+ rxq->start_seg = rxm;
>+ vmxnet3_rx_offload(rcd, rxm);
>+ } else {
>+ struct rte_mbuf *start = rxq->start_seg;
>+
>+ VMXNET3_ASSERT(rxd->btype == VMXNET3_RXD_BTYPE_BODY);
>+ VMXNET3_ASSERT(start != NULL);
>+
>+ start->pkt_len += rxm->data_len;
>+ start->nb_segs++;
>+
>+ rxq->last_seg->next = rxm;
>+ }
>+ rxq->last_seg = rxm;
>+
>+ if (rcd->eop) {
>+ rx_pkts[nb_rx++] = rxq->start_seg;
>+ rxq->start_seg = NULL;
>+ }
>
>- rx_pkts[nb_rx++] = rxm;
> rcd_done:
> rxq->cmd_ring[ring_idx].next2comp = idx;
> VMXNET3_INC_RING_IDX_ONLY(rxq->cmd_ring[ring_idx].next2comp, rxq->cmd_ring[ring_idx].size);
>@@ -812,20 +824,9 @@ vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev,
> int size;
> uint8_t i;
> char mem_name[32];
>- uint16_t buf_size;
>
> PMD_INIT_FUNC_TRACE();
>
>- buf_size = rte_pktmbuf_data_room_size(mp) -
>- RTE_PKTMBUF_HEADROOM;
>-
>- if (dev->data->dev_conf.rxmode.max_rx_pkt_len > buf_size) {
>- PMD_INIT_LOG(ERR, "buf_size = %u, max_pkt_len = %u, "
>- "VMXNET3 don't support scatter packets yet",
>- buf_size, dev->data->dev_conf.rxmode.max_rx_pkt_len);
>- return -EINVAL;
>- }
>-
> rxq = rte_zmalloc("ethdev_rx_queue", sizeof(struct vmxnet3_rx_queue), RTE_CACHE_LINE_SIZE);
> if (rxq == NULL) {
> PMD_INIT_LOG(ERR, "Can not allocate rx queue structure");
>@@ -944,6 +945,7 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev)
> }
> }
> rxq->stopped = FALSE;
>+ rxq->start_seg = NULL;
> }
>
> for (i = 0; i < dev->data->nb_tx_queues; i++) {
>--
>2.1.4
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/3] vmxnet3: don't clear vf_table on restart
2015-12-04 1:05 [PATCH 0/3] vmxnet3: bugfix and enhancements Stephen Hemminger
2015-12-04 1:05 ` [PATCH 1/3] vmxnet3: support mult-segment receive Stephen Hemminger
@ 2015-12-04 1:05 ` Stephen Hemminger
2015-12-09 20:35 ` Yong Wang
2015-12-04 1:05 ` [PATCH 3/3] vmxnet3: fix vlan_offload_set Stephen Hemminger
2016-02-03 11:10 ` [PATCH 0/3] vmxnet3: bugfix and enhancements Bruce Richardson
3 siblings, 1 reply; 8+ messages in thread
From: Stephen Hemminger @ 2015-12-04 1:05 UTC (permalink / raw)
To: yongwang; +Cc: dev, Charles (Chas) Williams
From: "Charles (Chas) Williams" <ciwillia@brocade.com>
From: Charles (Chas) Williams <ciwillia@brocade.com>
During an MTU change, the adapter is restarted. If hardware VLAN offload
is in use, this existing filter table would also be cleared. Instead,
setup the shadow table once during device initialization and just update
during restart.
Signed-off-by: Charles (Chas) Williams <ciwillia@brocade.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/vmxnet3/vmxnet3_ethdev.c | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index c363bf6..2d7bf13 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -89,8 +89,8 @@ static void vmxnet3_dev_info_get(struct rte_eth_dev *dev,
static int vmxnet3_dev_vlan_filter_set(struct rte_eth_dev *dev,
uint16_t vid, int on);
static void vmxnet3_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask);
-static void vmxnet3_dev_vlan_offload_set_clear(struct rte_eth_dev *dev,
- int mask, int clear);
+static void vmxnet3_dev_vlan_offload_update(struct rte_eth_dev *dev,
+ int mask);
#if PROCESS_SYS_EVENTS == 1
static void vmxnet3_process_events(struct vmxnet3_hw *);
@@ -294,6 +294,9 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
/* Put device in Quiesce Mode */
VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_QUIESCE_DEV);
+ /* allow untagged pkts */
+ VMXNET3_SET_VFTABLE_ENTRY(hw->shadow_vfta, 0);
+
return 0;
}
@@ -518,7 +521,7 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
if (dev->data->dev_conf.rxmode.hw_vlan_filter)
mask |= ETH_VLAN_FILTER_MASK;
- vmxnet3_dev_vlan_offload_set_clear(dev, mask, 1);
+ vmxnet3_dev_vlan_offload_update(dev, mask);
PMD_INIT_LOG(DEBUG,
"Writing MAC Address : %02x:%02x:%02x:%02x:%02x:%02x",
@@ -835,8 +838,7 @@ vmxnet3_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vid, int on)
}
static void
-vmxnet3_dev_vlan_offload_set_clear(struct rte_eth_dev *dev,
- int mask, int clear)
+vmxnet3_dev_vlan_offload_update(struct rte_eth_dev *dev, int mask)
{
struct vmxnet3_hw *hw = dev->data->dev_private;
Vmxnet3_DSDevRead *devRead = &hw->shared->devRead;
@@ -851,17 +853,8 @@ vmxnet3_dev_vlan_offload_set_clear(struct rte_eth_dev *dev,
VMXNET3_CMD_UPDATE_FEATURE);
if (mask & ETH_VLAN_FILTER_MASK) {
- if (clear) {
- memset(hw->shadow_vfta, 0,
- VMXNET3_VFT_TABLE_SIZE);
- /* allow untagged pkts */
- VMXNET3_SET_VFTABLE_ENTRY(hw->shadow_vfta, 0);
- }
memcpy(vf_table, hw->shadow_vfta, VMXNET3_VFT_TABLE_SIZE);
} else {
- /* allow any pkts -- no filtering */
- if (clear)
- memset(hw->shadow_vfta, 0xff, VMXNET3_VFT_TABLE_SIZE);
memset(vf_table, 0xff, VMXNET3_VFT_TABLE_SIZE);
}
@@ -872,7 +865,7 @@ vmxnet3_dev_vlan_offload_set_clear(struct rte_eth_dev *dev,
static void
vmxnet3_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask)
{
- vmxnet3_dev_vlan_offload_set_clear(dev, mask, 0);
+ vmxnet3_dev_vlan_offload_update(dev, mask);
}
#if PROCESS_SYS_EVENTS == 1
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 2/3] vmxnet3: don't clear vf_table on restart
2015-12-04 1:05 ` [PATCH 2/3] vmxnet3: don't clear vf_table on restart Stephen Hemminger
@ 2015-12-09 20:35 ` Yong Wang
0 siblings, 0 replies; 8+ messages in thread
From: Yong Wang @ 2015-12-09 20:35 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev, Charles (Chas) Williams
On 12/3/15, 5:05 PM, "Stephen Hemminger" <stephen@networkplumber.org> wrote:
>From: "Charles (Chas) Williams" <ciwillia@brocade.com>
>
>From: Charles (Chas) Williams <ciwillia@brocade.com>
>
>During an MTU change, the adapter is restarted. If hardware VLAN offload
>is in use, this existing filter table would also be cleared. Instead,
>setup the shadow table once during device initialization and just update
>during restart.
>
>Signed-off-by: Charles (Chas) Williams <ciwillia@brocade.com>
>Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
>---
Acked-by: Yong Wang <yongwang@vmware.com>
> drivers/net/vmxnet3/vmxnet3_ethdev.c | 23 ++++++++---------------
> 1 file changed, 8 insertions(+), 15 deletions(-)
>
>diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
>index c363bf6..2d7bf13 100644
>--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
>+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
>@@ -89,8 +89,8 @@ static void vmxnet3_dev_info_get(struct rte_eth_dev *dev,
> static int vmxnet3_dev_vlan_filter_set(struct rte_eth_dev *dev,
> uint16_t vid, int on);
> static void vmxnet3_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask);
>-static void vmxnet3_dev_vlan_offload_set_clear(struct rte_eth_dev *dev,
>- int mask, int clear);
>+static void vmxnet3_dev_vlan_offload_update(struct rte_eth_dev *dev,
>+ int mask);
>
> #if PROCESS_SYS_EVENTS == 1
> static void vmxnet3_process_events(struct vmxnet3_hw *);
>@@ -294,6 +294,9 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
> /* Put device in Quiesce Mode */
> VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_QUIESCE_DEV);
>
>+ /* allow untagged pkts */
>+ VMXNET3_SET_VFTABLE_ENTRY(hw->shadow_vfta, 0);
>+
> return 0;
> }
>
>@@ -518,7 +521,7 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
> if (dev->data->dev_conf.rxmode.hw_vlan_filter)
> mask |= ETH_VLAN_FILTER_MASK;
>
>- vmxnet3_dev_vlan_offload_set_clear(dev, mask, 1);
>+ vmxnet3_dev_vlan_offload_update(dev, mask);
>
> PMD_INIT_LOG(DEBUG,
> "Writing MAC Address : %02x:%02x:%02x:%02x:%02x:%02x",
>@@ -835,8 +838,7 @@ vmxnet3_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vid, int on)
> }
>
> static void
>-vmxnet3_dev_vlan_offload_set_clear(struct rte_eth_dev *dev,
>- int mask, int clear)
>+vmxnet3_dev_vlan_offload_update(struct rte_eth_dev *dev, int mask)
> {
> struct vmxnet3_hw *hw = dev->data->dev_private;
> Vmxnet3_DSDevRead *devRead = &hw->shared->devRead;
>@@ -851,17 +853,8 @@ vmxnet3_dev_vlan_offload_set_clear(struct rte_eth_dev *dev,
> VMXNET3_CMD_UPDATE_FEATURE);
>
> if (mask & ETH_VLAN_FILTER_MASK) {
>- if (clear) {
>- memset(hw->shadow_vfta, 0,
>- VMXNET3_VFT_TABLE_SIZE);
>- /* allow untagged pkts */
>- VMXNET3_SET_VFTABLE_ENTRY(hw->shadow_vfta, 0);
>- }
> memcpy(vf_table, hw->shadow_vfta, VMXNET3_VFT_TABLE_SIZE);
> } else {
>- /* allow any pkts -- no filtering */
>- if (clear)
>- memset(hw->shadow_vfta, 0xff, VMXNET3_VFT_TABLE_SIZE);
> memset(vf_table, 0xff, VMXNET3_VFT_TABLE_SIZE);
> }
>
>@@ -872,7 +865,7 @@ vmxnet3_dev_vlan_offload_set_clear(struct rte_eth_dev *dev,
> static void
> vmxnet3_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask)
> {
>- vmxnet3_dev_vlan_offload_set_clear(dev, mask, 0);
>+ vmxnet3_dev_vlan_offload_update(dev, mask);
> }
>
> #if PROCESS_SYS_EVENTS == 1
>--
>2.1.4
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] vmxnet3: fix vlan_offload_set
2015-12-04 1:05 [PATCH 0/3] vmxnet3: bugfix and enhancements Stephen Hemminger
2015-12-04 1:05 ` [PATCH 1/3] vmxnet3: support mult-segment receive Stephen Hemminger
2015-12-04 1:05 ` [PATCH 2/3] vmxnet3: don't clear vf_table on restart Stephen Hemminger
@ 2015-12-04 1:05 ` Stephen Hemminger
2015-12-09 20:38 ` Yong Wang
2016-02-03 11:10 ` [PATCH 0/3] vmxnet3: bugfix and enhancements Bruce Richardson
3 siblings, 1 reply; 8+ messages in thread
From: Stephen Hemminger @ 2015-12-04 1:05 UTC (permalink / raw)
To: yongwang; +Cc: dev, Nachiketa Prachanda
From: Nachiketa Prachanda <nprachan@brocade.com>
vmxnet3_dev_vlan_offload_set(dev, mask) was incorrectly treating the
mask parameter as the bitmask for vlan_strip and vlan_filter, whereas
the mask indicates only what has changed - the values for
vlan_stripping and vlan_filter needs to be taken from dev_conf.rxmode.
Signed-off-by: Nachiketa Prachanda <nprachan@brocade.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/vmxnet3/vmxnet3_ethdev.c | 45 ++++++++++++++++++++++--------------
1 file changed, 28 insertions(+), 17 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index 2d7bf13..40c4537 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -90,7 +90,7 @@ static int vmxnet3_dev_vlan_filter_set(struct rte_eth_dev *dev,
uint16_t vid, int on);
static void vmxnet3_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask);
static void vmxnet3_dev_vlan_offload_update(struct rte_eth_dev *dev,
- int mask);
+ int mask, int changed);
#if PROCESS_SYS_EVENTS == 1
static void vmxnet3_process_events(struct vmxnet3_hw *);
@@ -521,7 +521,7 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
if (dev->data->dev_conf.rxmode.hw_vlan_filter)
mask |= ETH_VLAN_FILTER_MASK;
- vmxnet3_dev_vlan_offload_update(dev, mask);
+ vmxnet3_dev_vlan_offload_update(dev, mask, mask);
PMD_INIT_LOG(DEBUG,
"Writing MAC Address : %02x:%02x:%02x:%02x:%02x:%02x",
@@ -838,34 +838,45 @@ vmxnet3_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vid, int on)
}
static void
-vmxnet3_dev_vlan_offload_update(struct rte_eth_dev *dev, int mask)
+vmxnet3_dev_vlan_offload_update(struct rte_eth_dev *dev, int mask, int changed)
{
struct vmxnet3_hw *hw = dev->data->dev_private;
Vmxnet3_DSDevRead *devRead = &hw->shared->devRead;
uint32_t *vf_table = devRead->rxFilterConf.vfTable;
- if (mask & ETH_VLAN_STRIP_MASK)
- devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
- else
- devRead->misc.uptFeatures &= ~UPT1_F_RXVLAN;
-
- VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
- VMXNET3_CMD_UPDATE_FEATURE);
+ if (changed & ETH_VLAN_STRIP_MASK) {
+ if (mask & ETH_VLAN_STRIP_MASK)
+ devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
+ else
+ devRead->misc.uptFeatures &= ~UPT1_F_RXVLAN;
- if (mask & ETH_VLAN_FILTER_MASK) {
- memcpy(vf_table, hw->shadow_vfta, VMXNET3_VFT_TABLE_SIZE);
- } else {
- memset(vf_table, 0xff, VMXNET3_VFT_TABLE_SIZE);
+ VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
+ VMXNET3_CMD_UPDATE_FEATURE);
}
- VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
- VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+ if (changed & ETH_VLAN_FILTER_MASK) {
+ if (mask & ETH_VLAN_FILTER_MASK)
+ memcpy(vf_table, hw->shadow_vfta, VMXNET3_VFT_TABLE_SIZE);
+ else
+ memset(vf_table, 0xff, VMXNET3_VFT_TABLE_SIZE);
+
+ VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
+ VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+ }
}
static void
vmxnet3_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask)
{
- vmxnet3_dev_vlan_offload_update(dev, mask);
+ int hw_mask = 0;
+
+ if (dev->data->dev_conf.rxmode.hw_vlan_strip)
+ hw_mask |= ETH_VLAN_STRIP_MASK;
+
+ if (dev->data->dev_conf.rxmode.hw_vlan_filter)
+ hw_mask |= ETH_VLAN_FILTER_MASK;
+
+ vmxnet3_dev_vlan_offload_update(dev, hw_mask, mask);
}
#if PROCESS_SYS_EVENTS == 1
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 3/3] vmxnet3: fix vlan_offload_set
2015-12-04 1:05 ` [PATCH 3/3] vmxnet3: fix vlan_offload_set Stephen Hemminger
@ 2015-12-09 20:38 ` Yong Wang
0 siblings, 0 replies; 8+ messages in thread
From: Yong Wang @ 2015-12-09 20:38 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev, Nachiketa Prachanda
On 12/3/15, 5:05 PM, "Stephen Hemminger" <stephen@networkplumber.org> wrote:
>From: Nachiketa Prachanda <nprachan@brocade.com>
>
>vmxnet3_dev_vlan_offload_set(dev, mask) was incorrectly treating the
>mask parameter as the bitmask for vlan_strip and vlan_filter, whereas
>the mask indicates only what has changed - the values for
>vlan_stripping and vlan_filter needs to be taken from dev_conf.rxmode.
>
>Signed-off-by: Nachiketa Prachanda <nprachan@brocade.com>
>Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
>---
> drivers/net/vmxnet3/vmxnet3_ethdev.c | 45 ++++++++++++++++++++++--------------
> 1 file changed, 28 insertions(+), 17 deletions(-)
>
>diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
>index 2d7bf13..40c4537 100644
>--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
>+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
>@@ -90,7 +90,7 @@ static int vmxnet3_dev_vlan_filter_set(struct rte_eth_dev *dev,
> uint16_t vid, int on);
> static void vmxnet3_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask);
> static void vmxnet3_dev_vlan_offload_update(struct rte_eth_dev *dev,
>- int mask);
>+ int mask, int changed);
>
> #if PROCESS_SYS_EVENTS == 1
> static void vmxnet3_process_events(struct vmxnet3_hw *);
>@@ -521,7 +521,7 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
> if (dev->data->dev_conf.rxmode.hw_vlan_filter)
> mask |= ETH_VLAN_FILTER_MASK;
>
>- vmxnet3_dev_vlan_offload_update(dev, mask);
>+ vmxnet3_dev_vlan_offload_update(dev, mask, mask);
>
> PMD_INIT_LOG(DEBUG,
> "Writing MAC Address : %02x:%02x:%02x:%02x:%02x:%02x",
>@@ -838,34 +838,45 @@ vmxnet3_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vid, int on)
> }
>
> static void
>-vmxnet3_dev_vlan_offload_update(struct rte_eth_dev *dev, int mask)
>+vmxnet3_dev_vlan_offload_update(struct rte_eth_dev *dev, int mask, int changed)
> {
> struct vmxnet3_hw *hw = dev->data->dev_private;
> Vmxnet3_DSDevRead *devRead = &hw->shared->devRead;
> uint32_t *vf_table = devRead->rxFilterConf.vfTable;
>
>- if (mask & ETH_VLAN_STRIP_MASK)
>- devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
>- else
>- devRead->misc.uptFeatures &= ~UPT1_F_RXVLAN;
>-
>- VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
>- VMXNET3_CMD_UPDATE_FEATURE);
>+ if (changed & ETH_VLAN_STRIP_MASK) {
>+ if (mask & ETH_VLAN_STRIP_MASK)
>+ devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
>+ else
>+ devRead->misc.uptFeatures &= ~UPT1_F_RXVLAN;
>
>- if (mask & ETH_VLAN_FILTER_MASK) {
>- memcpy(vf_table, hw->shadow_vfta, VMXNET3_VFT_TABLE_SIZE);
>- } else {
>- memset(vf_table, 0xff, VMXNET3_VFT_TABLE_SIZE);
>+ VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
>+ VMXNET3_CMD_UPDATE_FEATURE);
> }
>
>- VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
>- VMXNET3_CMD_UPDATE_VLAN_FILTERS);
>+ if (changed & ETH_VLAN_FILTER_MASK) {
>+ if (mask & ETH_VLAN_FILTER_MASK)
>+ memcpy(vf_table, hw->shadow_vfta, VMXNET3_VFT_TABLE_SIZE);
>+ else
>+ memset(vf_table, 0xff, VMXNET3_VFT_TABLE_SIZE);
>+
>+ VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
>+ VMXNET3_CMD_UPDATE_VLAN_FILTERS);
>+ }
> }
>
> static void
> vmxnet3_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask)
> {
>- vmxnet3_dev_vlan_offload_update(dev, mask);
>+ int hw_mask = 0;
>+
>+ if (dev->data->dev_conf.rxmode.hw_vlan_strip)
>+ hw_mask |= ETH_VLAN_STRIP_MASK;
>+
>+ if (dev->data->dev_conf.rxmode.hw_vlan_filter)
>+ hw_mask |= ETH_VLAN_FILTER_MASK;
>+
>+ vmxnet3_dev_vlan_offload_update(dev, hw_mask, mask);
I don’t see a need to have a separate function for _update. You can singly merge its implementation with vmxnet3_dev_vlan_offload_set, which seems to be clearer and easier to follow IMO.
> }
>
> #if PROCESS_SYS_EVENTS == 1
>--
>2.1.4
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] vmxnet3: bugfix and enhancements
2015-12-04 1:05 [PATCH 0/3] vmxnet3: bugfix and enhancements Stephen Hemminger
` (2 preceding siblings ...)
2015-12-04 1:05 ` [PATCH 3/3] vmxnet3: fix vlan_offload_set Stephen Hemminger
@ 2016-02-03 11:10 ` Bruce Richardson
3 siblings, 0 replies; 8+ messages in thread
From: Bruce Richardson @ 2016-02-03 11:10 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev
On Thu, Dec 03, 2015 at 05:05:04PM -0800, Stephen Hemminger wrote:
> A couple of fixes for vlan offload, and the patch to support
> multi-segment frames.
>
> Charles (Chas) Williams (1):
> vmxnet3: don't clear vf_table on restart
>
> Stephen Hemminger (2):
> vmxnet3: support mult-segment receive
> vmxnet3: fix vlan_offload_set
>
> drivers/net/vmxnet3/vmxnet3_ethdev.c | 60 ++++++++++++++-------------
> drivers/net/vmxnet3/vmxnet3_ring.h | 2 +
> drivers/net/vmxnet3/vmxnet3_rxtx.c | 78 ++++++++++++++++++------------------
> 3 files changed, 74 insertions(+), 66 deletions(-)
>
> --
> 2.1.4
>
Hi Stephen,
is there any update on this patchset? There have been a couple of comments
made on it, so will you be sending a V2 for inclusion in the April release?
Regards,
/Bruce
^ permalink raw reply [flat|nested] 8+ messages in thread