[dpdk-dev] Question about patchset order.
On Tue, Feb 23, 2016 at 06:34:38PM +0100, Thomas Monjalon wrote: > 2016-02-23 16:17, Kobylinski, MichalX: > > Hi Thomas, > > I sent in January a patch-set that extends to 24 bits a next_hop field in > > lpm library: > > http://dpdk.org/dev/patchwork/patch/10249/ > > http://dpdk.org/dev/patchwork/patch/10250/ > > > > also Jerin Jakob sent his patch-set with ARM architecture support in lpm > > library. > > http://dpdk.org/dev/patchwork/patch/10478/ > > http://dpdk.org/dev/patchwork/patch/10479/ > > http://dpdk.org/dev/patchwork/patch/10480/ > > > > Could you write please, in which order do you prefer to apply these two > > patch-sets? > > This information will be helpful to predict the risk and estimate > > additional work. > > Thanks for bringing up the LPM patches. > I would prefer to follow the advice of Bruce who has well followed > these interactions. Hi all, sorry, but I haven't been following the discussion as closely of late as previously, hence the slow reply. For what goes first, generally the more complex/bigger patchset should be merged first, so I think the expansion of the next_hop field should therefore go in first. Jerin's patches will then need to be rebased on it. Regards, /Bruce
[dpdk-dev] [PATCH v2] I217 and I218 changes
Hi Ravi, >Do you want me to resend it as 'v1' and include your comments in commit >message? let me know. I think it?s better if you withdraw this one, send a new one and make the commit log easy to understand ? And you can keep my ack.
[dpdk-dev] [PATCH v1] virtio: Use cpuflag for vector api
On 3/1/2016 5:46 PM, Santosh Shukla wrote:
> On Tue, Mar 1, 2016 at 2:41 PM, Qiu, Michael wrote:
>> On 2/26/2016 4:53 PM, Santosh Shukla wrote:
>>> Check cpuflag macro before using vectored api.
>>> -virtio_recv_pkts_vec() uses _sse3__ simd instruction for now so added
>>> cpuflag.
>>> - Also wrap other vectored freind api ie..
>>> 1) virtqueue_enqueue_recv_refill_simple
>>> 2) virtio_rxq_vec_setup
>>>
>>> todo:
>>> 1) Move virtio_recv_pkts_vec() implementation to
>>>drivers/virtio/virtio_vec_.h file.
>>> 2) Remove use_simple_rxtx flag, so that virtio/virtio_vec_.h
>>>files to provide vectored/non-vectored rx/tx apis.
>>>
>>> Signed-off-by: Santosh Shukla
>>> ---
>>> - v1: This is a rework of patch [1].
>>> Note: This patch will let non-x86 arch to use virtio pmd.
>>>
>>> [1] http://dpdk.org/dev/patchwork/patch/10429/
>>>
>>> drivers/net/virtio/virtio_rxtx.c| 16 +++-
>>> drivers/net/virtio/virtio_rxtx.h|2 ++
>>> drivers/net/virtio/virtio_rxtx_simple.c | 11 ++-
>>> 3 files changed, 27 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/net/virtio/virtio_rxtx.c
>>> b/drivers/net/virtio/virtio_rxtx.c
>>> index 41a1366..ec0b8de 100644
>>> --- a/drivers/net/virtio/virtio_rxtx.c
>>> +++ b/drivers/net/virtio/virtio_rxtx.c
>>> @@ -67,7 +67,9 @@
>>> #define VIRTIO_SIMPLE_FLAGS ((uint32_t)ETH_TXQ_FLAGS_NOMULTSEGS | \
>>> ETH_TXQ_FLAGS_NOOFFLOADS)
>>>
>>> +#ifdef RTE_MACHINE_CPUFLAG_SSSE3
>>> static int use_simple_rxtx;
>>> +#endif
>>>
>>>
>> I don't think so much #ifdef ... #endif in *.c file is a good choice.
>> Would you consider let it only in header file like:
>>
>> in drivers/net/virtio/virtio_rxtx.h
>>
>> [...]
>>
>> #ifdef RTE_MACHINE_CPUFLAG_SSSE3
>> int virtio_rxq_vec_setup(struct virtqueue *rxq);
>>
>> int virtqueue_enqueue_recv_refill_simple(struct virtqueue *vq,
>> struct rte_mbuf *m);
>> #else
>> int virtio_rxq_vec_setup(__rte_unused struct virtqueue *rxq) {return -1;}
>> int virtqueue_enqueue_recv_refill_simple(__rte_unused struct virtqueue *vq,
>> __rte_unused struct rte_mbuf *m) {
>> return -1;
>> }
>> #endif
>>
>> and remove most #ifdef ... #endif in *.c file.
>>
> I guess, above approach wont work for non-x86 arch, ad those func are
> dummy, right? also code wont build for arm/non-86 arch because
> tx/rx_pkt_burst callback will be using x86 specific virtio vec rx/tx
> api.
You may right, but you really need to reduce the #ifdef in *.c files.
Thanks,
Michael
>> Thanks,
>> Michael
[dpdk-dev] [PATCH v9 0/2] Add VHOST PMD
On 3/1/2016 10:19 AM, Tetsuya Mukawa wrote: > On 2016/03/01 11:00, Qiu, Michael wrote: >> On 2/26/2016 4:36 PM, Tetsuya Mukawa wrote: >>> On 2016/02/26 13:29, Tetsuya Mukawa wrote: [...] BTW, I have set the frontend mergeable off. I have checked below cases. - Case1: Disable mergeable feature in virtio-net PMD. - Case2: Disable mergeable feature in virtio-net PMD and use '--txqflags=0xf01' option to use simple ring deploying. Both cases, I still cannot see the drop. Anyway, I will send a few patch-series to determine the cause of drop. So, could you please apply them and check the performance to determine which cause the drop? >>> Hi Michael, >>> >>> I may find what causes the drop. >>> Could you please restart testpmd on guest when you see the drop, then >>> check performance again? >>> >>> I guess the drop will occur only first time when testpmd on guest and >>> host is connected. >>> Here are rough steps. >>> >>> 1. Start testpmd on host >>> 2. Start QEMU >>> 3. Start testpmd on guest >>> >>> Then you will see the drop. >>> Probably, if testpmd on guest is restarted, then you don't see the drop >>> again. >>> >>> 4. Type 'quit' on guest. >>> 5. Start testpmd on guest again. > Hi Michael, > > I am sorry that above was caused by my miss configuration. > So please ignore it. > If you can have time today, could you please check v7 and v8 performance? Hi, Tetsuya I have tried the qemu case but seems it does not have any difference, maybe my configuration is wrong. What I used to test is container case from Jianfeng. And I make a mistake that V6 compiled by GCC 5.3, but V9 with GCC 4.8, after using the same compiler, the performance almost the same. Thanks, Michael > Thanks, > Tetsuya > >> OK, I will help to tested today. >> >> Thanks, >> Michael >
[dpdk-dev] [PATCH 2/2 v3] i40e: Add floating VEB support in i40e
Suggest to add document for why to have it, the basic usage and the sample of
how to use it.
Thanks
Qian
-Original Message-
From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Zhe Tao
Sent: Thursday, February 25, 2016 2:32 PM
To: dev at dpdk.org
Subject: [dpdk-dev] [PATCH 2/2 v3] i40e: Add floating VEB support in i40e
This patch add the support for floating VEB in i40e.
All the VFs VSIs can decide whether to connect to the legacy VEB/VEPA or the
floating VEB. When connect to the floating VEB a new floating VEB is created.
Now all the VFs need to connect to floating VEB or legacy VEB, cannot connect
to both of them. The PF and VMDQ,FD VSIs still connect to the old legacy
VEB/VEPA.
All the VEB/VEPA concepts are not specific for FVL, they are defined in the
802.1Qbg spec.
Signed-off-by: Zhe Tao
---
doc/guides/rel_notes/release_16_04.rst | 2 +
drivers/net/i40e/Makefile | 2 +-
drivers/net/i40e/i40e_ethdev.c | 105 +++--
drivers/net/i40e/i40e_ethdev.h | 4 ++
drivers/net/i40e/i40e_pf.c | 11 +++-
5 files changed, 103 insertions(+), 21 deletions(-)
diff --git a/doc/guides/rel_notes/release_16_04.rst
b/doc/guides/rel_notes/release_16_04.rst
index 5786f74..446112c 100644
--- a/doc/guides/rel_notes/release_16_04.rst
+++ b/doc/guides/rel_notes/release_16_04.rst
@@ -46,6 +46,8 @@ This section should contain new features added in this
release. Sample format:
* **Added vhost-user live migration support.**
+* **Added floating VEB support for FVL.**
+
Resolved Issues
---
diff --git a/drivers/net/i40e/Makefile b/drivers/net/i40e/Makefile index
033ee4a..2e01d45 100644
--- a/drivers/net/i40e/Makefile
+++ b/drivers/net/i40e/Makefile
@@ -39,7 +39,7 @@ LIB = librte_pmd_i40e.a CFLAGS += -O3 CFLAGS +=
$(WERROR_FLAGS) -DPF_DRIVER -DVF_DRIVER -DINTEGRATED_VF CFLAGS +=
-DX722_SUPPORT -DX722_A0_SUPPORT
-
+CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common
EXPORT_MAP := rte_pmd_i40e_version.map
LIBABIVER := 1
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index ef24122..f8554c9 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -744,6 +744,7 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
pf->adapter = I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
pf->adapter->eth_dev = dev;
pf->dev_data = dev->data;
+ pf->floating = internal_config.floating;
hw->back = I40E_PF_TO_ADAPTER(pf);
hw->hw_addr = (uint8_t *)(pci_dev->mem_resource[0].addr);
@@ -3592,21 +3593,27 @@ i40e_veb_release(struct i40e_veb *veb)
struct i40e_vsi *vsi;
struct i40e_hw *hw;
- if (veb == NULL || veb->associate_vsi == NULL)
+ if (veb == NULL)
return -EINVAL;
if (!TAILQ_EMPTY(&veb->head)) {
PMD_DRV_LOG(ERR, "VEB still has VSI attached, can't remove");
return -EACCES;
}
+ /* associate_vsi field is NULL for floating VEB */
+ if (veb->associate_vsi != NULL) {
+ vsi = veb->associate_vsi;
+ hw = I40E_VSI_TO_HW(vsi);
- vsi = veb->associate_vsi;
- hw = I40E_VSI_TO_HW(vsi);
+ vsi->uplink_seid = veb->uplink_seid;
+ vsi->veb = NULL;
+ } else {
+ veb->associate_pf->main_vsi->floating_veb = NULL;
+ hw = I40E_VSI_TO_HW(veb->associate_pf->main_vsi);
+ }
- vsi->uplink_seid = veb->uplink_seid;
i40e_aq_delete_element(hw, veb->seid, NULL);
rte_free(veb);
- vsi->veb = NULL;
return I40E_SUCCESS;
}
@@ -3618,9 +3625,9 @@ i40e_veb_setup(struct i40e_pf *pf, struct i40e_vsi *vsi)
int ret;
struct i40e_hw *hw;
- if (NULL == pf || vsi == NULL) {
+ if (NULL == pf) {
PMD_DRV_LOG(ERR, "veb setup failed, "
- "associated VSI shouldn't null");
+ "associated PF shouldn't null");
return NULL;
}
hw = I40E_PF_TO_HW(pf);
@@ -3632,11 +3639,19 @@ i40e_veb_setup(struct i40e_pf *pf, struct i40e_vsi *vsi)
}
veb->associate_vsi = vsi;
+ veb->associate_pf = pf;
TAILQ_INIT(&veb->head);
- veb->uplink_seid = vsi->uplink_seid;
+ veb->uplink_seid = vsi ? vsi->uplink_seid : 0;
- ret = i40e_aq_add_veb(hw, veb->uplink_seid, vsi->seid,
- I40E_DEFAULT_TCMAP, false, false, &veb->seid, NULL);
+ /* create floating veb if vsi is NULL */
+ if (vsi != NULL) {
+ ret = i40e_aq_add_veb(hw, veb->uplink_seid, vsi->seid,
+ I40E_DEFAULT_TCMAP, false, false,
+ &veb->seid, NULL);
+ } else {
+ ret = i40e_aq_add_veb(hw, 0, 0, I40E_DEFAULT_TCMAP,
+ false, false, &veb->seid, NULL);
+ }
if (ret != I40E_SUCC
[dpdk-dev] [PATCH] hash: fix memcmp function pointer in multi-process
On 3/2/2016 2:57 AM, Dhananjaya Reddy Eadala wrote:
> Hi
>
> We found a problem in dpdk-2.2 using under multi-process environment.
> Here is the brief description how we are using the dpdk:
>
> We have two processes proc1, proc2 using dpdk. These proc1 and proc2 are
> two different compiled binaries.
> proc1 is started as primary process and proc2 as secondary process.
>
> proc1:
> Calls srcHash = rte_hash_create("src_hash_name") to create rte_hash
> structure.
> As part of this, this api initalized the rte_hash structure and set the
> srcHash->rte_hash_cmp_eq to the address of memcmp() from proc1 address
> space.
>
> proc2:
> calls srcHash = rte_hash_find_existing("src_hash_name"). This returns the
> rte_hash created by proc1.
> This srcHash->rte_hash_cmp_eq still points to the address of memcmp() from
> proc1 address space.
> Later proc2 calls rte_hash_lookup_with_hash(srcHash, (const void*) &key,
> key.sig);
> Under the hood, rte_hash_lookup_with_hash() invokes
> __rte_hash_lookup_with_hash(), which in turn calls h->rte_hash_cmp_eq(key,
> k->key, h->key_len).
> This leads to a crash as h->rte_hash_cmp_eq is an address from proc1
> address space and is invalid address in proc2 address space.
>
> We found, from dpdk documentation, that
> "
> The use of function pointers between multiple processes running based of
> different compiled
> binaries is not supported, since the location of a given function in one
> process may be different to
> its location in a second. This prevents the librte_hash library from
> behaving properly as in a multi-
> threaded instance, since it uses a pointer to the hash function internally.
>
>
> To work around this issue, it is recommended that multi-process
> applications perform the hash
> calculations by directly calling the hashing function from the code and
> then using the
> rte_hash_add_with_hash()/rte_hash_lookup_with_hash() functions instead of
> the functions which do
> the hashing internally, such as rte_hash_add()/rte_hash_lookup().
> "
>
> We did follow the recommended steps by invoking rte_hash_lookup_with_hash().
> It was no issue up to and including dpdk-2.0. In later releases started
> crashing because rte_hash_cmp_eq is introduced in dpdk-2.1
>
> We fixed it with the following patch and would like to submit the patch to
> dpdk.org.
Could you send the patch in the mail?
Learn how to send a patch:
http://www.dpdk.org/dev
Thanks,
Michael
> Patch is created such that, if anyone wanted to use dpdk in multi-process
> environment with function pointers not shared, they need to
> define RTE_LIB_MP_NO_FUNC_PTR in their Makefile. Without defining this flag
> in Makefile, it works as it is now.
>
>
> Please find here attached is the patch file.
>
> Thanks
> Dhana
>
[dpdk-dev] [PATCH v1] virtio: Use cpuflag for vector api
On Wed, Mar 02, 2016 at 02:10:14AM +, Qiu, Michael wrote:
> On 3/1/2016 5:46 PM, Santosh Shukla wrote:
> > On Tue, Mar 1, 2016 at 2:41 PM, Qiu, Michael
> > wrote:
> >> On 2/26/2016 4:53 PM, Santosh Shukla wrote:
> >>> Check cpuflag macro before using vectored api.
> >>> -virtio_recv_pkts_vec() uses _sse3__ simd instruction for now so added
> >>> cpuflag.
> >>> - Also wrap other vectored freind api ie..
> >>> 1) virtqueue_enqueue_recv_refill_simple
> >>> 2) virtio_rxq_vec_setup
> >>>
> >>> todo:
> >>> 1) Move virtio_recv_pkts_vec() implementation to
> >>>drivers/virtio/virtio_vec_.h file.
> >>> 2) Remove use_simple_rxtx flag, so that virtio/virtio_vec_.h
> >>>files to provide vectored/non-vectored rx/tx apis.
> >>>
> >>> Signed-off-by: Santosh Shukla
> >>> ---
> >>> - v1: This is a rework of patch [1].
> >>> Note: This patch will let non-x86 arch to use virtio pmd.
> >>>
> >>> [1] http://dpdk.org/dev/patchwork/patch/10429/
> >>>
> >>> drivers/net/virtio/virtio_rxtx.c| 16 +++-
> >>> drivers/net/virtio/virtio_rxtx.h|2 ++
> >>> drivers/net/virtio/virtio_rxtx_simple.c | 11 ++-
> >>> 3 files changed, 27 insertions(+), 2 deletions(-)
> >>>
> >>> diff --git a/drivers/net/virtio/virtio_rxtx.c
> >>> b/drivers/net/virtio/virtio_rxtx.c
> >>> index 41a1366..ec0b8de 100644
> >>> --- a/drivers/net/virtio/virtio_rxtx.c
> >>> +++ b/drivers/net/virtio/virtio_rxtx.c
> >>> @@ -67,7 +67,9 @@
> >>> #define VIRTIO_SIMPLE_FLAGS ((uint32_t)ETH_TXQ_FLAGS_NOMULTSEGS | \
> >>> ETH_TXQ_FLAGS_NOOFFLOADS)
> >>>
> >>> +#ifdef RTE_MACHINE_CPUFLAG_SSSE3
> >>> static int use_simple_rxtx;
> >>> +#endif
> >>>
> >>>
> >> I don't think so much #ifdef ... #endif in *.c file is a good choice.
> >> Would you consider let it only in header file like:
> >>
> >> in drivers/net/virtio/virtio_rxtx.h
> >>
> >> [...]
> >>
> >> #ifdef RTE_MACHINE_CPUFLAG_SSSE3
> >> int virtio_rxq_vec_setup(struct virtqueue *rxq);
> >>
> >> int virtqueue_enqueue_recv_refill_simple(struct virtqueue *vq,
> >> struct rte_mbuf *m);
> >> #else
> >> int virtio_rxq_vec_setup(__rte_unused struct virtqueue *rxq) {return -1;}
> >> int virtqueue_enqueue_recv_refill_simple(__rte_unused struct virtqueue *vq,
> >> __rte_unused struct rte_mbuf *m) {
> >> return -1;
> >> }
> >> #endif
> >>
> >> and remove most #ifdef ... #endif in *.c file.
> >>
> > I guess, above approach wont work for non-x86 arch, ad those func are
> > dummy, right? also code wont build for arm/non-86 arch because
> > tx/rx_pkt_burst callback will be using x86 specific virtio vec rx/tx
> > api.
>
> You may right, but you really need to reduce the #ifdef in *.c files.
In general, yes. But for this case, no: those vec stuff are for
platforms that support it. For other platforms, we should not
invoke a dummy function like virtio_rxq_vec_setup() at all.
The right way to go is to add another wrapper beyond the vector
stuff, something like:
virtio_rxq_setup()
{
if (has_vec_support)
virtio_rxq_vec_setup();
else
virtio_rxq_generic_setup();
}
Where virtio_rxq_vec_setup() could have a per-arch implementation,
say for X86, or ARM.
It touchs more code, but for now, I'd like to make it simple first.
With the virtio_rxtx_simple.c isolated from Makefile, there aren't
many #ifdef after all.
--yliu
[dpdk-dev] [PATCH v6 1/4] lib/ether: optimize the'rte_eth_tunnel_filter_conf' structure
Hi, Panu > -Original Message- > From: Panu Matilainen [mailto:pmatilai at redhat.com] > Sent: Tuesday, March 01, 2016 4:54 PM > To: Sun, Xutao ; dev at dpdk.org > Subject: Re: [dpdk-dev] [PATCH v6 1/4] lib/ether: optimize > the'rte_eth_tunnel_filter_conf' structure > > On 03/01/2016 05:47 AM, Xutao Sun wrote: > > Change the fields of outer_mac and inner_mac from pointer to struct in > > order to keep the code's readability. > > > > Signed-off-by: Xutao Sun > > Signed-off-by: Jijiang Liu > > --- > > app/test-pmd/cmdline.c | 6 -- > > doc/guides/rel_notes/deprecation.rst | 5 - > > doc/guides/rel_notes/release_16_04.rst | 2 ++ > > drivers/net/i40e/i40e_ethdev.c | 12 ++-- > > lib/librte_ether/rte_eth_ctrl.h| 4 ++-- > > 5 files changed, 14 insertions(+), 15 deletions(-) > > > > Since this is the commit actually changing the ABI, its best to actually bump > LIBABIVER right here as well lest it go forgotten, and also update the list of > shared library versions in release notes. > See commit d8c4ae275582784ec0ff3b2c54a4c861b55bc056 for an example. > > Oh and sorry for not noticing this earlier. > > - Panu - I didn't use the Macro "RTE_NEXT_ABI", so I think I don't need to update the shared library verisons. And I also updated the doc about ABI change in the deprecation.rst and release notes. Thanks, Xutao
[dpdk-dev] tcp/ip stack based on dpdk is ready
hi, The tcp/ip stack is developed based on dpdk. tcp/ip stack and APP deployment. |---| |---| |---| | APP | | APP | | APP | | | | | | | | | | | | | |---| |---| |---| | | | -- netdpsock| | | fd fd fd | | | -- netdp| | | |---| |---| |---| | TCP | | TCP | | TCP | | | | | | | | | | | | | | | | | | | |---| | IP/ARP/ICMP | |---| | | | | | | |LCORE0 | |LCORE1 | |LCORE2 | |---| |---| |---| | | | ---RSS--- | |---| | NIC | |---| NIC distribute packets to different lcore based on RSS, so same TCP flow are handled in the same lcore. Each lcore has own TCP stack. so no share data between lcores, free lock. IP/ARP/ICMP are shared between lcores. APP process runs as a tcp server, only listens on one lcore and accept tcp connections from the lcore, so the APP process number shall large than the lcore number. The APP processes are deployed on each lcore automaticly and averagely. APP process runs as a tcp client, app process can communicate with each lcore. The tcp connection can be located in specified lcore automaticly. APP process can bind the same port if enable reuseport, APP process could accept tcp connection by round robin. If NIC don't support multi queue or RSS, shall enhance opendp_main.c, reserve one lcore to receive and send packets from NIC, and distribute packets to lcores of netdp tcp stack by software RSS. 2. netdpsock are compatible with BSD socket, so it is easy to porting app to run in netdp stack. nginx is already porting to run in netdp, a few code are changed. link: https://github.com/opendp/dpdk-nginx redis is also porting. link: https://github.com/opendp/dpdk-redis 3. Performance. one lcore, one http server, ab testing Concurrency Level: 500 Time taken for tests: 0.642 seconds Complete requests: 3 Failed requests:0 Total transferred: 453 bytes HTML transferred: 189 bytes Requests per second:46695.59 [#/sec] (mean) Time per request: 10.708 [ms] (mean) Time per request: 0.021 [ms] (mean, across all concurrent requests) Transfer rate: 6885.78 [Kbytes/sec] received one lcore, one nginx server, ab testing Concurrency Level: 500 Time taken for tests: 0.965 seconds Complete requests: 3 Failed requests:0 Total transferred: 2532 bytes HTML transferred: 1836 bytes Requests per second:31092.43 [#/sec] (mean) Time per request: 16.081 [ms] (mean) Time per request: 0.032 [ms] (mean, across all concurrent requests) Transfer rate: 25626.97 [Kbytes/sec] received one lcore, one redis server, redis-bench testing root at h163:~/dpdk-redis# ./src/redis-benchmark -h 2.2.2.2 -p 6379 -n 10 -c 50 -q PING_INLINE: 86655.11 requests per second PING_BULK: 90497.73 requests per second SET: 84317.03 requests per second GET: 85106.38 requests per second INCR: 86580.09 requests per second LPUSH: 83263.95 requests per second LPOP: 83612.04 requests per second SADD: 85034.02 requests per second SPOP: 86430.43 requests per second LPUSH (needed to benchmark LRANGE): 84245.99 requests per second LRANGE_100 (first 100 elements): 46948.36 requests per second LRANGE_300 (first 300 elements): 19615.54 requests per second LRANGE_500 (first 450 elements): 11584.80 requests per second LRANGE_600 (first 600 elements): 10324.18 requests per second MSET (10 keys): 66401.06 requests per second Still didn't test multicore tcp performance because lack test tools and env. For detail test result, please refer to https://github.com/opendp/dpdk-odp -- Best Regards, zimeiw
[dpdk-dev] [PATCH v2] ethdev: fix byte order inconsistence between fdir flow and mask
Hi,
> -Original Message-
> From: Wu, Jingjing
> Sent: Monday, February 1, 2016 10:48 AM
> To: dev at dpdk.org
> Cc: Wu, Jingjing; Lu, Wenzhuo; Pei, Yulong; yaacovh at mellanox.com
> Subject: [PATCH v2] ethdev: fix byte order inconsistence between fdir flow and
> mask
>
> Fixed issue of byte order in ethdev library that the structure for setting
> fdir's
> mask and flow entry is inconsist and made inputs of mask be in big endian.
>
> Fixes: 76c6f89e80d4 ("ixgbe: support new flow director masks")
> Fixes: 2d4c1a9ea2ac ("ethdev: add new flow director masks")
>
> Reported-by: Yaacov Hazan
> Signed-off-by: Jingjing Wu
Acked-by: Wenzhuo Lu
[dpdk-dev] [PATCH v4 1/3] fm10k: enable FTAG based forwarding
Hi,
> -Original Message-
> From: Stephen Hemminger [mailto:stephen at networkplumber.org]
> Sent: Wednesday, March 2, 2016 6:38 AM
> To: Wang, Xiao W
> Cc: Chen, Jing D ; dev at dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v4 1/3] fm10k: enable FTAG based forwarding
>
> On Tue, 1 Mar 2016 13:36:39 +0800
> Wang Xiao W wrote:
>
> >
> > +static int
> > +fm10k_check_ftag(struct rte_devargs *devargs) {
> > + if (devargs == NULL)
> > + return 0;
> > +
> > + if (strstr(devargs->args, "enable_ftag=1") == NULL)
> > + return 0;
> > +
> > + return 1;
> > +}
> > +
>
> It is good to see the DPDK keeping up with the leading edge of hardware
> support.
>
> My issue is that devargs are the Linux module parameters method of
> configuration in the DPDK world. They are an API only a developer would
> love..
DPDK supports passing string parameter (devargs) for every pci device to EAL,
it's like:
"./test -w 84:00.0,enable_ftag=1 -w 86:00.0,enable_ftag=1 -c f -n 4".
We have discussed (in v3) on how to configure the specific feature for fm10k
(by means
of adding a build time config option, or changing the common ethdev structure,
or changing the mbuf structure), neither adding extra build config option nor
changing the common structure looks satisfactory, and we think using devargs is
a good enough solution.
>
> 1. It has to be done at boot
> 2. Applications have to rewrite (or expect customer) to pass args 3. Can't
> be
> changed at runtime 4. Can't be selected on per device basis.
Customers configure the FTAG feature according to their need.
We just parse the devargs at dev_start and set FTAG flag for RX/TX queues, we
(or the customers) needn't to change the devargs at runtime.
In DPDK devargs is designed for each pci device, each device has its own pointer
for devargs structure.
Thank you for the comment.
Best Regards,
Xiao
[dpdk-dev] [PATCH v2] doc: Malicious Driver Detection not supported by ixgbe
Hi, > -Original Message- > From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Wenzhuo Lu > Sent: Friday, February 26, 2016 12:49 PM > To: dev at dpdk.org > Subject: [dpdk-dev] [PATCH v2] doc: Malicious Driver Detection not supported > by ixgbe > > Announce that Malicious Driver Detection is not supported. > > V2: > *Rework the words. > > Signed-off-by: Wenzhuo Lu Acked-by: Shaopeng He
[dpdk-dev] [PATCH v4 1/3] lpm: make rte_lpm_lookupx4 API definition architecture agnostic
On Tue, Mar 01, 2016 at 06:42:35PM +0100, Thomas Monjalon wrote: > 2016-02-12 17:58, Jerin Jacob: > > -Used architecture agnostic xmm_t to represent 128 bit SIMD variable > > > > -Introduced vect_* API abstraction in app/test to test rte_lpm_lookupx4 > > API in architecture agnostic way > > > > -Moved rte_lpm_lookupx4 SSE implementation to architecture specific > > rte_lpm_sse.h file to accommodate new rte_lpm_lookupx4 implementation > > for a different architecture. > > > > Signed-off-by: Jerin Jacob > > Acked-by: Konstantin Ananyev > > --- > > app/test/test_lpm.c | 21 --- > > app/test/test_xmmt_ops.h | 47 ++ > > lib/librte_lpm/Makefile | 2 + > > lib/librte_lpm/rte_lpm.h | 93 +--- > > lib/librte_lpm/rte_lpm_sse.h | 143 > > +++ > > 5 files changed, 206 insertions(+), 100 deletions(-) > > app/test/test_xmmt_ops.h must be added to LPM in MAINTAINERS file. OK. I will add into LPM section like below, --- a/MAINTAINERS +++ b/MAINTAINERS @@ -444,6 +444,7 @@ F: lib/librte_lpm/ F: doc/guides/prog_guide/lpm* F: app/test/test_lpm* F: app/test/test_func_reentrancy.c +F: app/test/test_xmmt_ops.h > >
[dpdk-dev] [PATCH v4 2/3] lpm: add support for NEON
On Tue, Mar 01, 2016 at 06:46:04PM +0100, Thomas Monjalon wrote: > 2016-02-12 17:58, Jerin Jacob: > > # fails to compile on ARM > > -CONFIG_RTE_LIBRTE_LPM=n > > -CONFIG_RTE_LIBRTE_TABLE=n > > -CONFIG_RTE_LIBRTE_PIPELINE=n > > The associated examples cannot compile. > Maybe it's too early to enable them. > What about updating the comment to state that only examples fail? Not sure where to comment it though. The only l3fwd build is failing on arm64 due to insane use of SSE intrinsics with out proper abstraction in recent l3fwd rework. l3fwd was building earlier with a minor change; Now it looks like it needs reasonable cycles to fix it properly. > > > --- a/lib/librte_lpm/Makefile > > +++ b/lib/librte_lpm/Makefile > > +ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) > > +SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_neon.h > > Simpler: > ifneq ($(CONFIG_RTE_ARCH_ARM)$(CONFIG_RTE_ARCH_ARM64),nn) I will change it in next version
[dpdk-dev] [PATCH v5 0/5] Support VxLAN & NVGRE checksum off-load on X550
This patch set add the VxLAN & NVGRE checksum off-load support. Both RX and TX checksum off-load can be used for VxLAN & NVGRE. And the VxLAN port can be set, it's implemented in this patch set either. v2: - Update release note. v3: - Update RX/TX offload capability. - Reuse PKT_RX_EIP_CKSUM_BAD but not add a new one. - Correct the tunnel len for TX, and remove the useless out_l2_len. - Don't set the tunnel type for TX, and remove the unused ol_flag_nvgre. v4: - Fix the issue that not setting the MAC length correctly. v5: - Change the behavior of VxLAN port add/del to make it align with i40e. Wenzhuo Lu (5): lib/librte_ether: change function name of tunnel port config i40e: rename the tunnel port config functions ixgbe: support UDP tunnel port config ixgbe: support VxLAN & NVGRE RX checksum off-load ixgbe: support VxLAN & NVGRE TX checksum off-load app/test-pmd/cmdline.c | 6 +- doc/guides/rel_notes/release_16_04.rst | 9 +++ drivers/net/i40e/i40e_ethdev.c | 22 +++--- drivers/net/ixgbe/ixgbe_ethdev.c | 131 + drivers/net/ixgbe/ixgbe_rxtx.c | 67 ++--- drivers/net/ixgbe/ixgbe_rxtx.h | 6 +- examples/tep_termination/vxlan_setup.c | 2 +- lib/librte_ether/rte_ethdev.c | 45 +++ lib/librte_ether/rte_ethdev.h | 19 + lib/librte_mbuf/rte_mbuf.c | 2 +- lib/librte_mbuf/rte_mbuf.h | 2 +- 11 files changed, 283 insertions(+), 28 deletions(-) -- 1.9.3
[dpdk-dev] [PATCH v5 1/5] lib/librte_ether: change function name of tunnel port config
The names of function for tunnel port configuration are not
accurate. They're tunnel_add/del, better change them to
tunnel_port_add/del.
As it may be an ABI change if change the names directly, the
new functions are added but not remove the old ones. The old
ones will be removed in the next release after an ABI change
announcement.
Signed-off-by: Wenzhuo Lu
---
app/test-pmd/cmdline.c | 6 +++--
examples/tep_termination/vxlan_setup.c | 2 +-
lib/librte_ether/rte_ethdev.c | 45 ++
lib/librte_ether/rte_ethdev.h | 18 ++
4 files changed, 68 insertions(+), 3 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 52e9f5f..0fae655 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -6782,9 +6782,11 @@ cmd_tunnel_udp_config_parsed(void *parsed_result,
tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN;
if (!strcmp(res->what, "add"))
- ret = rte_eth_dev_udp_tunnel_add(res->port_id, &tunnel_udp);
+ ret = rte_eth_dev_udp_tunnel_port_add(res->port_id,
+ &tunnel_udp);
else
- ret = rte_eth_dev_udp_tunnel_delete(res->port_id, &tunnel_udp);
+ ret = rte_eth_dev_udp_tunnel_port_delete(res->port_id,
+&tunnel_udp);
if (ret < 0)
printf("udp tunneling add error: (%s)\n", strerror(-ret));
diff --git a/examples/tep_termination/vxlan_setup.c
b/examples/tep_termination/vxlan_setup.c
index 51ad133..8836603 100644
--- a/examples/tep_termination/vxlan_setup.c
+++ b/examples/tep_termination/vxlan_setup.c
@@ -191,7 +191,7 @@ vxlan_port_init(uint8_t port, struct rte_mempool *mbuf_pool)
/* Configure UDP port for UDP tunneling */
tunnel_udp.udp_port = udp_port;
tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN;
- retval = rte_eth_dev_udp_tunnel_add(port, &tunnel_udp);
+ retval = rte_eth_dev_udp_tunnel_port_add(port, &tunnel_udp);
if (retval < 0)
return retval;
rte_eth_macaddr_get(port, &ports_eth_addr[port]);
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 1257965..937b348 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1949,6 +1949,28 @@ rte_eth_dev_udp_tunnel_add(uint8_t port_id,
}
int
+rte_eth_dev_udp_tunnel_port_add(uint8_t port_id,
+ struct rte_eth_udp_tunnel *udp_tunnel)
+{
+ struct rte_eth_dev *dev;
+
+ RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+ if (udp_tunnel == NULL) {
+ RTE_PMD_DEBUG_TRACE("Invalid udp_tunnel parameter\n");
+ return -EINVAL;
+ }
+
+ if (udp_tunnel->prot_type >= RTE_TUNNEL_TYPE_MAX) {
+ RTE_PMD_DEBUG_TRACE("Invalid tunnel type\n");
+ return -EINVAL;
+ }
+
+ dev = &rte_eth_devices[port_id];
+ RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->udp_tunnel_port_add, -ENOTSUP);
+ return (*dev->dev_ops->udp_tunnel_port_add)(dev, udp_tunnel);
+}
+
+int
rte_eth_dev_udp_tunnel_delete(uint8_t port_id,
struct rte_eth_udp_tunnel *udp_tunnel)
{
@@ -1972,6 +1994,29 @@ rte_eth_dev_udp_tunnel_delete(uint8_t port_id,
}
int
+rte_eth_dev_udp_tunnel_port_delete(uint8_t port_id,
+ struct rte_eth_udp_tunnel *udp_tunnel)
+{
+ struct rte_eth_dev *dev;
+
+ RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+ dev = &rte_eth_devices[port_id];
+
+ if (udp_tunnel == NULL) {
+ RTE_PMD_DEBUG_TRACE("Invalid udp_tunnel parameter\n");
+ return -EINVAL;
+ }
+
+ if (udp_tunnel->prot_type >= RTE_TUNNEL_TYPE_MAX) {
+ RTE_PMD_DEBUG_TRACE("Invalid tunnel type\n");
+ return -EINVAL;
+ }
+
+ RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->udp_tunnel_port_del, -ENOTSUP);
+ return (*dev->dev_ops->udp_tunnel_port_del)(dev, udp_tunnel);
+}
+
+int
rte_eth_led_on(uint8_t port_id)
{
struct rte_eth_dev *dev;
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 16da821..f1f96c1 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1261,6 +1261,14 @@ typedef int (*eth_set_eeprom_t)(struct rte_eth_dev *dev,
struct rte_dev_eeprom_info *info);
/**< @internal Program eeprom data */
+typedef int (*eth_udp_tunnel_port_add_t)(struct rte_eth_dev *dev,
+struct rte_eth_udp_tunnel *tunnel_udp);
+/**< @internal Add tunneling UDP port */
+
+typedef int (*eth_udp_tunnel_port_del_t)(struct rte_eth_dev *dev,
+struct rte_eth_udp_tunnel *tunnel_udp);
+/**< @internal Delete tunneling UDP port */
+
#ifdef RTE_NIC_BYPASS
enum {
@@ -1443
[dpdk-dev] [PATCH v5 2/5] i40e: rename the tunnel port config functions
As the names of tunnel port config functions are not
accurate, change them from tunnel_add/del to
tunnel_port_add/del.
And support both the old and new rte ops.
Signed-off-by: Wenzhuo Lu
---
drivers/net/i40e/i40e_ethdev.c | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index ef24122..3cc9384 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -369,10 +369,10 @@ static int i40e_dev_rss_hash_update(struct rte_eth_dev
*dev,
struct rte_eth_rss_conf *rss_conf);
static int i40e_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
struct rte_eth_rss_conf *rss_conf);
-static int i40e_dev_udp_tunnel_add(struct rte_eth_dev *dev,
- struct rte_eth_udp_tunnel *udp_tunnel);
-static int i40e_dev_udp_tunnel_del(struct rte_eth_dev *dev,
- struct rte_eth_udp_tunnel *udp_tunnel);
+static int i40e_dev_udp_tunnel_port_add(struct rte_eth_dev *dev,
+ struct rte_eth_udp_tunnel *udp_tunnel);
+static int i40e_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
+ struct rte_eth_udp_tunnel *udp_tunnel);
static int i40e_ethertype_filter_set(struct i40e_pf *pf,
struct rte_eth_ethertype_filter *filter,
bool add);
@@ -467,8 +467,10 @@ static const struct eth_dev_ops i40e_eth_dev_ops = {
.reta_query = i40e_dev_rss_reta_query,
.rss_hash_update = i40e_dev_rss_hash_update,
.rss_hash_conf_get= i40e_dev_rss_hash_conf_get,
- .udp_tunnel_add = i40e_dev_udp_tunnel_add,
- .udp_tunnel_del = i40e_dev_udp_tunnel_del,
+ .udp_tunnel_add = i40e_dev_udp_tunnel_port_add,
+ .udp_tunnel_del = i40e_dev_udp_tunnel_port_del,
+ .udp_tunnel_port_add = i40e_dev_udp_tunnel_port_add,
+ .udp_tunnel_port_del = i40e_dev_udp_tunnel_port_del,
.filter_ctrl = i40e_dev_filter_ctrl,
.rxq_info_get = i40e_rxq_info_get,
.txq_info_get = i40e_txq_info_get,
@@ -5976,8 +5978,8 @@ i40e_del_vxlan_port(struct i40e_pf *pf, uint16_t port)
/* Add UDP tunneling port */
static int
-i40e_dev_udp_tunnel_add(struct rte_eth_dev *dev,
- struct rte_eth_udp_tunnel *udp_tunnel)
+i40e_dev_udp_tunnel_port_add(struct rte_eth_dev *dev,
+struct rte_eth_udp_tunnel *udp_tunnel)
{
int ret = 0;
struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -6007,8 +6009,8 @@ i40e_dev_udp_tunnel_add(struct rte_eth_dev *dev,
/* Remove UDP tunneling port */
static int
-i40e_dev_udp_tunnel_del(struct rte_eth_dev *dev,
- struct rte_eth_udp_tunnel *udp_tunnel)
+i40e_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
+struct rte_eth_udp_tunnel *udp_tunnel)
{
int ret = 0;
struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
--
1.9.3
[dpdk-dev] [PATCH v5 4/5] ixgbe: support VxLAN & NVGRE RX checksum off-load
X550 will do VxLAN & NVGRE RX checksum off-load automatically.
This patch exposes the result of the checksum off-load.
Signed-off-by: Wenzhuo Lu
---
drivers/net/ixgbe/ixgbe_ethdev.c | 4
drivers/net/ixgbe/ixgbe_rxtx.c | 11 ++-
lib/librte_ether/rte_ethdev.h| 1 +
lib/librte_mbuf/rte_mbuf.c | 2 +-
lib/librte_mbuf/rte_mbuf.h | 2 +-
5 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index ec2ff0e..86afba4 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -2799,6 +2799,10 @@ ixgbe_dev_info_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
!RTE_ETH_DEV_SRIOV(dev).active)
dev_info->rx_offload_capa |= DEV_RX_OFFLOAD_TCP_LRO;
+ if (hw->mac.type == ixgbe_mac_X550 ||
+ hw->mac.type == ixgbe_mac_X550EM_x)
+ dev_info->rx_offload_capa |= DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM;
+
dev_info->tx_offload_capa =
DEV_TX_OFFLOAD_VLAN_INSERT |
DEV_TX_OFFLOAD_IPV4_CKSUM |
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index e95e6b7..6b913ee 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -1003,6 +1003,8 @@ rx_desc_status_to_pkt_flags(uint32_t rx_status)
static inline uint64_t
rx_desc_error_to_pkt_flags(uint32_t rx_status)
{
+ uint64_t pkt_flags;
+
/*
* Bit 31: IPE, IPv4 checksum error
* Bit 30: L4I, L4I integrity error
@@ -1011,8 +1013,15 @@ rx_desc_error_to_pkt_flags(uint32_t rx_status)
0, PKT_RX_L4_CKSUM_BAD, PKT_RX_IP_CKSUM_BAD,
PKT_RX_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD
};
- return error_to_pkt_flags_map[(rx_status >>
+ pkt_flags = error_to_pkt_flags_map[(rx_status >>
IXGBE_RXDADV_ERR_CKSUM_BIT) & IXGBE_RXDADV_ERR_CKSUM_MSK];
+
+ if ((rx_status & IXGBE_RXD_STAT_OUTERIPCS) &&
+ (rx_status & IXGBE_RXDADV_ERR_OUTERIPER)) {
+ pkt_flags |= PKT_RX_EIP_CKSUM_BAD;
+ }
+
+ return pkt_flags;
}
/*
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index f1f96c1..e7e7a66 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -810,6 +810,7 @@ struct rte_eth_conf {
#define DEV_RX_OFFLOAD_TCP_CKSUM 0x0008
#define DEV_RX_OFFLOAD_TCP_LRO 0x0010
#define DEV_RX_OFFLOAD_QINQ_STRIP 0x0020
+#define DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM 0x0040
/**
* TX offload capabilities of a device.
diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
index c18b438..dc0467c 100644
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -253,7 +253,7 @@ const char *rte_get_rx_ol_flag_name(uint64_t mask)
case PKT_RX_FDIR: return "PKT_RX_FDIR";
case PKT_RX_L4_CKSUM_BAD: return "PKT_RX_L4_CKSUM_BAD";
case PKT_RX_IP_CKSUM_BAD: return "PKT_RX_IP_CKSUM_BAD";
- /* case PKT_RX_EIP_CKSUM_BAD: return "PKT_RX_EIP_CKSUM_BAD"; */
+ case PKT_RX_EIP_CKSUM_BAD: return "PKT_RX_EIP_CKSUM_BAD";
/* case PKT_RX_OVERSIZE: return "PKT_RX_OVERSIZE"; */
/* case PKT_RX_HBUF_OVERFLOW: return "PKT_RX_HBUF_OVERFLOW"; */
/* case PKT_RX_RECIP_ERR: return "PKT_RX_RECIP_ERR"; */
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index c973e9b..c4e7e25 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -88,7 +88,7 @@ extern "C" {
#define PKT_RX_FDIR (1ULL << 2) /**< RX packet with FDIR match
indicate. */
#define PKT_RX_L4_CKSUM_BAD (1ULL << 3) /**< L4 cksum of RX pkt. is not OK.
*/
#define PKT_RX_IP_CKSUM_BAD (1ULL << 4) /**< IP cksum of RX pkt. is not OK.
*/
-#define PKT_RX_EIP_CKSUM_BAD (0ULL << 0) /**< External IP header checksum
error. */
+#define PKT_RX_EIP_CKSUM_BAD (1ULL << 5) /**< External IP header checksum
error. */
#define PKT_RX_OVERSIZE (0ULL << 0) /**< Num of desc of an RX pkt
oversize. */
#define PKT_RX_HBUF_OVERFLOW (0ULL << 0) /**< Header buffer overflow. */
#define PKT_RX_RECIP_ERR (0ULL << 0) /**< Hardware processing error. */
--
1.9.3
[dpdk-dev] [PATCH v5 3/5] ixgbe: support UDP tunnel port config
Add UDP tunnel port add/del support on ixgbe. Now only
support VxLAN port configuration.
Although according to the specification the VxLAN port has
a default value 4789, it can be changed. We support VxLAN
port configuration to meet the change.
Note, the default value of VxLAN port in ixgbe NICs is 0. So
please set it when using VxLAN off-load.
Signed-off-by: Wenzhuo Lu
---
drivers/net/ixgbe/ixgbe_ethdev.c | 123 +++
1 file changed, 123 insertions(+)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 3e6fe86..ec2ff0e 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -337,6 +337,10 @@ static int ixgbe_timesync_read_time(struct rte_eth_dev
*dev,
struct timespec *timestamp);
static int ixgbe_timesync_write_time(struct rte_eth_dev *dev,
const struct timespec *timestamp);
+static int ixgbe_dev_udp_tunnel_port_add(struct rte_eth_dev *dev,
+struct rte_eth_udp_tunnel *udp_tunnel);
+static int ixgbe_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
+struct rte_eth_udp_tunnel *udp_tunnel);
/*
* Define VF Stats MACRO for Non "cleared on read" register
@@ -495,6 +499,10 @@ static const struct eth_dev_ops ixgbe_eth_dev_ops = {
.timesync_adjust_time = ixgbe_timesync_adjust_time,
.timesync_read_time = ixgbe_timesync_read_time,
.timesync_write_time = ixgbe_timesync_write_time,
+ .udp_tunnel_add = ixgbe_dev_udp_tunnel_port_add,
+ .udp_tunnel_del = ixgbe_dev_udp_tunnel_port_del,
+ .udp_tunnel_port_add = ixgbe_dev_udp_tunnel_port_add,
+ .udp_tunnel_port_del = ixgbe_dev_udp_tunnel_port_del,
};
/*
@@ -6191,6 +6199,121 @@ ixgbe_dev_get_dcb_info(struct rte_eth_dev *dev,
return 0;
}
+static int
+ixgbe_update_vxlan_port(struct ixgbe_hw *hw,
+ uint16_t port)
+{
+ IXGBE_WRITE_REG(hw, IXGBE_VXLANCTRL, port);
+ IXGBE_WRITE_FLUSH(hw);
+
+ return 0;
+}
+
+/* There's only one register for VxLAN UDP port.
+ * So, we cannot add several ports. Will update it.
+ */
+static int
+ixgbe_add_vxlan_port(struct ixgbe_hw *hw,
+uint16_t port)
+{
+ if (port == 0) {
+ PMD_DRV_LOG(ERR, "Add VxLAN port 0 is not allowed.");
+ return -EINVAL;
+ }
+
+ return ixgbe_update_vxlan_port(hw, port);
+}
+
+/* We cannot delete the VxLAN port. For there's a register for VxLAN
+ * UDP port, it must have a value.
+ * So, will reset it to the original value 0.
+ */
+static int
+ixgbe_del_vxlan_port(struct ixgbe_hw *hw,
+uint16_t port)
+{
+ uint16_t cur_port;
+
+ cur_port = (uint16_t)IXGBE_READ_REG(hw, IXGBE_VXLANCTRL);
+
+ if (cur_port != port) {
+ PMD_DRV_LOG(ERR, "Port %u does not exist.", port);
+ return -EINVAL;
+ }
+
+ return ixgbe_update_vxlan_port(hw, 0);
+}
+
+/* Add UDP tunneling port */
+static int
+ixgbe_dev_udp_tunnel_port_add(struct rte_eth_dev *dev,
+ struct rte_eth_udp_tunnel *udp_tunnel)
+{
+ int ret = 0;
+ struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+ if (hw->mac.type != ixgbe_mac_X550 &&
+ hw->mac.type != ixgbe_mac_X550EM_x) {
+ return -ENOTSUP;
+ }
+
+ if (udp_tunnel == NULL)
+ return -EINVAL;
+
+ switch (udp_tunnel->prot_type) {
+ case RTE_TUNNEL_TYPE_VXLAN:
+ ret = ixgbe_add_vxlan_port(hw, udp_tunnel->udp_port);
+ break;
+
+ case RTE_TUNNEL_TYPE_GENEVE:
+ case RTE_TUNNEL_TYPE_TEREDO:
+ PMD_DRV_LOG(ERR, "Tunnel type is not supported now.");
+ ret = -1;
+ break;
+
+ default:
+ PMD_DRV_LOG(ERR, "Invalid tunnel type");
+ ret = -1;
+ break;
+ }
+
+ return ret;
+}
+
+/* Remove UDP tunneling port */
+static int
+ixgbe_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
+ struct rte_eth_udp_tunnel *udp_tunnel)
+{
+ int ret = 0;
+ struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+ if (hw->mac.type != ixgbe_mac_X550 &&
+ hw->mac.type != ixgbe_mac_X550EM_x) {
+ return -ENOTSUP;
+ }
+
+ if (udp_tunnel == NULL)
+ return -EINVAL;
+
+ switch (udp_tunnel->prot_type) {
+ case RTE_TUNNEL_TYPE_VXLAN:
+ ret = ixgbe_del_vxlan_port(hw, udp_tunnel->udp_port);
+ break;
+ case RTE_TUNNEL_TYPE_GENEVE:
+ case RTE_TUNNEL_TYPE_TEREDO:
+ PMD_DRV_LOG(ERR, "Tunnel type is not supported now.");
+ ret = -1;
+ break;
+ default:
+ PMD_DRV_LOG(ERR, "Invalid tunnel
[dpdk-dev] [PATCH v5 5/5] ixgbe: support VxLAN & NVGRE TX checksum off-load
The patch add VxLAN & NVGRE TX checksum off-load. When the flag of
outer IP header checksum offload is set, we'll set the context
descriptor to enable this checksum off-load.
Also update release note for VxLAN & NVGRE checksum off-load support.
Signed-off-by: Wenzhuo Lu
---
doc/guides/rel_notes/release_16_04.rst | 9 ++
drivers/net/ixgbe/ixgbe_ethdev.c | 4 +++
drivers/net/ixgbe/ixgbe_rxtx.c | 56 +++---
drivers/net/ixgbe/ixgbe_rxtx.h | 6 +++-
4 files changed, 63 insertions(+), 12 deletions(-)
diff --git a/doc/guides/rel_notes/release_16_04.rst
b/doc/guides/rel_notes/release_16_04.rst
index 8273817..a17c2fb 100644
--- a/doc/guides/rel_notes/release_16_04.rst
+++ b/doc/guides/rel_notes/release_16_04.rst
@@ -46,6 +46,15 @@ This section should contain new features added in this
release. Sample format:
* **Added vhost-user live migration support.**
+* **Added support for VxLAN & NVGRE checksum off-load on X550.**
+
+ * Added support for VxLAN & NVGRE RX/TX checksum off-load on
+X550. RX/TX checksum off-load is provided on both inner and
+outer IP header and TCP header.
+ * Added functions to support VxLAN port configuration. The
+default VxLAN port number is 4789 but this can be updated
+programmatically.
+
Resolved Issues
---
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 86afba4..7ad7a84 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -2811,6 +2811,10 @@ ixgbe_dev_info_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
DEV_TX_OFFLOAD_SCTP_CKSUM |
DEV_TX_OFFLOAD_TCP_TSO;
+ if (hw->mac.type == ixgbe_mac_X550 ||
+ hw->mac.type == ixgbe_mac_X550EM_x)
+ dev_info->tx_offload_capa |= DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM;
+
dev_info->default_rxconf = (struct rte_eth_rxconf) {
.rx_thresh = {
.pthresh = IXGBE_DEFAULT_RX_PTHRESH,
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 6b913ee..c2c71de 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -85,7 +85,8 @@
PKT_TX_VLAN_PKT |\
PKT_TX_IP_CKSUM |\
PKT_TX_L4_MASK | \
- PKT_TX_TCP_SEG)
+ PKT_TX_TCP_SEG | \
+ PKT_TX_OUTER_IP_CKSUM)
static inline struct rte_mbuf *
rte_rxmbuf_alloc(struct rte_mempool *mp)
@@ -364,9 +365,11 @@ ixgbe_set_xmit_ctx(struct ixgbe_tx_queue *txq,
uint32_t ctx_idx;
uint32_t vlan_macip_lens;
union ixgbe_tx_offload tx_offload_mask;
+ uint32_t seqnum_seed = 0;
ctx_idx = txq->ctx_curr;
- tx_offload_mask.data = 0;
+ tx_offload_mask.data[0] = 0;
+ tx_offload_mask.data[1] = 0;
type_tucmd_mlhl = 0;
/* Specify which HW CTX to upload. */
@@ -430,18 +433,35 @@ ixgbe_set_xmit_ctx(struct ixgbe_tx_queue *txq,
}
}
+ if (ol_flags & PKT_TX_OUTER_IP_CKSUM) {
+ tx_offload_mask.outer_l2_len |= ~0;
+ tx_offload_mask.outer_l3_len |= ~0;
+ tx_offload_mask.l2_len |= ~0;
+ seqnum_seed |= tx_offload.outer_l3_len
+ << IXGBE_ADVTXD_OUTER_IPLEN;
+ seqnum_seed |= tx_offload.l2_len
+ << IXGBE_ADVTXD_TUNNEL_LEN;
+ }
+
txq->ctx_cache[ctx_idx].flags = ol_flags;
- txq->ctx_cache[ctx_idx].tx_offload.data =
- tx_offload_mask.data & tx_offload.data;
+ txq->ctx_cache[ctx_idx].tx_offload.data[0] =
+ tx_offload_mask.data[0] & tx_offload.data[0];
+ txq->ctx_cache[ctx_idx].tx_offload.data[1] =
+ tx_offload_mask.data[1] & tx_offload.data[1];
txq->ctx_cache[ctx_idx].tx_offload_mask= tx_offload_mask;
ctx_txd->type_tucmd_mlhl = rte_cpu_to_le_32(type_tucmd_mlhl);
vlan_macip_lens = tx_offload.l3_len;
- vlan_macip_lens |= (tx_offload.l2_len << IXGBE_ADVTXD_MACLEN_SHIFT);
+ if (ol_flags & PKT_TX_OUTER_IP_CKSUM)
+ vlan_macip_lens |= (tx_offload.outer_l2_len <<
+ IXGBE_ADVTXD_MACLEN_SHIFT);
+ else
+ vlan_macip_lens |= (tx_offload.l2_len <<
+ IXGBE_ADVTXD_MACLEN_SHIFT);
vlan_macip_lens |= ((uint32_t)tx_offload.vlan_tci <<
IXGBE_ADVTXD_VLAN_SHIFT);
ctx_txd->vlan_macip_lens = rte_cpu_to_le_32(vlan_macip_lens);
ctx_txd->mss_l4len_idx = rte_cpu_to_le_32(mss_l4len_idx);
- ctx_txd->seqnum_seed = 0;
+ ctx_txd->seqnum_seed = seqnum_seed;
}
/*
@@ -454,16 +474,24 @@ what_advctx_update(struct ixgbe_tx_queue *txq, uint64_t
flags,
{
/* If match with the current used context */
if (likely((
[dpdk-dev] [PATCH v4 3/3] maintainers: claim responsibility for arm64 specific files of hash and lpm
On Tue, Mar 01, 2016 at 06:47:46PM +0100, Thomas Monjalon wrote: > 2016-02-12 17:58, Jerin Jacob: > > +F: lib/librte_lpm/rte_lpm_neon.h > > This line should be in the previous patch. Will fix in v5 > > > +F: lib/librte_hash/rte_crc_arm64.h > > +F: lib/librte_hash/rte_cmp_arm64.h > > Yes, hash for ARM was forgotten. > Please add a Fixes: line to refer to the arm enablement of librte_hash. Will fix in v5
[dpdk-dev] [PATCH v7 0/4] Add tunnel filter support for IP in GRE on i40e
Tested-by: Yong Liu - Tested Branch: dpdk-next-net - Tested Commit: 5fa83b5398e26af7537b09605432fcb3d0cc1d41 - OS: Fedora20 3.11.10-301.fc20.x86_64 - GCC: gcc version 4.8.3 20140911 - CPU: Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz - NIC: Intel Corporation Device RedrockCanyou [8086:15a4] - Default x86_64-native-linuxapp-gcc configuration - Prerequisites: - Total 4 cases, 4 passed, 0 failed - Prerequisites command / instruction: Intel(r) X710 (Fortville) NIC plugged in - Case: GRE ipv4 packet detect Description: check IPGRE packet can be normally detected Command / instruction: Start testpmd and enable rxonly forwarding mode testpmd -c -n 4 -- -i --txqflags=0x0 testpmd> set fwd rxonly testpmd> set verbose 1 testpmd> start Send ipv4+GRE+ipv4 packet and check testpmd log match packet type - Case: GRE ipv6 packet detect Description: check IPGRE packet can be normally detected Command / instruction: Start testpmd and enable rxonly forwarding mode testpmd -c -n 4 -- -i --txqflags=0x0 testpmd> set fwd rxonly testpmd> set verbose 1 testpmd> start Send ipv6+GRE+ipv4 packet and check testpmd log match packet type Send ipv6+GRE+ipv6 packet and check testpmd log match packet type - Case: GRE packet filter Description: check IPGRE cloud filter work as expected Command / instruction: Start testpmd with multi queues testpmd -c ff -n 3 -- -i --rxq=4 --txq=4 --txqflags=0x0 testpmd> set fwd rxonly testpmd> set nbcore 4 testpmd> set verbose 1 testpmd> start Add GRE filter that forward inner ip address 0.0.0.0 packets to queue 3 testpmd> tunnel_filter add 0 XX:XX:XX:XX:XX:XX YY:YY:YY:YY:YY:YY \ 0.0.0.0 1 ipingre iip 0 3 Send packet inner ip address matched and check packet recevied by queue 3. Remove tunnel filter and check same packet recevied by queue 0 testpmd> tunnel_filter rm 0 XX:XX:XX:XX:XX:XX YY:YY:YY:YY:YY:YY \ 0.0.0.0 1 ipingre iip 0 3 Add GRE filter that forward outer ip address 0.0.0.0 to queue 3 testpmd> tunnel_filter add 0 XX:XX:XX:XX:XX:XX YY:YY:YY:YY:YY:YY \ 0.0.0.0 1 ipingre oip 0 3 Send packet outer ip address matched and check packet recevied by queue 3. Remove tunnel filter and check same packet recevied by queue 0. testpmd> tunnel_filter rm 0 XX:XX:XX:XX:XX:XX YY:YY:YY:YY:YY:YY \ 0.0.0.0 1 ipingre iip 0 3 - Case: GRE packet chksum offload Description: check IPGRE packet's checksum can be offloaded Command / instruction: Start testpmd with hardware checksum offload enabled:: testpmd -c ff -n 3 -- -i --txqflags=0x0 --enable-rx-cksum testpmd> set verbose 1 testpmd> set fwd csum testpmd> csum set ip hw 0 testpmd> csum set udp hw 0 testpmd> csum set sctp hw 0 testpmd> csum set outer-ip hw 0 testpmd> csum set tcp hw 0 testpmd> csum parse_tunnel on 0 testpmd> start Send packet with wrong outer IP checksum and check forwarded packet IP checksum is correct. Send packet with wrong inner IP checksum and check forwarded packet IP checksum is correct. Send packet with wrong inner TCP checksum and check forwarded packet TCP checksum is correct. Send packet with wrong inner UDP checksum and check forwarded packet UDP checksum is correct. Send packet with wrong inner SCTP checksum and check forwarded packet SCTP checksum is correct. > -Original Message- > From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Xutao Sun > Sent: Tuesday, March 01, 2016 4:41 PM > To: dev at dpdk.org > Subject: [dpdk-dev] [PATCH v7 0/4] Add tunnel filter support for IP in > GRE on i40e > > This patch set adds tunnel filter support for IP in GRE on i40e. > > v2 changes: > Fix the byte order problem. > > v3 changes: > Remove the deprecation notice and update the release notes. > > v4 changes: > Modify the mistakes in cmdline.c in the old patch. > > v5 changes: > Fix type errors and update the testpmd documentation. > > v6 changes: > Use internal variables to convert byte order. > > v7 changes: > Modify the mistakes of code style. > > Xutao Sun (4): > lib/ether: optimize the'rte_eth_tunnel_filter_conf' structure > lib/ether: add IP in GRE type > driver/i40e: implement tunnel filter for IP in GRE > app/test-pmd: test tunnel filter for IP in GRE > > app/test-pmd/cmdline.c | 38 --- > - > doc/guides/rel_notes/deprecation.rst| 5 > doc/guides/rel_notes/release_16_04.rst | 2 ++ > doc/guides/testpmd_app_ug/testpmd_funcs.rst | 35 -- > drivers/net/i40e/i40e_ethdev.c | 45 +++ > -- > lib/librte_ether/rte_eth_ctrl.h | 5 ++-- > 6 files changed, 94 insertions(+), 36 deletions(-) > > -- > 1.9.3
[dpdk-dev] [PATCH v6 1/4] lib/ether: optimize the'rte_eth_tunnel_filter_conf' structure
On 03/02/2016 05:10 AM, Sun, Xutao wrote: > Hi, Panu > >> -Original Message- >> From: Panu Matilainen [mailto:pmatilai at redhat.com] >> Sent: Tuesday, March 01, 2016 4:54 PM >> To: Sun, Xutao ; dev at dpdk.org >> Subject: Re: [dpdk-dev] [PATCH v6 1/4] lib/ether: optimize >> the'rte_eth_tunnel_filter_conf' structure >> >> On 03/01/2016 05:47 AM, Xutao Sun wrote: >>> Change the fields of outer_mac and inner_mac from pointer to struct in >>> order to keep the code's readability. >>> >>> Signed-off-by: Xutao Sun >>> Signed-off-by: Jijiang Liu >>> --- >>>app/test-pmd/cmdline.c | 6 -- >>>doc/guides/rel_notes/deprecation.rst | 5 - >>>doc/guides/rel_notes/release_16_04.rst | 2 ++ >>>drivers/net/i40e/i40e_ethdev.c | 12 ++-- >>>lib/librte_ether/rte_eth_ctrl.h| 4 ++-- >>>5 files changed, 14 insertions(+), 15 deletions(-) >>> >> >> Since this is the commit actually changing the ABI, its best to actually bump >> LIBABIVER right here as well lest it go forgotten, and also update the list >> of >> shared library versions in release notes. >> See commit d8c4ae275582784ec0ff3b2c54a4c861b55bc056 for an example. >> >> Oh and sorry for not noticing this earlier. >> >> - Panu - > > I didn't use the Macro "RTE_NEXT_ABI", so I think I don't need to update the > shared library verisons. > And I also updated the doc about ABI change in the deprecation.rst and > release notes. Shared library version MUST change when there's an incompatible change to prevent programs/libraries linked against the older version to be used with the incompatible version, that is the sole reason for versioning the libraries in the first place. Whether RTE_NEXT_ABI is used or not is not relevant. In fact RTE_NEXT_ABI creates a shared library version of its own, sort of parallel to the current one. The basic idea remains the same though: shared library version has to change when an incompatible change goes in. - Panu - - Panu - - Panu - - Panu -
[dpdk-dev] [PATCH v7 0/4] Add tunnel filter support for IP in GRE on i40e
> -Original Message- > From: Sun, Xutao > Sent: Tuesday, March 01, 2016 4:41 PM > To: dev at dpdk.org > Cc: Wu, Jingjing; Zhang, Helin > Subject: [PATCH v7 0/4] Add tunnel filter support for IP in GRE on i40e > > This patch set adds tunnel filter support for IP in GRE on i40e. > > v2 changes: > Fix the byte order problem. > > v3 changes: > Remove the deprecation notice and update the release notes. > > v4 changes: > Modify the mistakes in cmdline.c in the old patch. > > v5 changes: > Fix type errors and update the testpmd documentation. > > v6 changes: > Use internal variables to convert byte order. > > v7 changes: > Modify the mistakes of code style. > > Xutao Sun (4): > lib/ether: optimize the'rte_eth_tunnel_filter_conf' structure > lib/ether: add IP in GRE type > driver/i40e: implement tunnel filter for IP in GRE > app/test-pmd: test tunnel filter for IP in GRE > > app/test-pmd/cmdline.c | 38 > doc/guides/rel_notes/deprecation.rst| 5 > doc/guides/rel_notes/release_16_04.rst | 2 ++ > doc/guides/testpmd_app_ug/testpmd_funcs.rst | 35 > -- > drivers/net/i40e/i40e_ethdev.c | 45 > +++-- > lib/librte_ether/rte_eth_ctrl.h | 5 ++-- > 6 files changed, 94 insertions(+), 36 deletions(-) > Acked-by: Jingjing Wu > -- > 1.9.3
[dpdk-dev] [PATCH 0/2 v4] i40e: Add floating VEB support for i40e
This patch-set add the support for floating VEB in i40e. All the VFs VSIs can decide whether to connect to the legacy VEB/VEPA or the floating VEB. When connect to the floating VEB a new floating VEB is created. Now all the VFs need to connect to floating VEB or legacy VEB, cannot connect to both of them. The PF and VMDQ,FD VSIs connect to the old legacy VEB/VEPA. All the VEB/VEPA concepts are not specific for FVL, they are defined in the 802.1Qbg spec. This floating VEB only take effects on the specific version F/W. Zhe Tao (2): support floating VEB config Add floating VEB support in i40e doc/guides/rel_notes/release_16_04.rst | 2 + doc/guides/testpmd_app_ug/run_app.rst | 4 + drivers/net/i40e/Makefile | 2 +- drivers/net/i40e/i40e_ethdev.c | 115 - drivers/net/i40e/i40e_ethdev.h | 8 ++ drivers/net/i40e/i40e_pf.c | 11 ++- lib/librte_eal/common/eal_common_options.c | 4 + lib/librte_eal/common/eal_internal_cfg.h | 1 + lib/librte_eal/common/eal_options.h| 2 + 9 files changed, 126 insertions(+), 23 deletions(-) V2: Added the release notes and changed commit log. V3: Changed the VSI release operation. V4: Add the FW version check otherwise it will cause the segment fault. -- 2.1.4
[dpdk-dev] [PATCH 1/2 v4] i40e: support floating VEB config
Add the new floating related argument option in the EAL.
Using this parameter, all the samples can decide whether to use legacy VEB/VEPA
or floating VEB.
Even the floating argument is provided in the EAL, but this floating
feature are only support for FVL so far.
Signed-off-by: Zhe Tao
---
doc/guides/testpmd_app_ug/run_app.rst | 4
lib/librte_eal/common/eal_common_options.c | 4
lib/librte_eal/common/eal_internal_cfg.h | 1 +
lib/librte_eal/common/eal_options.h| 2 ++
4 files changed, 11 insertions(+)
diff --git a/doc/guides/testpmd_app_ug/run_app.rst
b/doc/guides/testpmd_app_ug/run_app.rst
index f605564..2f02f63 100644
--- a/doc/guides/testpmd_app_ug/run_app.rst
+++ b/doc/guides/testpmd_app_ug/run_app.rst
@@ -156,6 +156,10 @@ See the DPDK Getting Started Guides for more information
on these options.
Use malloc instead of hugetlbfs.
+* ``--floating``
+
+Enable floating feature for virtual ethernet switch in the NIC.
+Now only Intel i40e NIC supports this feature.
Testpmd Command-line Options
diff --git a/lib/librte_eal/common/eal_common_options.c
b/lib/librte_eal/common/eal_common_options.c
index 29942ea..29ed7bf 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -95,6 +95,7 @@ eal_long_options[] = {
{OPT_VFIO_INTR, 1, NULL, OPT_VFIO_INTR_NUM},
{OPT_VMWARE_TSC_MAP,0, NULL, OPT_VMWARE_TSC_MAP_NUM },
{OPT_XEN_DOM0, 0, NULL, OPT_XEN_DOM0_NUM },
+ {OPT_FLOATING, 0, NULL, OPT_FLOATING_NUM },
{0, 0, NULL, 0}
};
@@ -896,6 +897,9 @@ eal_parse_common_option(int opt, const char *optarg,
return -1;
}
break;
+ case OPT_FLOATING_NUM:
+ conf->floating = 1;
+ break;
/* don't know what to do, leave this to caller */
default:
diff --git a/lib/librte_eal/common/eal_internal_cfg.h
b/lib/librte_eal/common/eal_internal_cfg.h
index 5f1367e..19b321a 100644
--- a/lib/librte_eal/common/eal_internal_cfg.h
+++ b/lib/librte_eal/common/eal_internal_cfg.h
@@ -68,6 +68,7 @@ struct internal_config {
volatile unsigned xen_dom0_support; /**< support app running on Xen
Dom0*/
volatile unsigned no_pci; /**< true to disable PCI */
volatile unsigned no_hpet;/**< true to disable HPET */
+ volatile unsigned floating; /**< true to enable floating VEB */
volatile unsigned vmware_tsc_map; /**< true to use VMware TSC mapping
* instead of native TSC */
volatile unsigned no_shconf; /**< true if there is no shared
config */
diff --git a/lib/librte_eal/common/eal_options.h
b/lib/librte_eal/common/eal_options.h
index a881c62..413c9e6 100644
--- a/lib/librte_eal/common/eal_options.h
+++ b/lib/librte_eal/common/eal_options.h
@@ -83,6 +83,8 @@ enum {
OPT_VMWARE_TSC_MAP_NUM,
#define OPT_XEN_DOM0 "xen-dom0"
OPT_XEN_DOM0_NUM,
+#define OPT_FLOATING "floating"
+ OPT_FLOATING_NUM,
OPT_LONG_MAX_NUM
};
--
2.1.4
[dpdk-dev] [PATCH 2/2 v4] i40e: Add floating VEB support in i40e
This patch add the support for floating VEB in i40e.
All the VFs VSIs can decide whether to connect to the legacy VEB/VEPA or
the floating VEB. When connect to the floating VEB a new floating VEB is
created. Now all the VFs need to connect to floating VEB or legacy VEB,
cannot connect to both of them. The PF and VMDQ,FD VSIs still connect to
the old legacy VEB/VEPA.
All the VEB/VEPA concepts are not specific for FVL, they are defined in the
802.1Qbg spec.
Now the floating VEB feature is only avaiable in the specific version of FW.
Signed-off-by: Zhe Tao
---
doc/guides/rel_notes/release_16_04.rst | 2 +
drivers/net/i40e/Makefile | 2 +-
drivers/net/i40e/i40e_ethdev.c | 115 +++--
drivers/net/i40e/i40e_ethdev.h | 8 +++
drivers/net/i40e/i40e_pf.c | 11 +++-
5 files changed, 115 insertions(+), 23 deletions(-)
diff --git a/doc/guides/rel_notes/release_16_04.rst
b/doc/guides/rel_notes/release_16_04.rst
index 5786f74..446112c 100644
--- a/doc/guides/rel_notes/release_16_04.rst
+++ b/doc/guides/rel_notes/release_16_04.rst
@@ -46,6 +46,8 @@ This section should contain new features added in this
release. Sample format:
* **Added vhost-user live migration support.**
+* **Added floating VEB support for FVL.**
+
Resolved Issues
---
diff --git a/drivers/net/i40e/Makefile b/drivers/net/i40e/Makefile
index 033ee4a..2e01d45 100644
--- a/drivers/net/i40e/Makefile
+++ b/drivers/net/i40e/Makefile
@@ -39,7 +39,7 @@ LIB = librte_pmd_i40e.a
CFLAGS += -O3
CFLAGS += $(WERROR_FLAGS) -DPF_DRIVER -DVF_DRIVER -DINTEGRATED_VF
CFLAGS += -DX722_SUPPORT -DX722_A0_SUPPORT
-
+CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common
EXPORT_MAP := rte_pmd_i40e_version.map
LIBABIVER := 1
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index ef24122..cf3c346 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -802,6 +802,13 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
((hw->nvm.version >> 4) & 0xff),
(hw->nvm.version & 0xf), hw->nvm.eetrack);
+ /* Need the special FW version support floating VEB */
+ if ((hw->aq.fw_maj_ver == FLOATING_FW_MAJ) &&
+ (hw->aq.fw_min_ver == FLOATING_FW_MIN)) {
+ pf->floating = internal_config.floating;
+ } else {
+ pf->floating = false;
+ }
/* Clear PXE mode */
i40e_clear_pxe_mode(hw);
@@ -3592,21 +3599,27 @@ i40e_veb_release(struct i40e_veb *veb)
struct i40e_vsi *vsi;
struct i40e_hw *hw;
- if (veb == NULL || veb->associate_vsi == NULL)
+ if (veb == NULL)
return -EINVAL;
if (!TAILQ_EMPTY(&veb->head)) {
PMD_DRV_LOG(ERR, "VEB still has VSI attached, can't remove");
return -EACCES;
}
+ /* associate_vsi field is NULL for floating VEB */
+ if (veb->associate_vsi != NULL) {
+ vsi = veb->associate_vsi;
+ hw = I40E_VSI_TO_HW(vsi);
- vsi = veb->associate_vsi;
- hw = I40E_VSI_TO_HW(vsi);
+ vsi->uplink_seid = veb->uplink_seid;
+ vsi->veb = NULL;
+ } else {
+ veb->associate_pf->main_vsi->floating_veb = NULL;
+ hw = I40E_VSI_TO_HW(veb->associate_pf->main_vsi);
+ }
- vsi->uplink_seid = veb->uplink_seid;
i40e_aq_delete_element(hw, veb->seid, NULL);
rte_free(veb);
- vsi->veb = NULL;
return I40E_SUCCESS;
}
@@ -3618,9 +3631,9 @@ i40e_veb_setup(struct i40e_pf *pf, struct i40e_vsi *vsi)
int ret;
struct i40e_hw *hw;
- if (NULL == pf || vsi == NULL) {
+ if (NULL == pf) {
PMD_DRV_LOG(ERR, "veb setup failed, "
- "associated VSI shouldn't null");
+ "associated PF shouldn't null");
return NULL;
}
hw = I40E_PF_TO_HW(pf);
@@ -3632,11 +3645,19 @@ i40e_veb_setup(struct i40e_pf *pf, struct i40e_vsi *vsi)
}
veb->associate_vsi = vsi;
+ veb->associate_pf = pf;
TAILQ_INIT(&veb->head);
- veb->uplink_seid = vsi->uplink_seid;
+ veb->uplink_seid = vsi ? vsi->uplink_seid : 0;
- ret = i40e_aq_add_veb(hw, veb->uplink_seid, vsi->seid,
- I40E_DEFAULT_TCMAP, false, false, &veb->seid, NULL);
+ /* create floating veb if vsi is NULL */
+ if (vsi != NULL) {
+ ret = i40e_aq_add_veb(hw, veb->uplink_seid, vsi->seid,
+ I40E_DEFAULT_TCMAP, false, false,
+ &veb->seid, NULL);
+ } else {
+ ret = i40e_aq_add_veb(hw, 0, 0, I40E_DEFAULT_TCMAP,
+ true, false, &veb->seid, NULL);
+ }
if (ret != I40E_SUCCESS) {
PMD_DRV_LOG(ERR, "Add veb failed, aq_err: %d",
@@ -3652,10 +3673,10 @@ i4
[dpdk-dev] [PATCH v4 4/4] ena: DPDK polling-mode driver for Amazon Elastic Network Adapters (ENA)
On 03/01/2016 06:46 PM, Jan Medala wrote:
> This is a PMD for the Amazon ethernet ENA family.
> The driver operates variety of ENA adapters through feature negotiation
> with the adapter and upgradable commands set.
> ENA driver handles PCI Physical and Virtual ENA functions.
>
> Signed-off-by: Evgeny Schemeilin
> Signed-off-by: Jan Medala
> Signed-off-by: Jakub Palider
> ---
> config/common_linuxapp | 11 +
> drivers/net/Makefile|1 +
> drivers/net/ena/Makefile| 65 ++
> drivers/net/ena/ena_ethdev.c| 1311
> +++
> drivers/net/ena/ena_ethdev.h| 155
> drivers/net/ena/ena_logs.h | 74 ++
> drivers/net/ena/ena_platform.h | 58 ++
> drivers/net/ena/rte_pmd_ena_version.map |4 +
> mk/rte.app.mk |1 +
> 9 files changed, 1680 insertions(+)
> create mode 100644 drivers/net/ena/Makefile
> create mode 100644 drivers/net/ena/ena_ethdev.c
> create mode 100644 drivers/net/ena/ena_ethdev.h
> create mode 100644 drivers/net/ena/ena_logs.h
> create mode 100644 drivers/net/ena/ena_platform.h
> create mode 100644 drivers/net/ena/rte_pmd_ena_version.map
>
[...]
> diff --git a/drivers/net/ena/Makefile b/drivers/net/ena/Makefile
> new file mode 100644
> index 000..0beb850
> --- /dev/null
> +++ b/drivers/net/ena/Makefile
> @@ -0,0 +1,65 @@
> +#
[...]
> +include $(RTE_SDK)/mk/rte.vars.mk
> +
> +#
> +# library name
> +#
> +LIB = librte_pmd_ena.a
> +CFLAGS += $(WERROR_FLAGS) -O2
> +INCLUDES :=-I$(SRCDIR) -I$(SRCDIR)/base/ena_defs -I$(SRCDIR)/base
> +
> +EXPORT_MAP := rte_pmd_ena_version.map
> +LIBABIVER := 1
> +
> +VPATH += $(SRCDIR)/base
> +#
> +# all source are stored in SRCS-y
> +#
> +SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_ethdev.c
> +SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_com.c
> +SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_eth_com.c
> +
> +# this lib depends upon:
> +DEPDIRS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += lib/librte_eal lib/librte_ether
> +DEPDIRS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += lib/librte_mempool lib/librte_mbuf
> +DEPDIRS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += lib/librte_net lib/librte_malloc
> +
> +ifeq ($(CONFIG_RTE_EXEC_ENV),"cvos")
> +CFLAGS += -Wno-old-style-definition
> +endif
Hmm, what's this? There's no "cvos" exec env in DPDK that I know of, and
while its of course quite harmless I dont think its entirely appropriate
to have references to in-house projects and the like (assuming that's
what it is) in an OSS project.
[...]
> diff --git a/drivers/net/ena/rte_pmd_ena_version.map
> b/drivers/net/ena/rte_pmd_ena_version.map
> new file mode 100644
> index 000..ef35398
> --- /dev/null
> +++ b/drivers/net/ena/rte_pmd_ena_version.map
> @@ -0,0 +1,4 @@
> +DPDK_2.0 {
> +
> + local: *;
> +};
The symbol versions should reflect the actual DPDK version where
introduced. Its fairly academical here since no actual symbols are
exported but for correctness sake, it should say DPDK_16.04 as the version.
- Panu -
[dpdk-dev] [PATCH 1/3] kcp: add kernel control path kernel module
On 03/02/2016 04:02 AM, Stephen Hemminger wrote: > On Mon, 29 Feb 2016 08:33:25 -0600 > Jay Rolette wrote: > >> On Mon, Feb 29, 2016 at 5:06 AM, Thomas Monjalon > 6wind.com> >> wrote: >> >>> Hi, >>> I totally agree with Avi's comments. >>> This topic is really important for the future of DPDK. >>> So I think we must give some time to continue the discussion >>> and have netdev involved in the choices done. >>> As a consequence, these series should not be merged in the release 16.04. >>> Thanks for continuing the work. >>> >> >> I know you guys are very interested in getting rid of the out-of-tree >> drivers, but please do not block incremental improvements to DPDK in the >> meantime. Ferruh's patch improves the usability of KNI. Don't throw out >> good and useful enhancements just because it isn't where you want to be in >> the end. >> >> I'd like to see these be merged. >> >> Jay > > The code is really not ready. I am okay with cooperative development > but the current code needs to go into a staging type tree. > No compatibility, no ABI guarantees, more of an RFC. > Don't want vendors building products with it then screaming when it > gets rebuilt/reworked/scrapped. > Exactly. If a venturous vendor wants to go and build a product based on something in a staging tree there's nothing stopping them from doing that, but at least it should set the expectations straight. - Panu -
[dpdk-dev] [PATCH v1 0/3] virtio vector and misc
On Tue, Mar 01, 2016 at 03:32:17PM +0530, Santosh Shukla wrote: > - 1st patch: let non-x86 arch use virtio pmd driver in non-vec > - 2nd patch: enable virtio arm support > - 3rd patch: update virtio for arm feature entry in release guide. Series looks good to me: Acked-by: Yuanhan Liu However, FYI, Thomas would like to see that the release note is added __inside__ the patch that acutally enables it, but not in another standalone patch. In another word, you should squash patch 3 to patch 2. I'm wondering Thomas could do that for you this time while applying your pathces. But, this is just a kind remind, and you should not do that next time. --yliu
[dpdk-dev] [PATCH v2] ethdev: fix byte order inconsistence between fdir flow and mask
On Mon, Feb 01, 2016 at 10:48:21AM +0800, Jingjing Wu wrote:
> Fixed issue of byte order in ethdev library that the structure
> for setting fdir's mask and flow entry is inconsist and made
> inputs of mask be in big endian.
>
> Fixes: 76c6f89e80d4 ("ixgbe: support new flow director masks")
> Fixes: 2d4c1a9ea2ac ("ethdev: add new flow director masks")
>
> Reported-by: Yaacov Hazan
> Signed-off-by: Jingjing Wu
> ---
> v2 changes:
> fix typo and reword API doc.
>
> app/test-pmd/cmdline.c | 6 ++---
> doc/guides/rel_notes/release_2_3.rst | 6 +
> drivers/net/ixgbe/ixgbe_fdir.c | 47
> ++--
> lib/librte_ether/rte_eth_ctrl.h | 17 ++---
> 4 files changed, 51 insertions(+), 25 deletions(-)
>
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index 73298c9..13194c9 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -8687,13 +8687,13 @@ cmd_flow_director_mask_parsed(void *parsed_result,
> return;
> }
Acked-by: Zhe Tao
[dpdk-dev] [PATCH v1 0/3] virtio vector and misc
On Wed, Mar 2, 2016 at 2:02 PM, Yuanhan Liu wrote: > On Tue, Mar 01, 2016 at 03:32:17PM +0530, Santosh Shukla wrote: >> - 1st patch: let non-x86 arch use virtio pmd driver in non-vec >> - 2nd patch: enable virtio arm support >> - 3rd patch: update virtio for arm feature entry in release guide. > > Series looks good to me: > > Acked-by: Yuanhan Liu > > However, FYI, Thomas would like to see that the release note is > added __inside__ the patch that acutally enables it, but not in > another standalone patch. In another word, you should squash > patch 3 to patch 2. > > I'm wondering Thomas could do that for you this time while applying > your pathces. But, this is just a kind remind, and you should not > do that next time. > Thanks!, Thomas, Can you please take care? > --yliu
[dpdk-dev] [PATCH v5 1/5] lib/librte_ether: change function name of tunnel port config
On 03/02/2016 08:45 AM, Wenzhuo Lu wrote: > The names of function for tunnel port configuration are not > accurate. They're tunnel_add/del, better change them to > tunnel_port_add/del. > As it may be an ABI change if change the names directly, the > new functions are added but not remove the old ones. The old > ones will be removed in the next release after an ABI change > announcement. > > Signed-off-by: Wenzhuo Lu > --- > app/test-pmd/cmdline.c | 6 +++-- > examples/tep_termination/vxlan_setup.c | 2 +- > lib/librte_ether/rte_ethdev.c | 45 > ++ > lib/librte_ether/rte_ethdev.h | 18 ++ > 4 files changed, 68 insertions(+), 3 deletions(-) > [...] > diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h > index 16da821..f1f96c1 100644 > --- a/lib/librte_ether/rte_ethdev.h > +++ b/lib/librte_ether/rte_ethdev.h [...] > @@ -3403,6 +3415,9 @@ rte_eth_dev_rss_hash_conf_get(uint8_t port_id, > int > rte_eth_dev_udp_tunnel_add(uint8_t port_id, > struct rte_eth_udp_tunnel *tunnel_udp); > +int > +rte_eth_dev_udp_tunnel_port_add(uint8_t port_id, > + struct rte_eth_udp_tunnel *tunnel_udp); > >/** >* Detete UDP tunneling port configuration of Ethernet device > @@ -3420,6 +3435,9 @@ rte_eth_dev_udp_tunnel_add(uint8_t port_id, > int > rte_eth_dev_udp_tunnel_delete(uint8_t port_id, > struct rte_eth_udp_tunnel *tunnel_udp); > +int > +rte_eth_dev_udp_tunnel_port_delete(uint8_t port_id, > +struct rte_eth_udp_tunnel *tunnel_udp); > > /** >* Check whether the filter type is supported on an Ethernet device. > You need to add these functions to rte_ether_version.map in order to export them. - Panu -
[dpdk-dev] [PATCH v2 4/6] bond mode 4: allow external state machine
Hi Eric,
> > > > @@ -157,6 +159,7 @@ struct rte_eth_bond_8023ad_conf {
> > > > uint32_t tx_period_ms;
> > > > uint32_t rx_marker_period_ms;
> > > > uint32_t update_timeout_ms;
> > > > + rte_eth_bond_8023ad_ext_slowrx_fn slowrx_cb;
> > > > };
> > >
> > > This still is a likely an ABI break, previously discussed around here:
> > > http://dpdk.org/ml/archives/dev/2015-November/027321.html
> > >
> > > It might not be embedded anywhere in DPDK codebase, but there's no
> > > telling what others might have done with it (have an array of them,
> > > embed in other structs etc).
> > >
> > > Also ultimately ABI compatibility goes both ways: when the library
> > > soname does not change then an application is free to assume both
> > > downgrading and upgrading are safe. In this case, upgrading *might*
> > > be okay, downgrading certainly is not. So by that measure it definitely is
> an ABI break.
> > >
> > > [...]
> > > > diff --git a/drivers/net/bonding/rte_eth_bond_version.map
> > > > b/drivers/net/bonding/rte_eth_bond_version.map
> > > > index 22bd920..33d73ff 100644
> > > > --- a/drivers/net/bonding/rte_eth_bond_version.map
> > > > +++ b/drivers/net/bonding/rte_eth_bond_version.map
> > > > @@ -27,3 +27,9 @@ DPDK_2.1 {
> > > > rte_eth_bond_free;
> > > >
> > > > } DPDK_2.0;
> > > > +
> > > > +DPDK_2.2 {
> > > > + rte_eth_bond_8023ad_ext_collect;
> > > > + rte_eth_bond_8023ad_ext_distrib;
> > > > + rte_eth_bond_8023ad_ext_slowtx;
> > > > +} DPDK_2.1;
> > > >
> > >
> > > These symbols are not part of DPDK 2.2, the version here is wrong.
> > > Technically it would not actually matter much but better not to
> > > confuse things unnecessarily.
> > >
> > > - Panu -
> >
> > It looks like Panu's points are valid, a V3 of this patch set which takes
> > care of
> these issues will be needed.
> >
> > Patches 1/6, 5/6 and 6/6 of the patch set are bug fixes, so each patch
> should contain a fixes line.
> > Patches 2/6, 3/6 and 4/6 are a new feature, the release notes should be
> updated for this feature.
> >
> > Could I suggest splitting the patch set into two patch sets, a bug fix patch
> set and a new feature patch set.
> >
> > Regards,
> >
> > Bernard.
>
> Bernard, a v3 is on the way. I included only things that are fixes, but the
> patch set doesn't quite match the set of patch numbers you listed above.
> 1/6 (bond: use existing enslaved device queues) is an improvement, but
> doesn't really fix anything that was broken, so I left that out.
> 2/6 (bond mode 4: copy entire config structure) and 3/6 (bond mode 4:
> do not ignore multicast) fix bugs and are included.
>
>
> Eric
Thanks for the V3 patchset and clarifying which patches in the V2 patchset were
fixes.
Regards,
Bernard.
[dpdk-dev] New driver (large patch) question.
Hi, 2016-03-01 19:56, Stephen Hurd: > I submitted a new driver on Friday, and it was rejected for being over 300k. > > The rejection email suggested contacing dev-owner at dpdk.org, which I did on > Monday with no reply. > > What's the process to submit patches larger than the mailing list size > limit? A patch has two lives: 1/ it must be reviewed and accepted 2/ it will stay in the git history for future reference Those 2 periods require the patch to be well explained, with a reasonnable scope and a human readable size. The primary rule to think about is to introduce only one feature per patch. So the size should be naturally small and the mailing list don't need to accept greater sizes. To make it short, please split your driver in several introduction steps.
[dpdk-dev] [PATCH 1/3] kcp: add kernel control path kernel module
Le 02/03/2016 09:27, Panu Matilainen a ?crit : >>> I'd like to see these be merged. >>> >>> Jay >> >> The code is really not ready. I am okay with cooperative development >> but the current code needs to go into a staging type tree. >> No compatibility, no ABI guarantees, more of an RFC. >> Don't want vendors building products with it then screaming when it >> gets rebuilt/reworked/scrapped. >> > > Exactly. +1 too We need to build on this innovation while there is a path for kernel mainstream. The logic of using a staging is a good one. Thomas, can we open a staging folder into the DPDK like it is done into the kernel? Thank you, Vincent
[dpdk-dev] [PATCH 1/3] kcp: add kernel control path kernel module
> On Mar 2, 2016, at 4:47 AM, Vincent JARDIN > wrote: > > Le 02/03/2016 09:27, Panu Matilainen a ?crit : I'd like to see these be merged. Jay >>> >>> The code is really not ready. I am okay with cooperative development >>> but the current code needs to go into a staging type tree. >>> No compatibility, no ABI guarantees, more of an RFC. >>> Don't want vendors building products with it then screaming when it >>> gets rebuilt/reworked/scrapped. >>> >> >> Exactly. > > +1 too > > We need to build on this innovation while there is a path for kernel > mainstream. The logic of using a staging is a good one. > > Thomas, > > can we open a staging folder into the DPDK like it is done into the kernel? Can we take it as a requirement to support FreeBSD this time around?
[dpdk-dev] [PATCH v2] app/testpmd Fix max_socket detection
> -Original Message-
> From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Stephen Hurd
> Sent: Wednesday, January 13, 2016 10:24 PM
> To: dev at dpdk.org
> Subject: [dpdk-dev] [PATCH v2] app/testpmd Fix max_socket detection
>
> Previously, max_socket was set to the highest numbered socket with
> an enabled lcore. The intent is to set it to the highest socket
> regardless of it being enabled.
>
> Change-Id: I6306af0f90aa3c1fc5ffed75d1eed8297d29e132
> Signed-off-by: Stephen Hurd
>
> v2: Forgot to commit before sending email... sorry for the nouse.
> ---
> app/test-pmd/testpmd.c | 10 +-
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
> index 6129c26..a4088f9 100644
> --- a/app/test-pmd/testpmd.c
> +++ b/app/test-pmd/testpmd.c
> @@ -359,17 +359,17 @@ set_default_fwd_lcores_config(void)
>
> nb_lc = 0;
> for (i = 0; i < RTE_MAX_LCORE; i++) {
> - if (! rte_lcore_is_enabled(i))
> - continue;
> - if (i == rte_get_master_lcore())
> - continue;
> - fwd_lcores_cpuids[nb_lc++] = i;
> sock_num = rte_lcore_to_socket_id(i) + 1;
> if (sock_num > max_socket) {
> if (sock_num > RTE_MAX_NUMA_NODES)
> rte_exit(EXIT_FAILURE, "Total sockets greater
> than %u\n", RTE_MAX_NUMA_NODES);
> max_socket = sock_num;
> }
> + if (! rte_lcore_is_enabled(i))
> + continue;
> + if (i == rte_get_master_lcore())
> + continue;
> + fwd_lcores_cpuids[nb_lc++] = i;
> }
> nb_lcores = (lcoreid_t) nb_lc;
> nb_cfg_lcores = nb_lcores;
> --
> 1.9.1
Acked-by: Pablo de Lara
[dpdk-dev] [PATCH v4 2/4] kcp: add kernel control path kernel module
On 3/1/2016 11:06 PM, Stephen Hemminger wrote: > On Tue, 1 Mar 2016 15:41:58 + > Ferruh Yigit wrote: > >> +#ifdef RTE_KCP_KO_DEBUG >> +#define KCP_DBG(args...) pr_info(args) >> +#else >> +#define KCP_DBG(args...) >> +#en > > Why not use pr_debug() which is compile enabled already and supports dynamic > enabling as well. > Because of dynamic debug control, it is more complex and less known. But I will update it to pr_debug. Thanks, ferruh
[dpdk-dev] [PATCH v4 2/4] kcp: add kernel control path kernel module
On 3/1/2016 11:10 PM, Stephen Hemminger wrote:
> On Tue, 1 Mar 2016 15:41:58 +
> Ferruh Yigit wrote:
>
>> +struct kcp_ethtool_msg {
>> +int cmd_id;
>> +int port_id;
>> +unsigned int flag;
>> +char input_buffer[KCP_ETHTOOL_MSG_LEN];
>> +char output_buffer[KCP_ETHTOOL_MSG_LEN];
>> +int input_buffer_len;
>> +int output_buffer_len;
>> +int err;
>> +};
>> +
>
> In general try and use unsigned where ever it is possible.
> Having int and char types was the C style back in Unix, but now
> most code use size_t, uint32_t and uint8_t.
>
Thanks for the comments, this and previous ones, I will update accordingly.
>
> You seem to be trying to force ethtool into netlink.
> There are some others doing that already, so following their work
> would be good.
>
Sure I would like to check them, where can I find them? inside the kernel?
Thanks,
ferruh
[dpdk-dev] [PATCH v5 0/2] fm10k: enable FTAG based forwarding
v5: * Used kvargs api to parse the devargs parameter. * Put release note into the driver patch. v4: * Removed the build time config option, used devargs to config FTAG. * Rebased on head of dpdk-next-net/rel_16_04 branch. v3: * Removed "\n" in PMD_INIT_LOG. * Returned "-ENOTSUP" instead of -1 in VF FTAG use case. v2: * Gave an error message for VF FTAG use case. * Added a notice in the doc to emphasize that application should ensure an appropriate FTAG for every frame in FTAG based forwarding mode. Wang Xiao W (2): fm10k: enable FTAG based forwarding doc: add introduction for fm10k FTAG based forwarding doc/guides/nics/fm10k.rst | 16 - doc/guides/rel_notes/release_16_04.rst | 2 ++ drivers/net/fm10k/fm10k.h | 2 ++ drivers/net/fm10k/fm10k_ethdev.c | 65 +- drivers/net/fm10k/fm10k_rxtx.c | 15 drivers/net/fm10k/fm10k_rxtx_vec.c | 3 ++ 6 files changed, 101 insertions(+), 2 deletions(-) -- 1.9.3
[dpdk-dev] [PATCH v5 1/2] fm10k: enable FTAG based forwarding
This patch enables reading sglort info into mbuf for RX and inserting
an FTAG at the beginning of the packet for TX. The vlan_tci_outer field
selected from rte_mbuf structure for sglort is not used in fm10k now.
In FTAG based forwarding mode, the switch will forward packets according
to glort info in FTAG rather than mac and vlan table.
To activate this feature, user needs to pass a devargs parameter to eal
for fm10k device like "-w :84:00.0,enable_ftag=1". Currently this
feature is supported only on PF, because FM10K_PFVTCTL register is
read-only for VF.
Signed-off-by: Wang Xiao W
Acked-by: Jing Chen
Acked-by: John McNamara
---
doc/guides/rel_notes/release_16_04.rst | 2 ++
drivers/net/fm10k/fm10k.h | 2 ++
drivers/net/fm10k/fm10k_ethdev.c | 65 +-
drivers/net/fm10k/fm10k_rxtx.c | 15
drivers/net/fm10k/fm10k_rxtx_vec.c | 3 ++
5 files changed, 86 insertions(+), 1 deletion(-)
diff --git a/doc/guides/rel_notes/release_16_04.rst
b/doc/guides/rel_notes/release_16_04.rst
index 73494f9..c3ee8b1 100644
--- a/doc/guides/rel_notes/release_16_04.rst
+++ b/doc/guides/rel_notes/release_16_04.rst
@@ -49,6 +49,8 @@ This section should contain new features added in this
release. Sample format:
* Free multiple mbufs at a time to reduce freeing mbuf cycles.
+* **Added fm10k FTAG based forwarding support.**
+
* **Added new new X550EM_a devices.**
Added new X550EM_a devices and their mac types, X550EM_a and X550EM_a_vf.
diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h
index 770d6ba..05aa1a2 100644
--- a/drivers/net/fm10k/fm10k.h
+++ b/drivers/net/fm10k/fm10k.h
@@ -204,6 +204,7 @@ struct fm10k_rx_queue {
uint8_t port_id;
uint8_t drop_en;
uint8_t rx_deferred_start; /* don't start this queue in dev start. */
+ uint16_t rx_ftag_en; /* indicates FTAG RX supported */
};
/*
@@ -240,6 +241,7 @@ struct fm10k_tx_queue {
uint8_t port_id;
uint8_t tx_deferred_start; /** don't start this queue in dev start. */
uint16_t queue_id;
+ uint16_t tx_ftag_en; /* indicates FTAG TX supported */
};
struct fm10k_txq_ops {
diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index 3c1e1d6..ad6cad9 100644
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
#include "fm10k.h"
#include "base/fm10k_api.h"
@@ -79,6 +80,7 @@ static void fm10k_tx_queue_release(void *queue);
static void fm10k_rx_queue_release(void *queue);
static void fm10k_set_rx_function(struct rte_eth_dev *dev);
static void fm10k_set_tx_function(struct rte_eth_dev *dev);
+static int fm10k_check_ftag(struct rte_devargs *devargs);
struct fm10k_xstats_name_off {
char name[RTE_ETH_XSTATS_NAME_SIZE];
@@ -668,6 +670,19 @@ fm10k_dev_tx_init(struct rte_eth_dev *dev)
PMD_INIT_LOG(ERR, "failed to disable queue %d", i);
return -1;
}
+ /* Enable use of FTAG bit in TX descriptor, PFVTCTL
+* register is read-only for VF.
+*/
+ if (fm10k_check_ftag(dev->pci_dev->devargs)) {
+ if (hw->mac.type == fm10k_mac_pf) {
+ FM10K_WRITE_REG(hw, FM10K_PFVTCTL(i),
+ FM10K_PFVTCTL_FTAG_DESC_ENABLE);
+ PMD_INIT_LOG(DEBUG, "FTAG mode is enabled");
+ } else {
+ PMD_INIT_LOG(ERR, "VF FTAG is not supported.");
+ return -ENOTSUP;
+ }
+ }
/* set location and size for descriptor ring */
FM10K_WRITE_REG(hw, FM10K_TDBAL(i),
@@ -2597,15 +2612,57 @@ static const struct eth_dev_ops fm10k_eth_dev_ops = {
.rss_hash_conf_get = fm10k_rss_hash_conf_get,
};
+static int ftag_check_handler(__rte_unused const char *key,
+ const char *value, __rte_unused void *opaque)
+{
+ if (strcmp(value, "1"))
+ return -1;
+
+ return 0;
+}
+
+static int
+fm10k_check_ftag(struct rte_devargs *devargs)
+{
+ struct rte_kvargs *kvlist;
+ const char *ftag_key = "enable_ftag";
+
+ if (devargs == NULL)
+ return 0;
+
+ kvlist = rte_kvargs_parse(devargs->args, NULL);
+ if (kvlist == NULL)
+ return 0;
+
+ if (!rte_kvargs_count(kvlist, ftag_key)) {
+ rte_kvargs_free(kvlist);
+ return 0;
+ }
+ /* FTAG is enabled when there's key-value pair: enable_ftag=1 */
+ if (rte_kvargs_process(kvlist, ftag_key,
+ ftag_check_handler, NULL) < 0) {
+ rte_kvargs_free(kvlist);
+ return 0;
+ }
+ rte_kvargs_free(kvlist);
+
+ return 1;
+}
+
stati
[dpdk-dev] [PATCH v5 2/2] doc: add introduction for fm10k FTAG based forwarding
Add a brief introduction on FTAG, describe what's FTAG and how it works in forwarding. Signed-off-by: Wang Xiao W --- doc/guides/nics/fm10k.rst | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/fm10k.rst b/doc/guides/nics/fm10k.rst index dc5cb6e..89d6ae2 100644 --- a/doc/guides/nics/fm10k.rst +++ b/doc/guides/nics/fm10k.rst @@ -1,5 +1,5 @@ .. BSD LICENSE -Copyright(c) 2015 Intel Corporation. All rights reserved. +Copyright(c) 2015-2016 Intel Corporation. All rights reserved. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -34,6 +34,20 @@ FM10K Poll Mode Driver The FM10K poll mode driver library provides support for the Intel FM1 (FM10K) family of 40GbE/100GbE adapters. +FTAG Based Forwarding of FM10K +-- + +FTAG Based Forwarding is a unique feature of FM10K. The FM10K family of NICs +support the addition of a Fabric Tag (FTAG) to carry special information. +The FTAG is placed at the beginning of the frame, it contains information +such as where the packet comes from and goes, and the vlan tag. In FTAG based +forwarding mode, the switch logic forwards packets according to glort (global +resource tag) information, rather than the mac and vlan table. Currently this +feature works only on PF. + +To enable this feature, the user should pass a devargs parameter to the eal +like "-w 84:00.0,enable_ftag=1", and the application should make sure an +appropriate FTAG is inserted for every frame on TX side. Limitations --- -- 1.9.3
[dpdk-dev] [PATCH 1/3] kcp: add kernel control path kernel module
2016-03-02 11:47, Vincent JARDIN: > Le 02/03/2016 09:27, Panu Matilainen a ?crit : > >>> I'd like to see these be merged. > >>> > >>> Jay > >> > >> The code is really not ready. I am okay with cooperative development > >> but the current code needs to go into a staging type tree. > >> No compatibility, no ABI guarantees, more of an RFC. > >> Don't want vendors building products with it then screaming when it > >> gets rebuilt/reworked/scrapped. > >> > > > > Exactly. > > +1 too > > We need to build on this innovation while there is a path for kernel > mainstream. The logic of using a staging is a good one. > > Thomas, > > can we open a staging folder into the DPDK like it is done into the kernel? It's possible to create a staging directory if everybody agree. It is important to state in a README file or in the doc/ that there will be no guarantee (no stable ABI, no validation and can be dropped) and that it is a work in progress, a suggestion to discuss with the kernel community. The kernel modules must clearly target an upstream integration.
[dpdk-dev] [PATCH v2 00/12] extend flow director's fields in i40e driver
v2 changes: - rebase on dpdk-next-net/rel_16_04 - comments rewording. - redefine the value of RTE_ETH_INPUT_SET_L3_IP4_TTL to avoid ABI breaking. - remove ABI announce in Deprecation. - fix the ethertype setting when program filter in v1 patch set. This patch set extends flow director to support filtering by additional fields below in i40e driver: - TOS, Protocol and TTL in IP header - Tunnel id if NVGRE/GRE/VxLAN packets - single vlan or inner vlan Andrey Chilikin (1): i40e: fix VLAN bitmasks for hash/fdir input sets for tunnels Jingjing Wu (11): ethdev: extend flow director to support input set selection i40e: split function for input set change of hash and fdir i40e: remove flex payload from INPUT_SET_SELECT operation i40e: restore default setting on input set of filters i40e: extend flow director to filter by more IP Header fields testpmd: extend commands for filter's input set changing librte_ether: extend rte_eth_fdir_flow to support tunnel format i40e: extend flow director to filter by tunnel ID testpmd: extend commands for fdir's tunnel id input set i40e: extend flow director to filter by vlan id testpmd: extend commands for fdir's vlan input set app/test-pmd/cmdline.c | 121 +++-- doc/guides/rel_notes/deprecation.rst| 4 - doc/guides/rel_notes/release_16_04.rst | 5 + doc/guides/testpmd_app_ug/testpmd_funcs.rst | 56 ++-- drivers/net/i40e/i40e_ethdev.c | 401 +--- drivers/net/i40e/i40e_ethdev.h | 11 +- drivers/net/i40e/i40e_fdir.c| 206 ++ lib/librte_ether/rte_eth_ctrl.h | 35 ++- 8 files changed, 570 insertions(+), 269 deletions(-) -- 2.4.0
[dpdk-dev] [PATCH v2 01/12] ethdev: extend flow director to support input set selection
This patch added RTE_ETH_INPUT_SET_L3_IP4_TTL,
RTE_ETH_INPUT_SET_L3_IP6_HOP_LIMITS input field type and extended
struct rte_eth_ipv4_flow and rte_eth_ipv6_flow to support filtering
by tos, protocol and ttl.
Signed-off-by: Jingjing Wu
---
lib/librte_ether/rte_eth_ctrl.h | 8
1 file changed, 8 insertions(+)
diff --git a/lib/librte_ether/rte_eth_ctrl.h b/lib/librte_ether/rte_eth_ctrl.h
index ce224ad..8c51023 100644
--- a/lib/librte_ether/rte_eth_ctrl.h
+++ b/lib/librte_ether/rte_eth_ctrl.h
@@ -340,6 +340,8 @@ enum rte_eth_input_set_field {
RTE_ETH_INPUT_SET_L3_IP4_PROTO,
RTE_ETH_INPUT_SET_L3_IP6_TC,
RTE_ETH_INPUT_SET_L3_IP6_NEXT_HEADER,
+ RTE_ETH_INPUT_SET_L3_IP4_TTL,
+ RTE_ETH_INPUT_SET_L3_IP6_HOP_LIMITS,
/* L4 */
RTE_ETH_INPUT_SET_L4_UDP_SRC_PORT = 257,
@@ -407,6 +409,9 @@ struct rte_eth_l2_flow {
struct rte_eth_ipv4_flow {
uint32_t src_ip; /**< IPv4 source address to match. */
uint32_t dst_ip; /**< IPv4 destination address to match. */
+ uint8_t tos; /**< Type of service to match. */
+ uint8_t ttl; /**< Time to live */
+ uint8_t proto;
};
/**
@@ -443,6 +448,9 @@ struct rte_eth_sctpv4_flow {
struct rte_eth_ipv6_flow {
uint32_t src_ip[4]; /**< IPv6 source address to match. */
uint32_t dst_ip[4]; /**< IPv6 destination address to match. */
+ uint8_t tc; /**< Traffic class to match. */
+ uint8_t proto; /**< Protocol, next header. */
+ uint8_t hop_limits;
};
/**
--
2.4.0
[dpdk-dev] [PATCH v2 02/12] i40e: split function for input set change of hash and fdir
This patch split function for input set changing of hash
and fdir to avoid multiple check on different situation.
Signed-off-by: Jingjing Wu
---
drivers/net/i40e/i40e_ethdev.c | 233 +
drivers/net/i40e/i40e_ethdev.h | 11 +-
drivers/net/i40e/i40e_fdir.c | 5 +-
3 files changed, 107 insertions(+), 142 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index c86febc..85419ab 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -6914,25 +6914,6 @@ i40e_generate_inset_mask_reg(uint64_t inset, uint32_t
*mask, uint8_t nb_elem)
return idx;
}
-static uint64_t
-i40e_get_reg_inset(struct i40e_hw *hw, enum rte_filter_type filter,
- enum i40e_filter_pctype pctype)
-{
- uint64_t reg = 0;
-
- if (filter == RTE_ETH_FILTER_HASH) {
- reg = I40E_READ_REG(hw, I40E_GLQF_HASH_INSET(1, pctype));
- reg <<= I40E_32_BIT_WIDTH;
- reg |= I40E_READ_REG(hw, I40E_GLQF_HASH_INSET(0, pctype));
- } else if (filter == RTE_ETH_FILTER_FDIR) {
- reg = I40E_READ_REG(hw, I40E_PRTQF_FD_INSET(pctype, 1));
- reg <<= I40E_32_BIT_WIDTH;
- reg |= I40E_READ_REG(hw, I40E_PRTQF_FD_INSET(pctype, 0));
- }
-
- return reg;
-}
-
static void
i40e_check_write_reg(struct i40e_hw *hw, uint32_t addr, uint32_t val)
{
@@ -6945,103 +6926,96 @@ i40e_check_write_reg(struct i40e_hw *hw, uint32_t
addr, uint32_t val)
(uint32_t)I40E_READ_REG(hw, addr));
}
-static int
-i40e_set_hash_inset_mask(struct i40e_hw *hw,
-enum i40e_filter_pctype pctype,
-enum rte_filter_input_set_op op,
-uint32_t *mask_reg,
-uint8_t num)
+int
+i40e_hash_filter_inset_select(struct i40e_hw *hw,
+struct rte_eth_input_set_conf *conf)
{
- uint32_t reg;
- uint8_t i;
+ struct i40e_pf *pf = &((struct i40e_adapter *)hw->back)->pf;
+ enum i40e_filter_pctype pctype;
+ uint64_t input_set, inset_reg = 0;
+ uint32_t mask_reg[I40E_INSET_MASK_NUM_REG] = {0};
+ int ret, i, num;
- if (!mask_reg || num > RTE_ETH_INPUT_SET_SELECT)
+ if (!hw || !conf) {
+ PMD_DRV_LOG(ERR, "Invalid pointer");
+ return -EFAULT;
+ }
+ if (conf->op != RTE_ETH_INPUT_SET_SELECT &&
+ conf->op != RTE_ETH_INPUT_SET_ADD) {
+ PMD_DRV_LOG(ERR, "Unsupported input set operation");
return -EINVAL;
-
- if (op == RTE_ETH_INPUT_SET_SELECT) {
- for (i = 0; i < I40E_INSET_MASK_NUM_REG; i++) {
- i40e_check_write_reg(hw, I40E_GLQF_HASH_MSK(i, pctype),
-0);
- if (i >= num)
- continue;
- i40e_check_write_reg(hw, I40E_GLQF_HASH_MSK(i, pctype),
-mask_reg[i]);
- }
- } else if (op == RTE_ETH_INPUT_SET_ADD) {
- uint8_t j, count = 0;
-
- for (i = 0; i < I40E_INSET_MASK_NUM_REG; i++) {
- reg = I40E_READ_REG(hw, I40E_GLQF_HASH_MSK(i, pctype));
- if (reg & I40E_GLQF_HASH_MSK_FIELD)
- count++;
- }
- if (count + num > I40E_INSET_MASK_NUM_REG)
- return -EINVAL;
-
- for (i = count, j = 0; i < I40E_INSET_MASK_NUM_REG; i++, j++)
- i40e_check_write_reg(hw, I40E_GLQF_HASH_MSK(i, pctype),
-mask_reg[j]);
}
- return 0;
-}
-
-static int
-i40e_set_fd_inset_mask(struct i40e_hw *hw,
- enum i40e_filter_pctype pctype,
- enum rte_filter_input_set_op op,
- uint32_t *mask_reg,
- uint8_t num)
-{
- uint32_t reg;
- uint8_t i;
-
- if (!mask_reg || num > RTE_ETH_INPUT_SET_SELECT)
+ pctype = i40e_flowtype_to_pctype(conf->flow_type);
+ if (pctype == 0 || pctype > I40E_FILTER_PCTYPE_L2_PAYLOAD) {
+ PMD_DRV_LOG(ERR, "Not supported flow type (%u)",
+ conf->flow_type);
return -EINVAL;
+ }
- if (op == RTE_ETH_INPUT_SET_SELECT) {
- for (i = 0; i < I40E_INSET_MASK_NUM_REG; i++) {
- i40e_check_write_reg(hw, I40E_GLQF_FD_MSK(i, pctype),
-0);
- if (i >= num)
- continue;
- i40e_check_write_reg(hw, I40E_GLQF_FD_MSK(i, pctype),
-mask_reg[i]);
- }
- } else if (op == RTE_ETH_INPUT_SET_ADD) {
- uint
[dpdk-dev] [PATCH v2 03/12] i40e: remove flex payload from INPUT_SET_SELECT operation
In this patch, flex payload is removed from valid fdir input set
values. It is because all flex payload configuration can be set
in struct rte_fdir_conf during device configure phase.
And it is a more flexible configuration including flexpayload's
selection, input set selection by word and mask setting in bits.
Signed-off-by: Jingjing Wu
---
drivers/net/i40e/i40e_ethdev.c | 59 +++---
1 file changed, 26 insertions(+), 33 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 85419ab..63a1df3 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -262,7 +262,8 @@
#define I40E_REG_INSET_FLEX_PAYLOAD_WORD70x0080ULL
/* 8th word of flex payload */
#define I40E_REG_INSET_FLEX_PAYLOAD_WORD80x0040ULL
-
+/* all 8 words flex payload */
+#define I40E_REG_INSET_FLEX_PAYLOAD_WORDS0x3FC0ULL
#define I40E_REG_INSET_MASK_DEFAULT 0xULL
#define I40E_TRANSLATE_INSET 0
@@ -6614,43 +6615,32 @@ i40e_get_valid_input_set(enum i40e_filter_pctype pctype,
*/
static const uint64_t valid_fdir_inset_table[] = {
[I40E_FILTER_PCTYPE_FRAG_IPV4] =
- I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
- I40E_INSET_FLEX_PAYLOAD,
+ I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST,
[I40E_FILTER_PCTYPE_NONF_IPV4_UDP] =
I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
- I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT |
- I40E_INSET_FLEX_PAYLOAD,
+ I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT,
[I40E_FILTER_PCTYPE_NONF_IPV4_TCP] =
- I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
- I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT |
- I40E_INSET_FLEX_PAYLOAD,
+ I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST,
[I40E_FILTER_PCTYPE_NONF_IPV4_SCTP] =
I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT |
- I40E_INSET_SCTP_VT | I40E_INSET_FLEX_PAYLOAD,
+ I40E_INSET_SCTP_VT,
[I40E_FILTER_PCTYPE_NONF_IPV4_OTHER] =
- I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
- I40E_INSET_FLEX_PAYLOAD,
+ I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST,
[I40E_FILTER_PCTYPE_FRAG_IPV6] =
- I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
- I40E_INSET_FLEX_PAYLOAD,
+ I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST,
[I40E_FILTER_PCTYPE_NONF_IPV6_UDP] =
- I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
- I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT |
- I40E_INSET_FLEX_PAYLOAD,
+ I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST,
[I40E_FILTER_PCTYPE_NONF_IPV6_TCP] =
- I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
- I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT |
- I40E_INSET_FLEX_PAYLOAD,
+ I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST,
[I40E_FILTER_PCTYPE_NONF_IPV6_SCTP] =
I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT |
- I40E_INSET_SCTP_VT | I40E_INSET_FLEX_PAYLOAD,
+ I40E_INSET_SCTP_VT,
[I40E_FILTER_PCTYPE_NONF_IPV6_OTHER] =
- I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
- I40E_INSET_FLEX_PAYLOAD,
+ I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST,
[I40E_FILTER_PCTYPE_L2_PAYLOAD] =
- I40E_INSET_LAST_ETHER_TYPE | I40E_INSET_FLEX_PAYLOAD,
+ I40E_INSET_LAST_ETHER_TYPE,
};
if (pctype > I40E_FILTER_PCTYPE_L2_PAYLOAD)
@@ -6878,7 +6868,7 @@ i40e_translate_input_set_reg(uint64_t input)
return val;
}
-static uint8_t
+static int
i40e_generate_inset_mask_reg(uint64_t inset, uint32_t *mask, uint8_t nb_elem)
{
uint8_t i, idx = 0;
@@ -6896,16 +6886,13 @@ i40e_generate_inset_mask_reg(uint64_t inset, uint32_t
*mask, uint8_t nb_elem)
if (!inset || !mask || !nb_elem)
return 0;
- if (!inset && nb_elem >= I40E_INSET_MASK_NUM_REG) {
- for (i = 0; i < I40E_INSET_MASK_NUM_REG; i++)
- mask[i] = 0;
- return I40E_INSET_MASK_NUM_REG;
- }
for (i = 0, idx = 0; i < RTE_DIM(inset_mask_map); i++) {
- if (idx >= nb_elem)
- break;
- if (inset & inset_mask_map[i].inset) {
+ if ((inset & inset_mask_map[i].inset) ==
inset_mask_map[i].inset) {
+ if (idx >= nb_elem) {
+ PMD_DRV_LOG(ERR, "exceed maximal number of
bitmasks");
+ return -EINVA
[dpdk-dev] [PATCH v2 04/12] i40e: restore default setting on input set of filters
This patch added a new function to set the input set to default
when initialization.
Signed-off-by: Jingjing Wu
---
drivers/net/i40e/i40e_ethdev.c | 56 ++
1 file changed, 56 insertions(+)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 63a1df3..d13fde3 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -374,6 +374,7 @@ static int i40e_dev_udp_tunnel_add(struct rte_eth_dev *dev,
struct rte_eth_udp_tunnel *udp_tunnel);
static int i40e_dev_udp_tunnel_del(struct rte_eth_dev *dev,
struct rte_eth_udp_tunnel *udp_tunnel);
+static void i40e_filter_input_set_init(struct i40e_pf *pf);
static int i40e_ethertype_filter_set(struct i40e_pf *pf,
struct rte_eth_ethertype_filter *filter,
bool add);
@@ -788,6 +789,8 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
* It should be removed once issues are fixed in NVM.
*/
i40e_flex_payload_reg_init(hw);
+ /* Initialize the input set for filters (hash and fd) to default value
*/
+ i40e_filter_input_set_init(pf);
/* Initialize the parameters for adminq */
i40e_init_adminq_parameter(hw);
@@ -6913,6 +6916,59 @@ i40e_check_write_reg(struct i40e_hw *hw, uint32_t addr,
uint32_t val)
(uint32_t)I40E_READ_REG(hw, addr));
}
+static void
+i40e_filter_input_set_init(struct i40e_pf *pf)
+{
+ struct i40e_hw *hw = I40E_PF_TO_HW(pf);
+ enum i40e_filter_pctype pctype;
+ uint64_t input_set, inset_reg;
+ uint32_t mask_reg[I40E_INSET_MASK_NUM_REG] = {0};
+ int num, i;
+
+ for (pctype = I40E_FILTER_PCTYPE_NONF_IPV4_UDP;
+pctype <= I40E_FILTER_PCTYPE_L2_PAYLOAD; pctype++) {
+ if (!I40E_VALID_PCTYPE(pctype))
+ continue;
+ input_set = i40e_get_default_input_set(pctype);
+
+ num = i40e_generate_inset_mask_reg(input_set, mask_reg,
+ I40E_INSET_MASK_NUM_REG);
+ if (num < 0)
+ return;
+ inset_reg = i40e_translate_input_set_reg(input_set);
+
+ i40e_check_write_reg(hw, I40E_PRTQF_FD_INSET(pctype, 0),
+ (uint32_t)(inset_reg & UINT32_MAX));
+ i40e_check_write_reg(hw, I40E_PRTQF_FD_INSET(pctype, 1),
+(uint32_t)((inset_reg >>
+I40E_32_BIT_WIDTH) & UINT32_MAX));
+ i40e_check_write_reg(hw, I40E_GLQF_HASH_INSET(0, pctype),
+ (uint32_t)(inset_reg & UINT32_MAX));
+ i40e_check_write_reg(hw, I40E_GLQF_HASH_INSET(1, pctype),
+(uint32_t)((inset_reg >>
+I40E_32_BIT_WIDTH) & UINT32_MAX));
+
+ for (i = 0; i < num; i++) {
+ i40e_check_write_reg(hw, I40E_GLQF_FD_MSK(i, pctype),
+mask_reg[i]);
+ i40e_check_write_reg(hw, I40E_GLQF_HASH_MSK(i, pctype),
+mask_reg[i]);
+ }
+ /*clear unused mask registers of the pctype */
+ for (i = num; i < I40E_INSET_MASK_NUM_REG; i++) {
+ i40e_check_write_reg(hw, I40E_GLQF_FD_MSK(i, pctype),
+0);
+ i40e_check_write_reg(hw, I40E_GLQF_HASH_MSK(i, pctype),
+0);
+ }
+ I40E_WRITE_FLUSH(hw);
+
+ /* store the default input set */
+ pf->hash_input_set[pctype] = input_set;
+ pf->fdir.input_set[pctype] = input_set;
+ }
+}
+
int
i40e_hash_filter_inset_select(struct i40e_hw *hw,
struct rte_eth_input_set_conf *conf)
--
2.4.0
[dpdk-dev] [PATCH v2 05/12] i40e: extend flow director to filter by more IP Header fields
This patch extended flow director to select more IP Header fields
as filter input set.
Signed-off-by: Jingjing Wu
---
drivers/net/i40e/i40e_ethdev.c | 69 ++
drivers/net/i40e/i40e_fdir.c | 26 +++-
2 files changed, 75 insertions(+), 20 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index d13fde3..80c703d 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -218,6 +218,8 @@
#define I40E_REG_INSET_L3_IP4_TOS0x0040ULL
/* IPv4 Protocol */
#define I40E_REG_INSET_L3_IP4_PROTO 0x0004ULL
+/* IPv4 Time to Live */
+#define I40E_REG_INSET_L3_IP4_TTL0x0004ULL
/* Source IPv6 address */
#define I40E_REG_INSET_L3_SRC_IP60x0007F800ULL
/* Destination IPv6 address */
@@ -226,6 +228,8 @@
#define I40E_REG_INSET_L3_IP6_TC 0x0040ULL
/* IPv6 Next Header */
#define I40E_REG_INSET_L3_IP6_NEXT_HDR 0x0008ULL
+/* IPv6 Hop Limitr */
+#define I40E_REG_INSET_L3_IP6_HOP_LIMIT 0x0008ULL
/* Source L4 port */
#define I40E_REG_INSET_L4_SRC_PORT 0x0004ULL
/* Destination L4 port */
@@ -269,10 +273,12 @@
#define I40E_TRANSLATE_INSET 0
#define I40E_TRANSLATE_REG 1
-#define I40E_INSET_IPV4_TOS_MASK 0x0009FF00UL
-#define I40E_INSET_IPV4_PROTO_MASK0x000DFF00UL
-#define I40E_INSET_IPV6_TC_MASK 0x0009F00FUL
-#define I40E_INSET_IPV6_NEXT_HDR_MASK 0x000C00FFUL
+#define I40E_INSET_IPV4_TOS_MASK0x0009FF00UL
+#define I40E_INSET_IPv4_TTL_MASK0x000D00FFUL
+#define I40E_INSET_IPV4_PROTO_MASK 0x000DFF00UL
+#define I40E_INSET_IPV6_TC_MASK 0x0009F00FUL
+#define I40E_INSET_IPV6_HOP_LIMIT_MASK 0x000CFF00UL
+#define I40E_INSET_IPV6_NEXT_HDR_MASK 0x000C00FFUL
static int eth_i40e_dev_init(struct rte_eth_dev *eth_dev);
static int eth_i40e_dev_uninit(struct rte_eth_dev *eth_dev);
@@ -6618,30 +6624,47 @@ i40e_get_valid_input_set(enum i40e_filter_pctype pctype,
*/
static const uint64_t valid_fdir_inset_table[] = {
[I40E_FILTER_PCTYPE_FRAG_IPV4] =
- I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST,
+ I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
+ I40E_INSET_IPV4_TOS | I40E_INSET_IPV4_PROTO |
+ I40E_INSET_IPV4_TTL,
[I40E_FILTER_PCTYPE_NONF_IPV4_UDP] =
I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
+ I40E_INSET_IPV4_TOS | I40E_INSET_IPV4_TTL |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT,
[I40E_FILTER_PCTYPE_NONF_IPV4_TCP] =
- I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST,
+ I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
+ I40E_INSET_IPV4_TOS | I40E_INSET_IPV4_TTL |
+ I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT,
[I40E_FILTER_PCTYPE_NONF_IPV4_SCTP] =
I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
+ I40E_INSET_IPV4_TOS | I40E_INSET_IPV4_TTL |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT |
I40E_INSET_SCTP_VT,
[I40E_FILTER_PCTYPE_NONF_IPV4_OTHER] =
- I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST,
+ I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
+ I40E_INSET_IPV4_TOS | I40E_INSET_IPV4_PROTO |
+ I40E_INSET_IPV4_TTL,
[I40E_FILTER_PCTYPE_FRAG_IPV6] =
- I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST,
+ I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
+ I40E_INSET_IPV6_TC | I40E_INSET_IPV6_NEXT_HDR |
+ I40E_INSET_IPV6_HOP_LIMIT,
[I40E_FILTER_PCTYPE_NONF_IPV6_UDP] =
- I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST,
+ I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
+ I40E_INSET_IPV6_TC | I40E_INSET_IPV6_HOP_LIMIT |
+ I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT,
[I40E_FILTER_PCTYPE_NONF_IPV6_TCP] =
- I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST,
+ I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
+ I40E_INSET_IPV6_TC | I40E_INSET_IPV6_HOP_LIMIT |
+ I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT,
[I40E_FILTER_PCTYPE_NONF_IPV6_SCTP] =
I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
+ I40E_INSET_IPV6_TC | I40E_INSET_IPV6_HOP_LIMIT |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT |
I40E_INSET_SCTP_VT,
[I40E_FILTER_PCTYPE_NONF_IPV6_OTHER] =
- I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST,
+ I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
+ I40E_INSET_IPV6_TC | I40E_INSET_IPV6_NEXT_HDR |
+ I40E_INSET_IPV6_HOP_LIMIT,
[I40E_FILTER_PCTYPE_L2_PAYLO
[dpdk-dev] [PATCH v2 06/12] testpmd: extend commands for filter's input set changing
This patch extended commands for filter's input set changing.
It added tos, protocol and ttl as filter's input fields, and
remove the words selection from flex payloads for flow director.
Signed-off-by: Jingjing Wu
---
app/test-pmd/cmdline.c | 100 ++--
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 42 +++-
2 files changed, 104 insertions(+), 38 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 52e9f5f..5787f57 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -642,6 +642,7 @@ static void cmd_help_long_parsed(void *parsed_result,
"flow_director_filter (port_id) mode IP
(add|del|update)"
" flow (ipv4-other|ipv4-frag|ipv6-other|ipv6-frag)"
" src (src_ip_address) dst (dst_ip_address)"
+ " tos (tos_value) proto (proto_value) ttl (ttl_value)"
" vlan (vlan_value) flexbytes (flexbytes_value)"
" (drop|fwd) pf|vf(vf_id) queue (queue_id)"
" fd_id (fd_id_value)\n"
@@ -651,6 +652,7 @@ static void cmd_help_long_parsed(void *parsed_result,
" flow (ipv4-tcp|ipv4-udp|ipv6-tcp|ipv6-udp)"
" src (src_ip_address) (src_port)"
" dst (dst_ip_address) (dst_port)"
+ " tos (tos_value) ttl (ttl_value)"
" vlan (vlan_value) flexbytes (flexbytes_value)"
" (drop|fwd) pf|vf(vf_id) queue (queue_id)"
" fd_id (fd_id_value)\n"
@@ -660,7 +662,9 @@ static void cmd_help_long_parsed(void *parsed_result,
" flow (ipv4-sctp|ipv6-sctp)"
" src (src_ip_address) (src_port)"
" dst (dst_ip_address) (dst_port)"
- " tag (verification_tag) vlan (vlan_value)"
+ " tag (verification_tag) "
+ " tos (tos_value) ttl (ttl_value)"
+ " vlan (vlan_value)"
" flexbytes (flexbytes_value) (drop|fwd)"
" pf|vf(vf_id) queue (queue_id) fd_id (fd_id_value)\n"
"Add/Del a SCTP type flow director filter.\n\n"
@@ -740,14 +744,15 @@ static void cmd_help_long_parsed(void *parsed_result,
"fld-8th|none) (select|add)\n"
"Set the input set for hash.\n\n"
- "set_fdir_input_set (port_id) (ipv4|ipv4-frag|"
- "ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|ipv6|"
+ "set_fdir_input_set (port_id) "
+ "(ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|"
"ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|"
- "l2_payload) (src-ipv4|dst-ipv4|src-ipv6|dst-ipv6|"
- "udp-src-port|udp-dst-port|tcp-src-port|tcp-dst-port|"
- "sctp-src-port|sctp-dst-port|sctp-veri-tag|fld-1st|"
- "fld-2nd|fld-3rd|fld-4th|fld-5th|fld-6th|fld-7th|"
- "fld-8th|none) (select|add)\n"
+ "l2_payload) (ethertype|src-ipv4|dst-ipv4|src-ipv6|"
+ "dst-ipv6|ipv4-tos|ipv4-proto|ipv4-ttl|ipv6-tc|"
+ "ipv6-next-header|ipv6-hop-limits|udp-src-port|"
+ "udp-dst-port|tcp-src-port|tcp-dst-port|"
+ "sctp-src-port|sctp-dst-port|sctp-veri-tag|none)"
+ " (select|add)\n"
"Set the input set for FDir.\n\n"
);
}
@@ -7985,6 +7990,12 @@ struct cmd_flow_director_result {
uint16_t port_dst;
cmdline_fixed_string_t verify_tag;
uint32_t verify_tag_value;
+ cmdline_ipaddr_t tos;
+ uint8_t tos_value;
+ cmdline_ipaddr_t proto;
+ uint8_t proto_value;
+ cmdline_ipaddr_t ttl;
+ uint8_t ttl_value;
cmdline_fixed_string_t vlan;
uint16_t vlan_value;
cmdline_fixed_string_t flexbytes;
@@ -8164,12 +8175,15 @@ cmd_flow_director_filter_parsed(void *parsed_result,
switch (entry.input.flow_type) {
case RTE_ETH_FLOW_FRAG_IPV4:
case RTE_ETH_FLOW_NONFRAG_IPV4_OTHER:
+ entry.input.flow.ip4_flow.proto = res->proto_value;
case RTE_ETH_FLOW_NONFRAG_IPV4_UDP:
case RTE_ETH_FLOW_NONFRAG_IPV4_TCP:
IPV4_ADDR_TO_UINT(res->ip_dst,
entry.input.flow.ip4_flow.dst_ip);
IPV4_ADDR_TO_UINT(res->ip_src,
entry.input.flow.ip4_flow.src_ip);
+ entry.input.flow.ip4_flow.tos = res->tos_value;
+ entry.input.flow.ip4_flow.ttl = res->ttl_value;
/* need convert to big endian. */
entry.input.flow.udp4_flow.dst_port =
[dpdk-dev] [PATCH v2 07/12] librte_ether: extend rte_eth_fdir_flow to support tunnel format
This patch changed rte_eth_fdir_flow from union to struct to
support more packets formats, for example, Vxlan and GRE tunnel
packets with IP inner frame.
This patch also add new RTE_FDIR_TUNNEL_TYPE_GRE enum.
Signed-off-by: Jingjing Wu
---
doc/guides/rel_notes/deprecation.rst | 4
doc/guides/rel_notes/release_16_04.rst | 3 +++
lib/librte_ether/rte_eth_ctrl.h| 27 +++
3 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index e94d4a2..7fa8639 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -20,10 +20,6 @@ Deprecation Notices
tables (512 queues).
It should be integrated in release 2.3.
-* ABI changes are planned for struct rte_eth_fdir_flow in order to support
- extend flow director's input set. The release 2.2 does not contain these ABI
- changes, but release 2.3 will, and no backwards compatibility is planned.
-
* ABI changes are planned for rte_eth_ipv4_flow and rte_eth_ipv6_flow to
include more fields to be matched against. The release 2.2 does not
contain these ABI changes, but release 2.3 will.
diff --git a/doc/guides/rel_notes/release_16_04.rst
b/doc/guides/rel_notes/release_16_04.rst
index 73494f9..1d784d3 100644
--- a/doc/guides/rel_notes/release_16_04.rst
+++ b/doc/guides/rel_notes/release_16_04.rst
@@ -183,6 +183,9 @@ ABI Changes
the previous releases and made in this release. Use fixed width quotes for
``rte_function_names`` or ``rte_struct_names``. Use the past tense.
+* The ethdev flow director structure ``rte_eth_fdir_flow`` structure was
+ changed. New fields were added to extend flow director's input set, and
+ organizing is also changed to support multiple input format.
Shared Library Versions
---
diff --git a/lib/librte_ether/rte_eth_ctrl.h b/lib/librte_ether/rte_eth_ctrl.h
index 8c51023..b6a5c50 100644
--- a/lib/librte_ether/rte_eth_ctrl.h
+++ b/lib/librte_ether/rte_eth_ctrl.h
@@ -495,6 +495,7 @@ enum rte_eth_fdir_tunnel_type {
RTE_FDIR_TUNNEL_TYPE_UNKNOWN = 0,
RTE_FDIR_TUNNEL_TYPE_NVGRE,
RTE_FDIR_TUNNEL_TYPE_VXLAN,
+ RTE_FDIR_TUNNEL_TYPE_GRE,
};
/**
@@ -508,18 +509,20 @@ struct rte_eth_tunnel_flow {
};
/**
- * An union contains the inputs for all types of flow
+ * A struct contains the inputs for all types of flow
*/
-union rte_eth_fdir_flow {
- struct rte_eth_l2_flow l2_flow;
- struct rte_eth_udpv4_flow udp4_flow;
- struct rte_eth_tcpv4_flow tcp4_flow;
- struct rte_eth_sctpv4_flow sctp4_flow;
- struct rte_eth_ipv4_flow ip4_flow;
- struct rte_eth_udpv6_flow udp6_flow;
- struct rte_eth_tcpv6_flow tcp6_flow;
- struct rte_eth_sctpv6_flow sctp6_flow;
- struct rte_eth_ipv6_flow ipv6_flow;
+struct rte_eth_fdir_flow {
+ union {
+ struct rte_eth_l2_flow l2_flow;
+ struct rte_eth_udpv4_flow udp4_flow;
+ struct rte_eth_tcpv4_flow tcp4_flow;
+ struct rte_eth_sctpv4_flow sctp4_flow;
+ struct rte_eth_ipv4_flow ip4_flow;
+ struct rte_eth_udpv6_flow udp6_flow;
+ struct rte_eth_tcpv6_flow tcp6_flow;
+ struct rte_eth_sctpv6_flow sctp6_flow;
+ struct rte_eth_ipv6_flow ipv6_flow;
+ };
struct rte_eth_mac_vlan_flow mac_vlan_flow;
struct rte_eth_tunnel_flow tunnel_flow;
};
@@ -540,7 +543,7 @@ struct rte_eth_fdir_flow_ext {
*/
struct rte_eth_fdir_input {
uint16_t flow_type;
- union rte_eth_fdir_flow flow;
+ struct rte_eth_fdir_flow flow;
/**< Flow fields to match, dependent on flow_type */
struct rte_eth_fdir_flow_ext flow_ext;
/**< Additional fields to match */
--
2.4.0
[dpdk-dev] [PATCH v2 09/12] testpmd: extend commands for fdir's tunnel id input set
This patch extended commands for filter's input set changing.
It added GRE/Vxlan Tunnel as filter's input fields.
Signed-off-by: Jingjing Wu
---
app/test-pmd/cmdline.c | 27 +--
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 22 --
2 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 5787f57..9cba2cc 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -643,7 +643,8 @@ static void cmd_help_long_parsed(void *parsed_result,
" flow (ipv4-other|ipv4-frag|ipv6-other|ipv6-frag)"
" src (src_ip_address) dst (dst_ip_address)"
" tos (tos_value) proto (proto_value) ttl (ttl_value)"
- " vlan (vlan_value) flexbytes (flexbytes_value)"
+ " vlan (vlan_value) (NVGRE|VxLAN|GRE|Notunnel)"
+ " (tunnel_id_value) flexbytes (flexbytes_value)"
" (drop|fwd) pf|vf(vf_id) queue (queue_id)"
" fd_id (fd_id_value)\n"
"Add/Del an IP type flow director filter.\n\n"
@@ -653,7 +654,8 @@ static void cmd_help_long_parsed(void *parsed_result,
" src (src_ip_address) (src_port)"
" dst (dst_ip_address) (dst_port)"
" tos (tos_value) ttl (ttl_value)"
- " vlan (vlan_value) flexbytes (flexbytes_value)"
+ " vlan (vlan_value) (NVGRE|VxLAN|GRE|Notunnel)"
+ " (tunnel_id_value) flexbytes (flexbytes_value)"
" (drop|fwd) pf|vf(vf_id) queue (queue_id)"
" fd_id (fd_id_value)\n"
"Add/Del an UDP/TCP type flow director filter.\n\n"
@@ -665,6 +667,7 @@ static void cmd_help_long_parsed(void *parsed_result,
" tag (verification_tag) "
" tos (tos_value) ttl (ttl_value)"
" vlan (vlan_value)"
+ " (NVGRE|VxLAN|GRE|Notunnel) (tunnel_id_value)"
" flexbytes (flexbytes_value) (drop|fwd)"
" pf|vf(vf_id) queue (queue_id) fd_id (fd_id_value)\n"
"Add/Del a SCTP type flow director filter.\n\n"
@@ -751,7 +754,8 @@ static void cmd_help_long_parsed(void *parsed_result,
"dst-ipv6|ipv4-tos|ipv4-proto|ipv4-ttl|ipv6-tc|"
"ipv6-next-header|ipv6-hop-limits|udp-src-port|"
"udp-dst-port|tcp-src-port|tcp-dst-port|"
- "sctp-src-port|sctp-dst-port|sctp-veri-tag|none)"
+ "sctp-src-port|sctp-dst-port|sctp-veri-tag|"
+ "udp-key|gre-key|none)"
" (select|add)\n"
"Set the input set for FDir.\n\n"
);
@@ -8094,6 +8098,7 @@ str2fdir_tunneltype(char *string)
} tunneltype_str[] = {
{"NVGRE", RTE_FDIR_TUNNEL_TYPE_NVGRE},
{"VxLAN", RTE_FDIR_TUNNEL_TYPE_VXLAN},
+ {"GRE", RTE_FDIR_TUNNEL_TYPE_GRE},
};
for (i = 0; i < RTE_DIM(tunneltype_str); i++) {
@@ -8265,6 +8270,10 @@ cmd_flow_director_filter_parsed(void *parsed_result,
RTE_ETH_FDIR_MAX_FLEXLEN);
entry.input.flow_ext.vlan_tci = rte_cpu_to_be_16(res->vlan_value);
+ entry.input.flow.tunnel_flow.tunnel_type =
+ str2fdir_tunneltype(res->tunnel_type);
+ entry.input.flow.tunnel_flow.tunnel_id =
+ rte_cpu_to_be_32(res->tunnel_id_value);
entry.action.flex_off = 0; /*use 0 by default */
if (!strcmp(res->drop, "drop"))
@@ -8428,7 +8437,7 @@ cmdline_parse_token_string_t cmd_flow_director_tunnel =
tunnel, "tunnel");
cmdline_parse_token_string_t cmd_flow_director_tunnel_type =
TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-tunnel_type, "NVGRE#VxLAN");
+tunnel_type, "NVGRE#VxLAN#GRE#Notunnel");
cmdline_parse_token_string_t cmd_flow_director_tunnel_id =
TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
tunnel_id, "tunnel-id");
@@ -8460,6 +8469,8 @@ cmdline_parse_inst_t cmd_add_del_ip_flow_director = {
(void *)&cmd_flow_director_ttl_value,
(void *)&cmd_flow_director_vlan,
(void *)&cmd_flow_director_vlan_value,
+ (void *)&cmd_flow_director_tunnel_type,
+ (void *)&cmd_flow_director_tunnel_id_value,
(void *)&cmd_flow_director_flexbytes,
(void *)&cmd_flow_director_flexbytes_value,
(void *)&cmd_flow_director_drop,
@@ -8496,6 +8507,8 @@ cmdline_parse_inst_t cmd_add_del_udp_flow_director = {
[dpdk-dev] [PATCH v2 08/12] i40e: extend flow director to filter by tunnel ID
This patch extended flow director to select Vxlan/GRE tunnel ID
as filter's input set and program the filter rule with the defined
tunnel type.
Signed-off-by: Jingjing Wu
---
drivers/net/i40e/i40e_ethdev.c | 11 +++
drivers/net/i40e/i40e_fdir.c | 150 +++--
2 files changed, 125 insertions(+), 36 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 80c703d..df20b6c 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -6624,48 +6624,59 @@ i40e_get_valid_input_set(enum i40e_filter_pctype pctype,
*/
static const uint64_t valid_fdir_inset_table[] = {
[I40E_FILTER_PCTYPE_FRAG_IPV4] =
+ I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
I40E_INSET_IPV4_TOS | I40E_INSET_IPV4_PROTO |
I40E_INSET_IPV4_TTL,
[I40E_FILTER_PCTYPE_NONF_IPV4_UDP] =
+ I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
I40E_INSET_IPV4_TOS | I40E_INSET_IPV4_TTL |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT,
[I40E_FILTER_PCTYPE_NONF_IPV4_TCP] =
+ I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
I40E_INSET_IPV4_TOS | I40E_INSET_IPV4_TTL |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT,
[I40E_FILTER_PCTYPE_NONF_IPV4_SCTP] =
+ I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
I40E_INSET_IPV4_TOS | I40E_INSET_IPV4_TTL |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT |
I40E_INSET_SCTP_VT,
[I40E_FILTER_PCTYPE_NONF_IPV4_OTHER] =
+ I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
I40E_INSET_IPV4_TOS | I40E_INSET_IPV4_PROTO |
I40E_INSET_IPV4_TTL,
[I40E_FILTER_PCTYPE_FRAG_IPV6] =
+ I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
I40E_INSET_IPV6_TC | I40E_INSET_IPV6_NEXT_HDR |
I40E_INSET_IPV6_HOP_LIMIT,
[I40E_FILTER_PCTYPE_NONF_IPV6_UDP] =
+ I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
I40E_INSET_IPV6_TC | I40E_INSET_IPV6_HOP_LIMIT |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT,
[I40E_FILTER_PCTYPE_NONF_IPV6_TCP] =
+ I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
I40E_INSET_IPV6_TC | I40E_INSET_IPV6_HOP_LIMIT |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT,
[I40E_FILTER_PCTYPE_NONF_IPV6_SCTP] =
+ I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
I40E_INSET_IPV6_TC | I40E_INSET_IPV6_HOP_LIMIT |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT |
I40E_INSET_SCTP_VT,
[I40E_FILTER_PCTYPE_NONF_IPV6_OTHER] =
+ I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
I40E_INSET_IPV6_TC | I40E_INSET_IPV6_NEXT_HDR |
I40E_INSET_IPV6_HOP_LIMIT,
[I40E_FILTER_PCTYPE_L2_PAYLOAD] =
+ I40E_INSET_TUNNEL_ID |
I40E_INSET_LAST_ETHER_TYPE,
};
diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index 5ea97e5..48ec63b 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -687,12 +687,41 @@ i40e_fdir_configure(struct rte_eth_dev *dev)
}
static inline void
-i40e_fdir_fill_eth_ip_head(const struct rte_eth_fdir_input *fdir_input,
- unsigned char *raw_pkt)
+i40e_fdir_fill_ether_head(const struct rte_eth_fdir_input *fdir_input,
+ unsigned char *pkt)
{
- struct ether_hdr *ether = (struct ether_hdr *)raw_pkt;
- struct ipv4_hdr *ip;
- struct ipv6_hdr *ip6;
+ struct ether_hdr *ether = (struct ether_hdr *)pkt;
+ switch (fdir_input->flow_type) {
+ case RTE_ETH_FLOW_L2_PAYLOAD:
+ ether->ether_type = fdir_input->flow.l2_flow.ether_type;
+ break;
+ case RTE_ETH_FLOW_NONFRAG_IPV4_TCP:
+ case RTE_ETH_FLOW_NONFRAG_IPV4_UDP:
+ case RTE_ETH_FLOW_NONFRAG_IPV4_SCTP:
+ case RTE_ETH_FLOW_NONFRAG_IPV4_OTHER:
+ case RTE_ETH_FLOW_FRAG_IPV4:
+ ether->ether_type = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
+ break;
+ case RTE_ETH_FLOW_NONFRAG_IPV6_TCP:
+ case RTE_ETH_FLOW_NONFRAG_IPV6_UDP:
+ case RTE_ETH_FLOW_NONFRAG_IPV6_SCTP:
+ case RTE_ETH_FLOW_NONFRAG_IPV6_OTHER:
+ case RTE_ETH_FLOW_FRAG_IPV6:
+ ether->ether_type =
[dpdk-dev] [PATCH v2 11/12] i40e: extend flow director to filter by vlan id
This patch extended flow director to select vlan id
as filter's input set and program the filter rule with vlan id.
Signed-off-by: Jingjing Wu
---
doc/guides/rel_notes/release_16_04.rst | 2 ++
drivers/net/i40e/i40e_ethdev.c | 11
drivers/net/i40e/i40e_fdir.c | 49 ++
3 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/doc/guides/rel_notes/release_16_04.rst
b/doc/guides/rel_notes/release_16_04.rst
index 1d784d3..8c7b3e1 100644
--- a/doc/guides/rel_notes/release_16_04.rst
+++ b/doc/guides/rel_notes/release_16_04.rst
@@ -74,6 +74,8 @@ This section should contain new features added in this
release. Sample format:
* **szedata2: Add functions for setting link up/down.**
+* **Added Flow director enhancements on Intel X710/XL710.**
+
Resolved Issues
---
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 6401768..a829e8b 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -6626,58 +6626,69 @@ i40e_get_valid_input_set(enum i40e_filter_pctype pctype,
*/
static const uint64_t valid_fdir_inset_table[] = {
[I40E_FILTER_PCTYPE_FRAG_IPV4] =
+ I40E_INSET_VLAN_OUTER | I40E_INSET_VLAN_INNER |
I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
I40E_INSET_IPV4_TOS | I40E_INSET_IPV4_PROTO |
I40E_INSET_IPV4_TTL,
[I40E_FILTER_PCTYPE_NONF_IPV4_UDP] =
+ I40E_INSET_VLAN_OUTER | I40E_INSET_VLAN_INNER |
I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
I40E_INSET_IPV4_TOS | I40E_INSET_IPV4_TTL |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT,
[I40E_FILTER_PCTYPE_NONF_IPV4_TCP] =
+ I40E_INSET_VLAN_OUTER | I40E_INSET_VLAN_INNER |
I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
I40E_INSET_IPV4_TOS | I40E_INSET_IPV4_TTL |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT,
[I40E_FILTER_PCTYPE_NONF_IPV4_SCTP] =
+ I40E_INSET_VLAN_OUTER | I40E_INSET_VLAN_INNER |
I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
I40E_INSET_IPV4_TOS | I40E_INSET_IPV4_TTL |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT |
I40E_INSET_SCTP_VT,
[I40E_FILTER_PCTYPE_NONF_IPV4_OTHER] =
+ I40E_INSET_VLAN_OUTER | I40E_INSET_VLAN_INNER |
I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV4_SRC | I40E_INSET_IPV4_DST |
I40E_INSET_IPV4_TOS | I40E_INSET_IPV4_PROTO |
I40E_INSET_IPV4_TTL,
[I40E_FILTER_PCTYPE_FRAG_IPV6] =
+ I40E_INSET_VLAN_OUTER | I40E_INSET_VLAN_INNER |
I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
I40E_INSET_IPV6_TC | I40E_INSET_IPV6_NEXT_HDR |
I40E_INSET_IPV6_HOP_LIMIT,
[I40E_FILTER_PCTYPE_NONF_IPV6_UDP] =
+ I40E_INSET_VLAN_OUTER | I40E_INSET_VLAN_INNER |
I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
I40E_INSET_IPV6_TC | I40E_INSET_IPV6_HOP_LIMIT |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT,
[I40E_FILTER_PCTYPE_NONF_IPV6_TCP] =
+ I40E_INSET_VLAN_OUTER | I40E_INSET_VLAN_INNER |
I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
I40E_INSET_IPV6_TC | I40E_INSET_IPV6_HOP_LIMIT |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT,
[I40E_FILTER_PCTYPE_NONF_IPV6_SCTP] =
+ I40E_INSET_VLAN_OUTER | I40E_INSET_VLAN_INNER |
I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
I40E_INSET_IPV6_TC | I40E_INSET_IPV6_HOP_LIMIT |
I40E_INSET_SRC_PORT | I40E_INSET_DST_PORT |
I40E_INSET_SCTP_VT,
[I40E_FILTER_PCTYPE_NONF_IPV6_OTHER] =
+ I40E_INSET_VLAN_OUTER | I40E_INSET_VLAN_INNER |
I40E_INSET_TUNNEL_ID |
I40E_INSET_IPV6_SRC | I40E_INSET_IPV6_DST |
I40E_INSET_IPV6_TC | I40E_INSET_IPV6_NEXT_HDR |
I40E_INSET_IPV6_HOP_LIMIT,
[I40E_FILTER_PCTYPE_L2_PAYLOAD] =
+ I40E_INSET_VLAN_OUTER | I40E_INSET_VLAN_INNER |
I40E_INSET_TUNNEL_ID |
I40E_INSET_LAST_ETHER_TYPE,
};
diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index 48ec63b..33be634 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -686,34 +686,50 @@ i40e_fdir_configure(struct rte_eth_de
[dpdk-dev] [PATCH v2 12/12] testpmd: extend commands for fdir's vlan input set
This patch extended commands for filter's input set changing.
It added vlan as filter's input fields.
Signed-off-by: Jingjing Wu
---
app/test-pmd/cmdline.c | 6 +++---
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 9cba2cc..6679a86 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -750,7 +750,7 @@ static void cmd_help_long_parsed(void *parsed_result,
"set_fdir_input_set (port_id) "
"(ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|"
"ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|"
- "l2_payload) (ethertype|src-ipv4|dst-ipv4|src-ipv6|"
+ "l2_payload)
(ivlan|ethertype|src-ipv4|dst-ipv4|src-ipv6|"
"dst-ipv6|ipv4-tos|ipv4-proto|ipv4-ttl|ipv6-tc|"
"ipv6-next-header|ipv6-hop-limits|udp-src-port|"
"udp-dst-port|tcp-src-port|tcp-dst-port|"
@@ -9624,7 +9624,7 @@ cmdline_parse_token_string_t
cmd_set_fdir_input_set_flow_type =
cmdline_parse_token_string_t cmd_set_fdir_input_set_field =
TOKEN_STRING_INITIALIZER(struct cmd_set_fdir_input_set_result,
inset_field,
- "ethertype#src-ipv4#dst-ipv4#src-ipv6#dst-ipv6#"
+ "ivlan#ethertype#src-ipv4#dst-ipv4#src-ipv6#dst-ipv6#"
"ipv4-tos#ipv4-proto#ipv4-ttl#ipv6-tc#ipv6-next-header#"
"ipv6-hop-limits#udp-src-port#udp-dst-port#"
"tcp-src-port#tcp-dst-port#sctp-src-port#sctp-dst-port#"
@@ -9639,7 +9639,7 @@ cmdline_parse_inst_t cmd_set_fdir_input_set = {
.help_str = "set_fdir_input_set "
"ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|"
"ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|l2_payload "
- "ethertype|src-ipv4|dst-ipv4|src-ipv6|dst-ipv6|"
+ "ivlan|ethertype|src-ipv4|dst-ipv4|src-ipv6|dst-ipv6|"
"ipv4-tos|ipv4-proto|ipv4-ttl|ipv6-tc|ipv6-next-header|"
"ipv6-hop-limits|udp-src-port|udp-dst-port|"
"tcp-src-port|tcp-dst-port|sctp-src-port|sctp-dst-port|"
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 417ddde..aa20d5a 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1878,7 +1878,7 @@ Set the input set for flow director::
set_fdir_input_set (port_id) (ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp| \
ipv4-other|ipv6|ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other| \
- l2_payload) (ethertype|src-ipv4|dst-ipv4|src-ipv6|dst-ipv6|ipv4-tos| \
+ l2_payload) (ivlan|ethertype|src-ipv4|dst-ipv4|src-ipv6|dst-ipv6|ipv4-tos| \
ipv4-proto|ipv4-ttl|ipv6-tc|ipv6-next-header|ipv6-hop-limits| \
tudp-src-port|udp-dst-port|cp-src-port|tcp-dst-port|sctp-src-port| \
sctp-dst-port|sctp-veri-tag|udp-key|gre-key|none) (select|add)
--
2.4.0
[dpdk-dev] [PATCH v2 10/12] i40e: fix VLAN bitmasks for hash/fdir input sets for tunnels
From: Andrey Chilikin
This patch adds missing VLAN bitmask for inner frame in case of
tunneling and fixes VLAN tags bitmasks for single or outer frame
in case of tunneling.
Fixes: 98f055707685 ("i40e: configure input fields for RSS or flow director")
Signed-off-by: Andrey Chilikin
---
drivers/net/i40e/i40e_ethdev.c | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index df20b6c..6401768 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -206,10 +206,12 @@
#define I40E_REG_INSET_L2_DMAC 0xE000ULL
/* Source MAC address */
#define I40E_REG_INSET_L2_SMAC 0x1C00ULL
-/* VLAN tag in the outer L2 header */
-#define I40E_REG_INSET_L2_OUTER_VLAN 0x0080ULL
-/* VLAN tag in the inner L2 header */
-#define I40E_REG_INSET_L2_INNER_VLAN 0x0100ULL
+/* Outer (S-Tag) VLAN tag in the outer L2 header */
+#define I40E_REG_INSET_L2_OUTER_VLAN 0x0200ULL
+/* Inner (C-Tag) or single VLAN tag in the outer L2 header */
+#define I40E_REG_INSET_L2_INNER_VLAN 0x0080ULL
+/* Single VLAN tag in the inner L2 header */
+#define I40E_REG_INSET_TUNNEL_VLAN 0x0100ULL
/* Source IPv4 address */
#define I40E_REG_INSET_L3_SRC_IP40x00018000ULL
/* Destination IPv4 address */
@@ -6887,7 +6889,7 @@ i40e_translate_input_set_reg(uint64_t input)
I40E_REG_INSET_TUNNEL_L4_UDP_SRC_PORT},
{I40E_INSET_TUNNEL_DST_PORT,
I40E_REG_INSET_TUNNEL_L4_UDP_DST_PORT},
- {I40E_INSET_TUNNEL_ID, I40E_REG_INSET_TUNNEL_ID},
+ {I40E_INSET_VLAN_TUNNEL, I40E_REG_INSET_TUNNEL_VLAN},
{I40E_INSET_FLEX_PAYLOAD_W1, I40E_REG_INSET_FLEX_PAYLOAD_WORD1},
{I40E_INSET_FLEX_PAYLOAD_W2, I40E_REG_INSET_FLEX_PAYLOAD_WORD2},
{I40E_INSET_FLEX_PAYLOAD_W3, I40E_REG_INSET_FLEX_PAYLOAD_WORD3},
--
2.4.0
[dpdk-dev] [PATCH v3] af_packet: make the device detachable
Hi Panu,
>I think its okay to remove without going through the deprecation process.
> just drop the accidentally exported symbol from the 2.0 definition.
Well, this is what I've done so far. I'm going to post v4 patch
modifying release_16_04.rst instead of release_2_3.rst, then. Thank
you for sharing your opinion on this topic.
Wojtek
2016-03-01 10:43 GMT+01:00 Panu Matilainen :
> On 02/29/2016 08:22 PM, Wojciech ?muda wrote:
>>
>> Hi Bernard,
>>
>>> Does making rte_pmd_af_packet_devinit local result in an ABI breakage?
>>
>> If someone uses it in their app, they'll be forced to change it.
>> However, as this function is not intentionally public and there is API
>> to create devices that finally calls rte_pmd_af_packet_devinit(), I'm
>> not sure if any special caution is needed here.
>
>
> Yeah this is a bit of a gray area. Strictly speaking it certainly is an ABI
> break, but given that the function is documented as internal-only and
> there's a proper, public way to create the device, there's no good excuse
> for anybody to be using it. I think its okay to remove without going through
> the deprecation process.
>
>>
>>> Should the DPDK_2.0 structure be kept and a DPDK_2.3 structure added?
>>
>> Should it be just `DPDK_2.3 { local: *} DPDK_2.0`? Doesn't inheritance
>> of DPDK_2.0 make the symbol also global in 2.3?
>
>
> Since there are no symbols being exported I dont see any point in changing
> the version, just drop the accidentally exported symbol from the 2.0
> definition.
>
> - Panu -
>
>
>>> A deprecation notice may need to be added to the
>>> doc/guides/rel_notes/deprecation.rst file.
>>
>> As far as I understand, deprecation.rst is used to announce something
>> will be removed in the future release. Changes already done should be
>> moved from deprecation.rst to the release's .rst file. At least, this
>> is what I see in commit logs. If this change should be announced in
>> deprecation.rst, does this mean there should be another patch in the
>> future (after 2.3 release?) making this function static? And that
>> future patch will add DPDK_2.3 structure in the map file?
>>
>> Thank you for your time,
>> Wojtek
>>
>
[dpdk-dev] [PATCH v4] af_packet: make the device detachable
Allow dynamic deallocation of af_packet device through proper
API functions. To achieve this:
* set device flag to RTE_ETH_DEV_DETACHABLE
* implement rte_pmd_af_packet_devuninit() and expose it
through rte_driver.uninit()
* copy device name to ethdev->data to make discoverable with
rte_eth_dev_allocated()
Moreover, make af_packet init function static, as there is no
reason to keep it public.
Signed-off-by: Wojciech Zmuda
---
v4:
* Rebased against current master branch
v3:
* Rephrased feature note in release notes.
* Rephrased commit log.
* Added API change note in release notes.
* Made init function static.
* Removed af_packet header file, as it is not needed
after init function is not public anymore.
v2:
* Fixed typo and a comment.
* Added feature to the 2.3 release notes.
* Free memory allocated for rx and tx queues.
doc/guides/rel_notes/release_16_04.rst | 6 +++
drivers/net/af_packet/Makefile | 5 --
drivers/net/af_packet/rte_eth_af_packet.c | 43 --
drivers/net/af_packet/rte_eth_af_packet.h | 53 --
.../net/af_packet/rte_pmd_af_packet_version.map| 3 --
5 files changed, 45 insertions(+), 65 deletions(-)
delete mode 100644 drivers/net/af_packet/rte_eth_af_packet.h
diff --git a/doc/guides/rel_notes/release_16_04.rst
b/doc/guides/rel_notes/release_16_04.rst
index fd7dd1a..475acea 100644
--- a/doc/guides/rel_notes/release_16_04.rst
+++ b/doc/guides/rel_notes/release_16_04.rst
@@ -51,6 +51,9 @@ This section should contain new features added in this
release. Sample format:
* **Added vhost-user live migration support.**
+* **Added af_packet dynamic removal function.**
+
+ Af_packet device can now be detached using API, like other PMD devices.
Resolved Issues
---
@@ -120,6 +123,9 @@ This section should contain API changes. Sample format:
* Add a short 1-2 sentence description of the API change. Use fixed width
quotes for ``rte_function_names`` or ``rte_struct_names``. Use the past
tense.
+* Af_packet device init function is no longer public. Device should be attached
+ with API.
+
ABI Changes
---
diff --git a/drivers/net/af_packet/Makefile b/drivers/net/af_packet/Makefile
index ce5d239..cb1a7ae 100644
--- a/drivers/net/af_packet/Makefile
+++ b/drivers/net/af_packet/Makefile
@@ -50,11 +50,6 @@ CFLAGS += $(WERROR_FLAGS)
#
SRCS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += rte_eth_af_packet.c
-#
-# Export include files
-#
-SYMLINK-y-include += rte_eth_af_packet.h
-
# this lib depends upon:
DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += lib/librte_mbuf
DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += lib/librte_ether
diff --git a/drivers/net/af_packet/rte_eth_af_packet.c
b/drivers/net/af_packet/rte_eth_af_packet.c
index 767f36b..5544528 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -53,8 +53,6 @@
#include
#include
-#include "rte_eth_af_packet.h"
-
#define ETH_AF_PACKET_IFACE_ARG"iface"
#define ETH_AF_PACKET_NUM_Q_ARG"qpairs"
#define ETH_AF_PACKET_BLOCKSIZE_ARG"blocksz"
@@ -65,6 +63,8 @@
#define DFLT_FRAME_SIZE(1 << 11)
#define DFLT_FRAME_COUNT (1 << 9)
+#define RTE_PMD_AF_PACKET_MAX_RINGS 16
+
struct pkt_rx_queue {
int sockfd;
@@ -667,11 +667,13 @@ rte_pmd_init_internals(const char *name,
data->nb_tx_queues = (uint16_t)nb_queues;
data->dev_link = pmd_link;
data->mac_addrs = &(*internals)->eth_addr;
+ strncpy(data->name,
+ (*eth_dev)->data->name, strlen((*eth_dev)->data->name));
(*eth_dev)->data = data;
(*eth_dev)->dev_ops = &ops;
(*eth_dev)->driver = NULL;
- (*eth_dev)->data->dev_flags = 0;
+ (*eth_dev)->data->dev_flags = RTE_ETH_DEV_DETACHABLE;
(*eth_dev)->data->drv_name = drivername;
(*eth_dev)->data->kdrv = RTE_KDRV_NONE;
(*eth_dev)->data->numa_node = numa_node;
@@ -798,7 +800,7 @@ rte_eth_from_packet(const char *name,
return 0;
}
-int
+static int
rte_pmd_af_packet_devinit(const char *name, const char *params)
{
unsigned numa_node;
@@ -836,10 +838,43 @@ exit:
return ret;
}
+static int
+rte_pmd_af_packet_devuninit(const char *name)
+{
+ struct rte_eth_dev *eth_dev = NULL;
+ struct pmd_internals *internals;
+ unsigned q;
+
+ RTE_LOG(INFO, PMD, "Closing AF_PACKET ethdev on numa socket %u\n",
+ rte_socket_id());
+
+ if (name == NULL)
+ return -1;
+
+ /* find the ethdev entry */
+ eth_dev = rte_eth_dev_allocated(name);
+ if (eth_dev == NULL)
+ return -1;
+
+ internals = eth_dev->data->dev_private;
+ for (q = 0; q < internals->nb_queues; q++) {
+ rte_free(internals->rx_queue[q].rd);
+ rte_free(internals->tx_queue[q].rd);
+ }
+
+ rte_free(eth_dev->data->dev_priva
[dpdk-dev] [PATCH 1/3] kcp: add kernel control path kernel module
Le 02/03/2016 11:51, Jim Thompson a ?crit : > Can we take it as a requirement to support FreeBSD this time around? Of course, all OS should be on the loop, but I guess, it would be per kernel specific. What is ethtool on FreeBSD? Or can you start porting ethtool on FreeBSD?
[dpdk-dev] [PATCH v3 0/5] add dpdk packet capture support for tcpdump
This patch set include the design to capture packets from dpdk ports for tcpdump. This patch set include test-pmd changes to verify below patch set. http://dpdk.org/dev/patchwork/patch/9750/ http://dpdk.org/dev/patchwork/patch/9751/ http://dpdk.org/dev/patchwork/patch/9752/ Dependencies 1: Patches 2/5 and 3/5 of current patch set contains pcap based design. So to compile and run these patches, libpcap must be installed and pcap config option should be set to yes i.e. CONFIG_RTE_LIBRTE_PMD_PCAP=y. packet capture flow for tcpdump: Part of the design is implemented in secondary process (proc_info.c) and other part in primary process (eal_interrupt.c). Communication between primary and secondary processes is provided using socket and rte_ring. [Secondary process: proc_info application] *Changes are included in the patch 3/5 *User should request packet capture via proc_info application command line by passing newly added tcpdump command line options i.e. [--tcpdump (port,queue)] [ --src-ip-filter \"A.B.C.D\"] [--single-tcpdump-file]. Note: As basic support, a src ip filter option is provided for filtering the packets. This is optional. If user dont provide any src ip filter option all packets will be captured for tcpdump. *proc_info application sends port, queue and src ip filter information to primary process along with register rx tx callbacks message. *proc_info application either writes ingress, egress packets to seperate RX and TX pcap files, or writes both ingress and egress packets to single RX_TX pcap file. This behaviour can be controlled by passing command line option "--sicgle-tcpdump-file". *proc_info application runs in a while loop, dequeues packets sent by primary process over shared rte_ring and write the packets to pcap file. [Primary Process]: *Changes are included in the patch 4/5. *Creates rte_rings and mempool used for communicating the packets with the secondary process. *Creates socket, waits on socket for message from secondary process. *Upon receiving the register rx tx callbacks message, registers ''rte_eth_rxtx_callbacks'' for receiving ingress and egress packets of given port and queue. *RX callback: Get the packets, apply src ip filter, for the matched packets duplicate packets will be created from new mempool and the new duplicated packets will be enqueued to rte_ring for the secondary process to dequeue and write to pcap. Note: If user dont provide any src ip filter option, all the packets are captured. *TX callback: Gets the packets, apply src ip filter, for the matched packets increments reference counter of the packet, enqueue to other rte_ring for the secondary process to dequeue and write to pcap. Note: If user dont provide any src ip filter option, all the packets are captured. [Secondary Process]: *When the secondary process is terminated with ''ctrl+c'', secondary process sends remove rx tx callbacks message to the primary process. *[Primary Process]: *When the primary process receives remove rx tx callbacks message, it removes registered rxtx callbacks. Users who wish to view packets can run "tcpdump -r RX_pcap.pcap/TX_pcap.pcap/RX_TX_pcap.pcap" to view packets of interest. Running the changes: === 1)Start any primary sample application. ex:sudo ./examples/rxtx_callbacks/build/rxtx_callbacks -c 0x2 -n 2 2)Start traffic from traffic generator. 3)Start proc_info(runs as secondary process by default)application with new parameters for tcpdump. these parameters can be mix and matched to acheive different usability experience ex1: sudo ./build/app/proc_info/dpdk_proc_info -c 0x4 -n 2 -- -p 0x3 --tcpdump '(0,0)(1,0)' --src-ip-filter="2.2.2.2" packets from queue 0 of each port matching with src ip filter are captured to /tmp/RX_pcap.pcap, /tmp/TX_pcap.pcap. ex2: sudo ./build/app/proc_info/dpdk_proc_info -c 0x4 -n 2 -- -p 0x3 --tcpdump '(0,*)(1,*)' --src-ip-filter="2.2.2.2" --single-tcpdump-file packets from all queues of each port matching with src ip filter are captured to single pcap file i.e. /tmp/RX_TX_pcap.pcap. ex3: sudo ./build/app/proc_info/dpdk_proc_info -c 0x4 -n 2 -- -p 0x3 --tcpdump '(0,*)(1,0)' packets from all queues of port 0 and packets from queue 0 of port 1 are captured to /tmp/RX_pcap.pcap, /tmp/TX_pcap.pcap. 4)Stop the secondary process using "ctrl+c" and rerun it, packet capturing should start again. Note 1: For every start of proc_info application existing pacp files from /tmp/ folder will be removed and new ones will be created. Note 2: Secondary process must use cores different from the primary process cores. Known limitations: 1: Writing to PCAP files will be stopped once the folder size where pcap files exists reaches its max value. 2: Because of the underlying pcap writing overhead packets can only be captured at slow rates. v3: * added tcpdump design changes to programmers guide and proc_info sample a
[dpdk-dev] [PATCH v3 1/5] app/test-pmd: fix nb_rxq and nb_txq checks
Made testpmd changes to validate nb_rxq/nb_txq zero
value changes of librte_ether.
Signed-off-by: Reshma Pattan
---
app/test-pmd/cmdline.c| 11 +--
app/test-pmd/parameters.c | 14 +-
app/test-pmd/testpmd.c| 28 +---
3 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 52e9f5f..f8e71a3 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* Copyright(c) 2014 6WIND S.A.
* All rights reserved.
*
@@ -1163,17 +1163,16 @@ cmd_config_rx_tx_parsed(void *parsed_result,
printf("Please stop all ports first\n");
return;
}
-
if (!strcmp(res->name, "rxq")) {
- if (res->value <= 0) {
- printf("rxq %d invalid - must be > 0\n", res->value);
+ if (!res->value && !nb_txq) {
+ printf("Warning: Either rx or tx queues should be non
zero\n");
return;
}
nb_rxq = res->value;
}
else if (!strcmp(res->name, "txq")) {
- if (res->value <= 0) {
- printf("txq %d invalid - must be > 0\n", res->value);
+ if (!res->value && !nb_rxq) {
+ printf("Warning: Either rx or tx queues should be non
zero\n");
return;
}
nb_txq = res->value;
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 4b421c8..55572eb 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -810,22 +810,26 @@ launch_args_parse(int argc, char** argv)
rss_hf = ETH_RSS_UDP;
if (!strcmp(lgopts[opt_idx].name, "rxq")) {
n = atoi(optarg);
- if (n >= 1 && n <= (int) MAX_QUEUE_ID)
+ if (n >= 0 && n <= (int) MAX_QUEUE_ID)
nb_rxq = (queueid_t) n;
else
rte_exit(EXIT_FAILURE, "rxq %d invalid
- must be"
- " >= 1 && <= %d\n", n,
+ " >= 0 && <= %d\n", n,
(int) MAX_QUEUE_ID);
}
if (!strcmp(lgopts[opt_idx].name, "txq")) {
n = atoi(optarg);
- if (n >= 1 && n <= (int) MAX_QUEUE_ID)
+ if (n >= 0 && n <= (int) MAX_QUEUE_ID)
nb_txq = (queueid_t) n;
else
rte_exit(EXIT_FAILURE, "txq %d invalid
- must be"
- " >= 1 && <= %d\n", n,
+ " >= 0 && <= %d\n", n,
(int) MAX_QUEUE_ID);
}
+ if (!nb_rxq && !nb_txq) {
+ rte_exit(EXIT_FAILURE, "Either rx or tx queues
should "
+ "be non-zero\n");
+ }
if (!strcmp(lgopts[opt_idx].name, "burst")) {
n = atoi(optarg);
if ((n >= 1) && (n <= MAX_PKT_BURST))
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 1319917..a523442 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -608,6 +608,7 @@ init_fwd_streams(void)
portid_t pid;
struct rte_port *port;
streamid_t sm_id, nb_fwd_streams_new;
+ queueid_t q;
/* set socket id according to numa or not */
FOREACH_PORT(pid, ports) {
@@ -643,7 +644,12 @@ init_fwd_streams(void)
}
}
- nb_fwd_streams_new = (streamid_t)(nb_ports * nb_rxq);
+ q = RTE_MAX(nb_rxq, nb_txq);
+ if (q == 0) {
+ printf("Fail:Cannot allocate fwd streams as number of queues is
0\
[dpdk-dev] [PATCH v3 2/5] drivers/net/pcap: add public api to create pcap device
Added new public api to create pcap device from pcaps.
Added new header file for API declaration.
Added new public api to version map
Signed-off-by: Reshma Pattan
---
drivers/net/pcap/Makefile |4 +-
drivers/net/pcap/rte_eth_pcap.c | 156 +---
drivers/net/pcap/rte_eth_pcap.h | 87
drivers/net/pcap/rte_pmd_pcap_version.map |7 ++
4 files changed, 235 insertions(+), 19 deletions(-)
create mode 100644 drivers/net/pcap/rte_eth_pcap.h
diff --git a/drivers/net/pcap/Makefile b/drivers/net/pcap/Makefile
index b41d8a2..8e424bf 100644
--- a/drivers/net/pcap/Makefile
+++ b/drivers/net/pcap/Makefile
@@ -1,6 +1,6 @@
# BSD LICENSE
#
-# Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+# Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
# Copyright(c) 2014 6WIND S.A.
# All rights reserved.
#
@@ -53,7 +53,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += rte_eth_pcap.c
#
# Export include files
#
-SYMLINK-y-include +=
+SYMLINK-y-include += rte_eth_pcap.h
# this lib depends upon:
DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += lib/librte_mbuf
diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index f9230eb..b7b9fd9 100644
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* Copyright(c) 2014 6WIND S.A.
* All rights reserved.
*
@@ -44,7 +44,7 @@
#include
-#include
+#include "rte_eth_pcap.h"
#define RTE_ETH_PCAP_SNAPSHOT_LEN 65535
#define RTE_ETH_PCAP_SNAPLEN ETHER_MAX_JUMBO_FRAME_LEN
@@ -85,21 +85,6 @@ struct pcap_tx_queue {
char type[ETH_PCAP_ARG_MAXLEN];
};
-struct rx_pcaps {
- unsigned num_of_rx;
- pcap_t *pcaps[RTE_PMD_RING_MAX_RX_RINGS];
- const char *names[RTE_PMD_RING_MAX_RX_RINGS];
- const char *types[RTE_PMD_RING_MAX_RX_RINGS];
-};
-
-struct tx_pcaps {
- unsigned num_of_tx;
- pcap_dumper_t *dumpers[RTE_PMD_RING_MAX_TX_RINGS];
- pcap_t *pcaps[RTE_PMD_RING_MAX_RX_RINGS];
- const char *names[RTE_PMD_RING_MAX_RX_RINGS];
- const char *types[RTE_PMD_RING_MAX_RX_RINGS];
-};
-
struct pmd_internals {
struct pcap_rx_queue rx_queue[RTE_PMD_RING_MAX_RX_RINGS];
struct pcap_tx_queue tx_queue[RTE_PMD_RING_MAX_TX_RINGS];
@@ -875,6 +860,143 @@ error:
return -1;
}
+int
+rte_eth_from_pcapsndumpers(const char *name,
+ struct rx_pcaps *rx_queues,
+ const unsigned nb_rx_queues,
+ struct tx_pcaps *tx_queues,
+ const unsigned nb_tx_queues,
+ const unsigned numa_node)
+{
+ struct rte_eth_dev_data *data = NULL;
+ struct pmd_internals *internals = NULL;
+ struct rte_eth_dev *eth_dev = NULL;
+ unsigned i;
+ pcap_dumper_t *dumper;
+ pcap_t *pcap = NULL;
+
+ hz = rte_get_timer_hz();
+ /* do some parameter checking */
+ if (!rx_queues && nb_rx_queues > 0)
+ return -1;
+ if (!tx_queues && nb_tx_queues > 0)
+ return -1;
+
+ /* initialize rx and tx pcaps */
+ for (i = 0; i < nb_rx_queues; i++) {
+ if (open_single_rx_pcap(rx_queues->names[i], &pcap) < 0)
+ return -1;
+ rx_queues->pcaps[i] = pcap;
+ }
+ for (i = 0; i < nb_tx_queues; i++) {
+ if (open_single_tx_pcap(tx_queues->names[i], &dumper) < 0)
+ return -1;
+ tx_queues->dumpers[i] = dumper;
+ }
+
+ RTE_LOG(INFO, PMD, "Creating pcap-backed ethdev on numa socket %u\n",
numa_node);
+
+ /* now do all data allocation - for eth_dev structure, dummy pci driver
+* and internal (private) data
+*/
+ data = rte_zmalloc_socket(name, sizeof(*data), 0, numa_node);
+ if (!data)
+ goto error;
+
+ if (nb_rx_queues) {
+ data->rx_queues = rte_zmalloc_socket(name, sizeof(void *) *
nb_rx_queues,
+ 0, numa_node);
+ if (!data->rx_queues)
+ goto error;
+ }
+
+ if (nb_tx_queues) {
+ data->tx_queues = rte_zmalloc_socket(name, sizeof(void *) *
nb_tx_queues,
+ 0, numa_node);
+ if (!data->tx_queues)
+ goto error;
+ }
+
+ internals = rte_zmalloc_socket(name, sizeof(*internals), 0, numa_node);
+ if (!internals)
+ goto error;
+
+ /* reserve an ethdev entry */
+ eth_dev = rte_eth_dev_allocate(name, RTE_ETH_DEV_VIRTUAL);
+ if (!eth_dev)
+ goto error;
+
+ /* check length of device name */
+ if ((strlen(eth_dev->data->name) + 1) > sizeof(data->name))
+ goto error;
+
+
[dpdk-dev] [PATCH v3 4/5] lib/librte_eal: add tcpdump support in primary process
Added tcpdump functionality to eal interrupt thread.
Enhanced interrupt thread to support tcpdump socket
and message processing from secondary.
Created new mempool and rings to handle packets of tcpdump.
Added rte_eth_rxtx_callbacks for ingress/egress packets processing
for tcpdump.
Added functionality to remove registered rte_eth_rxtx_callbacks
once secondary process is terminated.
Signed-off-by: Reshma Pattan
---
lib/librte_eal/linuxapp/eal/Makefile |5 +-
lib/librte_eal/linuxapp/eal/eal_interrupts.c | 422 +-
2 files changed, 424 insertions(+), 3 deletions(-)
diff --git a/lib/librte_eal/linuxapp/eal/Makefile
b/lib/librte_eal/linuxapp/eal/Makefile
index 6e26250..425152c 100644
--- a/lib/librte_eal/linuxapp/eal/Makefile
+++ b/lib/librte_eal/linuxapp/eal/Makefile
@@ -1,6 +1,6 @@
# BSD LICENSE
#
-# Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
+# Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -47,6 +47,9 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include
CFLAGS += -I$(RTE_SDK)/lib/librte_ring
CFLAGS += -I$(RTE_SDK)/lib/librte_mempool
CFLAGS += -I$(RTE_SDK)/lib/librte_ivshmem
+CFLAGS += -I$(RTE_SDK)/lib/librte_mbuf
+CFLAGS += -I$(RTE_SDK)/lib/librte_ether
+CFLAGS += -I$(RTE_SDK)/lib/librte_net
CFLAGS += $(WERROR_FLAGS) -O3
# specific to linuxapp exec-env
diff --git a/lib/librte_eal/linuxapp/eal/eal_interrupts.c
b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
index 06b26a9..3b82b7b 100644
--- a/lib/librte_eal/linuxapp/eal/eal_interrupts.c
+++ b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,11 @@
#include
#include
#include
+#include
+#include
#include
+#include
+#include
#include
#include
@@ -65,15 +69,40 @@
#include
#include
#include
+#include
+#include
+#include
+#include
+#include
#include "eal_private.h"
#include "eal_vfio.h"
#include "eal_thread.h"
+#include "eal_internal_cfg.h"
#define EAL_INTR_EPOLL_WAIT_FOREVER (-1)
#define NB_OTHER_INTR 1
+#define TCPDUMP_SOCKET_PATH "%s/tcpdump_mp_socket"
+#define TCPDUMP_SOCKET_ERR 0xFF
+#define TCPDUMP_REQ 0x1
+#define RING_SIZE 1024
+#define BURST_SIZE 32
+#define NUM_MBUFS 65536
+#define MBUF_CACHE_SIZE 250
+#define MAX_CBS 54
+#define PORT_QUEUE_SIZE 5
static RTE_DEFINE_PER_LCORE(int, _epfd) = -1; /**< epoll fd per thread */
+static uint32_t src_ip_filter;
+static int tcpdump_socket_fd;
+struct rte_ring *prim_to_sec_rx;
+struct rte_ring *prim_to_sec_tx;
+struct rte_mempool *tcpdump_pktmbuf_pool;
+static struct rxtx_cbs {
+ uint8_t port;
+ uint16_t queue;
+ struct rte_eth_rxtx_callback *cb;
+} rx_cbs[MAX_CBS], tx_cbs[MAX_CBS];
/**
* union for pipe fds.
@@ -644,6 +673,306 @@ rte_intr_disable(struct rte_intr_handle *intr_handle)
return 0;
}
+static inline void
+tcpdump_pktmbuf_duplicate(struct rte_mbuf *mi, struct rte_mbuf *m)
+{
+
+ mi->data_len = m->data_len;
+ mi->port = m->port;
+ mi->vlan_tci = m->vlan_tci;
+ mi->vlan_tci_outer = m->vlan_tci_outer;
+ mi->tx_offload = m->tx_offload;
+ mi->hash = m->hash;
+
+ mi->pkt_len = mi->data_len;
+ mi->ol_flags = m->ol_flags;
+ mi->packet_type = m->packet_type;
+
+ rte_memcpy(rte_pktmbuf_mtod(mi, void *),
+ rte_pktmbuf_mtod(m, void *),
+ rte_pktmbuf_data_len(mi));
+
+ __rte_mbuf_sanity_check(mi, 1);
+ __rte_mbuf_sanity_check(m, 0);
+}
+
+static inline struct rte_mbuf *
+tcpdump_pktmbuf_clone(struct rte_mbuf *md, struct rte_mempool *mp)
+{
+ struct rte_mbuf *mc, *mi, **prev;
+ uint32_t pktlen;
+ uint8_t nseg;
+
+ mc = rte_pktmbuf_alloc(mp);
+ if (unlikely(mc == NULL))
+ return NULL;
+
+ mi = mc;
+ prev = &mi->next;
+ pktlen = md->pkt_len;
+ nseg = 0;
+
+ do {
+ nseg++;
+ tcpdump_pktmbuf_duplicate(mi, md);
+ *prev = mi;
+ prev = &mi->next;
+ } while ((md = md->next) != NULL &&
+ (mi = rte_pktmbuf_alloc(mp)) != NULL);
+
+ *prev = NULL;
+ mc->nb_segs = nseg;
+ mc->pkt_len = pktlen;
+
+ /* Allocation of new indirect segment failed */
+ if (unlikely(mi == NULL)) {
+ rte_pktmbuf_free(mc);
+ return NULL;
+ }
+
+ __rte_mbuf_sanity_check(mc, 1);
+ return mc;
+
+}
+
+static int
+compare_filter(struct rte_mbuf *pkt)
+{
+ struct ipv4_hdr *pkt_hdr = rte_pktmbuf_mtod_offset(pkt, struct ipv4_hdr
*,
+
[dpdk-dev] [PATCH v3 5/5] doc: update doc for tcpdump feature
Added tcpdump design changes to proc_info section of sample application user guide. Added tcpdump design changes to env abstraction layer section of programmers guide. Updated Release notes Signed-off-by: Reshma Pattan --- doc/guides/prog_guide/env_abstraction_layer.rst | 43 - doc/guides/rel_notes/release_16_04.rst |6 ++ doc/guides/sample_app_ug/proc_info.rst | 57 +++ 3 files changed, 94 insertions(+), 12 deletions(-) diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst index 4737dc2..be06764 100644 --- a/doc/guides/prog_guide/env_abstraction_layer.rst +++ b/doc/guides/prog_guide/env_abstraction_layer.rst @@ -1,5 +1,5 @@ .. BSD LICENSE -Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +Copyright(c) 2010-2016 Intel Corporation. All rights reserved. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -169,7 +169,8 @@ The EAL can query the CPU at runtime (using the rte_cpu_get_feature() function) User Space Interrupt Event ~~ -+ User Space Interrupt and Alarm Handling in Host Thread +User Space Interrupt and Alarm Handling in Host Thread +^^ The EAL creates a host thread to poll the UIO device file descriptors to detect the interrupts. Callbacks can be registered or unregistered by the EAL functions for a specific interrupt event @@ -182,7 +183,8 @@ The EAL also allows timed callbacks to be used in the same way as for NIC interr i.e. link up and link down notification. -+ RX Interrupt Event +RX Interrupt Event +^^ The receive and transmit routines provided by each PMD don't limit themselves to execute in polling thread mode. To ease the idle polling with tiny throughput, it's useful to pause the polling and wait until the wake-up event happens. @@ -207,6 +209,41 @@ The eth_dev driver takes responsibility to program the latter mapping. The RX interrupt are controlled/enabled/disabled by ethdev APIs - 'rte_eth_dev_rx_intr_*'. They return failure if the PMD hasn't support them yet. The intr_conf.rxq flag is used to turn on the capability of RX interrupt per device. +Tcpdump +^^^ + +The EAL thread polls for the tcpdump file descriptor. +If the polled file descriptor matches the tcpdump file descriptor it will initiate tcpdump processing. + +The EAL thread creates the socket for the tcpdump connection with the secondary process and registers the socket with +the tcpdump epoll event. +The tcpdump event will be polled as part of the interrupt thread. + +The EAL thread also creates the mempool and two rte_rings for packets duplication, and sharing the packet information +with the secondary process respectively. + +Upon receiving the tcpdump event, the EAL thread either receives a "register" or "remove" message for RX/TX callbacks +on the socket. + +For the "register" RX/TX callback message: + +* The EAL thread parses the port and queue information of the message and registers the ``rte_eth_rxtx_callbacks`` + for the given port and queue. + +* The Rx callback will apply a src ip filter to the received packets and the matched packets will be duplicated to the + new mempool. + Duplicated packets will be enqueued to one of the rte_rings for the secondary process to use. + If no filter is provided, all the packets will be duplicated to the new mempool. + +* The TX callback will apply a src ip filter to the received packets and the reference count of the matched + packets will be incremented before enqueuing to the second rte_ring for the secondary process to use. + If no filter is provided, the reference count of all the packets will be incremented. + +For the "remove" RX/TX callback message: + +* The EAL thread parses the port and queue information of the message and removes the ``rte_eth_rxtx_callbacks`` + for the given port and queue. + Blacklisting diff --git a/doc/guides/rel_notes/release_16_04.rst b/doc/guides/rel_notes/release_16_04.rst index fd7dd1a..bd6f33b 100644 --- a/doc/guides/rel_notes/release_16_04.rst +++ b/doc/guides/rel_notes/release_16_04.rst @@ -51,6 +51,9 @@ This section should contain new features added in this release. Sample format: * **Added vhost-user live migration support.** +* **Added dpdk packet capturing support for tcpdump.** + + Now users have the facility to capture the packets of dpdk ports using dpdk_proc_info application. Resolved Issues --- @@ -83,6 +86,7 @@ Drivers This made impossible the creation of more than one aesni_mb device from command line. +* **pcap: Added public API support for creating pcap device using pcaps and dumpers.** Libraries ~ @@ -92,6 +96,7 @@ Libraries Fix crc32c hash functions to return a valid crc32c value for data lengths not multiple of 4 bytes. +* **Enhan
[dpdk-dev] [PATCH v3 3/5] app/proc_info: add tcpdump support in secondary process
Added below optional command line options for tcpdump support.
1)--tcupdump '(port,queue)' ==> port id and queue can be valid
queue number or '*'. User need to specify specific queue id to
capture packets on given queue for given port.
(OR) '*' to capture packets from all queues of given port.
2)--src-ip-filter "A.B.C.D" ==> src ip to be used to filter the
packets. If src ip filter option is not passed, all packets will
be captured.
3)--single-tcpdump-file ==> If option is passed ingress and egress
packets will be captured to single pcap file. Else will be captured
to two different RX & TX pcap files.
Added pcap device creation and writing of packets to pcap device
for tcpdump.
Added socket functionality to communicate with primary process.
Signed-off-by: Reshma Pattan
---
app/proc_info/main.c | 472 +-
1 files changed, 469 insertions(+), 3 deletions(-)
diff --git a/app/proc_info/main.c b/app/proc_info/main.c
index 341176d..96d4b6e 100644
--- a/app/proc_info/main.c
+++ b/app/proc_info/main.c
@@ -1,7 +1,7 @@
/*
* BSD LICENSE
*
- * Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -38,8 +38,25 @@
#include
#include
#include
+#include
#include
#include
+#include
+#include
+#include
+#include
+
+/* sys/un.h with __USE_MISC uses strlen, which is unsafe */
+#ifdef __USE_MISC
+#define REMOVED_USE_MISC
+#undef __USE_MISC
+#endif
+#include
+/* make sure we redefine __USE_MISC only if it was previously undefined */
+#ifdef REMOVED_USE_MISC
+#define __USE_MISC
+#undef REMOVED_USE_MISC
+#endif
#include
#include
@@ -57,10 +74,23 @@
#include
#include
#include
+#include
+
+#ifdef RTE_LIBRTE_PMD_PCAP
+#include
+#endif
/* Maximum long option length for option parsing. */
#define MAX_LONG_OPT_SZ 64
#define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1
+#define APP_ARG_TCPDUMP_MAX_TUPLES 54
+#define TCPDUMP_SOCKET_PATH "%s/tcpdump_mp_socket"
+#define CMSGLEN CMSG_LEN(sizeof(int))
+#define TX_DESC_PER_QUEUE 512
+#define RX_DESC_PER_QUEUE 128
+#define BURST_SIZE 32
+#define MBUF_PER_POOL 65535
+#define MBUF_POOL_CACHE_SIZE 250
/**< mask of enabled ports */
static uint32_t enabled_port_mask;
@@ -75,13 +105,63 @@ static uint32_t reset_xstats;
/**< Enable memory info. */
static uint32_t mem_info;
+enum tcpdump_msg_type {
+ REMOVE_RXTX_CBS = 1,
+ REGISTER_RXTX_CBS = 2
+};
+
+enum rx_tx_type {
+ RX = 1,
+ TX = 2,
+ RX_TX = 3,
+ RX_TX_TYPES = 2
+};
+
+/**< src ip filter for tcpdump. */
+static uint32_t src_ip_filter;
+/**< socket for connecting to primary. */
+static int socket_fd;
+/**< vdev port ids. */
+static int pcap_vdev_port_id[RX_TX_TYPES];
+volatile uint8_t quit_signal;
+/**< Enable tcpdump feature. */
+bool is_tcpdump_enabled;
+/** Enable single tcpdump pcap file */
+bool single_tcpdump_file;
+
+static volatile struct tcpdump_app_stats {
+ struct {
+ uint64_t dequeue_pkts;
+ uint64_t tx_pkts;
+ uint64_t freed_pkts;
+ } in __rte_cache_aligned;
+ struct {
+ uint64_t dequeue_pkts;
+ uint64_t tx_pkts;
+ uint64_t freed_pkts;
+ } out __rte_cache_aligned;
+} tcpdump_app_stats __rte_cache_aligned;
+
+struct tcpdump_port_queue_tuples {
+ int num_pq_tuples;
+ char *port_id[APP_ARG_TCPDUMP_MAX_TUPLES];
+ char *queue_id[APP_ARG_TCPDUMP_MAX_TUPLES];
+} __rte_cache_aligned;
+
+static struct tcpdump_port_queue_tuples tcpdump_pq_t;
+
/**< display usage */
+
static void
proc_info_usage(const char *prgname)
{
printf("%s [EAL options] -- -p PORTMASK\n"
" -m to display DPDK memory zones, segments and TAILQ
information\n"
" -p PORTMASK: hexadecimal bitmask of ports to retrieve stats
for\n"
+ " --tcpdump (port,queue): port and queue info for capturing
packets "
+ "for tcpdump\n"
+ " --src-ip-filter \"A.B.C.D\": src ip for tcpdump filtering\n"
+ " --single-tcpdump-file: capture packets to single pcap file\n"
" --stats: to display port statistics, enabled by default\n"
" --xstats: to display extended port statistics, disabled by "
"default\n"
@@ -116,14 +196,74 @@ parse_portmask(const char *portmask)
}
+static int
+parse_tcpdump(const char *q_arg)
+{
+ char s[256];
+ const char *p, *p0 = q_arg;
+ unsigned size;
+
+ enum fieldnames {
+ FLD_PORT = 0,
+ FLD_QUEUE,
+ _NUM_FLD
+ };
+
+ char *str_fld[_NUM_FLD];
+
+ while ((p = strchr(p0, '(')) != NULL) {
+ ++p;
+ p0 = strchr(p, ')');
+ if (p0 == NULL)
+
[dpdk-dev] [PATCH v2] mk: replace the combined library with a linker script
On 03/01/2016 04:48 PM, Panu Matilainen wrote: > On 03/01/2016 03:40 PM, Thomas Monjalon wrote: >> ping >> I would like to be sure nothing is forgotten in this new revision. > > Sorry, didn't realize you were waiting for input from me, it feels a bit > strange to comment on something supposedly coming from myself :) > >> 2016-02-23 23:20, Thomas Monjalon: >>> From: Panu Matilainen >>> >>> The physically linked-together combined library has been an increasing >>> source of problems, as was predicted when library and symbol versioning >>> was introduced. Replace the complex and fragile construction with a >>> simple linker script which achieves the same without all the problems, >>> remove the related kludges from eg mlx drivers. >>> >>> Since creating the linker script is practically zero cost, remove the >>> config option and just create it always. >>> >>> Based on a patch by Sergio Gonzales Monroy, linker script approach >>> initially suggested by Neil Horman. >>> >>> Suggested-by: Sergio Gonzalez Monroy >>> Suggested-by: Neil Horman >>> Signed-off-by: Panu Matilainen >>> Signed-off-by: Thomas Monjalon >>> --- >>> v2: >>> - move RTE_LIBNAME assignment rte.vars.mk to rte.combinedlib.mk >>> - update crypto >>> - update doc >>> - update rte.app.mk >>> - update test-build.sh >> > > Briefly tested, gets generated and installed as it should etc - looks > good to me. Forgot to note that the patch doesn't apply anymore because of scripts/test-build.sh changes, so it needs a rebase. Want me to send a v3 or will you handle it when committing? On a related note, if this is about to go in then I'd rather have it sooner than later because it also conflicts with the LDLIBS fixing that's been slowly going on for months and months but been on hold lately, partly because of this hangup. - Panu -
[dpdk-dev] [PATCH v2] mk: replace the combined library with a linker script
2016-03-02 14:30, Panu Matilainen: > On 03/01/2016 04:48 PM, Panu Matilainen wrote: > > On 03/01/2016 03:40 PM, Thomas Monjalon wrote: > >> ping > >> I would like to be sure nothing is forgotten in this new revision. > > > > Sorry, didn't realize you were waiting for input from me, it feels a bit > > strange to comment on something supposedly coming from myself :) > > > >> 2016-02-23 23:20, Thomas Monjalon: > >>> From: Panu Matilainen > >>> > >>> The physically linked-together combined library has been an increasing > >>> source of problems, as was predicted when library and symbol versioning > >>> was introduced. Replace the complex and fragile construction with a > >>> simple linker script which achieves the same without all the problems, > >>> remove the related kludges from eg mlx drivers. > >>> > >>> Since creating the linker script is practically zero cost, remove the > >>> config option and just create it always. > >>> > >>> Based on a patch by Sergio Gonzales Monroy, linker script approach > >>> initially suggested by Neil Horman. > >>> > >>> Suggested-by: Sergio Gonzalez Monroy > >>> Suggested-by: Neil Horman > >>> Signed-off-by: Panu Matilainen > >>> Signed-off-by: Thomas Monjalon > >>> --- > >>> v2: > >>> - move RTE_LIBNAME assignment rte.vars.mk to rte.combinedlib.mk > >>> - update crypto > >>> - update doc > >>> - update rte.app.mk > >>> - update test-build.sh > >> > > > > Briefly tested, gets generated and installed as it should etc - looks > > good to me. > > Forgot to note that the patch doesn't apply anymore because of > scripts/test-build.sh changes, so it needs a rebase. Want me to send a > v3 or will you handle it when committing? > > On a related note, if this is about to go in then I'd rather have it > sooner than later because it also conflicts with the LDLIBS fixing > that's been slowly going on for months and months but been on hold > lately, partly because of this hangup. Applied, thanks
[dpdk-dev] [PATCH v2] mk: replace the combined library with a linker script
On 03/02/2016 02:40 PM, Thomas Monjalon wrote: > 2016-03-02 14:30, Panu Matilainen: >> On 03/01/2016 04:48 PM, Panu Matilainen wrote: >>> On 03/01/2016 03:40 PM, Thomas Monjalon wrote: ping I would like to be sure nothing is forgotten in this new revision. >>> >>> Sorry, didn't realize you were waiting for input from me, it feels a bit >>> strange to comment on something supposedly coming from myself :) >>> 2016-02-23 23:20, Thomas Monjalon: > From: Panu Matilainen > > The physically linked-together combined library has been an increasing > source of problems, as was predicted when library and symbol versioning > was introduced. Replace the complex and fragile construction with a > simple linker script which achieves the same without all the problems, > remove the related kludges from eg mlx drivers. > > Since creating the linker script is practically zero cost, remove the > config option and just create it always. > > Based on a patch by Sergio Gonzales Monroy, linker script approach > initially suggested by Neil Horman. > > Suggested-by: Sergio Gonzalez Monroy > Suggested-by: Neil Horman > Signed-off-by: Panu Matilainen > Signed-off-by: Thomas Monjalon > --- > v2: > - move RTE_LIBNAME assignment rte.vars.mk to rte.combinedlib.mk > - update crypto > - update doc > - update rte.app.mk > - update test-build.sh >>> >>> Briefly tested, gets generated and installed as it should etc - looks >>> good to me. >> >> Forgot to note that the patch doesn't apply anymore because of >> scripts/test-build.sh changes, so it needs a rebase. Want me to send a >> v3 or will you handle it when committing? >> >> On a related note, if this is about to go in then I'd rather have it >> sooner than later because it also conflicts with the LDLIBS fixing >> that's been slowly going on for months and months but been on hold >> lately, partly because of this hangup. > > Applied, thanks > Awesome, thank you! :) - Panu -
[dpdk-dev] [PATCH] eal: arm64: introduce RTE_CPUFLAG_ATOMICS
armv8.1 adds support for new atomic instructions.
Linux kernel v4.3 onwards, the presence of atomic instruction
support can detect through HWCAP_ATOMICS
Signed-off-by: Jerin Jacob
---
app/test/test_cpuflags.c | 3 +++
lib/librte_eal/common/arch/arm/rte_cpuflags.c| 1 +
lib/librte_eal/common/include/arch/arm/rte_cpuflags_64.h | 1 +
3 files changed, 5 insertions(+)
diff --git a/app/test/test_cpuflags.c b/app/test/test_cpuflags.c
index e8d0ce7..d083c86 100644
--- a/app/test/test_cpuflags.c
+++ b/app/test/test_cpuflags.c
@@ -144,6 +144,9 @@ test_cpuflags(void)
printf("Check for CRC32:\t");
CHECK_FOR_FLAG(RTE_CPUFLAG_CRC32);
+
+ printf("Check for ATOMICS:\t");
+ CHECK_FOR_FLAG(RTE_CPUFLAG_ATOMICS);
#endif
#if defined(RTE_ARCH_X86_64) || defined(RTE_ARCH_I686)
diff --git a/lib/librte_eal/common/arch/arm/rte_cpuflags.c
b/lib/librte_eal/common/arch/arm/rte_cpuflags.c
index f14c56a..23240ef 100644
--- a/lib/librte_eal/common/arch/arm/rte_cpuflags.c
+++ b/lib/librte_eal/common/arch/arm/rte_cpuflags.c
@@ -122,6 +122,7 @@ const struct feature_entry rte_cpu_feature_table[] = {
FEAT_DEF(SHA1, REG_HWCAP,5)
FEAT_DEF(SHA2, REG_HWCAP,6)
FEAT_DEF(CRC32, REG_HWCAP,7)
+ FEAT_DEF(ATOMICS, REG_HWCAP,8)
FEAT_DEF(AARCH64, REG_PLATFORM, 1)
};
#endif /* RTE_ARCH */
diff --git a/lib/librte_eal/common/include/arch/arm/rte_cpuflags_64.h
b/lib/librte_eal/common/include/arch/arm/rte_cpuflags_64.h
index 810e8a0..49aead9 100644
--- a/lib/librte_eal/common/include/arch/arm/rte_cpuflags_64.h
+++ b/lib/librte_eal/common/include/arch/arm/rte_cpuflags_64.h
@@ -49,6 +49,7 @@ enum rte_cpu_flag_t {
RTE_CPUFLAG_SHA1,
RTE_CPUFLAG_SHA2,
RTE_CPUFLAG_CRC32,
+ RTE_CPUFLAG_ATOMICS,
RTE_CPUFLAG_AARCH64,
/* The last item */
RTE_CPUFLAG_NUMFLAGS,/**< This should always be the last! */
--
2.1.0
[dpdk-dev] [PATCH v4 1/3] fm10k: enable FTAG based forwarding
2016-03-01 14:37, Stephen Hemminger:
> On Tue, 1 Mar 2016 13:36:39 +0800
> Wang Xiao W wrote:
> > +static int
> > +fm10k_check_ftag(struct rte_devargs *devargs)
> > +{
> > + if (devargs == NULL)
> > + return 0;
> > +
> > + if (strstr(devargs->args, "enable_ftag=1") == NULL)
> > + return 0;
> > +
> > + return 1;
> > +}
>
> It is good to see the DPDK keeping up with the leading edge of hardware
> support.
>
> My issue is that devargs are the Linux module parameters method of
> configuration in the DPDK world. They are an API only a developer
> would love..
>
> 1. It has to be done at boot
For vdev it can be done later.
The devargs can be generalized in the driver model to provide a
configuration interface per device.
> 2. Applications have to rewrite (or expect customer) to pass args
Like said above, if the devargs are correctly implemented, there will
be some API to pass them.
> 3. Can't be changed at runtime
Same point as 1.
> 4. Can't be selected on per device basis.
No. The devargs are args per device.
For PCI, they are currently passed in the whitelist.
> Please find a better way.
Another way would be to extend the configuration structures.
I think it's better to re-think the device configuration and the command line
using some devargs and more functions, ops and structs to configure the really
generic stuff.
This devargs goes in the direction of a flexible configuration, so I'd vote +1.
[dpdk-dev] [PATCH v1] I217 and I218 changes
v1: Make necessary changes to support I217 and I218 NICs.
Use v2' incorporating internal review comments as a base.
Internal review done by Wenzhou Lu (Intel) and internal
review versions and testing shown below
v2':
Incorporate Wenzhou's comments, remove superfluous
assignment to fc.requested_mode in em_hardware_init
function.
Compiled and tested (via testpmd) on Ubuntu 14.04 on target
x86_64-native-linuxapp-gcc
Compiled for target x86_64-native-linuxapp-clang
v1':
Modified driver and eal code to support I217 and I218
Intel NICs.
Compiled and tested (via testpmd) on Ubuntu 14.04 for target
x86_64-native-linuxapp-gcc
Compiled for target x86_64-native-linuxapp-clang
M. Jay(Intel) had used the patch for DPDK demo.
Signed-off-by: Ravi Kerur
Acked-by: Wenzhuo Lu
---
drivers/net/e1000/base/e1000_osdep.h| 26 +++-
drivers/net/e1000/em_ethdev.c | 32 +
lib/librte_eal/common/include/rte_pci_dev_ids.h | 9 +++
3 files changed, 61 insertions(+), 6 deletions(-)
diff --git a/drivers/net/e1000/base/e1000_osdep.h
b/drivers/net/e1000/base/e1000_osdep.h
index b2c76e3..47a1948 100644
--- a/drivers/net/e1000/base/e1000_osdep.h
+++ b/drivers/net/e1000/base/e1000_osdep.h
@@ -96,21 +96,35 @@ typedef int bool;
#define E1000_PCI_REG(reg) (*((volatile uint32_t *)(reg)))
+#define E1000_PCI_REG16(reg) (*((volatile uint16_t *)(reg)))
+
#define E1000_PCI_REG_WRITE(reg, value) do { \
E1000_PCI_REG((reg)) = (rte_cpu_to_le_32(value)); \
} while (0)
+#define E1000_PCI_REG_WRITE16(reg, value) do { \
+ E1000_PCI_REG16((reg)) = (rte_cpu_to_le_16(value)); \
+} while (0)
+
#define E1000_PCI_REG_ADDR(hw, reg) \
((volatile uint32_t *)((char *)(hw)->hw_addr + (reg)))
#define E1000_PCI_REG_ARRAY_ADDR(hw, reg, index) \
E1000_PCI_REG_ADDR((hw), (reg) + ((index) << 2))
-static inline uint32_t e1000_read_addr(volatile void* addr)
+#define E1000_PCI_REG_FLASH_ADDR(hw, reg) \
+ ((volatile uint32_t *)((char *)(hw)->flash_address + (reg)))
+
+static inline uint32_t e1000_read_addr(volatile void *addr)
{
return rte_le_to_cpu_32(E1000_PCI_REG(addr));
}
+static inline uint16_t e1000_read_addr16(volatile void *addr)
+{
+ return rte_le_to_cpu_16(E1000_PCI_REG16(addr));
+}
+
/* Necessary defines */
#define E1000_MRQC_ENABLE_MASK 0x0007
#define E1000_MRQC_RSS_FIELD_IPV6_EX 0x0008
@@ -155,20 +169,20 @@ static inline uint32_t e1000_read_addr(volatile void*
addr)
E1000_WRITE_REG(hw, reg, value)
/*
- * Not implemented.
+ * Tested on I217/I218 chipset.
*/
#define E1000_READ_FLASH_REG(hw, reg) \
- (E1000_ACCESS_PANIC(E1000_READ_FLASH_REG, hw, reg, 0), 0)
+ e1000_read_addr(E1000_PCI_REG_FLASH_ADDR((hw), (reg)))
#define E1000_READ_FLASH_REG16(hw, reg) \
- (E1000_ACCESS_PANIC(E1000_READ_FLASH_REG16, hw, reg, 0), 0)
+ e1000_read_addr16(E1000_PCI_REG_FLASH_ADDR((hw), (reg)))
#define E1000_WRITE_FLASH_REG(hw, reg, value) \
- E1000_ACCESS_PANIC(E1000_WRITE_FLASH_REG, hw, reg, value)
+ E1000_PCI_REG_WRITE(E1000_PCI_REG_FLASH_ADDR((hw), (reg)), (value))
#define E1000_WRITE_FLASH_REG16(hw, reg, value) \
- E1000_ACCESS_PANIC(E1000_WRITE_FLASH_REG16, hw, reg, value)
+ E1000_PCI_REG_WRITE16(E1000_PCI_REG_FLASH_ADDR((hw), (reg)), (value))
#define STATIC static
diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index 4a843fe..a8c26ed 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -231,6 +231,32 @@ rte_em_dev_atomic_write_link_status(struct rte_eth_dev
*dev,
return 0;
}
+/**
+ * eth_em_dev_is_ich8 - Check for ICH8 device
+ * @hw: pointer to the HW structure
+ *
+ * return TRUE for ICH8, otherwise FALSE
+ **/
+static bool
+eth_em_dev_is_ich8(struct e1000_hw *hw)
+{
+ DEBUGFUNC("eth_em_dev_is_ich8");
+
+ switch (hw->device_id) {
+ case E1000_DEV_ID_PCH_LPT_I217_LM:
+ case E1000_DEV_ID_PCH_LPT_I217_V:
+ case E1000_DEV_ID_PCH_LPTLP_I218_LM:
+ case E1000_DEV_ID_PCH_LPTLP_I218_V:
+ case E1000_DEV_ID_PCH_I218_V2:
+ case E1000_DEV_ID_PCH_I218_LM2:
+ case E1000_DEV_ID_PCH_I218_V3:
+ case E1000_DEV_ID_PCH_I218_LM3:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
static int
eth_em_dev_init(struct rte_eth_dev *eth_dev)
{
@@ -265,6 +291,8 @@ eth_em_dev_init(struct rte_eth_dev *eth_dev)
adapter->stopped = 0;
/* For ICH8 support we'll need to map the flash memory BAR */
+ if (eth_em_dev_is_ich8(hw))
+ hw->flash_address = (void *)pci_dev->mem_resource[1].addr;
if (e1000_setup_
[dpdk-dev] [PATCH v1] I217 and I218 changes
v1: Make necessary changes to support I217 and I218 NICs.
Use v2' incorporating internal review comments as a base.
Internal review done by Wenzhuo Lu (Intel) and internal
review versions and testing shown below
v2':
Incorporate Wenzhuo's comments, remove superfluous
assignment to fc.requested_mode in em_hardware_init
function.
Compiled and tested (via testpmd) on Ubuntu 14.04 on target
x86_64-native-linuxapp-gcc
Compiled for target x86_64-native-linuxapp-clang
v1':
Modified driver and eal code to support I217 and I218
Intel NICs.
Compiled and tested (via testpmd) on Ubuntu 14.04 for target
x86_64-native-linuxapp-gcc
Compiled for target x86_64-native-linuxapp-clang
M. Jay(Intel) had used the patch for DPDK demo.
Signed-off-by: Ravi Kerur
Acked-by: Wenzhuo Lu
---
drivers/net/e1000/base/e1000_osdep.h| 26 +++-
drivers/net/e1000/em_ethdev.c | 32 +
lib/librte_eal/common/include/rte_pci_dev_ids.h | 9 +++
3 files changed, 61 insertions(+), 6 deletions(-)
diff --git a/drivers/net/e1000/base/e1000_osdep.h
b/drivers/net/e1000/base/e1000_osdep.h
index b2c76e3..47a1948 100644
--- a/drivers/net/e1000/base/e1000_osdep.h
+++ b/drivers/net/e1000/base/e1000_osdep.h
@@ -96,21 +96,35 @@ typedef int bool;
#define E1000_PCI_REG(reg) (*((volatile uint32_t *)(reg)))
+#define E1000_PCI_REG16(reg) (*((volatile uint16_t *)(reg)))
+
#define E1000_PCI_REG_WRITE(reg, value) do { \
E1000_PCI_REG((reg)) = (rte_cpu_to_le_32(value)); \
} while (0)
+#define E1000_PCI_REG_WRITE16(reg, value) do { \
+ E1000_PCI_REG16((reg)) = (rte_cpu_to_le_16(value)); \
+} while (0)
+
#define E1000_PCI_REG_ADDR(hw, reg) \
((volatile uint32_t *)((char *)(hw)->hw_addr + (reg)))
#define E1000_PCI_REG_ARRAY_ADDR(hw, reg, index) \
E1000_PCI_REG_ADDR((hw), (reg) + ((index) << 2))
-static inline uint32_t e1000_read_addr(volatile void* addr)
+#define E1000_PCI_REG_FLASH_ADDR(hw, reg) \
+ ((volatile uint32_t *)((char *)(hw)->flash_address + (reg)))
+
+static inline uint32_t e1000_read_addr(volatile void *addr)
{
return rte_le_to_cpu_32(E1000_PCI_REG(addr));
}
+static inline uint16_t e1000_read_addr16(volatile void *addr)
+{
+ return rte_le_to_cpu_16(E1000_PCI_REG16(addr));
+}
+
/* Necessary defines */
#define E1000_MRQC_ENABLE_MASK 0x0007
#define E1000_MRQC_RSS_FIELD_IPV6_EX 0x0008
@@ -155,20 +169,20 @@ static inline uint32_t e1000_read_addr(volatile void*
addr)
E1000_WRITE_REG(hw, reg, value)
/*
- * Not implemented.
+ * Tested on I217/I218 chipset.
*/
#define E1000_READ_FLASH_REG(hw, reg) \
- (E1000_ACCESS_PANIC(E1000_READ_FLASH_REG, hw, reg, 0), 0)
+ e1000_read_addr(E1000_PCI_REG_FLASH_ADDR((hw), (reg)))
#define E1000_READ_FLASH_REG16(hw, reg) \
- (E1000_ACCESS_PANIC(E1000_READ_FLASH_REG16, hw, reg, 0), 0)
+ e1000_read_addr16(E1000_PCI_REG_FLASH_ADDR((hw), (reg)))
#define E1000_WRITE_FLASH_REG(hw, reg, value) \
- E1000_ACCESS_PANIC(E1000_WRITE_FLASH_REG, hw, reg, value)
+ E1000_PCI_REG_WRITE(E1000_PCI_REG_FLASH_ADDR((hw), (reg)), (value))
#define E1000_WRITE_FLASH_REG16(hw, reg, value) \
- E1000_ACCESS_PANIC(E1000_WRITE_FLASH_REG16, hw, reg, value)
+ E1000_PCI_REG_WRITE16(E1000_PCI_REG_FLASH_ADDR((hw), (reg)), (value))
#define STATIC static
diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index 4a843fe..a8c26ed 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -231,6 +231,32 @@ rte_em_dev_atomic_write_link_status(struct rte_eth_dev
*dev,
return 0;
}
+/**
+ * eth_em_dev_is_ich8 - Check for ICH8 device
+ * @hw: pointer to the HW structure
+ *
+ * return TRUE for ICH8, otherwise FALSE
+ **/
+static bool
+eth_em_dev_is_ich8(struct e1000_hw *hw)
+{
+ DEBUGFUNC("eth_em_dev_is_ich8");
+
+ switch (hw->device_id) {
+ case E1000_DEV_ID_PCH_LPT_I217_LM:
+ case E1000_DEV_ID_PCH_LPT_I217_V:
+ case E1000_DEV_ID_PCH_LPTLP_I218_LM:
+ case E1000_DEV_ID_PCH_LPTLP_I218_V:
+ case E1000_DEV_ID_PCH_I218_V2:
+ case E1000_DEV_ID_PCH_I218_LM2:
+ case E1000_DEV_ID_PCH_I218_V3:
+ case E1000_DEV_ID_PCH_I218_LM3:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
static int
eth_em_dev_init(struct rte_eth_dev *eth_dev)
{
@@ -265,6 +291,8 @@ eth_em_dev_init(struct rte_eth_dev *eth_dev)
adapter->stopped = 0;
/* For ICH8 support we'll need to map the flash memory BAR */
+ if (eth_em_dev_is_ich8(hw))
+ hw->flash_address = (void *)pci_dev->mem_resource[1].addr;
if (e1000_setup_
[dpdk-dev] [PATCH] hash: fix memcmp function pointer in multi-process
Michael
Please find the attached is the patch file generated from "git format-patch
-1"
Thanks
Dhana
On Tue, Mar 1, 2016 at 9:29 PM, Qiu, Michael wrote:
> On 3/2/2016 2:57 AM, Dhananjaya Reddy Eadala wrote:
> > Hi
> >
> > We found a problem in dpdk-2.2 using under multi-process environment.
> > Here is the brief description how we are using the dpdk:
> >
> > We have two processes proc1, proc2 using dpdk. These proc1 and proc2 are
> > two different compiled binaries.
> > proc1 is started as primary process and proc2 as secondary process.
> >
> > proc1:
> > Calls srcHash = rte_hash_create("src_hash_name") to create rte_hash
> > structure.
> > As part of this, this api initalized the rte_hash structure and set the
> > srcHash->rte_hash_cmp_eq to the address of memcmp() from proc1 address
> > space.
> >
> > proc2:
> > calls srcHash = rte_hash_find_existing("src_hash_name"). This returns
> the
> > rte_hash created by proc1.
> > This srcHash->rte_hash_cmp_eq still points to the address of memcmp()
> from
> > proc1 address space.
> > Later proc2 calls rte_hash_lookup_with_hash(srcHash, (const void*) &key,
> > key.sig);
> > Under the hood, rte_hash_lookup_with_hash() invokes
> > __rte_hash_lookup_with_hash(), which in turn calls
> h->rte_hash_cmp_eq(key,
> > k->key, h->key_len).
> > This leads to a crash as h->rte_hash_cmp_eq is an address from proc1
> > address space and is invalid address in proc2 address space.
> >
> > We found, from dpdk documentation, that
> > "
> > The use of function pointers between multiple processes running based of
> > different compiled
> > binaries is not supported, since the location of a given function in one
> > process may be different to
> > its location in a second. This prevents the librte_hash library from
> > behaving properly as in a multi-
> > threaded instance, since it uses a pointer to the hash function
> internally.
> >
> >
> > To work around this issue, it is recommended that multi-process
> > applications perform the hash
> > calculations by directly calling the hashing function from the code and
> > then using the
> > rte_hash_add_with_hash()/rte_hash_lookup_with_hash() functions instead
> of
> > the functions which do
> > the hashing internally, such as rte_hash_add()/rte_hash_lookup().
> > "
> >
> > We did follow the recommended steps by invoking
> rte_hash_lookup_with_hash().
> > It was no issue up to and including dpdk-2.0. In later releases started
> > crashing because rte_hash_cmp_eq is introduced in dpdk-2.1
> >
> > We fixed it with the following patch and would like to submit the patch
> to
> > dpdk.org.
>
> Could you send the patch in the mail?
>
> Learn how to send a patch:
>
> http://www.dpdk.org/dev
>
> Thanks,
> Michael
> > Patch is created such that, if anyone wanted to use dpdk in multi-process
> > environment with function pointers not shared, they need to
> > define RTE_LIB_MP_NO_FUNC_PTR in their Makefile. Without defining this
> flag
> > in Makefile, it works as it is now.
> >
> >
> > Please find here attached is the patch file.
> >
> > Thanks
> > Dhana
> >
>
>
[dpdk-dev] [PATCH v2] I217 and I218 changes
Hi, Wenzhuo, Bruce, I have superseded old patch with a new submission. Please let me know if that approach is ok. Thanks, Ravi On Tue, Mar 1, 2016 at 5:21 PM, Lu, Wenzhuo wrote: > Hi Ravi, > > > > >Do you want me to resend it as 'v1' and include your comments in commit > message? let me know. > > I think it?s better if you withdraw this one, send a new one and make the > commit log easy to understand J And you can keep my ack. > > >
[dpdk-dev] [PATCH] eal: arm64: introduce RTE_CPUFLAG_ATOMICS
On Wed, 2 Mar 2016 18:50:59 +0530 Jerin Jacob wrote: > armv8.1 adds support for new atomic instructions. > Linux kernel v4.3 onwards, the presence of atomic instruction > support can detect through HWCAP_ATOMICS > > Signed-off-by: Jerin Jacob Reviewed-by: Jan Viktorin
[dpdk-dev] Multi Queue Support With Mellanox 40GbE NIC - MT27500 Family [ConnectX-3]
Hi Suresh, RSS configuration is not supported with ConnectX-3 PMD. We added this support for ConnectX-4 PMD, available in DPDK 2.2. Best Regards, Olga -Original Message- From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Suresh Paruchuri Sent: Tuesday, March 01, 2016 8:03 PM To: users at dpdk.org; dev at dpdk.org Subject: [dpdk-dev] Multi Queue Support With Mellanox 40GbE NIC - MT27500 Family [ConnectX-3] Hi, We are planning to use the Multi Queue features of Mellanox NIC by using RSS to distribute packets among the multiple RX queues. We have Mellanox ConnectX-3 NIC. Seems there are lot of limitations in using RSS as there is no support for Hash Key and function update with ConnectX-3 series. Is there any patch available for Mellanox to using RSS by required hash update? Here is the requirement: 1. Multi Queue Support 2. Symmetric IP Hash - SRC IP and DST IP Please guide me if you have any solution available which will help us in using Mellanox NIC with multi queue feature. Thanks in advance. DPDK Version: 2.1.0 + Additional patches. NIC And Driver Details: Network controller: Mellanox Technologies MT27500 Family [ConnectX-3] [root at localhost ~]# ethtool -i p2p1 driver: mlx4_en version: 3.1-1.0.3 (29 Sep 2015) firmware-version: 2.34.5000 bus-info: :84:00.0 supports-statistics: yes supports-test: yes supports-eeprom-access: no supports-register-dump: no supports-priv-flags: yes [root at localhost ~]# Regards, Suresh.
[dpdk-dev] [PATCH] hash: fix memcmp function pointer in multi-process
Hi Dhana,
> -Original Message-
> From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Dhananjaya Reddy
> Eadala
> Sent: Wednesday, March 02, 2016 2:02 PM
> To: Qiu, Michael
> Cc: dev at dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] hash: fix memcmp function pointer in multi-
> process
>
> Michael
>
> Please find the attached is the patch file generated from "git format-patch
> -1"
What Michael means is that you should use git send-email and not attach the
patch
to the mail.
You can use:
git send-email -1 --to dev at dpdk.org
or
git send-email your-patch.patch --to dev at dpdk.org
Take a look at dpdk.org/dev for more details and how to configure git with your
smtp server details.
Thanks,
Pablo
>
>
> Thanks
> Dhana
>
>
> On Tue, Mar 1, 2016 at 9:29 PM, Qiu, Michael
> wrote:
>
> > On 3/2/2016 2:57 AM, Dhananjaya Reddy Eadala wrote:
> > > Hi
> > >
> > > We found a problem in dpdk-2.2 using under multi-process environment.
> > > Here is the brief description how we are using the dpdk:
> > >
> > > We have two processes proc1, proc2 using dpdk. These proc1 and proc2
> are
> > > two different compiled binaries.
> > > proc1 is started as primary process and proc2 as secondary process.
> > >
> > > proc1:
> > > Calls srcHash = rte_hash_create("src_hash_name") to create rte_hash
> > > structure.
> > > As part of this, this api initalized the rte_hash structure and set the
> > > srcHash->rte_hash_cmp_eq to the address of memcmp() from proc1
> address
> > > space.
> > >
> > > proc2:
> > > calls srcHash = rte_hash_find_existing("src_hash_name"). This returns
> > the
> > > rte_hash created by proc1.
> > > This srcHash->rte_hash_cmp_eq still points to the address of memcmp()
> > from
> > > proc1 address space.
> > > Later proc2 calls rte_hash_lookup_with_hash(srcHash, (const void*)
> &key,
> > > key.sig);
> > > Under the hood, rte_hash_lookup_with_hash() invokes
> > > __rte_hash_lookup_with_hash(), which in turn calls
> > h->rte_hash_cmp_eq(key,
> > > k->key, h->key_len).
> > > This leads to a crash as h->rte_hash_cmp_eq is an address from proc1
> > > address space and is invalid address in proc2 address space.
> > >
> > > We found, from dpdk documentation, that
> > > "
> > > The use of function pointers between multiple processes running based
> of
> > > different compiled
> > > binaries is not supported, since the location of a given function in one
> > > process may be different to
> > > its location in a second. This prevents the librte_hash library from
> > > behaving properly as in a multi-
> > > threaded instance, since it uses a pointer to the hash function
> > internally.
> > >
> > >
> > > To work around this issue, it is recommended that multi-process
> > > applications perform the hash
> > > calculations by directly calling the hashing function from the code and
> > > then using the
> > > rte_hash_add_with_hash()/rte_hash_lookup_with_hash() functions
> instead
> > of
> > > the functions which do
> > > the hashing internally, such as rte_hash_add()/rte_hash_lookup().
> > > "
> > >
> > > We did follow the recommended steps by invoking
> > rte_hash_lookup_with_hash().
> > > It was no issue up to and including dpdk-2.0. In later releases started
> > > crashing because rte_hash_cmp_eq is introduced in dpdk-2.1
> > >
> > > We fixed it with the following patch and would like to submit the patch
> > to
> > > dpdk.org.
> >
> > Could you send the patch in the mail?
> >
> > Learn how to send a patch:
> >
> > http://www.dpdk.org/dev
> >
> > Thanks,
> > Michael
> > > Patch is created such that, if anyone wanted to use dpdk in multi-process
> > > environment with function pointers not shared, they need to
> > > define RTE_LIB_MP_NO_FUNC_PTR in their Makefile. Without defining
> this
> > flag
> > > in Makefile, it works as it is now.
> > >
> > >
> > > Please find here attached is the patch file.
> > >
> > > Thanks
> > > Dhana
> > >
> >
> >
[dpdk-dev] [PATCH v3] mk: stop on warning only in developer build
From: Panu Matilainen Add RTE_DEVEL_BUILD make-variable which can be used to do things differently when doing development vs building a release, autodetected from source root .git presence and overridable via commandline. It is used it to enable -Werror compiler flag and may be extended to other checks. Failing build on warnings is a useful developer tool but its bad for release tarballs which can and do get built with newer compilers than what was used/available during development. Compilers routinely add new warnings so code which built silently with cc X might no longer do so with X+1. This doesn't make the existing code any more buggier and failing the build in this case does not help to improve the quality of an already released version either. This change the default flags which can be tuned with EXTRA_CFLAGS. Signed-off-by: Panu Matilainen Signed-off-by: Thomas Monjalon --- doc/build-sdk-quick.txt| 1 + doc/guides/prog_guide/dev_kit_build_system.rst | 2 ++ mk/rte.vars.mk | 5 + mk/toolchain/clang/rte.vars.mk | 6 +- mk/toolchain/gcc/rte.vars.mk | 6 +- mk/toolchain/icc/rte.vars.mk | 6 +- 6 files changed, 23 insertions(+), 3 deletions(-) v3: - not only for SDK build (-Werror for examples, apps) - update doc diff --git a/doc/build-sdk-quick.txt b/doc/build-sdk-quick.txt index acd1bfe..967ff09 100644 --- a/doc/build-sdk-quick.txt +++ b/doc/build-sdk-quick.txt @@ -15,6 +15,7 @@ Build variables EXTRA_LDFLAGSlinker options EXTRA_LDLIBS linker library options RTE_KERNELDIRlinux headers path + RTE_DEVEL_BUILD stricter options (default: y in git tree) CROSS toolchain prefix V verbose D debug dependencies diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst index dd3e3d0..3e89eae 100644 --- a/doc/guides/prog_guide/dev_kit_build_system.rst +++ b/doc/guides/prog_guide/dev_kit_build_system.rst @@ -343,6 +343,8 @@ Useful Variables Provided by the Build System By default, the variable is set to /lib/modules/$(shell uname -r)/build, which is correct when the target machine is also the build machine. +* RTE_DEVEL_BUILD: Stricter options (stop on warning). It defaults to y in a git tree. + Variables that Can be Set/Overridden in a Makefile Only ~~~ diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk index 2d734bd..28982a5 100644 --- a/mk/rte.vars.mk +++ b/mk/rte.vars.mk @@ -102,6 +102,11 @@ export RTE_MACHINE export RTE_EXEC_ENV export RTE_TOOLCHAIN +# developer build automatically enabled in a git tree +ifneq ($(wildcard $(RTE_SDK)/.git),) +RTE_DEVEL_BUILD := y +endif + # SRCDIR is the current source directory ifdef S SRCDIR := $(abspath $(RTE_SRCDIR)/$(S)) diff --git a/mk/toolchain/clang/rte.vars.mk b/mk/toolchain/clang/rte.vars.mk index 245ea7e..7749b99 100644 --- a/mk/toolchain/clang/rte.vars.mk +++ b/mk/toolchain/clang/rte.vars.mk @@ -63,12 +63,16 @@ TOOLCHAIN_ASFLAGS = TOOLCHAIN_CFLAGS = TOOLCHAIN_LDFLAGS = -WERROR_FLAGS := -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes +WERROR_FLAGS := -W -Wall -Wstrict-prototypes -Wmissing-prototypes WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith WERROR_FLAGS += -Wnested-externs -Wcast-qual WERROR_FLAGS += -Wformat-nonliteral -Wformat-security WERROR_FLAGS += -Wundef -Wwrite-strings +ifeq ($(RTE_DEVEL_BUILD),y) +WERROR_FLAGS += -Werror +endif + # process cpu flags include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk index c2c5255..ff70f3d 100644 --- a/mk/toolchain/gcc/rte.vars.mk +++ b/mk/toolchain/gcc/rte.vars.mk @@ -71,12 +71,16 @@ ifeq (,$(findstring -O0,$(EXTRA_CFLAGS))) endif endif -WERROR_FLAGS := -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes +WERROR_FLAGS := -W -Wall -Wstrict-prototypes -Wmissing-prototypes WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith WERROR_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual WERROR_FLAGS += -Wformat-nonliteral -Wformat-security WERROR_FLAGS += -Wundef -Wwrite-strings +ifeq ($(RTE_DEVEL_BUILD),y) +WERROR_FLAGS += -Werror +endif + # There are many issues reported for ARMv7 architecture # which are not necessarily fatal. Report as warnings. ifeq ($(CONFIG_RTE_ARCH_ARMv7),y) diff --git a/mk/toolchain/icc/rte.vars.mk b/mk/toolchain/icc/rte.vars.mk index 9b6b34b..ba69f1f 100644 --- a/mk/toolchain/icc/rte.vars.mk +++ b/mk/toolchain/icc/rte.vars.mk @@ -69,9 +69,13 @@ TOOLCHAIN_ASFLAGS = # error #13368: loop was not vectorized with "vector always assert" # error #15527: loop was not vectorized: function call to fprintf cannot be vectorize # was declared "deprecated" -WERROR_FLAGS
[dpdk-dev] [PATCH v2 1/2] lpm: extend ip4 next_hop and add config structure
Hi, As suggested by Bruce, I'm looking to apply this patchset before the ARM one. Please check the comments below. Is it possible to split the changes in next_hop and config structure? > --- a/doc/guides/rel_notes/release_2_3.rst > +++ b/doc/guides/rel_notes/release_2_3.rst > @@ -18,7 +18,11 @@ Drivers > > Libraries > ~ > +** librte_lpm: Increase number of next hops for IPv4 to 2^24 ** > > +Extend next_hop field from 8-bits to 24-bits for IPv4. Changed structures: > +rte_lpm_tbl24_entry and rte_lpm_tbl8_entry to one structure > rte_lpm_tbl_entry. > +Added a new rte_lpm_config structure. The spacing is wrong here. Please check also the past tense. There is a template in the release notes. > +BIND_DEFAULT_SYMBOL(rte_lpm_add, _v23, 2.3); > +MAP_STATIC_SYMBOL( > + int rte_lpm_add(struct rte_lpm *lpm, uint32_t ip, uint8_t depth, > + uint32_t next_hop), rte_lpm_add_v23); The version will be 16.04 instead of 2.3.
[dpdk-dev] [PATCH] mk: fix error message
When specifying a wrong directory with RTE_SDK and RTE_TARGET
to build an application, the error message about missing config
file was wrong.
Fixes: 6b62a72a70d0 ("mk: install a standard cutomizable tree")
Reported-by: Steeven Lee
Signed-off-by: Thomas Monjalon
---
mk/internal/rte.extvars.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mk/internal/rte.extvars.mk b/mk/internal/rte.extvars.mk
index 040d39f..e2462fd 100644
--- a/mk/internal/rte.extvars.mk
+++ b/mk/internal/rte.extvars.mk
@@ -54,7 +54,7 @@ export RTE_EXTMK
# RTE_SDK_BIN must point to .config, include/ and lib/.
RTE_SDK_BIN := $(RTE_SDK)/$(RTE_TARGET)
ifeq ($(wildcard $(RTE_SDK_BIN)/.config),)
-$(error Cannot find .config in $(RTE_SDK))
+$(error Cannot find .config in $(RTE_SDK_BIN))
endif
#
--
2.7.0
[dpdk-dev] [PATCH] e1000: fix setting of VF MAC address
Allow reprogramming of the RAR with a zero mac address,
to ensure that the VF traffic goes to the PF after
stop, close and detach of the VF.
Fixes: be2d648a2dd3 ("igb: add PF support")
Fixes: d82170d27918 ("igb: add VF support")
Signed-off-by: Bernard Iremonger
---
drivers/net/e1000/igb_ethdev.c | 12 +++-
drivers/net/e1000/igb_pf.c | 8 +---
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 4ed5e95..f1044b7 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -2819,6 +2819,7 @@ igbvf_dev_close(struct rte_eth_dev *dev)
struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct e1000_adapter *adapter =
E1000_DEV_PRIVATE(dev->data->dev_private);
+ struct ether_addr addr;
PMD_INIT_FUNC_TRACE();
@@ -2827,6 +2828,15 @@ igbvf_dev_close(struct rte_eth_dev *dev)
igbvf_dev_stop(dev);
adapter->stopped = 1;
igb_dev_free_queues(dev);
+
+ /**
+* reprogram the RAR with a zero mac address,
+* to ensure that the VF traffic goes to the PF
+* after stop, close and detach of the VF.
+**/
+
+ memset(&addr, 0, sizeof(addr));
+ igbvf_default_mac_addr_set(dev, &addr);
}
static int igbvf_set_vfta(struct e1000_hw *hw, uint16_t vid, bool on)
diff --git a/drivers/net/e1000/igb_pf.c b/drivers/net/e1000/igb_pf.c
index 1d00dda..95204e9 100644
--- a/drivers/net/e1000/igb_pf.c
+++ b/drivers/net/e1000/igb_pf.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -332,8 +332,10 @@ igb_vf_set_mac_addr(struct rte_eth_dev *dev, uint32_t vf,
uint32_t *msgbuf)
int rar_entry = hw->mac.rar_entry_count - (vf + 1);
uint8_t *new_mac = (uint8_t *)(&msgbuf[1]);
- if (is_valid_assigned_ether_addr((struct ether_addr*)new_mac)) {
- rte_memcpy(vfinfo[vf].vf_mac_addresses, new_mac, 6);
+ if (is_unicast_ether_addr((struct ether_addr *)new_mac)) {
+ if (!is_zero_ether_addr((struct ether_addr *)new_mac))
+ rte_memcpy(vfinfo[vf].vf_mac_addresses, new_mac,
+ sizeof(vfinfo[vf].vf_mac_addresses));
hw->mac.ops.rar_set(hw, new_mac, rar_entry);
return 0;
}
--
2.6.3
[dpdk-dev] [PATCH v5 1/1] eal/linux: change hugepage sorting to avoid overlapping memcpy
2016-01-07 15:54, Ralf Hoffmann: > with only one hugepage or already sorted hugepage addresses, the sort > function called memcpy with same src and dst pointer. Debugging with > valgrind will issue a warning about overlapping area. This patch changes > the sort method to qsort to avoid this behavior. The separate sort > function is no longer necessary. > > Signed-off-by: Ralf Hoffmann > Acked-by: Sergio Gonzalez Monroy Added ref to Jay Rolette and Applied, thanks
[dpdk-dev] [PATCH v2 1/2] lpm: extend ip4 next_hop and add config structure
> -Original Message- > From: Thomas Monjalon [mailto:thomas.monjalon at 6wind.com] > Sent: Wednesday, March 2, 2016 4:29 PM > To: Kobylinski, MichalX > Cc: dev at dpdk.org > Subject: Re: [dpdk-dev] [PATCH v2 1/2] lpm: extend ip4 next_hop and add config > structure > Importance: High > > Hi, Hi Thomas, thank you for suggested. > > As suggested by Bruce, I'm looking to apply this patchset before the ARM one. > Please check the comments below. > > Is it possible to split the changes in next_hop and config structure? It is possible. Do you mean to put config structure into seperate patch-set? > > --- a/doc/guides/rel_notes/release_2_3.rst > > +++ b/doc/guides/rel_notes/release_2_3.rst > > @@ -18,7 +18,11 @@ Drivers > > > > Libraries > > ~ > > +** librte_lpm: Increase number of next hops for IPv4 to 2^24 ** > > > > +Extend next_hop field from 8-bits to 24-bits for IPv4. Changed structures: > > +rte_lpm_tbl24_entry and rte_lpm_tbl8_entry to one structure > rte_lpm_tbl_entry. > > +Added a new rte_lpm_config structure. > > The spacing is wrong here. Please check also the past tense. > There is a template in the release notes. > > > +BIND_DEFAULT_SYMBOL(rte_lpm_add, _v23, 2.3); MAP_STATIC_SYMBOL( > > + int rte_lpm_add(struct rte_lpm *lpm, uint32_t ip, uint8_t depth, > > + uint32_t next_hop), rte_lpm_add_v23); > > The version will be 16.04 instead of 2.3.
[dpdk-dev] New driver (large patch) question.
On Wed, 02 Mar 2016 11:21:26 +0100 Thomas Monjalon wrote: > Hi, > > 2016-03-01 19:56, Stephen Hurd: > > I submitted a new driver on Friday, and it was rejected for being over 300k. > > > > The rejection email suggested contacing dev-owner at dpdk.org, which I did > > on > > Monday with no reply. > > > > What's the process to submit patches larger than the mailing list size > > limit? > > A patch has two lives: > 1/ it must be reviewed and accepted > 2/ it will stay in the git history for future reference > > Those 2 periods require the patch to be well explained, with a > reasonnable scope and a human readable size. > The primary rule to think about is to introduce only one feature > per patch. > So the size should be naturally small and the mailing list don't need > to accept greater sizes. > > To make it short, please split your driver in several introduction steps. > Too many of the DPDK drivers are bloated. Recall the venerable paraphrase of Pascal, "I made this so long because I did not have time to make it shorter." https://en.wikipedia.org/wiki/Wikipedia:Too_long;_didn%27t_read Linux went through similar stages. Many drivers ended up being rewritten for brevity (e1000, skge, tg3). Vendor drivers seem to want to engage all features even if they have no value.
[dpdk-dev] [PATCH v2 1/2] lpm: extend ip4 next_hop and add config structure
2016-03-02 16:23, Kobylinski, MichalX: > From: Thomas Monjalon [mailto:thomas.monjalon at 6wind.com] > > Sent: Wednesday, March 2, 2016 4:29 PM > > Is it possible to split the changes in next_hop and config structure? > > It is possible. Do you mean to put config structure into seperate patch-set? If it makes sense, yes. I don't know how strongly the changes are tied. If possible, it's better to have progressive changes to make the patches easier to understand.
[dpdk-dev] [PATCH] eal: fix compile error in eal_timer.c caused by hpet
2016-01-28 14:16, ? ?:
> Fix compile error when enable CONFIG_RTE_LIBEAL_USE_HPET.
>
> Error messages:
> /root/dpdk-2.2.0/lib/librte_eal/linuxapp/eal/eal_timer.c: In function
> ?rte_eal_hpet_init?:
> /root/dpdk-2.2.0/lib/librte_eal/linuxapp/eal/eal_timer.c:222:2: error:
> implicit declaration of function ?rte_thread_setname?
> [-Werror=implicit-function-declaration]
> ret = rte_thread_setname(msb_inc_thread_id, thread_name);
> ^
> /root/dpdk-2.2.0/lib/librte_eal/linuxapp/eal/eal_timer.c:222:2: error: nested
> extern declaration of ?rte_thread_setname? [-Werror=nested-externs]
> cc1: all warnings being treated as errors
>
> Fixes: badb3688ffa8 ("eal/linux: fix build with glibc < 2.12")
Just looking at the first letters of this SHA1 gives a hint ;)
> Signed-off-by: Yi Lu
> Acked-by: David Marchand
Applied, thanks
[dpdk-dev] [PATCH v4 05/12] pmd/fm10k: add dev_ptype_info_get implementation
Hi,
-Original Message-
From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Jianfeng Tan
Sent: Thursday, February 25, 2016 6:09 PM
To: dev at dpdk.org
Subject: [dpdk-dev] [PATCH v4 05/12] pmd/fm10k: add dev_ptype_info_get
implementation
Signed-off-by: Jianfeng Tan
---
drivers/net/fm10k/fm10k_ethdev.c | 50 ++
drivers/net/fm10k/fm10k_rxtx.c | 3 +++
drivers/net/fm10k/fm10k_rxtx_vec.c | 3 +++
3 files changed, 56 insertions(+)
diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index 421266b..429cbdd 100644
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -1335,6 +1335,55 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev,
};
}
+#ifdef RTE_LIBRTE_FM10K_RX_OLFLAGS_ENABLE
+static const uint32_t *
+fm10k_dev_ptype_info_get(struct rte_eth_dev *dev) {
+ if (dev->rx_pkt_burst == fm10k_recv_pkts ||
+ dev->rx_pkt_burst == fm10k_recv_scattered_pkts) {
+ static uint32_t ptypes[] = {
+ /* refers to rx_desc_to_ol_flags() */
+ RTE_PTYPE_L2_ETHER,
+ RTE_PTYPE_L3_IPV4,
+ RTE_PTYPE_L3_IPV4_EXT,
+ RTE_PTYPE_L3_IPV6,
+ RTE_PTYPE_L3_IPV6_EXT,
+ RTE_PTYPE_L4_TCP,
+ RTE_PTYPE_L4_UDP,
+ RTE_PTYPE_UNKNOWN
+ };
+
+ return ptypes;
+ } else if (dev->rx_pkt_burst == fm10k_recv_pkts_vec ||
+ dev->rx_pkt_burst == fm10k_recv_scattered_pkts_vec) {
+ static uint32_t ptypes_vec[] = {
+ /* refers to fm10k_desc_to_pktype_v() */
+ RTE_PTYPE_L3_IPV4,
+ RTE_PTYPE_L3_IPV4_EXT,
+ RTE_PTYPE_L3_IPV6,
+ RTE_PTYPE_L3_IPV6_EXT,
+ RTE_PTYPE_L4_TCP,
+ RTE_PTYPE_L4_UDP,
+ RTE_PTYPE_TUNNEL_GENEVE,
+ RTE_PTYPE_TUNNEL_NVGRE,
+ RTE_PTYPE_TUNNEL_VXLAN,
+ RTE_PTYPE_TUNNEL_GRE,
+ RTE_PTYPE_UNKNOWN
+ };
+
+ return ptypes_vec;
+ }
+
+ return NULL;
+}
May I know when " fm10k_dev_ptype_info_get " will be called? In fm10k, the
actual
Rx/tx func will be decided after port is started.
[dpdk-dev] [PATCH v3 1/2] librte_pipeline: add support for packet redirection at action handlers
Currently, there is no mechanism that allows the pipeline ports (in/out) and
table action handlers to override the default forwarding decision (as
previously configured per input port or in the table entry). Therefore, new
pipeline API functions have been added which allows action handlers to
hijack packets and remove them from the pipeline processing, and then either
drop them or send them out of the pipeline on any output port. The port
(in/out) and table action handler prototypes have been changed for making
use of these new API functions. This feature will be helpful to implement
functions such as exception handling (e.g. TTL =0), load balancing etc.
Signed-off-by: Jasvinder Singh
Acked-by: Cristian Dumitrescu
---
v3
* improved comments in "rte_pipeline.h"
v2
* rebased on master
doc/guides/rel_notes/deprecation.rst | 5 -
doc/guides/rel_notes/release_16_04.rst | 6 +-
lib/librte_pipeline/Makefile | 4 +-
lib/librte_pipeline/rte_pipeline.c | 461 ++-
lib/librte_pipeline/rte_pipeline.h | 174 ++
lib/librte_pipeline/rte_pipeline_version.map | 8 +
6 files changed, 362 insertions(+), 296 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index e94d4a2..1a7d660 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -40,11 +40,6 @@ Deprecation Notices
* The scheduler statistics structure will change to allow keeping track of
RED actions.
-* librte_pipeline: The prototype for the pipeline input port, output port
- and table action handlers will be updated:
- the pipeline parameter will be added, the packets mask parameter will be
- either removed (for input port action handler) or made input-only.
-
* ABI changes are planned in cmdline buffer size to allow the use of long
commands (such as RETA update in testpmd). This should impact
CMDLINE_PARSE_RESULT_BUFSIZE, STR_TOKEN_SIZE and RDLINE_BUF_SIZE.
diff --git a/doc/guides/rel_notes/release_16_04.rst
b/doc/guides/rel_notes/release_16_04.rst
index fd7dd1a..bd180ee 100644
--- a/doc/guides/rel_notes/release_16_04.rst
+++ b/doc/guides/rel_notes/release_16_04.rst
@@ -128,6 +128,10 @@ ABI Changes
the previous releases and made in this release. Use fixed width quotes for
``rte_function_names`` or ``rte_struct_names``. Use the past tense.
+* librte_pipeline: The prototype for the pipeline input port, output port
+ and table action handlers are updated:the pipeline parameter is added,
+ the packets mask parameter has been either removed or made input-only.
+
Shared Library Versions
---
@@ -154,7 +158,7 @@ The libraries prepended with a plus sign were incremented
in this version.
librte_mbuf.so.2
librte_mempool.so.1
librte_meter.so.1
- librte_pipeline.so.2
+ + librte_pipeline.so.3
librte_pmd_bond.so.1
librte_pmd_ring.so.2
librte_port.so.2
diff --git a/lib/librte_pipeline/Makefile b/lib/librte_pipeline/Makefile
index 1166d3c..822fd41 100644
--- a/lib/librte_pipeline/Makefile
+++ b/lib/librte_pipeline/Makefile
@@ -1,6 +1,6 @@
# BSD LICENSE
#
-# Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+# Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@ CFLAGS += $(WERROR_FLAGS)
EXPORT_MAP := rte_pipeline_version.map
-LIBABIVER := 2
+LIBABIVER := 3
#
# all source are stored in SRCS-y
diff --git a/lib/librte_pipeline/rte_pipeline.c
b/lib/librte_pipeline/rte_pipeline.c
index d625fd2..7f8fbac 100644
--- a/lib/librte_pipeline/rte_pipeline.c
+++ b/lib/librte_pipeline/rte_pipeline.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -49,14 +49,30 @@
#define RTE_TABLE_INVALID UINT32_MAX
#ifdef RTE_PIPELINE_STATS_COLLECT
-#define RTE_PIPELINE_STATS_ADD(counter, val) \
- ({ (counter) += (val); })
-#define RTE_PIPELINE_STATS_ADD_M(counter, mask) \
- ({ (counter) += __builtin_popcountll(mask); })
+#define RTE_PIPELINE_STATS_AH_DROP_WRITE(p, mask) \
+ ({ (p)->n_pkts_ah_drop = __builtin_popcountll(mask); })
+
+#define RTE_PIPELINE_STATS_AH_DROP_READ(p, counter)\
+ ({ (counter) += (p)->n_pkts_ah_drop; (p)->n_pkts_ah_drop = 0; })
+
+#define RTE_PIPELINE_STATS_TABLE_DROP0(p) \
+ ({ (p)->pkts_drop_mask = (p)->action_mask0[RTE_PIPELINE_ACTION_DROP]; })
+
+#define RTE_PIPELINE_STATS_TABLE_DROP1(p, counter) \
+({ \
[dpdk-dev] [PATCH v3 2/2] modify action handlers in test_pipeline and ip_pipeline
Changes are made to the ports and table action handlers defined
in app/test_pipeline and ip_pipeline sample application.
Signed-off-by: Jasvinder Singh
Acked-by: Cristian Dumitrescu
---
app/test-pipeline/pipeline_acl.c | 3 +-
app/test-pipeline/pipeline_hash.c | 3 +-
app/test-pipeline/pipeline_lpm.c | 3 +-
app/test-pipeline/pipeline_lpm_ipv6.c | 3 +-
app/test-pipeline/pipeline_stub.c | 3 +-
.../ip_pipeline/pipeline/pipeline_actions_common.h | 47 +-
.../ip_pipeline/pipeline/pipeline_firewall_be.c| 3 +-
.../pipeline/pipeline_flow_actions_be.c| 3 +-
.../pipeline/pipeline_flow_classification_be.c | 3 +-
.../ip_pipeline/pipeline/pipeline_passthrough_be.c | 3 +-
.../ip_pipeline/pipeline/pipeline_routing_be.c | 3 +-
11 files changed, 37 insertions(+), 40 deletions(-)
diff --git a/app/test-pipeline/pipeline_acl.c b/app/test-pipeline/pipeline_acl.c
index f163e55..22d5f36 100644
--- a/app/test-pipeline/pipeline_acl.c
+++ b/app/test-pipeline/pipeline_acl.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -159,7 +159,6 @@ app_main_loop_worker_pipeline_acl(void) {
.ops = &rte_port_ring_writer_ops,
.arg_create = (void *) &port_ring_params,
.f_action = NULL,
- .f_action_bulk = NULL,
.arg_ah = NULL,
};
diff --git a/app/test-pipeline/pipeline_hash.c
b/app/test-pipeline/pipeline_hash.c
index 8b888d7..f8aac0d 100644
--- a/app/test-pipeline/pipeline_hash.c
+++ b/app/test-pipeline/pipeline_hash.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -140,7 +140,6 @@ app_main_loop_worker_pipeline_hash(void) {
.ops = &rte_port_ring_writer_ops,
.arg_create = (void *) &port_ring_params,
.f_action = NULL,
- .f_action_bulk = NULL,
.arg_ah = NULL,
};
diff --git a/app/test-pipeline/pipeline_lpm.c b/app/test-pipeline/pipeline_lpm.c
index 2d7bc01..916abd4 100644
--- a/app/test-pipeline/pipeline_lpm.c
+++ b/app/test-pipeline/pipeline_lpm.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -99,7 +99,6 @@ app_main_loop_worker_pipeline_lpm(void) {
.ops = &rte_port_ring_writer_ops,
.arg_create = (void *) &port_ring_params,
.f_action = NULL,
- .f_action_bulk = NULL,
.arg_ah = NULL,
};
diff --git a/app/test-pipeline/pipeline_lpm_ipv6.c
b/app/test-pipeline/pipeline_lpm_ipv6.c
index c895b62..3352e89 100644
--- a/app/test-pipeline/pipeline_lpm_ipv6.c
+++ b/app/test-pipeline/pipeline_lpm_ipv6.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -100,7 +100,6 @@ app_main_loop_worker_pipeline_lpm_ipv6(void) {
.ops = &rte_port_ring_writer_ops,
.arg_create = (void *) &port_ring_params,
.f_action = NULL,
- .f_action_bulk = NULL,
.arg_ah = NULL,
};
diff --git a/app/test-pipeline/pipeline_stub.c
b/app/test-pipeline/pipeline_stub.c
index 0ad6f9b..ba710ca 100644
--- a/app/test-pipeline/pipeline_stub.c
+++ b/app/test-pipeline/pipeline_stub.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -94,7 +94,6 @@ app_main_loop_worker_pipeline_stub(void) {
.ops = &rte_port_ring_writer_ops,
.arg_create = (void *) &port_ring_params,
.f_action = NULL,
- .f_action_bulk = NULL,
.arg_ah = NULL,
}
[dpdk-dev] [PATCH] nfp: fix non-x86 build
On Mon, Feb 08, 2016 at 02:27:59PM +, Alejandro Lucero wrote: > On Sat, Feb 6, 2016 at 9:51 PM, Thomas Monjalon > wrote: > > > The file sys/io.h was included but it can be unavailable in some > > non-x86 toolchains. > > As others system includes in the file nfp_net.c, it seems useless, > > so the easy fix is to remove them. > > > > Signed-off-by: Thomas Monjalon > > --- > > drivers/net/nfp/nfp_net.c | 11 --- > > 1 file changed, 11 deletions(-) > > > > diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c > > index bc2089f..283269e 100644 > > --- a/drivers/net/nfp/nfp_net.c > > +++ b/drivers/net/nfp/nfp_net.c > > @@ -39,18 +39,7 @@ > > * Netronome vNIC DPDK Poll-Mode Driver: Main entry point > > */ > > > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > #include > > -#include > > > > #include > > #include > > -- > > 2.7.0 > > > > > This is fine for me. > > Thanks Applied to dpdk-next-net/rel_16_04 with Alejandro's ack /Bruce
[dpdk-dev] [PATCH] librte_port: fix segmentation fault for ethdev writer nodrop
Error log:
[APP] Initializing PIPELINE0 ...
pipeline> [APP] Initializing PIPELINE1 ...
[PIPELINE1] Pass-through
Segmentation fault (core dumped)
Fixes: 304c8091e90a ("port: add ethdev writer nodrop")
Signed-off-by: Jasvinder Singh
Acked-by: Cristian Dumitrescu
---
lib/librte_port/rte_port_ethdev.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/librte_port/rte_port_ethdev.c
b/lib/librte_port/rte_port_ethdev.c
index 1f0c81c..1c34602 100644
--- a/lib/librte_port/rte_port_ethdev.c
+++ b/lib/librte_port/rte_port_ethdev.c
@@ -390,16 +390,20 @@ send_burst_nodrop(struct rte_port_ethdev_writer_nodrop *p)
p->tx_buf_count);
/* We sent all the packets in a first try */
- if (nb_tx >= p->tx_buf_count)
+ if (nb_tx >= p->tx_buf_count) {
+ p->tx_buf_count = 0;
return;
+ }
for (i = 0; i < p->n_retries; i++) {
nb_tx += rte_eth_tx_burst(p->port_id, p->queue_id,
p->tx_buf + nb_tx,
p->tx_buf_count - nb_tx);
/* We sent all the packets in more than one try */
- if (nb_tx >= p->tx_buf_count)
+ if (nb_tx >= p->tx_buf_count) {
+ p->tx_buf_count = 0;
return;
+ }
}
/* We didn't send the packets in maximum allowed attempts */
--
2.5.0
[dpdk-dev] [PATCH] librte_port: fix segmentation fault for ring writer nodrop
Error log:
[APP] Initializing PIPELINE0 ...
pipeline> [APP] Initializing PIPELINE1 ...
[PIPELINE1] Pass-through
[APP] Initializing PIPELINE2 ...
[PIPELINE2] Pass-through
Segmentation fault (core dumped)
Fixes: 5f4cd47309d6 ("port: add ring writer nodrop")
Fixes: d58f69c54172 ("port: add ring multi reader or writer")
Signed-off-by: Jasvinder Singh
---
lib/librte_port/rte_port_ring.c | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/lib/librte_port/rte_port_ring.c b/lib/librte_port/rte_port_ring.c
index 755dfc1..b847fea 100644
--- a/lib/librte_port/rte_port_ring.c
+++ b/lib/librte_port/rte_port_ring.c
@@ -520,16 +520,20 @@ send_burst_nodrop(struct rte_port_ring_writer_nodrop *p)
p->tx_buf_count);
/* We sent all the packets in a first try */
- if (nb_tx >= p->tx_buf_count)
+ if (nb_tx >= p->tx_buf_count) {
+ p->tx_buf_count = 0;
return;
+ }
for (i = 0; i < p->n_retries; i++) {
nb_tx += rte_ring_sp_enqueue_burst(p->ring,
(void **) (p->tx_buf + nb_tx), p->tx_buf_count
- nb_tx);
/* We sent all the packets in more than one try */
- if (nb_tx >= p->tx_buf_count)
+ if (nb_tx >= p->tx_buf_count) {
+ p->tx_buf_count = 0;
return;
+ }
}
/* We didn't send the packets in maximum allowed attempts */
@@ -549,16 +553,20 @@ send_burst_mp_nodrop(struct rte_port_ring_writer_nodrop
*p)
p->tx_buf_count);
/* We sent all the packets in a first try */
- if (nb_tx >= p->tx_buf_count)
+ if (nb_tx >= p->tx_buf_count) {
+ p->tx_buf_count = 0;
return;
+ }
for (i = 0; i < p->n_retries; i++) {
nb_tx += rte_ring_mp_enqueue_burst(p->ring,
(void **) (p->tx_buf + nb_tx), p->tx_buf_count
- nb_tx);
/* We sent all the packets in more than one try */
- if (nb_tx >= p->tx_buf_count)
+ if (nb_tx >= p->tx_buf_count) {
+ p->tx_buf_count = 0;
return;
+ }
}
/* We didn't send the packets in maximum allowed attempts */
--
2.5.0
[dpdk-dev] [PATCH 0/3] add flag to disable CRC checksum offloading
On Mon, Feb 15, 2016 at 05:55:22PM +0100, Paul Emmerich wrote: > This patch adds a new tx checksum offloading flag: PKT_TX_NO_CRC_CSUM. > This allows disabling CRC checksum offloading on a per-packet basis. > Doing this can be useful if you want to send out invalid packets on > purpose, e.g. in a packet generator/test framework. > > > Paul Emmerich (3): > add tx crc disable flag > ixgbe: use crc checksum disable flag > i40e: use crc checksum disable flag > Maintainers, Any comments or ack on the patchset. [The first patch is missing the "mbuf" prefix as it's a patch to that library.] /Bruce
[dpdk-dev] [PATCH v2] I217 and I218 changes
On Wed, Mar 02, 2016 at 06:02:02AM -0800, Ravi Kerur wrote: > Hi, Wenzhuo, Bruce, I have superseded old patch with a new submission. > Please let me know if that approach is ok. > > Thanks, > Ravi Superceding patches is standard. Please mark the old patch as superceded in patchwork so it doesn't show up as needing work. /Bruce > > On Tue, Mar 1, 2016 at 5:21 PM, Lu, Wenzhuo wrote: > > > Hi Ravi, > > > > > > > > >Do you want me to resend it as 'v1' and include your comments in commit > > message? let me know. > > > > I think it?s better if you withdraw this one, send a new one and make the > > commit log easy to understand J And you can keep my ack. > > > > > >
[dpdk-dev] New driver (large patch) question.
The bulk of the patch is the hardware interface header file. With all the comments, it weighs in around 800k. If I strip the comments, it's around 300k. If I both strip all the comments and remove all the currently unused structures, I can get the entire patch down just below 300k, but that makes it much harder for someone to do further development. I'm willing to do that though if it's what's preferred. The other large file (560k) is just a bunch of extra debug output that makes it easier to debug issues. It's normally not compiled, so it sounds like it's not wanted either. I'll submit without comments in the hardware interface file and take it from there. On Wed, Mar 2, 2016 at 8:24 AM, Stephen Hemminger < stephen at networkplumber.org> wrote: > On Wed, 02 Mar 2016 11:21:26 +0100 > Thomas Monjalon wrote: > > > Hi, > > > > 2016-03-01 19:56, Stephen Hurd: > > > I submitted a new driver on Friday, and it was rejected for being over > 300k. > > > > > > The rejection email suggested contacing dev-owner at dpdk.org, which I > did on > > > Monday with no reply. > > > > > > What's the process to submit patches larger than the mailing list size > > > limit? > > > > A patch has two lives: > > 1/ it must be reviewed and accepted > > 2/ it will stay in the git history for future reference > > > > Those 2 periods require the patch to be well explained, with a > > reasonnable scope and a human readable size. > > The primary rule to think about is to introduce only one feature > > per patch. > > So the size should be naturally small and the mailing list don't need > > to accept greater sizes. > > > > To make it short, please split your driver in several introduction steps. > > > > Too many of the DPDK drivers are bloated. > Recall the venerable paraphrase of Pascal, "I made this so long because I > did not have time to make it shorter." > https://en.wikipedia.org/wiki/Wikipedia:Too_long;_didn%27t_read > > Linux went through similar stages. Many drivers ended up being rewritten > for brevity (e1000, skge, tg3). Vendor drivers seem to want to engage all > features > even if they have no value. > -- Stephen Hurd Principal Engineer - Software Development Broadcom Corporation 949-926-8039 stephen.hurd at broadcom.com
[dpdk-dev] [PATCH] drivers/net/bnxt New driver for Broadcom bnxt
Initial new driver for Broadcom bnxt (Cumulus) devices. - Adds drivers/net/bnxt and the librte_pmd_bnxt - Adds bnxt PCI IDs - Adds support for 2/2.5/25/50Gbps modes to rte_ethdev.h Signed-off-by: Stephen Hurd --- MAINTAINERS |4 + config/common_bsdapp|5 + config/common_linuxapp |5 + drivers/net/Makefile|1 + drivers/net/bnxt/Makefile | 79 + drivers/net/bnxt/bnxt.h | 217 +++ drivers/net/bnxt/bnxt_cpr.c | 138 ++ drivers/net/bnxt/bnxt_cpr.h | 117 ++ drivers/net/bnxt/bnxt_ethdev.c | 1434 + drivers/net/bnxt/bnxt_filter.c | 175 +++ drivers/net/bnxt/bnxt_filter.h | 74 + drivers/net/bnxt/bnxt_hwrm.c| 1536 +++ drivers/net/bnxt/bnxt_hwrm.h| 103 ++ drivers/net/bnxt/bnxt_irq.c | 155 ++ drivers/net/bnxt/bnxt_irq.h | 51 + drivers/net/bnxt/bnxt_ring.c| 305 drivers/net/bnxt/bnxt_ring.h| 104 ++ drivers/net/bnxt/bnxt_rxq.c | 384 + drivers/net/bnxt/bnxt_rxq.h | 77 + drivers/net/bnxt/bnxt_rxr.c | 370 + drivers/net/bnxt/bnxt_rxr.h | 73 + drivers/net/bnxt/bnxt_stats.c | 222 +++ drivers/net/bnxt/bnxt_stats.h | 44 + drivers/net/bnxt/bnxt_txq.c | 165 ++ drivers/net/bnxt/bnxt_txq.h | 81 + drivers/net/bnxt/bnxt_txr.c | 316 drivers/net/bnxt/bnxt_txr.h | 71 + drivers/net/bnxt/bnxt_vnic.c| 284 drivers/net/bnxt/bnxt_vnic.h| 79 + drivers/net/bnxt/hsi_struct_def_dpdk.h | 1869 +++ drivers/net/bnxt/rte_pmd_bnxt_version.map |4 + lib/librte_eal/common/include/rte_pci_dev_ids.h | 45 +- lib/librte_ether/rte_ethdev.h |4 + mk/rte.app.mk |1 + 34 files changed, 8587 insertions(+), 5 deletions(-) create mode 100644 drivers/net/bnxt/Makefile create mode 100644 drivers/net/bnxt/bnxt.h create mode 100644 drivers/net/bnxt/bnxt_cpr.c create mode 100644 drivers/net/bnxt/bnxt_cpr.h create mode 100644 drivers/net/bnxt/bnxt_ethdev.c create mode 100644 drivers/net/bnxt/bnxt_filter.c create mode 100644 drivers/net/bnxt/bnxt_filter.h create mode 100644 drivers/net/bnxt/bnxt_hwrm.c create mode 100644 drivers/net/bnxt/bnxt_hwrm.h create mode 100644 drivers/net/bnxt/bnxt_irq.c create mode 100644 drivers/net/bnxt/bnxt_irq.h create mode 100644 drivers/net/bnxt/bnxt_ring.c create mode 100644 drivers/net/bnxt/bnxt_ring.h create mode 100644 drivers/net/bnxt/bnxt_rxq.c create mode 100644 drivers/net/bnxt/bnxt_rxq.h create mode 100644 drivers/net/bnxt/bnxt_rxr.c create mode 100644 drivers/net/bnxt/bnxt_rxr.h create mode 100644 drivers/net/bnxt/bnxt_stats.c create mode 100644 drivers/net/bnxt/bnxt_stats.h create mode 100644 drivers/net/bnxt/bnxt_txq.c create mode 100644 drivers/net/bnxt/bnxt_txq.h create mode 100644 drivers/net/bnxt/bnxt_txr.c create mode 100644 drivers/net/bnxt/bnxt_txr.h create mode 100644 drivers/net/bnxt/bnxt_vnic.c create mode 100644 drivers/net/bnxt/bnxt_vnic.h create mode 100644 drivers/net/bnxt/hsi_struct_def_dpdk.h create mode 100644 drivers/net/bnxt/rte_pmd_bnxt_version.map diff --git a/MAINTAINERS b/MAINTAINERS index 628bc05..6ee6c3c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -359,6 +359,10 @@ F: drivers/crypto/aesni_mb/ Intel QuickAssist F: drivers/crypto/qat/ +Broadcom bnxt +M: Stephen Hurd +F: drivers/net/bnxt/ + Packet processing - diff --git a/config/common_bsdapp b/config/common_bsdapp index 696382c..f37c7bb 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -276,6 +276,11 @@ CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_DRIVER=n # +# Compile burst-oriented BNXT PMD driver +# +CONFIG_RTE_LIBRTE_BNXT_PMD=y + +# # Compile example software rings based PMD # CONFIG_RTE_LIBRTE_PMD_RING=y diff --git a/config/common_linuxapp b/config/common_linuxapp index f1638db..35f544b 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -280,6 +280,11 @@ CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_DRIVER=n # +# Compile burst-oriented BNXT PMD driver +# +CONFIG_RTE_LIBRTE_BNXT_PMD=y + +# # Compile example software rings based PMD # CONFIG_RTE_LIBRTE_PMD_RING=y diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 6e4497e..6f0d64b 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -41,6 +41,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k DIRS-$(CONFIG_RT
[dpdk-dev] [PATCH] drivers/net/bnxt New driver for Broadcom bnxt
Please split into pieces, at a minimum:
* changes to base DPDK code, you are changing lib/librte_ether
* driver files
* config to enable, MAINTAINERS etc.
Also lots and lots of checkpatch errors:
Results of: DPDK_CHECKPATCH_PATH=$HOME/kernel/linux/scripts/checkpatch.pl
./scripts/checkpatches.sh /tmp/bnxt.mbox
ERROR:C99_COMMENTS: do not use C99 // comments
#311: FILE: drivers/net/bnxt/bnxt.h:45:
+// TODO make bnxt.def_cp_ring a pointer to avoid this...
ERROR:OPEN_BRACE: open brace '{' following enum go on the same line
#333: FILE: drivers/net/bnxt/bnxt.h:67:
+enum bnxt_hw_context
+{
WARNING:SPACE_BEFORE_TAB: please, no space before tabs
#344: FILE: drivers/net/bnxt/bnxt.h:78:
+^Iuint16_t ^Ifw_fid;$
CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV)
#416: FILE: drivers/net/bnxt/bnxt.h:150:
+ #define BNXT_FLAG_DCB_ENABLED (1<<0)
^
CHECK:BIT_MACRO: Prefer using the BIT macro
#416: FILE: drivers/net/bnxt/bnxt.h:150:
+ #define BNXT_FLAG_DCB_ENABLED (1<<0)
CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV)
#417: FILE: drivers/net/bnxt/bnxt.h:151:
+ #define BNXT_FLAG_VF(1<<1)
^
CHECK:BIT_MACRO: Prefer using the BIT macro
#417: FILE: drivers/net/bnxt/bnxt.h:151:
+ #define BNXT_FLAG_VF(1<<1)
CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV)
#418: FILE: drivers/net/bnxt/bnxt.h:152:
+ #define BNXT_FLAG_LRO (1<<2)
^
CHECK:BIT_MACRO: Prefer using the BIT macro
#418: FILE: drivers/net/bnxt/bnxt.h:152:
+ #define BNXT_FLAG_LRO (1<<2)
CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV)
#419: FILE: drivers/net/bnxt/bnxt.h:153:
+ #define BNXT_FLAG_GRO (1<<3)
^
CHECK:BIT_MACRO: Prefer using the BIT macro
#419: FILE: drivers/net/bnxt/bnxt.h:153:
+ #define BNXT_FLAG_GRO (1<<3)
CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV)
#420: FILE: drivers/net/bnxt/bnxt.h:154:
+ #define BNXT_FLAG_160B_TCAM (1<<16)
^
CHECK:BIT_MACRO: Prefer using the BIT macro
#420: FILE: drivers/net/bnxt/bnxt.h:154:
+ #define BNXT_FLAG_160B_TCAM (1<<16)
ERROR:C99_COMMENTS: do not use C99 // comments
#425: FILE: drivers/net/bnxt/bnxt.h:159:
+// uint32_trx_copy_thresh;
WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines
#544: FILE: drivers/net/bnxt/bnxt_cpr.c:55:
+ /* Can just prompt the update_op routine to do a qcfg
+ instead of doing the actual qcfg */
WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line
#544: FILE: drivers/net/bnxt/bnxt_cpr.c:55:
+ instead of doing the actual qcfg */
ERROR:C99_COMMENTS: do not use C99 // comments
#670: FILE: drivers/net/bnxt/bnxt_cpr.h:37:
+// TODO make bnxt_cp_ring_info.cp_ring_struct a pointer to avoid this.
WARNING:LONG_LINE: line over 80 characters
#675: FILE: drivers/net/bnxt/bnxt_cpr.h:42:
+ (!!(((struct cmpl_base *)(cmp))->info3_v & CMPL_BASE_V) ==
\
ERROR:COMPLEX_MACRO: Macros with complex values should be enclosed in
parentheses
#689: FILE: drivers/net/bnxt/bnxt_cpr.h:56:
+#define B_CP_DB_REARM(cpr, raw_cons) \
+ *(uint32_t *)((cpr)->cp_doorbell) = (DB_CP_REARM_FLAGS | \
+ RING_CMP(&cpr->cp_ring_struct, raw_cons))
ERROR:COMPLEX_MACRO: Macros with complex values should be enclosed in
parentheses
#693: FILE: drivers/net/bnxt/bnxt_cpr.h:60:
+#define B_CP_DIS_DB(cpr, raw_cons) \
+ *(uint32_t *)((cpr)->cp_doorbell) = (DB_CP_FLAGS | \
+ RING_CMP(&cpr->cp_ring_struct, raw_cons))
WARNING:SPACE_BEFORE_TAB: please, no space before tabs
#699: FILE: drivers/net/bnxt/bnxt_cpr.h:66:
+^Ivoid ^I^I^I*cp_doorbell;$
ERROR:COMPLEX_MACRO: Macros with complex values should be enclosed in
parentheses
#724: FILE: drivers/net/bnxt/bnxt_cpr.h:91:
+#define B_TPA_START_AGG_ID(rx_tpa_start) \
+ ((rx_tpa_start)->rx_tpa_start_cmp_misc_v1 & \
+RX_TPA_START_CMP_AGG_ID) >> RX_TPA_START_CMP_AGG_ID_SHIFT
ERROR:COMPLEX_MACRO: Macros with complex values should be enclosed in
parentheses
#728: FILE: drivers/net/bnxt/bnxt_cpr.h:95:
+#define B_TPA_END_AGG_ID(rx_tpa_end) \
+ ((rx_tpa_end)->rx_tpa_end_cmp_misc_v1 & \
+RX_TPA_END_CMP_AGG_ID) >> RX_TPA_END_CMP_AGG_ID_SHIFT
ERROR:COMPLEX_MACRO: Macros with complex values should be enclosed in
parentheses
#732: FILE: drivers/net/bnxt/bnxt_cpr.h:99:
+#define B_TPA_END_TPA_SEGS(rx_tpa_end) \
+ ((rx_tpa_end)->rx_tpa_end_cmp_
[dpdk-dev] New driver (large patch) question.
2016-03-02 13:30, Stephen Hurd: > The bulk of the patch is the hardware interface header file. With all the > comments, it weighs in around 800k. If I strip the comments, it's around > 300k. If I both strip all the comments and remove all the currently unused > structures, I can get the entire patch down just below 300k, but that makes > it much harder for someone to do further development. I'm willing to do > that though if it's what's preferred. > > The other large file (560k) is just a bunch of extra debug output that > makes it easier to debug issues. It's normally not compiled, so it sounds > like it's not wanted either. If the code is not needed, it's obviously better to not submit it :) > I'll submit without comments in the hardware interface file and take it > from there. I don't think removing the comments is a good option. Please try to split per-feature to make it readable. You can check how fm10k was introduced as an example: http://thread.gmane.org/gmane.comp.networking.dpdk.devel/13447 or mlx5: http://thread.gmane.org/gmane.comp.networking.dpdk.devel/26986
[dpdk-dev] [PATCH] drivers/net/bnxt New driver for Broadcom bnxt
Please do not submit some disabled code and avoid #ifdef.
2016-03-02 13:36, Stephen Hurd:
> +static struct eth_dev_ops bnxt_dev_ops = {
> + .dev_infos_get = bnxt_dev_info_get_op,
> + .dev_configure = bnxt_dev_configure_op,
> + .dev_start = bnxt_dev_start_op,
> + .dev_stop = bnxt_dev_stop_op,
> + .dev_set_link_up = bnxt_dev_set_link_up_op,
> + .dev_set_link_down = bnxt_dev_set_link_down_op,
> + .dev_close = bnxt_dev_close_op,
> + .stats_get = bnxt_stats_get_op,
> + .stats_reset = bnxt_stats_reset_op,
> + .rx_queue_setup = bnxt_rx_queue_setup_op,
> + .rx_queue_release = bnxt_rx_queue_release_op,
> +//.rx_queue_count = bnxt_rx_queue_count_op,
> +//.rx_descriptor_done = bnxt_rx_descriptor_done_op,
> + .tx_queue_setup = bnxt_tx_queue_setup_op,
> + .tx_queue_release = bnxt_tx_queue_release_op,
> +//.rx_queue_start = bnxt_rx_queue_start_op,
> +//.rx_queue_stop= bnxt_rx_queue_stop_op,
> +//.tx_queue_start = bnxt_tx_queue_start_op,
> +//.tx_queue_stop= bnxt_tx_queue_stop_op,
> + .reta_update = bnxt_reta_update_op,
> + .reta_query = bnxt_reta_query_op,
> + .rss_hash_update = bnxt_rss_hash_update_op,
> + .rss_hash_conf_get = bnxt_rss_hash_conf_get_op,
> + .link_update = bnxt_link_update_op,
> + .promiscuous_enable = bnxt_promiscuous_enable_op,
> + .promiscuous_disable = bnxt_promiscuous_disable_op,
> + .allmulticast_enable = bnxt_allmulticast_enable_op,
> + .allmulticast_disable = bnxt_allmulticast_disable_op,
> + .mtu_set = bnxt_mtu_set_op,
> + .mac_addr_add = bnxt_mac_addr_add_op,
> + .mac_addr_remove = bnxt_mac_addr_remove_op,
> + .vlan_filter_set = bnxt_vlan_filter_set_op,
> + .vlan_strip_queue_set = bnxt_vlan_strip_queue_set_op,
> + .flow_ctrl_get = bnxt_flow_ctrl_get_op,
> + .flow_ctrl_set = bnxt_flow_ctrl_set_op,
> +#if 0 // Phase 2/3
> + .dev_led_on = bnxt_dev_led_on_op,
> + .dev_led_off = bnxt_dev_led_off_op,
> + .queue_stats_mapping_set = bnxt_queue_stats_mapping_set_op,
> + .vlan_tpid_set = bnxt_vlan_tpid_set_op,
> + .vlan_offload_set = bnxt_vlan_offload_set_op,
> + .priority_flow_ctrl_set = bnxt_priority_flow_ctrl_set_op,
> + .uc_hash_table_set = bnxt_uc_hash_table_set_op,
> + .uc_all_hash_table_set = bnxt_uc_all_hash_table_set_op,
> + .mirror_rule_set = bnxt_mirror_rule_set_op,
> + .mirror_rule_reset = bnxt_mirror_rule_reset_op,
> + .set_vf_rx_mode = bnxt_set_vf_rx_mode_op,
> + .set_vf_rx = bnxt_set_vf_rx_op,
> + .set_vf_tx = bnxt_set_vf_tx_op,
> + .set_vf_vlan_filter = bnxt_set_vf_vlan_filter_op,
> + .set_queue_rate_limit = bnxt_set_queue_rate_limit_op,
> + .set_vf_rate_limit = bnxt_set_vf_rate_limit_op,
> + .fdir_add_signature_filter = bnxt_fdir_add_signature_filter_op,
> + .fdir_update_signature_filter = bnxt_fdir_update_signature_filter_op,
> + .fdir_remove_signature_filter = bnxt_fdir_remove_signature_filter_op,
> + .fdir_infos_get = bnxt_fdir_info_get_op,
> + .fdir_add_perfect_filter = bnxt_fdir_add_perfect_filter_op,
> + .fdir_update_perfect_filter = bnxt_fdir_update_perfect_filter_op,
> + .fdir_remove_perfect_filter = bnxt_fdir_remove_perfect_filter_op,
> + .fdir_set_masks = bnxt_fdir_set_masks_op,
> + .add_syn_filter = bnxt_add_syn_filter_op,
> + .remove_syn_filter = bnxt_remove_syn_filter_op,
> + .get_syn_filter = bnxt_get_syn_filter_op,
> + .add_ethertype_filter = bnxt_add_ethertype_filter_op,
> + .remove_ethertype_filter = bnxt_remove_ethertype_filter_op,
> + .get_ethertype_filter = bnxt_get_ethertype_filter_op,
> + .add_5tuple_filter = bnxt_add_5tuple_filter_op,
> + .remove_5tuple_filter = bnxt_remove_5tuple_filter_op,
> + .get_5tuple_filter = bnxt_get_5tuple_filter_op,
> +#endif
> +};
