Re: [dpdk-dev] [RFC 0/3] set protocol specific metadata using set_pkt_metadata API
Hi Akhil, Radu, On 01/29/2018 01:02 PM, Akhil Goyal wrote: On 1/26/2018 8:38 PM, Nicolau, Radu wrote: -Original Message- From: Anoob Joseph [mailto:anoob.jos...@caviumnetworks.com] Sent: Friday, January 26, 2018 2:38 PM To: Nicolau, Radu ; Akhil Goyal Cc: anoob.jos...@caviumnetworks.com; Doherty, Declan ; Gonzalez Monroy, Sergio ; Jerin Jacob ; Narayana Prasad ; Nelio Laranjeiro ; dev@dpdk.org Subject: Re: [RFC 0/3] set protocol specific metadata using set_pkt_metadata API Hi Radu, On 01/26/2018 04:52 PM, Nicolau, Radu wrote: -Original Message- From: Anoob Joseph [mailto:anoob.jos...@caviumnetworks.com] Sent: Thursday, January 25, 2018 5:13 PM To: Akhil Goyal ; Nicolau, Radu Cc: Doherty, Declan ; Gonzalez Monroy, Sergio ; anoob.jos...@caviumnetworks.com; Jerin Jacob ; Narayana Prasad ; Nelio Laranjeiro ; dev@dpdk.org Subject: Re: [RFC 0/3] set protocol specific metadata using set_pkt_metadata API Hi Akhil, Radu, Could you review the patch and share your thoughts on the proposed change? Hi, I've had a quick look. From what I can see you can do everything you do in this patch with the current API. For example you can store an internal struct pointer in the private section of the security context and you can increment the ESP SN with every tx or set metadata call. With the current API, PMD could store the ESN with the security session, but there is no means for the application to read this. Application should be aware of the sequence number used per packet. This is required to monitor sequence number overflow.In the proposal, the sequence number field is IN-OUT. So application could either dictate the sequence number, or read the value from the PMD. Thanks, Anoob My concern is that we are adding too much and too specific to the security API. Overflow situation can be monitored with a tx callback event or a crypto callback event, depending on the device type. Agreed with Radu, this looks too specific information. Instead, we can do overflow checking in the driver and add a macro in rte_crypto_op_status for overflow. We could do the callback when sequence number over flow happens, and IPsec processing fails subsequently. But ideally, application should be able to detect that the sequence number is about to over flow and renegotiate the SA while the original SA is still valid. I agree that we would be better off by handling this in the driver. But application would need some sort of event which would say, "sequence number is about to overflow, renegotiate SA", before the current SA becomes invalid. Do we have any mechanism to register a callback (acting on mbuf), when a particular event occurs (without dropping the mbuf)? If yes, we could move to that approach. rte_crypto_op_status could be leveraged for lookaside_protocol, but can we do something similar for inline protocol? Thoughts? Anoob -Akhil
[dpdk-dev] [PATCH v7 0/7] Dynamic HW Mempool Detection Support
W.r.t the multiple discussions in the past about the ability to dynamically detect the HW mempool support. [1],[2] & [3] This patchset helps in removing the current static mempool selection model and provides a flexible model to select the pktmbuf mempool in more dynamic way. 1) This patchset updates the hw mempool on the basis of device probe()), thus avoiding the need to specify the hw mempool in config file and focing different binaries for diffirent config architectures. 2) Selection of mempool ops though --mbuf-pool-ops-name (cmd line arg) which can overridden the scheme(1) 3) A new best mempool ops selection logic. 4) A new wrapper for the pktmbuf_pool_create helper to take mempool ops name as an argument as well. *Future Discussion points* 1. Platform OPS name is to be registered by the respentive HW. So it is the responsibility of HW to take care of not registering it from secondary process. 2. This logic can be further extended with addition for following patch, which is still under discussion. The ethdev PMD capability exposed through existing rte_eth_dev_pool_ops_supported() to select the update the mempool ops with some "weight" based algorithm like: http://dpdk.org/dev/patchwork/patch/32245/ [1]Multiple Pktmbuf mempool support http://dpdk.org/ml/archives/dev/2017-September/076531.html [2]Allow application set mempool handle http://dpdk.org/ml/archives/dev/2017-June/067022.html Other discussions [3] http://dpdk.org/ml/archives/dev/2017-December/084775.html -- Changes in v7: 1. new APIs as experimental as suggested by Thomas 2. fix patch commit messages. Changes in v6: 1. Fix compilation issue for patch 1/7 2. Fix return value comment for patch 3/7 Changes in v5: 1. Fix the doxygen API issues 2. remove unnecessary memset. Changes in v4: 1. Taking care of Olivier's comments 2. Changing the mempool ops name memory to named memzone Changes in v3: 1. Moving the new mbuf APIs to rte_mbuf_pool_ops.h 2. Taking care of comments from Jerin and Olivier 3. Adding memory for platform mempools ops in librte_mbuf Changes in v2: 1. Changed the active mempool to platform mempool 2. Moved all the relavant APIs to librte_mbuf 3. Added pktmbuf_create_pool_specific wrapper in this patch series. Hemant Agrawal (6): eal: prefix mbuf pool ops name with user defined mbuf: maintain user and compile time mempool ops name mbuf: add pool ops name selection API helpers mbuf: pktmbuf pool create helper for specific mempool ops dpaa: register dpaa as platform HW mempool on runtime dpaa2: register dpaa2 as platform HW mempool on runtime Pavan Nikhilesh (1): app/testpmd: add debug to print preferred mempool ops app/test-pmd/testpmd.c | 3 + config/defconfig_arm64-dpaa-linuxapp-gcc | 1 - config/defconfig_arm64-dpaa2-linuxapp-gcc | 1 - doc/api/doxy-api-index.md | 1 + drivers/bus/dpaa/dpaa_bus.c| 2 + drivers/bus/dpaa/rte_dpaa_bus.h| 2 + drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 7 +++ drivers/bus/fslmc/portal/dpaa2_hw_pvt.h| 2 + drivers/mempool/dpaa/dpaa_mempool.c| 2 +- drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 2 +- lib/librte_eal/bsdapp/eal/eal.c| 4 +- lib/librte_eal/common/eal_common_options.c | 2 +- lib/librte_eal/common/eal_internal_cfg.h | 3 +- lib/librte_eal/linuxapp/eal/eal.c | 4 +- lib/librte_mbuf/Makefile | 4 +- lib/librte_mbuf/rte_mbuf.c | 24 ++-- lib/librte_mbuf/rte_mbuf.h | 42 + lib/librte_mbuf/rte_mbuf_pool_ops.c| 96 ++ lib/librte_mbuf/rte_mbuf_pool_ops.h| 96 ++ lib/librte_mbuf/rte_mbuf_version.map | 12 20 files changed, 292 insertions(+), 18 deletions(-) create mode 100644 lib/librte_mbuf/rte_mbuf_pool_ops.c create mode 100644 lib/librte_mbuf/rte_mbuf_pool_ops.h -- 2.7.4
[dpdk-dev] [PATCH v7 1/7] eal: prefix mbuf pool ops name with user defined
This patch prefix the mbuf pool ops name with "user" to indicate
that it is user defined.
Signed-off-by: Hemant Agrawal
Acked-by: Olivier Matz
Acked-by: Santosh Shukla
---
lib/librte_eal/bsdapp/eal/eal.c| 4 ++--
lib/librte_eal/common/eal_common_options.c | 2 +-
lib/librte_eal/common/eal_internal_cfg.h | 3 ++-
lib/librte_eal/linuxapp/eal/eal.c | 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index 04cbd81..c602d02 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -114,7 +114,7 @@ int rte_cycles_vmware_tsc_map;
const char *
rte_eal_mbuf_default_mempool_ops(void)
{
- return internal_config.mbuf_pool_ops_name;
+ return internal_config.user_mbuf_pool_ops_name;
}
/* Return a pointer to the configuration structure */
@@ -397,7 +397,7 @@ eal_parse_args(int argc, char **argv)
switch (opt) {
case OPT_MBUF_POOL_OPS_NAME_NUM:
- internal_config.mbuf_pool_ops_name = optarg;
+ internal_config.user_mbuf_pool_ops_name = optarg;
break;
case 'h':
eal_usage(prgname);
diff --git a/lib/librte_eal/common/eal_common_options.c
b/lib/librte_eal/common/eal_common_options.c
index 996a034..7a40414 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -218,7 +218,7 @@ eal_reset_internal_config(struct internal_config
*internal_cfg)
#endif
internal_cfg->vmware_tsc_map = 0;
internal_cfg->create_uio_dev = 0;
- internal_cfg->mbuf_pool_ops_name = RTE_MBUF_DEFAULT_MEMPOOL_OPS;
+ internal_cfg->user_mbuf_pool_ops_name = RTE_MBUF_DEFAULT_MEMPOOL_OPS;
}
static int
diff --git a/lib/librte_eal/common/eal_internal_cfg.h
b/lib/librte_eal/common/eal_internal_cfg.h
index c67685c..1169fcc 100644
--- a/lib/librte_eal/common/eal_internal_cfg.h
+++ b/lib/librte_eal/common/eal_internal_cfg.h
@@ -52,7 +52,8 @@ struct internal_config {
volatile enum rte_intr_mode vfio_intr_mode;
const char *hugefile_prefix; /**< the base filename of hugetlbfs
files */
const char *hugepage_dir; /**< specific hugetlbfs directory to
use */
- const char *mbuf_pool_ops_name; /**< mbuf pool ops name */
+ const char *user_mbuf_pool_ops_name;
+ /**< user defined mbuf pool ops name */
unsigned num_hugepage_sizes; /**< how many sizes on this system */
struct hugepage_info hugepage_info[MAX_HUGEPAGE_SIZES];
};
diff --git a/lib/librte_eal/linuxapp/eal/eal.c
b/lib/librte_eal/linuxapp/eal/eal.c
index 229eec9..e8c7100 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -124,7 +124,7 @@ int rte_cycles_vmware_tsc_map;
const char *
rte_eal_mbuf_default_mempool_ops(void)
{
- return internal_config.mbuf_pool_ops_name;
+ return internal_config.user_mbuf_pool_ops_name;
}
/* Return a pointer to the configuration structure */
@@ -609,7 +609,7 @@ eal_parse_args(int argc, char **argv)
break;
case OPT_MBUF_POOL_OPS_NAME_NUM:
- internal_config.mbuf_pool_ops_name = optarg;
+ internal_config.user_mbuf_pool_ops_name = optarg;
break;
default:
--
2.7.4
[dpdk-dev] [PATCH v7 2/7] mbuf: maintain user and compile time mempool ops name
At present the userdefined mempool ops name overwrites
the default mempool ops name variable in internal_config.
This patch change the logic to maintain the value of
user defined only in the internal config.
The pktmbuf_create_pool is updated to reflect the same ie.
use user defined. If not present than use the default.
Signed-off-by: Hemant Agrawal
Acked-by: Olivier Matz
Acked-by: Santosh Shukla
---
lib/librte_eal/common/eal_common_options.c | 2 +-
lib/librte_mbuf/rte_mbuf.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/common/eal_common_options.c
b/lib/librte_eal/common/eal_common_options.c
index 7a40414..b6d2762 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -218,7 +218,7 @@ eal_reset_internal_config(struct internal_config
*internal_cfg)
#endif
internal_cfg->vmware_tsc_map = 0;
internal_cfg->create_uio_dev = 0;
- internal_cfg->user_mbuf_pool_ops_name = RTE_MBUF_DEFAULT_MEMPOOL_OPS;
+ internal_cfg->user_mbuf_pool_ops_name = NULL;
}
static int
diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
index 937fd70..c085c37 100644
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -177,6 +177,8 @@ rte_pktmbuf_pool_create(const char *name, unsigned n,
return NULL;
mp_ops_name = rte_eal_mbuf_default_mempool_ops();
+ if (mp_ops_name == NULL)
+ mp_ops_name = RTE_MBUF_DEFAULT_MEMPOOL_OPS;
ret = rte_mempool_set_ops_byname(mp, mp_ops_name, NULL);
if (ret != 0) {
RTE_LOG(ERR, MBUF, "error setting mempool handler\n");
--
2.7.4
[dpdk-dev] [PATCH v7 6/7] dpaa: register dpaa as platform HW mempool on runtime
Signed-off-by: Hemant Agrawal
---
config/defconfig_arm64-dpaa-linuxapp-gcc | 1 -
drivers/bus/dpaa/dpaa_bus.c | 2 ++
drivers/bus/dpaa/rte_dpaa_bus.h | 2 ++
drivers/mempool/dpaa/dpaa_mempool.c | 2 +-
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/config/defconfig_arm64-dpaa-linuxapp-gcc
b/config/defconfig_arm64-dpaa-linuxapp-gcc
index c2ca16a..ab9e67d 100644
--- a/config/defconfig_arm64-dpaa-linuxapp-gcc
+++ b/config/defconfig_arm64-dpaa-linuxapp-gcc
@@ -25,7 +25,6 @@ CONFIG_RTE_LIBRTE_DPAA_HWDEBUG=n
# NXP DPAA Mempool
CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=y
-CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS="dpaa"
# Compile software NXP DPAA PMD
CONFIG_RTE_LIBRTE_DPAA_PMD=y
diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index ba33566..f5840de 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#include
#include
@@ -469,6 +470,7 @@ rte_dpaa_bus_probe(void)
break;
}
}
+ rte_mbuf_set_platform_mempool_ops(DPAA_MEMPOOL_OPS_NAME);
svr_file = fopen(DPAA_SOC_ID_FILE, "r");
if (svr_file) {
diff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h
index 6fa0c3d..d613660 100644
--- a/drivers/bus/dpaa/rte_dpaa_bus.h
+++ b/drivers/bus/dpaa/rte_dpaa_bus.h
@@ -17,6 +17,8 @@
#define FSL_DPAA_BUS_NAME "FSL_DPAA_BUS"
+#define DPAA_MEMPOOL_OPS_NAME "dpaa"
+
#define DEV_TO_DPAA_DEVICE(ptr)\
container_of(ptr, struct rte_dpaa_device, device)
diff --git a/drivers/mempool/dpaa/dpaa_mempool.c
b/drivers/mempool/dpaa/dpaa_mempool.c
index ddc4e47..dc4bcc9 100644
--- a/drivers/mempool/dpaa/dpaa_mempool.c
+++ b/drivers/mempool/dpaa/dpaa_mempool.c
@@ -290,7 +290,7 @@ dpaa_register_memory_area(const struct rte_mempool *mp,
}
struct rte_mempool_ops dpaa_mpool_ops = {
- .name = "dpaa",
+ .name = DPAA_MEMPOOL_OPS_NAME,
.alloc = dpaa_mbuf_create_pool,
.free = dpaa_mbuf_free_pool,
.enqueue = dpaa_mbuf_free_bulk,
--
2.7.4
[dpdk-dev] [PATCH v7 3/7] mbuf: add pool ops name selection API helpers
This patch add support for various mempool ops config helper APIs.
1.User defined mempool ops
2.Platform detected HW mempool ops (active).
3.Best selection of mempool ops by looking into user defined,
platform registered and compile time configured.
Signed-off-by: Hemant Agrawal
Acked-by: Olivier Matz
Acked-by: Santosh Shukla
---
doc/api/doxy-api-index.md| 1 +
lib/librte_mbuf/Makefile | 4 +-
lib/librte_mbuf/rte_mbuf.c | 5 +-
lib/librte_mbuf/rte_mbuf_pool_ops.c | 96
lib/librte_mbuf/rte_mbuf_pool_ops.h | 96
lib/librte_mbuf/rte_mbuf_version.map | 11 +
6 files changed, 208 insertions(+), 5 deletions(-)
create mode 100644 lib/librte_mbuf/rte_mbuf_pool_ops.c
create mode 100644 lib/librte_mbuf/rte_mbuf_pool_ops.h
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index 76d606f..8cbd92a 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -136,6 +136,7 @@ The public API headers are grouped by topics:
- **containers**:
[mbuf] (@ref rte_mbuf.h),
+ [mbuf pool ops] (@ref rte_mbuf_pool_ops.h)
[ring] (@ref rte_ring.h),
[tailq] (@ref rte_tailq.h),
[bitmap] (@ref rte_bitmap.h)
diff --git a/lib/librte_mbuf/Makefile b/lib/librte_mbuf/Makefile
index 398f724..e2e3ec6 100644
--- a/lib/librte_mbuf/Makefile
+++ b/lib/librte_mbuf/Makefile
@@ -14,9 +14,9 @@ EXPORT_MAP := rte_mbuf_version.map
LIBABIVER := 3
# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_MBUF) := rte_mbuf.c rte_mbuf_ptype.c
+SRCS-$(CONFIG_RTE_LIBRTE_MBUF) := rte_mbuf.c rte_mbuf_ptype.c
rte_mbuf_pool_ops.c
# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include := rte_mbuf.h rte_mbuf_ptype.h
+SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include := rte_mbuf.h rte_mbuf_ptype.h
rte_mbuf_pool_ops.h
include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
index c085c37..0c4d374 100644
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -54,6 +54,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -176,9 +177,7 @@ rte_pktmbuf_pool_create(const char *name, unsigned n,
if (mp == NULL)
return NULL;
- mp_ops_name = rte_eal_mbuf_default_mempool_ops();
- if (mp_ops_name == NULL)
- mp_ops_name = RTE_MBUF_DEFAULT_MEMPOOL_OPS;
+ mp_ops_name = rte_mbuf_best_mempool_ops();
ret = rte_mempool_set_ops_byname(mp, mp_ops_name, NULL);
if (ret != 0) {
RTE_LOG(ERR, MBUF, "error setting mempool handler\n");
diff --git a/lib/librte_mbuf/rte_mbuf_pool_ops.c
b/lib/librte_mbuf/rte_mbuf_pool_ops.c
new file mode 100644
index 000..9aa1541
--- /dev/null
+++ b/lib/librte_mbuf/rte_mbuf_pool_ops.c
@@ -0,0 +1,96 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2018 NXP
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+int
+rte_mbuf_set_platform_mempool_ops(const char *ops_name)
+{
+ const struct rte_memzone *mz;
+
+ if (strlen(ops_name) >= RTE_MEMPOOL_OPS_NAMESIZE)
+ return -ENAMETOOLONG;
+
+ mz = rte_memzone_lookup("mbuf_platform_pool_ops");
+ if (mz == NULL) {
+ mz = rte_memzone_reserve("mbuf_platform_pool_ops",
+ RTE_MEMPOOL_OPS_NAMESIZE, SOCKET_ID_ANY, 0);
+ if (mz == NULL)
+ return -rte_errno;
+ strncpy(mz->addr, ops_name, strlen(ops_name));
+ return 0;
+ } else if (strcmp(mz->addr, ops_name) == 0) {
+ return 0;
+ }
+
+ RTE_LOG(ERR, MBUF,
+ "%s is already registered as platform mbuf pool ops\n",
+ (char *)mz->addr);
+ return -EEXIST;
+}
+
+const char *
+rte_mbuf_platform_mempool_ops(void)
+{
+ const struct rte_memzone *mz;
+
+ mz = rte_memzone_lookup("mbuf_platform_pool_ops");
+ if (mz == NULL)
+ return NULL;
+ return mz->addr;
+}
+
+int
+rte_mbuf_set_user_mempool_ops(const char *ops_name)
+{
+ const struct rte_memzone *mz;
+
+ if (strlen(ops_name) >= RTE_MEMPOOL_OPS_NAMESIZE)
+ return -ENAMETOOLONG;
+
+ mz = rte_memzone_lookup("mbuf_user_pool_ops");
+ if (mz == NULL) {
+ mz = rte_memzone_reserve("mbuf_user_pool_ops",
+ RTE_MEMPOOL_OPS_NAMESIZE, SOCKET_ID_ANY, 0);
+ if (mz == NULL)
+ return -rte_errno;
+ }
+
+ strncpy(mz->addr, ops_name, strlen(ops_name));
+ return 0;
+
+}
+
+const char *
+rte_mbuf_user_mempool_ops(void)
+{
+ const struct rte_memzone *mz;
+
+ mz = rte_memzone_lookup("mbuf_user_pool_ops");
+ if (mz == NULL)
+ return rte_eal_mbuf_default_mempool_ops();
+ return mz->addr;
+}
+
+/* Return mbuf pool ops name */
+cons
[dpdk-dev] [PATCH v7 5/7] app/testpmd: add debug to print preferred mempool ops
From: Pavan Nikhilesh
This patch adds the debug message to print the best selected
pktmbuf mempool ops name.
Signed-off-by: Pavan Nikhilesh
Signed-off-by: Hemant Agrawal
Reviewed-by: Olivier Matz
Acked-by: Santosh Shukla
---
app/test-pmd/testpmd.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 5dc8cca..d8ac432 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -499,6 +500,8 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
rte_mempool_obj_iter(rte_mp, rte_pktmbuf_init, NULL);
} else {
/* wrapper to rte_mempool_create() */
+ TESTPMD_LOG(INFO, "preferred mempool ops selected: %s\n",
+ rte_mbuf_best_mempool_ops());
rte_mp = rte_pktmbuf_pool_create(pool_name, nb_mbuf,
mb_mempool_cache, 0, mbuf_seg_size, socket_id);
}
--
2.7.4
[dpdk-dev] [PATCH v7 4/7] mbuf: pktmbuf pool create helper for specific mempool ops
Introduce a new helper for pktmbuf pool, which will allow
the application to optionally specify the mempool ops name
as well.
Signed-off-by: Hemant Agrawal
Acked-by: Olivier Matz
Acked-by: Santosh Shukla
---
lib/librte_mbuf/rte_mbuf.c | 23 ++--
lib/librte_mbuf/rte_mbuf.h | 42
lib/librte_mbuf/rte_mbuf_version.map | 1 +
3 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
index 0c4d374..a256b42 100644
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -149,15 +149,15 @@ rte_pktmbuf_init(struct rte_mempool *mp,
m->next = NULL;
}
-/* helper to create a mbuf pool */
+/* Helper to create a mbuf pool with given mempool ops name*/
struct rte_mempool *
-rte_pktmbuf_pool_create(const char *name, unsigned n,
- unsigned cache_size, uint16_t priv_size, uint16_t data_room_size,
- int socket_id)
+rte_pktmbuf_pool_create_by_ops(const char *name, unsigned int n,
+ unsigned int cache_size, uint16_t priv_size, uint16_t data_room_size,
+ int socket_id, const char *ops_name)
{
struct rte_mempool *mp;
struct rte_pktmbuf_pool_private mbp_priv;
- const char *mp_ops_name;
+ const char *mp_ops_name = ops_name;
unsigned elt_size;
int ret;
@@ -177,7 +177,8 @@ rte_pktmbuf_pool_create(const char *name, unsigned n,
if (mp == NULL)
return NULL;
- mp_ops_name = rte_mbuf_best_mempool_ops();
+ if (mp_ops_name == NULL)
+ mp_ops_name = rte_mbuf_best_mempool_ops();
ret = rte_mempool_set_ops_byname(mp, mp_ops_name, NULL);
if (ret != 0) {
RTE_LOG(ERR, MBUF, "error setting mempool handler\n");
@@ -199,6 +200,16 @@ rte_pktmbuf_pool_create(const char *name, unsigned n,
return mp;
}
+/* helper to create a mbuf pool */
+struct rte_mempool *
+rte_pktmbuf_pool_create(const char *name, unsigned int n,
+ unsigned int cache_size, uint16_t priv_size, uint16_t data_room_size,
+ int socket_id)
+{
+ return rte_pktmbuf_pool_create_by_ops(name, n, cache_size, priv_size,
+ data_room_size, socket_id, NULL);
+}
+
/* do some sanity checks on a mbuf: panic if it fails */
void
rte_mbuf_sanity_check(const struct rte_mbuf *m, int is_header)
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 2fd4f5e..fb367f8 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -1101,6 +1101,48 @@ rte_pktmbuf_pool_create(const char *name, unsigned n,
int socket_id);
/**
+ * Create a mbuf pool with a given mempool ops name
+ *
+ * This function creates and initializes a packet mbuf pool. It is
+ * a wrapper to rte_mempool functions.
+ *
+ * @param name
+ * The name of the mbuf pool.
+ * @param n
+ * The number of elements in the mbuf pool. The optimum size (in terms
+ * of memory usage) for a mempool is when n is a power of two minus one:
+ * n = (2^q - 1).
+ * @param cache_size
+ * Size of the per-core object cache. See rte_mempool_create() for
+ * details.
+ * @param priv_size
+ * Size of application private are between the rte_mbuf structure
+ * and the data buffer. This value must be aligned to RTE_MBUF_PRIV_ALIGN.
+ * @param data_room_size
+ * Size of data buffer in each mbuf, including RTE_PKTMBUF_HEADROOM.
+ * @param socket_id
+ * The socket identifier where the memory should be allocated. The
+ * value can be *SOCKET_ID_ANY* if there is no NUMA constraint for the
+ * reserved zone.
+ * @param ops_name
+ * The mempool ops name to be used for this mempool instead of
+ * default mempool. The value can be *NULL* to use default mempool.
+ * @return
+ * The pointer to the new allocated mempool, on success. NULL on error
+ * with rte_errno set appropriately. Possible rte_errno values include:
+ *- E_RTE_NO_CONFIG - function could not get pointer to rte_config
structure
+ *- E_RTE_SECONDARY - function was called from a secondary process instance
+ *- EINVAL - cache size provided is too large, or priv_size is not aligned.
+ *- ENOSPC - the maximum number of memzones has already been allocated
+ *- EEXIST - a memzone with the same name already exists
+ *- ENOMEM - no appropriate memory area found in which to create memzone
+ */
+struct rte_mempool *
+rte_pktmbuf_pool_create_by_ops(const char *name, unsigned int n,
+ unsigned int cache_size, uint16_t priv_size, uint16_t data_room_size,
+ int socket_id, const char *ops_name);
+
+/**
* Get the data room size of mbufs stored in a pktmbuf_pool
*
* The data room size is the amount of data that can be stored in a
diff --git a/lib/librte_mbuf/rte_mbuf_version.map
b/lib/librte_mbuf/rte_mbuf_version.map
index db87819..d418dcb 100644
--- a/lib/librte_mbuf/rte_mbuf_version.map
+++ b/lib/librte_mbuf/rte_mbuf_version.map
@@ -44,5 +44,6 @@ EXP
[dpdk-dev] [PATCH v7 7/7] dpaa2: register dpaa2 as platform HW mempool on runtime
Detect if the DPAA2 mempool objects are present and register
it as platform default hw mempool
Signed-off-by: Hemant Agrawal
---
config/defconfig_arm64-dpaa2-linuxapp-gcc | 1 -
drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 7 +++
drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 2 ++
drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 2 +-
4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/config/defconfig_arm64-dpaa2-linuxapp-gcc
b/config/defconfig_arm64-dpaa2-linuxapp-gcc
index d38d696..5d4437c 100644
--- a/config/defconfig_arm64-dpaa2-linuxapp-gcc
+++ b/config/defconfig_arm64-dpaa2-linuxapp-gcc
@@ -26,7 +26,6 @@ CONFIG_RTE_LIBRTE_VHOST_NUMA=n
# Compile Support Libraries for DPAA2
#
CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=y
-CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS="dpaa2"
CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=n
#
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c
b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c
index 139249c..1539739 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c
@@ -20,6 +20,7 @@
#include
#include
#include
+#include
#include
#include
@@ -38,6 +39,7 @@ dpaa2_create_dpbp_device(int vdev_fd __rte_unused,
{
struct dpaa2_dpbp_dev *dpbp_node;
int ret;
+ static int register_once;
/* Allocate DPAA2 dpbp handle */
dpbp_node = rte_malloc(NULL, sizeof(struct dpaa2_dpbp_dev), 0);
@@ -74,6 +76,11 @@ dpaa2_create_dpbp_device(int vdev_fd __rte_unused,
RTE_LOG(DEBUG, PMD, "DPAA2: Added [dpbp.%d]\n", dpbp_id);
+ if (!register_once) {
+ if (rte_mbuf_set_platform_mempool_ops(DPAA2_MEMPOOL_OPS_NAME))
+ register_once = 1;
+ }
+
return 0;
}
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
index 9436d37..d421dbf 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
@@ -44,6 +44,8 @@
/* Maximum release/acquire from QBMAN */
#define DPAA2_MBUF_MAX_ACQ_REL 7
+#define DPAA2_MEMPOOL_OPS_NAME "dpaa2"
+
#define MAX_BPID 256
#define DPAA2_MBUF_HW_ANNOTATION 64
#define DPAA2_FD_PTA_SIZE 0
diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c
b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c
index afda2c2..2bd62e8 100644
--- a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c
+++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c
@@ -354,7 +354,7 @@ rte_hw_mbuf_get_count(const struct rte_mempool *mp)
}
struct rte_mempool_ops dpaa2_mpool_ops = {
- .name = "dpaa2",
+ .name = DPAA2_MEMPOOL_OPS_NAME,
.alloc = rte_hw_mbuf_create_pool,
.free = rte_hw_mbuf_free_pool,
.enqueue = rte_hw_mbuf_free_bulk,
--
2.7.4
Re: [dpdk-dev] [PATCH v8 2/3] eal: add u64 bit variant for reciprocal
On 1/29/2018 1:24 PM, Pavan Nikhilesh wrote: Hi Hemant, On Mon, Jan 29, 2018 at 12:12:55PM +0530, Hemant Agrawal wrote: Hi Pavan, I am bit late in checking it. (series is already applied) Just few legal queries. --- a/lib/librte_eal/common/rte_reciprocal.c > +++ b/lib/librte_eal/common/rte_reciprocal.c @@ -1,3 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2017 Cavium, Inc you have added Cavium's copyright here. + +/* + * Code taken from Hacker's Delight: + * http://www.hackersdelight.org/hdcodetxt/divlu.c.txt + * License permits inclusion here per: + * http://www.hackersdelight.org/permissions.htm + */ Did you clarify it Cavium's legal team? The permissions states that you should not add it to another publication without written permission. DPDK can be considered a publication. Did you got written permission? The link specifically states that only the "The textural material and pictures are copyright by the author" and "You are free to use, copy, and distribute any of the code on this web site, whether modified by you or not". The textural material in this case mean any text/pictures taken from the Hacker's Delight book. The linux kernel also uses similar code as seen at https://github.com/torvalds/linux/blob/master/lib/div64.c. Let me know if any further clarification are needed. Thanks. It is clear now. Regards, Pavan. If not please specify Cavium's legal team opinion or take permission from author. I believe that it is easy to obtain permission for this code. "You are free to use, copy, and distribute any of the code on this web site, whether modified by you or not. You need not give attribution. This includes the algorithms (some of which appear in Hacker's Delight), the Hacker's Assistant, and any code submitted by readers. Submitters implicitly agree to this. *The textural material and pictures are copyright by the author, and the usual copyright rules apply. E.g., you may store the material on your computer and make hard or soft copies for your own use. However, you may not incorporate this material into another publication without written permission from the author (which the author may give by email).* The author has taken care in the preparation of this material, but makes no expressed or implied warranty of any kind and assumes no responsibility for errors or omissions. No liability is assumed for incidental or consequential damages in connection with or arising out of the use of the information or programs contained herein." regards, Hemant
[dpdk-dev] [PATCH] net/ixgbe: fix hardware reset issue in VF
There is no specific handling when there is error happened
of hardware reset process in VF device start process.
Fixes: 0a45657a6794a ("pci: rework interrupt handling")
Signed-off-by: Wei Zhao
---
drivers/net/ixgbe/ixgbe_ethdev.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 4f4334d..585c77c 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -5001,7 +5001,11 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)
PMD_INIT_FUNC_TRACE();
- hw->mac.ops.reset_hw(hw);
+ err = hw->mac.ops.reset_hw(hw);
+ if (err) {
+ PMD_INIT_LOG(ERR, "Unable to reset vf hardware (%d)", err);
+ return err;
+ }
hw->mac.get_link_status = true;
/* negotiate mailbox API version to use with the PF. */
--
2.9.3
Re: [dpdk-dev] [PATCH] net/mlx5: fix MTU update Changing the MTU is not related to changing the number of segments, activating or not the multi-segment support should be handled by the application.
Hi Erez, On Sun, Jan 28, 2018 at 03:39:47PM +0200, Erez Ferber wrote: > This is a backport based on commit > a0edafe4099b1ef139242abb7baa2c2a48b83fd2 There is some issues in this commit, first the title line exceed the 75 characters. Second it is submitted on the dev mailing list whereas it seems to be targeting a stable branch, in should have been posted on sta...@dpdk.org and according to the sha-1 I would say the target is the 17.08. Can you make things clearer? > Signed-off-by: Erez Ferber > --- > drivers/net/mlx5/mlx5_ethdev.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c > index c0f73e9..f73d26e 100644 > --- a/drivers/net/mlx5/mlx5_ethdev.c > +++ b/drivers/net/mlx5/mlx5_ethdev.c > @@ -930,9 +930,7 @@ recover: > /* Provide new values to rxq_setup(). */ > dev->data->dev_conf.rxmode.jumbo_frame = sp; > dev->data->dev_conf.rxmode.max_rx_pkt_len = max_frame_len; > - if (rehash) > - ret = rxq_rehash(dev, rxq_ctrl); > - else > + if (!rehash) > ret = rxq_ctrl_setup(dev, rxq_ctrl, 1 << rxq->elts_n, >rxq_ctrl->socket, NULL, rxq->mp); > if (!ret) > -- > 1.8.2.3 -- Nélio Laranjeiro 6WIND
Re: [dpdk-dev] [RFC] lib/librte_ether: add a return value for MAC set ops
Hi, On Fri, Jan 26, 2018 at 04:54:43PM +, Ferruh Yigit wrote: > On 1/26/2018 2:19 AM, Lu, Wenzhuo wrote: > > Hi Olivier, > > > > > >> -Original Message- > >> From: Olivier Matz [mailto:olivier.m...@6wind.com] > >> Sent: Thursday, January 25, 2018 6:40 PM > >> To: Lu, Wenzhuo > >> Cc: dev@dpdk.org > >> Subject: Re: [dpdk-dev] [RFC] lib/librte_ether: add a return value for MAC > >> set > >> ops > >> > >> Hi Wenzhuo, > >> > >> On Thu, Jan 25, 2018 at 10:46:57AM +0800, Wenzhuo Lu wrote: > >>> Setting the default MAC address may fail on many NICs. > >>> But the ops return void. So, even it failed, RTE changes the MAC > >>> address and APP doesn't know the failure. > >>> > >>> It's not real patch, just show the idea to add a return value for the > >>> ops. > >> > >> Thank you for taking care of this. I had some plans to work on it too, as > >> discussed here: > >> https://dpdk.org/dev/patchwork/patch/32284/ > > Sorry, didn't notice that. Glad to know you're working on that. So you'll > > continue, right? > > Plan was send PMD fixes and deprecation notice on this release and send fix > next > release [1]. > > I think PMD fixes are merged now, but deprecation notice not send yet. > > [1] > https://dpdk.org/ml/archives/dev/2018-January/085195.html Yes, I'll send the deprecation notice today.
[dpdk-dev] [PATCH v3] net/mlx4: fix dev rmv not detected after port stop
In failsafe device start can be called for ports/devices that
had been plugged out.
The mlx4 PMD detects device removal by listening to the device RMV
events, when the mlx4 port is being stopped, the PMD no longer
listens to these events causing the PMD to stop detecting device
removals.
This patch fixes this issue by moving installation of the interrupt
handler to device configuration, and toggle only the Rx-queue
interrupts on start/stop.
Fixes: a6e8b01c3c26 ("net/mlx4: compact interrupt functions")
Cc: sta...@dpdk.org
Signed-off-by: Moti Haimovsky
---
V3:
Modifications according to review inputs from Shahaf Shuler
See: 1516357009-15463-1-git-send-email-mo...@mellanox.com
V2:
Fixed commit message.
---
drivers/net/mlx4/mlx4.c | 10 --
drivers/net/mlx4/mlx4.h | 2 ++
drivers/net/mlx4/mlx4_intr.c | 41 ++---
3 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index 952dae0..680eca7 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -108,7 +108,13 @@ struct mlx4_conf {
" flow error type %d, cause %p, message: %s",
-ret, strerror(-ret), error.type, error.cause,
error.message ? error.message : "(unspecified)");
+ goto exit;
}
+ ret = mlx4_intr_install(priv);
+ if (ret)
+ ERROR("%p: interrupt handler installation failed",
+ (void *)dev);
+exit:
return ret;
}
@@ -141,7 +147,7 @@ struct mlx4_conf {
(void *)dev, strerror(-ret));
goto err;
}
- ret = mlx4_intr_install(priv);
+ ret = mlx4_rxq_intr_enable(priv);
if (ret) {
ERROR("%p: interrupt handler installation failed",
(void *)dev);
@@ -187,7 +193,7 @@ struct mlx4_conf {
dev->rx_pkt_burst = mlx4_rx_burst_removed;
rte_wmb();
mlx4_flow_sync(priv, NULL);
- mlx4_intr_uninstall(priv);
+ mlx4_rxq_intr_disable(priv);
mlx4_rss_deinit(priv);
}
diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h
index 30a544f..d65879f 100644
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
@@ -177,6 +177,8 @@ int mlx4_flow_ctrl_set(struct rte_eth_dev *dev,
int mlx4_intr_uninstall(struct priv *priv);
int mlx4_intr_install(struct priv *priv);
+int mlx4_rxq_intr_enable(struct priv *priv);
+void mlx4_rxq_intr_disable(struct priv *priv);
int mlx4_rx_intr_disable(struct rte_eth_dev *dev, uint16_t idx);
int mlx4_rx_intr_enable(struct rte_eth_dev *dev, uint16_t idx);
diff --git a/drivers/net/mlx4/mlx4_intr.c b/drivers/net/mlx4/mlx4_intr.c
index 2ff7218..e522949 100644
--- a/drivers/net/mlx4/mlx4_intr.c
+++ b/drivers/net/mlx4/mlx4_intr.c
@@ -291,7 +291,7 @@
}
rte_eal_alarm_cancel((void (*)(void *))mlx4_link_status_alarm, priv);
priv->intr_alarm = 0;
- mlx4_rx_intr_vec_disable(priv);
+ mlx4_rxq_intr_disable(priv);
rte_errno = err;
return 0;
}
@@ -313,8 +313,6 @@
int rc;
mlx4_intr_uninstall(priv);
- if (intr_conf->rxq && mlx4_rx_intr_vec_enable(priv) < 0)
- goto error;
if (intr_conf->lsc | intr_conf->rmv) {
priv->intr_handle.fd = priv->ctx->async_fd;
rc = rte_intr_callback_register(&priv->intr_handle,
@@ -395,3 +393,40 @@
}
return -ret;
}
+
+/**
+ * Enable datapath interrupts.
+ *
+ * @param priv
+ * Pointer to private structure.
+ *
+ * @return
+ * 0 on success, negative errno value otherwise and rte_errno is set.
+ */
+int
+mlx4_rxq_intr_enable(struct priv *priv)
+{
+ const struct rte_intr_conf *const intr_conf =
+ &priv->dev->data->dev_conf.intr_conf;
+
+ if (intr_conf->rxq && mlx4_rx_intr_vec_enable(priv) < 0)
+ goto error;
+ return 0;
+error:
+ return -rte_errno;
+}
+
+/**
+ * Disable datapath interrupts, keeping other interrupts intact.
+ *
+ * @param priv
+ * Pointer to private structure.
+ */
+void
+mlx4_rxq_intr_disable(struct priv *priv)
+{
+ int err = rte_errno; /* Make sure rte_errno remains unchanged. */
+
+ mlx4_rx_intr_vec_disable(priv);
+ rte_errno = err;
+}
--
1.8.3.1
Re: [dpdk-dev] [PATCH v7 3/7] mbuf: add pool ops name selection API helpers
On 01/29/2018 11:10 AM, Hemant Agrawal wrote: This patch add support for various mempool ops config helper APIs. 1.User defined mempool ops 2.Platform detected HW mempool ops (active). 3.Best selection of mempool ops by looking into user defined, platform registered and compile time configured. Signed-off-by: Hemant Agrawal Acked-by: Olivier Matz Acked-by: Santosh Shukla --- doc/api/doxy-api-index.md| 1 + lib/librte_mbuf/Makefile | 4 +- lib/librte_mbuf/rte_mbuf.c | 5 +- lib/librte_mbuf/rte_mbuf_pool_ops.c | 96 lib/librte_mbuf/rte_mbuf_pool_ops.h | 96 lib/librte_mbuf/rte_mbuf_version.map | 11 + 6 files changed, 208 insertions(+), 5 deletions(-) create mode 100644 lib/librte_mbuf/rte_mbuf_pool_ops.c create mode 100644 lib/librte_mbuf/rte_mbuf_pool_ops.h <...> diff --git a/lib/librte_mbuf/rte_mbuf_pool_ops.h b/lib/librte_mbuf/rte_mbuf_pool_ops.h new file mode 100644 index 000..e8ee20f --- /dev/null +++ b/lib/librte_mbuf/rte_mbuf_pool_ops.h <...> + +/** + * Set the platform supported pktmbuf HW mempool ops name + * + * This function allow the HW to register the actively supported HW mempool + * ops_name. Only one HW mempool ops can be registered at any point of time. + * + * @param ops_name + * @return + * - On success, zero. + * - On failure, a negative value. + */ +int +rte_mbuf_set_platform_mempool_ops(const char *ops_name); Just one minor note: As far as I can see it is not strictly followed in DPDK headers, but coding standard [1] says that "Short function prototypes should be contained on a single line." and all examples in coding style follow it. There is a known practical reason behind it: grep -r ^function_name will find single place where the function is implemented. <...> [1] http://dpdk.org/doc/guides/contributing/coding_style.html#prototypes
Re: [dpdk-dev] [dpdk-stable] patch 'event/octeontx: fix Rx adapter port id mapping' has been queued to LTS release 17.11.1
Hi Yliu,
On Sat, Jan 27, 2018 at 12:00:29AM +0800, Yuanhan Liu wrote:
> On Wed, Jan 24, 2018 at 11:32:20PM +0800, Yuanhan Liu wrote:
> > Hi,
> >
> > FYI, your patch has been queued to LTS release 17.11.1
> >
> > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
> > It will be pushed if I get no objections before 01/26/18. So please
> > shout if anyone has objections.
>
> I met an build error with this one:
This is due to map file having improper tag i.e.
http://dpdk.org/dev/patchwork/patch/32510/
+
+DPDK_18.04 {
Fixed while applying.
+ global:
+
+ rte_octeontx_pchan_map;
+
+};
Ferruh fixed it while applying.
Regards,
Pavan.
>
> error: ‘rte_octeontx_pchan_map ’ undeclared (first use in this function)
>
> This patch is then dropped. If you think it's needed for 17.11.1 LTS
> release, please do a backport. And sorry for the late notice: it was
> my fault, I should have done the build before sending it out.
>
> --yliu
> >
> > Thanks.
> >
> > --yliu
> >
> > ---
> > >From 3ab8effa1fd5b07c88688ff14e816e0a314d7778 Mon Sep 17 00:00:00 2001
> > From: Pavan Nikhilesh
> > Date: Tue, 19 Dec 2017 23:31:45 +0530
> > Subject: [PATCH] event/octeontx: fix Rx adapter port id mapping
> >
> > [ upstream commit 9b4298339652c5f4c3a1391ed26caa5bbb26c158 ]
> >
> > When octeontx event dev receives a packet for the event Rx adapter, the
> > mbuf port id should contain the appropriate ethdev id instead of
> > internal channel info.
> >
> > Fixes: 45a914c5bd71 ("event/octeontx: support event Rx adapter")
> >
> > Signed-off-by: Pavan Nikhilesh
> > Acked-by: Santosh Shukla
> > ---
Re: [dpdk-dev] [RFC 0/3] set protocol specific metadata using set_pkt_metadata API
On 1/29/2018 1:33 PM, Anoob Joseph wrote: Hi Akhil, Radu, On 01/29/2018 01:02 PM, Akhil Goyal wrote: On 1/26/2018 8:38 PM, Nicolau, Radu wrote: -Original Message- From: Anoob Joseph [mailto:anoob.jos...@caviumnetworks.com] Sent: Friday, January 26, 2018 2:38 PM To: Nicolau, Radu ; Akhil Goyal Cc: anoob.jos...@caviumnetworks.com; Doherty, Declan ; Gonzalez Monroy, Sergio ; Jerin Jacob ; Narayana Prasad ; Nelio Laranjeiro ; dev@dpdk.org Subject: Re: [RFC 0/3] set protocol specific metadata using set_pkt_metadata API Hi Radu, On 01/26/2018 04:52 PM, Nicolau, Radu wrote: -Original Message- From: Anoob Joseph [mailto:anoob.jos...@caviumnetworks.com] Sent: Thursday, January 25, 2018 5:13 PM To: Akhil Goyal ; Nicolau, Radu Cc: Doherty, Declan ; Gonzalez Monroy, Sergio ; anoob.jos...@caviumnetworks.com; Jerin Jacob ; Narayana Prasad ; Nelio Laranjeiro ; dev@dpdk.org Subject: Re: [RFC 0/3] set protocol specific metadata using set_pkt_metadata API Hi Akhil, Radu, Could you review the patch and share your thoughts on the proposed change? Hi, I've had a quick look. From what I can see you can do everything you do in this patch with the current API. For example you can store an internal struct pointer in the private section of the security context and you can increment the ESP SN with every tx or set metadata call. With the current API, PMD could store the ESN with the security session, but there is no means for the application to read this. Application should be aware of the sequence number used per packet. This is required to monitor sequence number overflow.In the proposal, the sequence number field is IN-OUT. So application could either dictate the sequence number, or read the value from the PMD. Thanks, Anoob My concern is that we are adding too much and too specific to the security API. Overflow situation can be monitored with a tx callback event or a crypto callback event, depending on the device type. Agreed with Radu, this looks too specific information. Instead, we can do overflow checking in the driver and add a macro in rte_crypto_op_status for overflow. We could do the callback when sequence number over flow happens, and IPsec processing fails subsequently. But ideally, application should be able to detect that the sequence number is about to over flow and renegotiate the SA while the original SA is still valid. I agree that we would be better off by handling this in the driver. But application would need some sort of event which would say, "sequence number is about to overflow, renegotiate SA", before the current SA becomes invalid. Do we have any mechanism to register a callback (acting on mbuf), when a particular event occurs (without dropping the mbuf)? If yes, we could move to that approach. rte_crypto_op_status could be leveraged for lookaside_protocol, but can we do something similar for inline protocol? Thoughts? Even in case of inline protocol, what is the issue in doing that? You can write a similar code in the driver(if hardware doesn't support that) instead of application for handling the sequence number overflow as well as anti-replay. Both of these errors are protocol specific and for full protocol offload, application need not bother about this. Application should be as clean as possible in case of protocol offload. - Akhil
Re: [dpdk-dev] [PATCH] crypto/scheduler: fix strncpy length
> -Original Message-
> From: Richardson, Bruce
> Sent: Friday, January 26, 2018 2:50 PM
> To: De Lara Guarch, Pablo ; Zhang, Roy
> Fan
> Cc: dev@dpdk.org; De Lara Guarch, Pablo
> ; sta...@dpdk.org
> Subject: RE: [dpdk-dev] [PATCH] crypto/scheduler: fix strncpy length
>
>
>
> > -Original Message-
> > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Pablo de Lara
> > Sent: Friday, January 26, 2018 2:44 PM
> > To: Zhang, Roy Fan
> > Cc: dev@dpdk.org; De Lara Guarch, Pablo
> > ; sta...@dpdk.org
> > Subject: [dpdk-dev] [PATCH] crypto/scheduler: fix strncpy length
> >
> > The coverity issue was not completely fixed, since strncpy should be
> > called with max length - 1.
> >
> > Coverity issue: 143431
> > Fixes: d040aca67170 ("crypto/scheduler: fix strings not null
> > terminated")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Pablo de Lara
>
> Use "snprintf", please, to fix these errors sanely without having to worry
> about off-by-one issues!
>
> /Bruce
Thanks for the comment. Will send a v2 shortly.
Pablo
Re: [dpdk-dev] [PATCH] doc: announce API deprecation in cryptodev
On 1/26/2018 4:57 PM, Pablo de Lara wrote: Functions rte_cryptodev_queue_pair_start/stop are not really used in any of the crypto drivers (they all just return 0 or -ENOTSUP). Therefore, this API can be deprecated from 18.02 and removed in 18.05. Signed-off-by: Pablo de Lara --- doc/guides/rel_notes/deprecation.rst | 5 + lib/librte_cryptodev/rte_cryptodev.h | 2 ++ 2 files changed, 7 insertions(+) Acked-by: Akhil Goyal
[dpdk-dev] [PATCH v2] crypto/scheduler: fix strncpy
The coverity issue was not completely fixed, since strncpy
should not be called with max length.
Instead, snprintf is used as a safer option.
Coverity issue: 143431
Fixes: d040aca67170 ("crypto/scheduler: fix strings not null terminated")
Cc: sta...@dpdk.org
Signed-off-by: Pablo de Lara
---
v2:
- Replaced strncpy with snprintf
drivers/crypto/scheduler/rte_cryptodev_scheduler.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
index ccf68a0ee..140c8b418 100644
--- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
+++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
@@ -439,8 +439,8 @@ rte_cryptodev_scheduler_load_user_scheduler(uint8_t
scheduler_id,
RTE_CRYPTODEV_NAME_MAX_LEN);
return -EINVAL;
}
- strncpy(sched_ctx->name, scheduler->name,
- RTE_CRYPTODEV_SCHEDULER_NAME_MAX_LEN);
+ snprintf(sched_ctx->name, sizeof(sched_ctx->name), "%s",
+ scheduler->name);
if (strlen(scheduler->description) >
RTE_CRYPTODEV_SCHEDULER_DESC_MAX_LEN - 1) {
@@ -449,8 +449,8 @@ rte_cryptodev_scheduler_load_user_scheduler(uint8_t
scheduler_id,
RTE_CRYPTODEV_SCHEDULER_DESC_MAX_LEN - 1);
return -EINVAL;
}
- strncpy(sched_ctx->description, scheduler->description,
- RTE_CRYPTODEV_SCHEDULER_DESC_MAX_LEN);
+ snprintf(sched_ctx->description, sizeof(sched_ctx->description), "%s",
+ scheduler->description);
/* load scheduler instance operations functions */
sched_ctx->ops.config_queue_pair = scheduler->ops->config_queue_pair;
--
2.14.3
Re: [dpdk-dev] [PATCH] doc: announce ABI change for crypto info struct
Hi Pablo/Fiona, On 1/26/2018 4:38 PM, De Lara Guarch, Pablo wrote: -Original Message- From: Trahe, Fiona Sent: Friday, January 26, 2018 10:45 AM To: De Lara Guarch, Pablo ; akhil.go...@nxp.com; hemant.agra...@nxp.com; Doherty, Declan ; jerin.ja...@intel.com; Griffin, John ; Jain, Deepak K ; j...@semihalf.com; t...@semihalf.com; d...@marvell.com; nsams...@marvell.com; jianbo@arm.com Cc: dev@dpdk.org; Trahe, Fiona Subject: RE: [PATCH] doc: announce ABI change for crypto info struct Hi Pablo, -Original Message- From: De Lara Guarch, Pablo Sent: Friday, January 26, 2018 9:04 AM To: akhil.go...@nxp.com; hemant.agra...@nxp.com; Doherty, Declan ; jerin.ja...@intel.com; Trahe, Fiona ; Griffin, John ; Jain, Deepak K ; j...@semihalf.com; t...@semihalf.com; d...@marvell.com; nsams...@marvell.com; jianbo@arm.com Cc: dev@dpdk.org; De Lara Guarch, Pablo Subject: [PATCH] doc: announce ABI change for crypto info struct Since the API changes made in 17.08, the session mempool is not created anymore in each crypto device. Therefore, there is no need to have, in the cryptodev info structure, the maximum number of sessions supported per device and per queue pair. Signed-off-by: Pablo de Lara --- doc/guides/rel_notes/deprecation.rst | 5 + 1 file changed, 5 insertions(+) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index d59ad5988..5588ba7c1 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -59,3 +59,8 @@ Deprecation Notices be added between the producer and consumer structures. The size of the structure and the offset of the fields will remain the same on platforms with 64B cache line, but will change on other platforms. + +* cryptodev: The structure ``sym``, including its fields +``max_nb_sessions`` + and ``max_nb_sessions_per_qp``, in structure +``rte_cryptodev_info``, + will be removed in 18.05, as these fields are not relevant anymore + since the session mempool is not internal in the crypto device anymore. -- [Fiona] max_nb_sessions must be also removed from struct rte_cryptodev_pmd_init_params Good point. Since this structure is internal, I guess we don't need a deprecation notice for it, but I will remove it in the patch for 18.05. Regards deprecation of max_nb_sessions from both structs: Acked-by: Fiona Trahe If removing the max_nb_sessions_per_qp, then the following functions should also be deprecated. rte_cryptodev_queue_pair_attach_sym_session rte_cryptodev_queue_pair_detach_sym_session These and the max_nb_session_per_qp were added here at request of NXP: http://dpdk.org/ml/archives/dev/2017-March/060740.html Akhil, do you agree on this change? We recently did some changes in the driver to take care of the dependency for limit on max_nb_sessions_per_qp, but it is not removed completely. We will need to look into this. But sending the deprecation notice at this moment is fine. If something comes up, will let you know later. -Akhil
Re: [dpdk-dev] Fwd: [PATCH v3 2/2] eal/x86: Use lock-prefixed instructions to reduce cost of rte_smp_mb()
Hi Michael,
>
> On Mon, Jan 15, 2018 at 04:15:00PM +0100, Maxime Coquelin wrote:
> > Hi Michael,
> >
> > FYI:
> >
> > Forwarded Message
> > Subject: [dpdk-dev] [PATCH v3 2/2] eal/x86: Use lock-prefixed instructions
> > to reduce cost of rte_smp_mb()
> > Date: Mon, 15 Jan 2018 15:09:31 +
> > From: Konstantin Ananyev
> > To: dev@dpdk.org
> > CC: Konstantin Ananyev
> >
> > On x86 it is possible to use lock-prefixed instructions to get
> > the similar effect as mfence.
> > As pointed by Java guys, on most modern HW that gives a better
> > performance than using mfence:
> > https://shipilev.net/blog/2014/on-the-fence-with-dependencies/
> > That patch adopts that technique for rte_smp_mb() implementation.
> > On BDW 2.2 mb_autotest on single lcore reports 2X cycle reduction,
> > i.e. from ~110 to ~55 cycles per operation.
> >
> > Signed-off-by: Konstantin Ananyev
> > Acked-by: Bruce Richardson
> > ---
> > .../common/include/arch/x86/rte_atomic.h | 44
> > +-
> > 1 file changed, 42 insertions(+), 2 deletions(-)
> >
> > diff --git a/lib/librte_eal/common/include/arch/x86/rte_atomic.h
> > b/lib/librte_eal/common/include/arch/x86/rte_atomic.h
> > index 8469f97e1..9d466d94a 100644
> > --- a/lib/librte_eal/common/include/arch/x86/rte_atomic.h
> > +++ b/lib/librte_eal/common/include/arch/x86/rte_atomic.h
> > @@ -26,12 +26,52 @@ extern "C" {
> > #define rte_rmb() _mm_lfence()
> > -#define rte_smp_mb() rte_mb()
> > -
> > #define rte_smp_wmb() rte_compiler_barrier()
> > #define rte_smp_rmb() rte_compiler_barrier()
> > +/*
> > + * From Intel Software Development Manual; Vol 3;
> > + * 8.2.2 Memory Ordering in P6 and More Recent Processor Families:
> > + * ...
> > + * . Reads are not reordered with other reads.
> > + * . Writes are not reordered with older reads.
> > + * . Writes to memory are not reordered with other writes,
> > + * with the following exceptions:
> > + * . streaming stores (writes) executed with the non-temporal move
> > + * instructions (MOVNTI, MOVNTQ, MOVNTDQ, MOVNTPS, and MOVNTPD); and
> > + * . string operations (see Section 8.2.4.1).
> > + * ...
> > + * . Reads may be reordered with older writes to different locations but
> > not
> > + * with older writes to the same location.
> > + * . Reads or writes cannot be reordered with I/O instructions,
> > + * locked instructions, or serializing instructions.
> > + * . Reads cannot pass earlier LFENCE and MFENCE instructions.
> > + * . Writes ... cannot pass earlier LFENCE, SFENCE, and MFENCE
> > instructions.
> > + * . LFENCE instructions cannot pass earlier reads.
> > + * . SFENCE instructions cannot pass earlier writes ...
> > + * . MFENCE instructions cannot pass earlier reads, writes ...
> > + *
> > + * As pointed by Java guys, that makes possible to use lock-prefixed
> > + * instructions to get the same effect as mfence and on most modern HW
> > + * that gives a better perfomance then using mfence:
> > + * https://shipilev.net/blog/2014/on-the-fence-with-dependencies/
> > + * Basic idea is to use lock prefixed add with some dummy memory location
> > + * as the destination. From their experiments 128B(2 cache lines) below
> > + * current stack pointer looks like a good candidate.
> > + * So below we use that techinque for rte_smp_mb() implementation.
> > + */
> > +
> > +static __rte_always_inline void
> > +rte_smp_mb(void)
> > +{
> > +#ifdef RTE_ARCH_I686
> > + asm volatile("lock addl $0, -128(%%esp); " ::: "memory");
> > +#else
> > + asm volatile("lock addl $0, -128(%%rsp); " ::: "memory");
> > +#endif
> > +}
> > +
> > #define rte_io_mb() rte_mb()
> > #define rte_io_wmb() rte_compiler_barrier()
>
> In my testing this appears to be suboptimal when the calling
> function is large. The following seems to work better:
>
> +static __rte_always_inline void
> +rte_smp_mb(void)
> +{
> +#ifdef RTE_ARCH_I686
> + asm volatile("lock addl $0, -132(%%esp); " ::: "memory");
> +#else
> + asm volatile("lock addl $0, -132(%%rsp); " ::: "memory");
> +#endif
> +}
> +
>
> The reason most likely is that 128 still overlaps the x86
> red zone by 4 bytes.
I tried what you suggested but for my cases didn't see any improvement so far.
Can you explain a bit more why do you expect it to be faster?
Probably some particular scenario?
Konstantin
>
> Feel free to reuse, and add
> Signed-off-by: Michael S. Tsirkin
>
>
> > --
> > 2.13.6
[dpdk-dev] [PATCH] doc: announce control mbuf removal
Link: http://dpdk.org/ml/archives/dev/2017-July/069813.html Link: http://dpdk.org/dev/patchwork/patch/32041/ Signed-off-by: Olivier Matz --- doc/guides/rel_notes/deprecation.rst | 13 + 1 file changed, 13 insertions(+) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index d59ad5988..e98ce6a0a 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -59,3 +59,16 @@ Deprecation Notices be added between the producer and consumer structures. The size of the structure and the offset of the fields will remain the same on platforms with 64B cache line, but will change on other platforms. + +* mbuf: The control mbuf API will be removed in v18.05. The impacted + functions and macros are: + + - ``rte_ctrlmbuf_init()`` + - ``rte_ctrlmbuf_alloc()`` + - ``rte_ctrlmbuf_free()`` + - ``rte_ctrlmbuf_data()`` + - ``rte_ctrlmbuf_len()`` + - ``rte_is_ctrlmbuf()`` + - ``CTRL_MBUF_FLAG`` + + The packet mbuf API should be used as a replacement. -- 2.11.0
[dpdk-dev] [PATCH] mbuf: fix API documentation regarding VLAN flags
Fix inconsistency between mbuf structure documentation and flags
documentation.
Fixes: 380a7aab1ae2 ("mbuf: rename deprecated VLAN flags")
Cc: sta...@dpdk.org
Reported-by: Morten Brørup
Signed-off-by: Olivier Matz
---
lib/librte_mbuf/rte_mbuf.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 2fd4f5ef9..7835a2be8 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -510,7 +510,7 @@ struct rte_mbuf {
uint32_t pkt_len; /**< Total pkt len: sum of all segments. */
uint16_t data_len;/**< Amount of data in segment buffer. */
- /** VLAN TCI (CPU order), valid if PKT_RX_VLAN_STRIPPED is set. */
+ /** VLAN TCI (CPU order), valid if PKT_RX_VLAN is set. */
uint16_t vlan_tci;
union {
@@ -536,7 +536,7 @@ struct rte_mbuf {
uint32_t usr; /**< User defined tags. See
rte_distributor_process() */
} hash; /**< hash information */
- /** Outer VLAN TCI (CPU order), valid if PKT_RX_QINQ_STRIPPED is set. */
+ /** Outer VLAN TCI (CPU order), valid if PKT_RX_QINQ is set. */
uint16_t vlan_tci_outer;
uint16_t buf_len; /**< Length of segment buffer. */
--
2.11.0
[dpdk-dev] [PATCH] mbuf: rename Tx VLAN flags
For consistency with the Rx flags, the flags PKT_TX_VLAN_PKT and
PKT_TX_QINQ_PKT are respectively renamed as PKT_TX_VLAN and
PKT_TX_QINQ. The old defines are deprecated but will stay for some time
for compatibility.
Reported-by: Morten Brørup
Signed-off-by: Olivier Matz
---
doc/guides/rel_notes/deprecation.rst | 4
lib/librte_mbuf/rte_mbuf.h | 11 +--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index e98ce6a0a..43a39d827 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -72,3 +72,7 @@ Deprecation Notices
- ``CTRL_MBUF_FLAG``
The packet mbuf API should be used as a replacement.
+
+* mbuf: The mbuf flags ``PKT_TX_VLAN_PKT`` and ``PKT_TX_QINQ_PKT`` are
+ respectively renamed as ``PKT_TX_VLAN`` and ``PKT_TX_QINQ``. The old
+ names will be removed in v18.08.
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 7835a2be8..4519fb303 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -244,7 +244,9 @@ extern "C" {
/**
* Second VLAN insertion (QinQ) flag.
*/
-#define PKT_TX_QINQ_PKT(1ULL << 49) /**< TX packet with double VLAN
inserted. */
+#define PKT_TX_QINQ(1ULL << 49) /**< TX packet with double VLAN
inserted. */
+/* this old name is deprecated */
+#define PKT_TX_QINQ_PKTPKT_TX_QINQ
/**
* TCP segmentation offload. To enable this offload feature for a
@@ -305,7 +307,12 @@ extern "C" {
*/
#define PKT_TX_IPV6 (1ULL << 56)
-#define PKT_TX_VLAN_PKT (1ULL << 57) /**< TX packet is a 802.1q VLAN
packet. */
+/**
+ * TX packet is a 802.1q VLAN packet.
+ */
+#define PKT_TX_VLAN (1ULL << 57)
+/* this old name is deprecated */
+#define PKT_TX_VLAN_PKT PKT_TX_VLAN
/**
* Offload the IP checksum of an external header in the hardware. The
--
2.11.0
Re: [dpdk-dev] [PATCH v6 1/2] eal: add channel for multi-process communication
On 29-Jan-18 6:37 AM, Tan, Jianfeng wrote: Hi Anatoly, -Original Message- From: Burakov, Anatoly Sent: Friday, January 26, 2018 6:26 PM To: Tan, Jianfeng; dev@dpdk.org Cc: Richardson, Bruce; Ananyev, Konstantin; tho...@monjalon.net Subject: Re: [PATCH v6 1/2] eal: add channel for multi-process communication On 26-Jan-18 3:41 AM, Jianfeng Tan wrote: Previouly, there are three channels for multi-process (i.e., primary/secondary) communication. 1. Config-file based channel, in which, the primary process writes info into a pre-defined config file, and the secondary process reads the info out. 2. vfio submodule has its own channel based on unix socket for the secondary process to get container fd and group fd from the primary process. 3. pdump submodule also has its own channel based on unix socket for packet dump. It'd be good to have a generic communication channel for multi-process communication to accommodate the requirements including: a. Secondary wants to send info to primary, for example, secondary would like to send request (about some specific vdev to primary). b. Sending info at any time, instead of just initialization time. c. Share FDs with the other side, for vdev like vhost, related FDs (memory region, kick) should be shared. d. A send message request needs the other side to response immediately. This patch proposes to create a communication channel, based on datagram unix socket, for above requirements. Each process will block on a unix socket waiting for messages from the peers. Three new APIs are added: 1. rte_eal_mp_action_register() is used to register an action, indexed by a string, when a component at receiver side would like to response the messages from the peer processe. 2. rte_eal_mp_action_unregister() is used to unregister the action if the calling component does not want to response the messages. 3. rte_eal_mp_sendmsg() is used to send a message, and returns immediately. If there are n secondary processes, the primary process will send n messages. Suggested-by: Konstantin Ananyev Signed-off-by: Jianfeng Tan Reviewed-by: Anatoly Burakov Acked-by: Konstantin Ananyev --- + } + closedir(mp_dir); + + return ret; Nitpick: you probably don't need ret here, just return 0 as in other places. We cannot just return 0 as it could be -1 as above comment shows. The ret variable was introduced to avoid two "closedir()". Thanks, Jianfeng Yep you're right, apologies. -- Thanks, Anatoly
[dpdk-dev] [PATCH v3] mbuf: fix freeing of NULL mbuf when debug enabled
Do not panic when calling rte_pktmbuf_free(NULL) with mbuf debug
enabled, it is a valid operation.
Fixes: af75078fece3 ("first public release")
Cc: sta...@dpdk.org
Reported-by: Keith Wiles
Signed-off-by: Olivier Matz
---
lib/librte_mbuf/rte_mbuf.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 4519fb303..719d04dda 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -1439,13 +1439,14 @@ rte_pktmbuf_free_seg(struct rte_mbuf *m)
* segment is added back into its original mempool.
*
* @param m
- * The packet mbuf to be freed.
+ * The packet mbuf to be freed. If NULL, the function does nothing.
*/
static inline void rte_pktmbuf_free(struct rte_mbuf *m)
{
struct rte_mbuf *m_next;
- __rte_mbuf_sanity_check(m, 1);
+ if (m != NULL)
+ __rte_mbuf_sanity_check(m, 1);
while (m != NULL) {
m_next = m->next;
--
2.11.0
Re: [dpdk-dev] [PATCH v4] net/tap: add Rx interrupts
On 1/28/2018 10:45 AM, Moti Haimovsky wrote: > This patch adds support for registering and waiting for Rx interrupts. > This allows applications to wait for Rx events from the PMD using the > DPDK rte_epoll subsystem. > > Signed-off-by: Moti Haimovsky Acked-by: Pascal Mazon Applied to dpdk-next-net/master, thanks.
Re: [dpdk-dev] [PATCH 1/2] test/memzone: add test for memzone count in eal mem config
On 27-Jan-18 2:53 PM, Radoslaw Biernacki wrote: Looks OK. Following note is aside from the patch. Might be beneficial (in some rare cases) to add bailout recovery with goto's in test_memzone_basic() Just in case one of the rte_memzone_reserve() we should not make return -1, but instead a goto to below section where we call rte_memzone_free(). This way we would be able to free only the allocated memzones and prevent leaking out those memzones to other tests. Thanks, and yep, it's on my todo list :) didn't get around to it yet. Reviewed-by: Radoslaw Biernacki adoslaw.bierna...@linaro.com> -- Thanks, Anatoly
Re: [dpdk-dev] [PATCH] test/memzone: fix incorrect result judging criteria
On 29-Jan-18 6:23 AM, Phil Yang wrote:
While running DTS with ixgbe NIC, dpdk EAL will reserve some
memzones for the PCI device. So it is incorrect to judging the result by
only checking whether it has memzone remained.
Fixed by insert an unique name prefix into each memzone used in this case.
And verify whether it has used memzone remained at the end.
Fixes: 71330483a193 ("test/memzone: fix memory leak")
Signed-off-by: Phil Yang
---
Hi Phil,
I think this is a (rough) duplicate of what i've submitted recently:
http://dpdk.org/dev/patchwork/patch/34564/
I believe approach i've taken is a little cleaner and more generic :)
--
Thanks,
Anatoly
Re: [dpdk-dev] [PATCH v8 01/15] eal: introduce atomic exchange operation
On Fri, Jan 26, 2018 at 01:54:23PM -0800, Stephen Hemminger wrote: > On Fri, 26 Jan 2018 17:24:40 + > Bruce Richardson wrote: > > > On Fri, Jan 26, 2018 at 06:14:01PM +0100, Thomas Monjalon wrote: > > > 26/01/2018 03:01, Stephen Hemminger: > > > > To handle atomic update of link status (64 bit), every driver was > > > > doing its own version using cmpset. Atomic exchange is a useful > > > > primitive in its own right; therefore make it a EAL routine. > > > > > > > > Signed-off-by: Stephen Hemminger --- > > > > .../common/include/arch/ppc_64/rte_atomic.h| 21 +- > > > > .../common/include/arch/x86/rte_atomic.h | 24 +++ > > > > .../common/include/arch/x86/rte_atomic_32.h| 12 > > > > .../common/include/arch/x86/rte_atomic_64.h| 12 > > > > lib/librte_eal/common/include/generic/rte_atomic.h | 78 > > > > ++ 5 files changed, 146 insertions(+), 1 > > > > deletion(-) > > > > > > Looks good, thanks. > > > > > > It probably deserves a review by PPC experts. Adding Chao, maintainer > > > of this part. + Bruce and Konstantin for x86 part. > > > > > Would it not be simpler to use __sync_bool_compare_and_swap compiler > > built-in on all supported platforms? Do we really need the per-platform > > optimization of this? > > > > /Bruce > > Exchange is different than compare and swap. The is nice atomic intrinsic > in GCC. The x86 part is in Linux and BSD already. Yes, sorry, I picked the wrong builtin. I should have referenced instead "__sync_lock_test_and_set", which is an xchg op according to the docs [https://gcc.gnu.org/onlinedocs/gcc-4.1.2/gcc/Atomic-Builtins.html].
[dpdk-dev] [PATCH v2 0/3] net/i40e: global configuration
DPDK i40e PMD will modify some global registers during initialization and post initialization, there'll be impact during use of 700 series Ethernet Adapter with both Linux kernel and DPDK PMD. This patchset adds log for global configuration and adds device args to disable global configuration. Beilei Xing (3): net/i40e: add warning log for global configuration net/i40e: add debug log for global configuration net/i40e: add device args to disable global configuration doc/guides/nics/i40e.rst | 12 ++ drivers/net/i40e/i40e_ethdev.c | 384 + drivers/net/i40e/i40e_ethdev.h | 53 ++ drivers/net/i40e/i40e_fdir.c | 40 +++-- drivers/net/i40e/i40e_flow.c | 9 + 5 files changed, 411 insertions(+), 87 deletions(-) -- 2.5.5
[dpdk-dev] [PATCH v2 3/3] net/i40e: add device args to disable global configuration
DPDK i40e PMD will modify some global registers during initialization
and post initialization, there'll be impact during use of 700 series
Ethernet Adapter with both Linux kernel and DPDK PMD.
This patch is to add device parameters to disable global configuration.
Signed-off-by: Beilei Xing
---
drivers/net/i40e/i40e_ethdev.c | 260 -
drivers/net/i40e/i40e_ethdev.h | 1 +
drivers/net/i40e/i40e_fdir.c | 39 ---
drivers/net/i40e/i40e_flow.c | 8 ++
4 files changed, 235 insertions(+), 73 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index aad00aa..b73b742 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -1039,6 +1039,64 @@ i40e_init_queue_region_conf(struct rte_eth_dev *dev)
memset(info, 0, sizeof(struct i40e_queue_regions));
}
+#define ETH_I40E_DISABLE_GLOBAL_CFG"disable-global-cfg"
+
+static int
+i40e_parse_global_cfg_handler(__rte_unused const char *key,
+ const char *value,
+ void *opaque)
+{
+ struct i40e_pf *pf;
+ unsigned long dis_global_cfg;
+ char *end;
+
+ pf = (struct i40e_pf *)opaque;
+
+ errno = 0;
+ dis_global_cfg = strtoul(value, &end, 10);
+ if (errno != 0 || end == value || *end != 0) {
+ PMD_DRV_LOG(WARNING, "Wrong global configuration");
+ return -(EINVAL);
+ }
+
+ if (dis_global_cfg == 1 || dis_global_cfg == 0)
+ pf->dis_global_cfg = (bool)dis_global_cfg;
+ else
+ PMD_DRV_LOG(WARNING, "%s must be 1 or 0,",
+ "enable global configuration by default."
+ ETH_I40E_DISABLE_GLOBAL_CFG);
+ return 0;
+}
+
+static int
+i40e_disable_global_cfg(struct rte_eth_dev *dev)
+{
+ struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+ static const char *const valid_keys[] = {
+ ETH_I40E_DISABLE_GLOBAL_CFG, NULL};
+ struct rte_kvargs *kvlist;
+
+ /* Enable global configuration by default */
+ pf->dis_global_cfg = false;
+
+ if (!dev->device->devargs)
+ return 0;
+
+ kvlist = rte_kvargs_parse(dev->device->devargs->args, valid_keys);
+ if (!kvlist)
+ return -EINVAL;
+
+ if (rte_kvargs_count(kvlist, ETH_I40E_DISABLE_GLOBAL_CFG) > 1)
+ PMD_DRV_LOG(WARNING, "More than one argument \"%s\" and only "
+ "the first invalid or last valid one is used !",
+ ETH_I40E_DISABLE_GLOBAL_CFG);
+
+ rte_kvargs_process(kvlist, ETH_I40E_DISABLE_GLOBAL_CFG,
+ i40e_parse_global_cfg_handler, pf);
+ rte_kvargs_free(kvlist);
+ return 0;
+}
+
static int
eth_i40e_dev_init(struct rte_eth_dev *dev)
{
@@ -1092,6 +1150,9 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
hw->bus.func = pci_dev->addr.function;
hw->adapter_stopped = 0;
+ /* Check if need to disable global registers configuration */
+ i40e_disable_global_cfg(dev);
+
/* Make sure all is clean before doing PF reset */
i40e_clear_hw(hw);
@@ -1119,7 +1180,8 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
* for packet type of QinQ by software.
* It should be removed once issues are fixed in NVM.
*/
- i40e_GLQF_reg_init(hw);
+ if (!pf->dis_global_cfg)
+ i40e_GLQF_reg_init(hw);
/* Initialize the input set for filters (hash and fd) to default value
*/
i40e_filter_input_set_init(pf);
@@ -1139,13 +1201,17 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
(hw->nvm.version & 0xf), hw->nvm.eetrack);
/* initialise the L3_MAP register */
- ret = i40e_aq_debug_write_register(hw, I40E_GLQF_L3_MAP(40),
- 0x0028, NULL);
- if (ret)
- PMD_INIT_LOG(ERR, "Failed to write L3 MAP register %d", ret);
- PMD_INIT_LOG(DEBUG, "Global register 0x%08x is changed with value 0x28",
-I40E_GLQF_L3_MAP(40));
- i40e_global_cfg_warning(I40E_WARNING_QINQ_CLOUD_FILTER);
+ if (!pf->dis_global_cfg) {
+ ret = i40e_aq_debug_write_register(hw, I40E_GLQF_L3_MAP(40),
+ 0x0028, NULL);
+ if (ret)
+ PMD_INIT_LOG(ERR, "Failed to write L3 MAP register %d",
+ret);
+ PMD_INIT_LOG(DEBUG,
+"Global register 0x%08x is changed with 0x28",
+I40E_GLQF_L3_MAP(40));
+ i40e_global_cfg_warning(I40E_WARNING_QINQ_CLOUD_FILTER);
+ }
/* Need the special FW version to support floating VEB */
config_floating_veb(dev);
@@ -1221,11 +1287,15 @@ eth_i40e_dev_init(struct rte_eth
[dpdk-dev] [PATCH v2 1/3] net/i40e: add warning log for global configuration
This patch adds warning log during global configuration, and add limitation doc for impact during use of 700 series NIC with both kernel driver and DPDK PMD. Signed-off-by: Beilei Xing --- doc/guides/nics/i40e.rst | 12 drivers/net/i40e/i40e_ethdev.c | 25 + drivers/net/i40e/i40e_ethdev.h | 41 + drivers/net/i40e/i40e_fdir.c | 1 + drivers/net/i40e/i40e_flow.c | 1 + 5 files changed, 80 insertions(+) diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst index 29601f1..166f447 100644 --- a/doc/guides/nics/i40e.rst +++ b/doc/guides/nics/i40e.rst @@ -566,6 +566,18 @@ DCB function DCB works only when RSS is enabled. +Global configuration warning + + +I40E PMD will set some global registers to enable some function or set some +configure. Then when using different ports of the same NIC with Linux kernel +and DPDK, the port with Linux kernel will be impacted by the port with DPDK. +For example, register I40E_GL_SWT_L2TAGCTRL is used to control L2 tag, i40e +PMD uses I40E_GL_SWT_L2TAGCTRL to set vlan TPID. If setting TPID in port A +with DPDK, then the configuration will also impact port B in the NIC with +kernel driver, which don't want to use the TPID. +So PMD reports warning to clarify what is changed by writing global register. + High Performance of Small Packets on 40G NIC diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 277c1a8..b4a2857 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -680,6 +680,7 @@ static inline void i40e_GLQF_reg_init(struct i40e_hw *hw) */ I40E_WRITE_REG(hw, I40E_GLQF_ORT(40), 0x0029); I40E_WRITE_REG(hw, I40E_GLQF_PIT(9), 0x9420); + i40e_global_cfg_warning(I40E_WARNING_QINQ_PARSER); } #define I40E_FLOW_CONTROL_ETHERTYPE 0x8808 @@ -1133,6 +1134,7 @@ eth_i40e_dev_init(struct rte_eth_dev *dev) 0x0028, NULL); if (ret) PMD_INIT_LOG(ERR, "Failed to write L3 MAP register %d", ret); + i40e_global_cfg_warning(I40E_WARNING_QINQ_CLOUD_FILTER); /* Need the special FW version to support floating VEB */ config_floating_veb(dev); @@ -1413,6 +1415,7 @@ void i40e_flex_payload_reg_set_default(struct i40e_hw *hw) I40E_WRITE_REG(hw, I40E_GLQF_ORT(33), 0x); I40E_WRITE_REG(hw, I40E_GLQF_ORT(34), 0x); I40E_WRITE_REG(hw, I40E_GLQF_ORT(35), 0x); + i40e_global_cfg_warning(I40E_WARNING_DIS_FLX_PLD); } static int @@ -3260,6 +3263,7 @@ i40e_vlan_tpid_set(struct rte_eth_dev *dev, /* If NVM API < 1.7, keep the register setting */ ret = i40e_vlan_tpid_set_by_registers(dev, vlan_type, tpid, qinq); + i40e_global_cfg_warning(I40E_WARNING_TPID); return ret; } @@ -3502,6 +3506,7 @@ i40e_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) I40E_WRITE_REG(hw, I40E_GLRPB_GLW, pf->fc_conf.low_water[I40E_MAX_TRAFFIC_CLASS] << I40E_KILOSHIFT); + i40e_global_cfg_warning(I40E_WARNING_FLOW_CTL); I40E_WRITE_FLUSH(hw); @@ -7284,6 +7289,8 @@ i40e_status_code i40e_replace_mpls_l1_filter(struct i40e_pf *pf) status = i40e_aq_replace_cloud_filters(hw, &filter_replace, &filter_replace_buf); + if (!status) + i40e_global_cfg_warning(I40E_WARNING_RPL_CLD_FILTER); return status; } @@ -7338,6 +7345,8 @@ i40e_status_code i40e_replace_mpls_cloud_filter(struct i40e_pf *pf) status = i40e_aq_replace_cloud_filters(hw, &filter_replace, &filter_replace_buf); + if (!status) + i40e_global_cfg_warning(I40E_WARNING_RPL_CLD_FILTER); return status; } @@ -7405,6 +7414,8 @@ i40e_replace_gtp_l1_filter(struct i40e_pf *pf) status = i40e_aq_replace_cloud_filters(hw, &filter_replace, &filter_replace_buf); + if (!status) + i40e_global_cfg_warning(I40E_WARNING_RPL_CLD_FILTER); return status; } @@ -7457,6 +7468,8 @@ i40e_status_code i40e_replace_gtp_cloud_filter(struct i40e_pf *pf) status = i40e_aq_replace_cloud_filters(hw, &filter_replace, &filter_replace_buf); + if (!status) + i40e_global_cfg_warning(I40E_WARNING_RPL_CLD_FILTER); return status; } @@ -8006,6 +8019,7 @@ i40e_dev_set_gre_key_len(struct i40e_hw *hw, uint8_t len) reg, NULL); if (ret != 0) return ret; + i40e_global_cfg_warning
[dpdk-dev] [PATCH v2 2/3] net/i40e: add debug log for global configuration
Add debug log during global configuration.
Signed-off-by: Beilei Xing
---
drivers/net/i40e/i40e_ethdev.c | 153 ++---
drivers/net/i40e/i40e_ethdev.h | 11 +++
2 files changed, 123 insertions(+), 41 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index b4a2857..aad00aa 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -656,6 +656,15 @@ rte_i40e_dev_atomic_write_link_status(struct rte_eth_dev
*dev,
return 0;
}
+static inline void
+i40e_write_global_rx_ctl(struct i40e_hw *hw, u32 reg_addr, u32 reg_val)
+{
+ i40e_write_rx_ctl(hw, reg_addr, reg_val);
+ PMD_DRV_LOG(DEBUG, "Global register 0x%08x is modified "
+ "with value 0x%08x",
+ reg_addr, reg_val);
+}
+
RTE_PMD_REGISTER_PCI(net_i40e, rte_i40e_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_i40e, pci_id_i40e_map);
RTE_PMD_REGISTER_KMOD_DEP(net_i40e, "* igb_uio | uio_pci_generic | vfio-pci");
@@ -678,8 +687,8 @@ static inline void i40e_GLQF_reg_init(struct i40e_hw *hw)
* configuration API is added to avoid configuration conflicts
* between ports of the same device.
*/
- I40E_WRITE_REG(hw, I40E_GLQF_ORT(40), 0x0029);
- I40E_WRITE_REG(hw, I40E_GLQF_PIT(9), 0x9420);
+ I40E_WRITE_GLB_REG(hw, I40E_GLQF_ORT(40), 0x0029);
+ I40E_WRITE_GLB_REG(hw, I40E_GLQF_PIT(9), 0x9420);
i40e_global_cfg_warning(I40E_WARNING_QINQ_PARSER);
}
@@ -1134,6 +1143,8 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
0x0028, NULL);
if (ret)
PMD_INIT_LOG(ERR, "Failed to write L3 MAP register %d", ret);
+ PMD_INIT_LOG(DEBUG, "Global register 0x%08x is changed with value 0x28",
+I40E_GLQF_L3_MAP(40));
i40e_global_cfg_warning(I40E_WARNING_QINQ_CLOUD_FILTER);
/* Need the special FW version to support floating VEB */
@@ -1412,9 +1423,9 @@ void i40e_flex_payload_reg_set_default(struct i40e_hw *hw)
* Disable by default flexible payload
* for corresponding L2/L3/L4 layers.
*/
- I40E_WRITE_REG(hw, I40E_GLQF_ORT(33), 0x);
- I40E_WRITE_REG(hw, I40E_GLQF_ORT(34), 0x);
- I40E_WRITE_REG(hw, I40E_GLQF_ORT(35), 0x);
+ I40E_WRITE_GLB_REG(hw, I40E_GLQF_ORT(33), 0x);
+ I40E_WRITE_GLB_REG(hw, I40E_GLQF_ORT(34), 0x);
+ I40E_WRITE_GLB_REG(hw, I40E_GLQF_ORT(35), 0x);
i40e_global_cfg_warning(I40E_WARNING_DIS_FLX_PLD);
}
@@ -3219,8 +3230,8 @@ i40e_vlan_tpid_set_by_registers(struct rte_eth_dev *dev,
return -EIO;
}
PMD_DRV_LOG(DEBUG,
- "Debug write 0x%08"PRIx64" to I40E_GL_SWT_L2TAGCTRL[%d]",
- reg_w, reg_id);
+ "Global register 0x%08x is changed with value 0x%08x",
+ I40E_GL_SWT_L2TAGCTRL(reg_id), (uint32_t)reg_w);
return 0;
}
@@ -3494,16 +3505,16 @@ i40e_flow_ctrl_set(struct rte_eth_dev *dev, struct
rte_eth_fc_conf *fc_conf)
}
/* config the water marker both based on the packets and bytes */
- I40E_WRITE_REG(hw, I40E_GLRPB_PHW,
+ I40E_WRITE_GLB_REG(hw, I40E_GLRPB_PHW,
(pf->fc_conf.high_water[I40E_MAX_TRAFFIC_CLASS]
<< I40E_KILOSHIFT) / I40E_PACKET_AVERAGE_SIZE);
- I40E_WRITE_REG(hw, I40E_GLRPB_PLW,
+ I40E_WRITE_GLB_REG(hw, I40E_GLRPB_PLW,
(pf->fc_conf.low_water[I40E_MAX_TRAFFIC_CLASS]
<< I40E_KILOSHIFT) / I40E_PACKET_AVERAGE_SIZE);
- I40E_WRITE_REG(hw, I40E_GLRPB_GHW,
+ I40E_WRITE_GLB_REG(hw, I40E_GLRPB_GHW,
pf->fc_conf.high_water[I40E_MAX_TRAFFIC_CLASS]
<< I40E_KILOSHIFT);
- I40E_WRITE_REG(hw, I40E_GLRPB_GLW,
+ I40E_WRITE_GLB_REG(hw, I40E_GLRPB_GLW,
pf->fc_conf.low_water[I40E_MAX_TRAFFIC_CLASS]
<< I40E_KILOSHIFT);
i40e_global_cfg_warning(I40E_WARNING_FLOW_CTL);
@@ -7289,8 +7300,13 @@ i40e_status_code i40e_replace_mpls_l1_filter(struct
i40e_pf *pf)
status = i40e_aq_replace_cloud_filters(hw, &filter_replace,
&filter_replace_buf);
- if (!status)
+ if (!status) {
i40e_global_cfg_warning(I40E_WARNING_RPL_CLD_FILTER);
+ PMD_DRV_LOG(DEBUG, "Global configuration modification: "
+ "cloud l1 type is changed from 0x%x to 0x%x",
+ filter_replace.old_filter_type,
+ filter_replace.new_filter_type);
+ }
return status;
}
@@ -7323,6 +7339,10 @@ i40e_status_code i40e_replace_mpls_cloud_filter(struct
i40e_pf *pf)
&filter_replace_buf);
if (status < 0)
Re: [dpdk-dev] [RFC 0/3] set protocol specific metadata using set_pkt_metadata API
> -Original Message- > From: Anoob Joseph [mailto:anoob.jos...@caviumnetworks.com] > Sent: Monday, January 29, 2018 8:04 AM > To: Akhil Goyal ; Nicolau, Radu > > Cc: anoob.jos...@caviumnetworks.com; Doherty, Declan > ; Gonzalez Monroy, Sergio > ; Jerin Jacob > ; Narayana Prasad > ; Nelio Laranjeiro > ; dev@dpdk.org > Subject: Re: [RFC 0/3] set protocol specific metadata using set_pkt_metadata > API > > Hi Akhil, Radu, > > > On 01/29/2018 01:02 PM, Akhil Goyal wrote: > > On 1/26/2018 8:38 PM, Nicolau, Radu wrote: > >> > >> > >>> -Original Message- > >>> From: Anoob Joseph [mailto:anoob.jos...@caviumnetworks.com] > >>> Sent: Friday, January 26, 2018 2:38 PM > >>> To: Nicolau, Radu ; Akhil Goyal > >>> > >>> Cc: anoob.jos...@caviumnetworks.com; Doherty, Declan > >>> ; Gonzalez Monroy, Sergio > >>> ; Jerin Jacob > >>> ; Narayana Prasad > >>> ; Nelio Laranjeiro > >>> ; dev@dpdk.org > >>> Subject: Re: [RFC 0/3] set protocol specific metadata using > >>> set_pkt_metadata API > >>> > >>> Hi Radu, > >>> > >>> On 01/26/2018 04:52 PM, Nicolau, Radu wrote: > > > -Original Message- > > From: Anoob Joseph [mailto:anoob.jos...@caviumnetworks.com] > > Sent: Thursday, January 25, 2018 5:13 PM > > To: Akhil Goyal ; Nicolau, Radu > > > > Cc: Doherty, Declan ; Gonzalez Monroy, > > Sergio ; > > anoob.jos...@caviumnetworks.com; Jerin Jacob > > ; Narayana Prasad > > ; Nelio Laranjeiro > > ; dev@dpdk.org > > Subject: Re: [RFC 0/3] set protocol specific metadata using > > set_pkt_metadata API > > > > Hi Akhil, Radu, > > > > Could you review the patch and share your thoughts on the proposed > > change? > > > Hi, > > I've had a quick look. From what I can see you can do everything > you do in > >>> this patch with the current API. For example you can store an > >>> internal struct pointer in the private section of the security > >>> context and you can increment the ESP SN with every tx or set > >>> metadata call. > >>> With the current API, PMD could store the ESN with the security > >>> session, but there is no means for the application to read this. > >>> Application should be aware of the sequence number used per packet. > >>> This is required to monitor sequence number overflow.In the > >>> proposal, the sequence number field is IN-OUT. So application could > >>> either dictate the sequence number, or read the value from the PMD. > >>> > >>> Thanks, > >>> Anoob > >> > >> My concern is that we are adding too much and too specific to the > >> security API. > >> Overflow situation can be monitored with a tx callback event or a > >> crypto callback event, depending on the device type. > >> > > Agreed with Radu, this looks too specific information. > > Instead, we can do overflow checking in the driver and add a macro in > > rte_crypto_op_status for overflow. > We could do the callback when sequence number over flow happens, and > IPsec processing fails subsequently. But ideally, application should be able > to > detect that the sequence number is about to over flow and renegotiate the > SA while the original SA is still valid. I agree that we would be better off > by > handling this in the driver. But application would need some sort of event > which would say, "sequence number is about to overflow, renegotiate SA", > before the current SA becomes invalid. > > Do we have any mechanism to register a callback (acting on mbuf), when a > particular event occurs (without dropping the mbuf)? If yes, we could move > to that approach. > > rte_crypto_op_status could be leveraged for lookaside_protocol, but can we > do something similar for inline protocol? Thoughts? You can look at rx/tx callbacks (http://dpdk.org/doc/api/examples_2rxtx_callbacks_2main_8c-example.html#a26) but probably events are more suitable: http://dpdk.org/doc/api/rte__ethdev_8h.html#ac0bef2920a6ade4041cab5103f4700d9 There is already a "RTE_ETH_EVENT_MACSEC MACsec offload related event" so you can add a security related event.
Re: [dpdk-dev] [PATCH] doc: announce control mbuf removal
-Original Message- > Date: Mon, 29 Jan 2018 10:30:27 +0100 > From: Olivier Matz > To: dev@dpdk.org, Neil Horman , John McNamara > , Marko Kovacevic > CC: Kevin Wilson , Konstantin Ananyev > > Subject: [dpdk-dev] [PATCH] doc: announce control mbuf removal > X-Mailer: git-send-email 2.11.0 > > Link: http://dpdk.org/ml/archives/dev/2017-July/069813.html > Link: http://dpdk.org/dev/patchwork/patch/32041/ > > Signed-off-by: Olivier Matz Acked-by: Jerin Jacob > --- > doc/guides/rel_notes/deprecation.rst | 13 + > 1 file changed, 13 insertions(+) > > diff --git a/doc/guides/rel_notes/deprecation.rst > b/doc/guides/rel_notes/deprecation.rst > index d59ad5988..e98ce6a0a 100644 > --- a/doc/guides/rel_notes/deprecation.rst > +++ b/doc/guides/rel_notes/deprecation.rst > @@ -59,3 +59,16 @@ Deprecation Notices >be added between the producer and consumer structures. The size of the >structure and the offset of the fields will remain the same on >platforms with 64B cache line, but will change on other platforms. > + > +* mbuf: The control mbuf API will be removed in v18.05. The impacted > + functions and macros are: > + > + - ``rte_ctrlmbuf_init()`` > + - ``rte_ctrlmbuf_alloc()`` > + - ``rte_ctrlmbuf_free()`` > + - ``rte_ctrlmbuf_data()`` > + - ``rte_ctrlmbuf_len()`` > + - ``rte_is_ctrlmbuf()`` > + - ``CTRL_MBUF_FLAG`` > + > + The packet mbuf API should be used as a replacement. > -- > 2.11.0 >
Re: [dpdk-dev] [PATCH 00/11] net/qede: update PMD version to 2.7.0.1
On 1/27/2018 9:15 PM, Rasesh Mody wrote: > This patch set includes some bug fixes and minor enhancements for QEDE PMD. > It also includes NIC guide updates for BNX2X and QEDE PMDs. > > Please apply. > > Thanks! > -Rasesh > > Harish Patil (4): > net/qede/base: fix VF LRO tunnel params configuration > net/qede: initialize VF tunnel as enabled on start > net/qede: fix to check if tunnel L3 header is valid > net/qede: fix tunnel header size in Tx BD configuration > > Rasesh Mody (6): > net/qede: remove DEBUG INFO config option > net/qede: fix MTU set and max Rx pkt len usage > net/qede: fix clearing of queue stats > doc: update qede guide > doc: update bnx2x guide > net/qede: update PMD version > > Shahed Shaikh (1): > net/qede: add check for null return value Series applied to dpdk-next-net/master, thanks.
[dpdk-dev] [PATCH] cmdline: standardize conversion of IP address strings
The code to convert IPv4 and IPv6 address strings into a binary format
(inet_ntop) was included in the cmdline library because the DPDK was
historically compiled in environments where the standard inet_ntop()
function is not available. Today, this is not the case and the standard
inet_ntop() can be used.
This patch removes the internal inet_ntop*() functions and their
specific license.
There is a small functional impact: IP addresses like 012.34.56.78
are not valid anymore.
Signed-off-by: Olivier Matz
---
lib/librte_cmdline/cmdline_parse_ipaddr.c | 221 +-
test/test/test_cmdline_ipaddr.c | 2 -
2 files changed, 3 insertions(+), 220 deletions(-)
diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.c
b/lib/librte_cmdline/cmdline_parse_ipaddr.c
index d3d3e044a..e54ec468b 100644
--- a/lib/librte_cmdline/cmdline_parse_ipaddr.c
+++ b/lib/librte_cmdline/cmdline_parse_ipaddr.c
@@ -58,26 +58,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- * For inet_ntop() functions:
- *
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-
#include
#include
#include
@@ -85,6 +65,7 @@
#include
#include
#include
+#include
#include
#ifndef __linux__
#ifndef __FreeBSD__
@@ -106,205 +87,9 @@ struct cmdline_token_ops cmdline_token_ipaddr_ops = {
.get_help = cmdline_get_help_ipaddr,
};
-#define INADDRSZ 4
-#define IN6ADDRSZ 16
#define PREFIXMAX 128
#define V4PREFIXMAX 32
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static int inet_pton4(const char *src, unsigned char *dst);
-static int inet_pton6(const char *src, unsigned char *dst);
-
-/* int
- * inet_pton(af, src, dst)
- * convert from presentation format (which usually means ASCII printable)
- * to network format (which is usually some kind of binary format).
- * return:
- * 1 if the address was valid for the specified address family
- * 0 if the address wasn't valid (`dst' is untouched in this case)
- * -1 if some other error occurred (`dst' is untouched in this case, too)
- * author:
- * Paul Vixie, 1996.
- */
-static int
-my_inet_pton(int af, const char *src, void *dst)
-{
- switch (af) {
- case AF_INET:
- return inet_pton4(src, dst);
- case AF_INET6:
- return inet_pton6(src, dst);
- default:
- errno = EAFNOSUPPORT;
- return -1;
- }
- /* NOTREACHED */
-}
-
-/* int
- * inet_pton4(src, dst)
- * like inet_aton() but without all the hexadecimal and shorthand.
- * return:
- * 1 if `src' is a valid dotted quad, else 0.
- * notice:
- * does not touch `dst' unless it's returning 1.
- * author:
- * Paul Vixie, 1996.
- */
-static int
-inet_pton4(const char *src, unsigned char *dst)
-{
- static const char digits[] = "0123456789";
- int saw_digit, octets, ch;
- unsigned char tmp[INADDRSZ], *tp;
-
- saw_digit = 0;
- octets = 0;
- *(tp = tmp) = 0;
- while ((ch = *src++) != '\0') {
- const char *pch;
-
- if ((pch = strchr(digits, ch)) != NULL) {
- unsigned int new = *tp * 10 + (pch - digits);
-
- if (new > 255)
- return 0;
- if (! saw_digit) {
- if (++octets > 4)
- return 0;
- saw_digit = 1;
- }
- *tp = (unsigned char)new;
- } else if (ch == '.' && saw_digit) {
- if (octets == 4)
- return 0;
- *++tp = 0;
- saw_digit = 0;
- } else
- return 0;
- }
- if (octets < 4)
- return 0;
-
- memcpy(dst, tmp, INADDRSZ);
- return 1;
-}
-
-/* int
- * inet_pton6(src, dst)
- * convert presentation level address to network order bin
[dpdk-dev] [PATCH v2 2/4] eal: add function to release internal resources
This commit adds a new function rte_eal_finalize(). The function serves as a hook to allow DPDK to release internal resources (e.g.: hugepage allocations). This function allows DPDK to become more like an ordinary library, where the library context itself can be initialized and finalized by the application. The rte_exit() and rte_panic() functions must be considered, particularly if they should call finalize() to cleanup any resources or not. This patch adds the cleanup to rte_exit(), but does not clean up on rte_panic(). The reason to not clean up on panicing is that the developer may wish to inspect the exact internal state of EAL. Signed-off-by: Harry van Haaren --- v2: - Add eal_common.c file to commit, fixing build (Vipin) [OT] Meson/ninja has a nice feature to avoid this error: ninja dist Cc: tho...@monjalon.net Cc: vipin.vargh...@intel.com --- doc/guides/prog_guide/env_abstraction_layer.rst | 8 doc/guides/rel_notes/release_18_02.rst | 9 + lib/librte_eal/bsdapp/eal/Makefile | 1 + lib/librte_eal/bsdapp/eal/eal_debug.c | 5 + lib/librte_eal/common/eal_common.c | 11 +++ lib/librte_eal/common/include/rte_eal.h | 15 +++ lib/librte_eal/linuxapp/eal/Makefile| 1 + lib/librte_eal/linuxapp/eal/eal_debug.c | 5 + lib/librte_eal/rte_eal_version.map | 1 + 9 files changed, 56 insertions(+) create mode 100644 lib/librte_eal/common/eal_common.c diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst index 34d871c..f020041 100644 --- a/doc/guides/prog_guide/env_abstraction_layer.rst +++ b/doc/guides/prog_guide/env_abstraction_layer.rst @@ -99,6 +99,14 @@ It consist of calls to the pthread library (more specifically, pthread_self(), p The creation and initialization functions for these objects are not multi-thread safe. However, once initialized, the objects themselves can safely be used in multiple threads simultaneously. +Finalizing and Cleanup +~~ + +During the initialization of EAL resources such as hugepage backed memory can be +allocated by core components. The memory allocated during ``rte_eal_init()`` +can be released by calling the ``rte_eal_finalize()`` function. Refer to the +API documentation for details. + Multi-process Support ~ diff --git a/doc/guides/rel_notes/release_18_02.rst b/doc/guides/rel_notes/release_18_02.rst index 00b3224..5c7410e 100644 --- a/doc/guides/rel_notes/release_18_02.rst +++ b/doc/guides/rel_notes/release_18_02.rst @@ -41,6 +41,15 @@ New Features Also, make sure to start the actual text at the margin. = +* **Add function to allow releasing internal EAL resources on exit** + + During ``rte_eal_init()`` EAL allocates memory from hugepages to enable its + core libraries to perform their tasks. The ``rte_eal_finalize()`` function + releases these resources, ensuring that no hugepage memory is leaked. It is + expected that all DPDK applications call ``rte_eal_finalize()`` before + exiting. Not calling this function could result in leaking hugepages, leading + to failure during initialization of secondary processes. + * **Added the ixgbe ethernet driver to support RSS with flow API.** Rte_flow actually defined to include RSS, but till now, RSS is out of diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile index c694076..7480f98 100644 --- a/lib/librte_eal/bsdapp/eal/Makefile +++ b/lib/librte_eal/bsdapp/eal/Makefile @@ -34,6 +34,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_interrupts.c SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_alarm.c # from common dir +SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common.c SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_lcore.c SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_timer.c SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_memzone.c diff --git a/lib/librte_eal/bsdapp/eal/eal_debug.c b/lib/librte_eal/bsdapp/eal/eal_debug.c index b0ae2b7..1a17ce3 100644 --- a/lib/librte_eal/bsdapp/eal/eal_debug.c +++ b/lib/librte_eal/bsdapp/eal/eal_debug.c @@ -14,6 +14,7 @@ #include #include #include +#include #define BACKTRACE_SIZE 256 @@ -79,6 +80,10 @@ rte_exit(int exit_code, const char *format, ...) va_end(ap); #ifndef RTE_EAL_ALWAYS_PANIC_ON_ERROR + int ret = rte_eal_finalize(); + if (ret) + RTE_LOG(CRIT, EAL, + "EAL could not release all resources, code %d\n", ret); exit(exit_code); #else rte_dump_stack(); diff --git a/lib/librte_eal/common/eal_common.c b/lib/librte_eal/common/eal_common.c new file mode 100644 index 000..46e8c62 --- /dev/null +++ b/lib/librte_eal/common/eal_common.c @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018 Intel Corporati
[dpdk-dev] [PATCH v2 3/4] app/pdump: call eal finalize before exit
This patch adds a call to the newly introduced finalize()
function just before quitting the pdump app.
Adding this function call before quitting from a secondary processes
is important, as otherwise it will leak hugepage memory. For a secondary
process that is run multiple times, this could cause hugepage memory
to become depleted and stop a secondary process from starting.
Signed-off-by: Harry van Haaren
---
Cc: tho...@monjalon.net
Cc: vipin.vargh...@intel.com
---
app/pdump/main.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/app/pdump/main.c b/app/pdump/main.c
index 0f70c75..6c58cda 100644
--- a/app/pdump/main.c
+++ b/app/pdump/main.c
@@ -882,5 +882,10 @@ main(int argc, char **argv)
/* dump debug stats */
print_pdump_stats();
+ ret = rte_eal_finalize();
+ if (ret)
+ printf("Error from rte_eal_finalize(), %d\n", ret);
+
+
return 0;
}
--
2.7.4
[dpdk-dev] [PATCH v2 4/4] app/proc_info: call eal finalize before exit
This patch adds a call to the newly introduced finalize()
function just before quitting the app.
Adding this function call before quitting from a secondary processes
is important, as otherwise it will leak hugepage memory. For a secondary
process that is run multiple times, this could cause hugepage memory
to become depleted and stop a secondary process from starting.
Signed-off-by: Harry van Haaren
---
Cc: tho...@monjalon.net
Cc: vipin.vargh...@intel.com
---
app/proc_info/main.c | 4
1 file changed, 4 insertions(+)
diff --git a/app/proc_info/main.c b/app/proc_info/main.c
index 94d53f5..44efbc4 100644
--- a/app/proc_info/main.c
+++ b/app/proc_info/main.c
@@ -660,5 +660,9 @@ main(int argc, char **argv)
if (enable_metrics)
metrics_display(RTE_METRICS_GLOBAL);
+ ret = rte_eal_finalize();
+ if (ret)
+ printf("Error from rte_eal_finalize(), %d\n", ret);
+
return 0;
}
--
2.7.4
[dpdk-dev] [PATCH v2 1/4] service: move finalize to internal
This commit moves the rte_service_finalize() function to be in the component header, and marks it as @internal. The function is only called internally by rte_eal_finalize(). Signed-off-by: Harry van Haaren --- Cc: tho...@monjalon.net Cc: vipin.vargh...@intel.com --- lib/librte_eal/common/include/rte_service.h | 11 --- lib/librte_eal/common/include/rte_service_component.h | 11 +++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/librte_eal/common/include/rte_service.h b/lib/librte_eal/common/include/rte_service.h index 5e3e3a6..02b1512 100644 --- a/lib/librte_eal/common/include/rte_service.h +++ b/lib/librte_eal/common/include/rte_service.h @@ -429,17 +429,6 @@ int32_t rte_service_attr_get(uint32_t id, uint32_t attr_id, */ int32_t rte_service_attr_reset_all(uint32_t id); -/** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * - * Free up the memory that has been initialized. This routine - * is to be invoked prior to process termination. - * - * @retval None - */ -void rte_service_finalize(void); - #ifdef __cplusplus } #endif diff --git a/lib/librte_eal/common/include/rte_service_component.h b/lib/librte_eal/common/include/rte_service_component.h index 849c71d..f881ac0 100644 --- a/lib/librte_eal/common/include/rte_service_component.h +++ b/lib/librte_eal/common/include/rte_service_component.h @@ -139,4 +139,15 @@ int32_t rte_service_component_runstate_set(uint32_t id, uint32_t runstate); */ int32_t rte_service_init(void); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + * + * @internal Free up the memory that has been initialized. + * This routine is to be invoked prior to process termination. + * + * @retval None + */ +void rte_service_finalize(void); + #endif /* _RTE_SERVICE_PRIVATE_H_ */ -- 2.7.4
Re: [dpdk-dev] [PATCH v3] net/mlx4: fix dev rmv not detected after port stop
Mordechay Haimovsky, Monday, January 29, 2018 10:35 AM:
> In failsafe device start can be called for ports/devices that had been plugged
> out.
> The mlx4 PMD detects device removal by listening to the device RMV events,
> when the mlx4 port is being stopped, the PMD no longer listens to these
> events causing the PMD to stop detecting device removals.
> This patch fixes this issue by moving installation of the interrupt handler to
> device configuration, and toggle only the Rx-queue interrupts on start/stop.
>
> Fixes: a6e8b01c3c26 ("net/mlx4: compact interrupt functions")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Moti Haimovsky
> ---
> V3:
> Modifications according to review inputs from Shahaf Shuler
> See: 1516357009-15463-1-git-send-email-mo...@mellanox.com
>
> V2:
> Fixed commit message.
> ---
>
> drivers/net/mlx4/mlx4.c | 10 --
> drivers/net/mlx4/mlx4.h | 2 ++
> drivers/net/mlx4/mlx4_intr.c | 41
> ++---
> 3 files changed, 48 insertions(+), 5 deletions(-)
>
Acked-by: Shahaf Shuler
Adrien - let me know if you see issues with this patch, I want to include it on
RC2.
Re: [dpdk-dev] [PATCH v2 2/4] eal: add function to release internal resources
29/01/2018 11:45, Harry van Haaren: > --- a/doc/guides/prog_guide/env_abstraction_layer.rst > +++ b/doc/guides/prog_guide/env_abstraction_layer.rst > +Finalizing and Cleanup > +~~ > + > +During the initialization of EAL resources such as hugepage backed memory > can be > +allocated by core components. The memory allocated during ``rte_eal_init()`` > +can be released by calling the ``rte_eal_finalize()`` function. Refer to the > +API documentation for details. About naming, what is better between rte_eal_finalize() and rte_eal_cleanup() ? I tend to think that "cleanup" is more descriptive.
Re: [dpdk-dev] [PATCH v2 2/4] eal: add function to release internal resources
> From: Thomas Monjalon [mailto:tho...@monjalon.net] > Sent: Monday, January 29, 2018 10:56 AM > To: Van Haaren, Harry > Cc: dev@dpdk.org; Varghese, Vipin > Subject: Re: [PATCH v2 2/4] eal: add function to release internal resources > > 29/01/2018 11:45, Harry van Haaren: > > --- a/doc/guides/prog_guide/env_abstraction_layer.rst > > +++ b/doc/guides/prog_guide/env_abstraction_layer.rst > > +Finalizing and Cleanup > > +~~ > > + > > +During the initialization of EAL resources such as hugepage backed memory > can be > > +allocated by core components. The memory allocated during > ``rte_eal_init()`` > > +can be released by calling the ``rte_eal_finalize()`` function. Refer to > the > > +API documentation for details. > > About naming, what is better between > rte_eal_finalize() and > rte_eal_cleanup() ? > I tend to think that "cleanup" is more descriptive. Sure cleanup() is fine for me, I'll spin a v3 with the function name change.
[dpdk-dev] [PATCH v1] net/tap: fix eBPF file descriptors leakage
When a user creates an RSS rule, the tap PMD dynamically allocates
a 'flow' data structure, and uploads BPF programs (represented by file
descriptors) to the kernel.
The kernel might reject the rule (due to filters overlap, for example)
in which case, flow memory should be freed and BPF file descriptors
should be closed.
In the corrupted code there were scenarios where BPF file descriptors
were not closed.
The fix is to add a new function - tap_flow_free(), which will make sure
to always close BPF file descriptors before freeing the flow allocated
memory.
Fixes: 036d721a8229 ("net/tap: implement RSS using eBPF")
Signed-off-by: Ophir Munk
---
drivers/net/tap/tap_flow.c | 84 +-
1 file changed, 53 insertions(+), 31 deletions(-)
diff --git a/drivers/net/tap/tap_flow.c b/drivers/net/tap/tap_flow.c
index 6aa53a7..5c87f8e 100644
--- a/drivers/net/tap/tap_flow.c
+++ b/drivers/net/tap/tap_flow.c
@@ -212,6 +212,9 @@ struct action_data {
const struct rte_flow_action actions[],
struct rte_flow_error *error);
+static void
+tap_flow_free(struct rte_flow *flow);
+
static int
tap_flow_destroy(struct rte_eth_dev *dev,
struct rte_flow *flow,
@@ -1311,6 +1314,36 @@ struct tap_flow_items {
}
/**
+ * Free the flow opened file descriptors and allocated memory
+ *
+ * @param[in] flow
+ * Pointer to the flow to free
+ *
+ */
+static void
+tap_flow_free(struct rte_flow *flow)
+{
+ int i;
+
+ if (!flow)
+ return;
+
+ /* Close flow BPF file descriptors */
+ for (i = 0; i < SEC_MAX; i++)
+ if (flow->bpf_fd[i] != 0) {
+ close(flow->bpf_fd[i]);
+ flow->bpf_fd[i] = 0;
+ }
+
+ /* Release the map key for this RSS rule */
+ bpf_rss_key(KEY_CMD_RELEASE, &flow->key_idx);
+ flow->key_idx = 0;
+
+ /* Free flow allocated memory */
+ rte_free(flow);
+}
+
+/**
* Create a flow.
*
* @see rte_flow_create()
@@ -1428,7 +1461,7 @@ struct tap_flow_items {
if (remote_flow)
rte_free(remote_flow);
if (flow)
- rte_free(flow);
+ tap_flow_free(flow);
return NULL;
}
@@ -1450,7 +1483,6 @@ struct tap_flow_items {
struct rte_flow_error *error)
{
struct rte_flow *remote_flow = flow->remote_flow;
- int i;
int ret = 0;
LIST_REMOVE(flow, next);
@@ -1476,22 +1508,6 @@ struct tap_flow_items {
"couldn't receive kernel ack to our request");
goto end;
}
- /* Close opened BPF file descriptors of this flow */
- for (i = 0; i < SEC_MAX; i++)
- if (flow->bpf_fd[i] != 0) {
- close(flow->bpf_fd[i]);
- flow->bpf_fd[i] = 0;
- }
-
- /* Release map key for this RSS rule */
- ret = bpf_rss_key(KEY_CMD_RELEASE, &flow->key_idx);
- if (ret < 0) {
- rte_flow_error_set(
- error, EINVAL, RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
- "Failed to release BPF RSS key");
-
- goto end;
- }
if (remote_flow) {
remote_flow->msg.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK;
@@ -1520,7 +1536,7 @@ struct tap_flow_items {
end:
if (remote_flow)
rte_free(remote_flow);
- rte_free(flow);
+ tap_flow_free(flow);
return ret;
}
@@ -1778,6 +1794,7 @@ int tap_flow_implicit_destroy(struct pmd_internals *pmd,
}
#define MAX_RSS_KEYS 256
+#define KEY_IDX_OFFSET (3 * MAX_RSS_KEYS)
#define SEC_NAME_CLS_Q "cls_q"
const char *sec_name[SEC_MAX] = {
@@ -1934,38 +1951,45 @@ static int rss_enable(struct pmd_internals *pmd,
static int bpf_rss_key(enum bpf_rss_key_e cmd, __u32 *key_idx)
{
__u32 i;
- int err = -1;
+ int err = 0;
static __u32 num_used_keys;
static __u32 rss_keys[MAX_RSS_KEYS] = {KEY_STAT_UNSPEC};
static __u32 rss_keys_initialized;
switch (cmd) {
case KEY_CMD_GET:
- if (!rss_keys_initialized)
+ if (!rss_keys_initialized) {
+ err = -1;
break;
+ }
- if (num_used_keys == RTE_DIM(rss_keys))
+ if (num_used_keys == RTE_DIM(rss_keys)) {
+ err = -1;
break;
+ }
*key_idx = num_used_keys % RTE_DIM(rss_keys);
while (rss_keys[*key_idx] == KEY_STAT_USED)
*key_idx = (*key_idx + 1) % RTE_DIM(rss_keys);
rss_keys[*key_idx] = KEY_STAT_USED;
+ /* add offset to return a key out of range */
+ *key_idx += KEY_IDX_OFFSET;
num_used_keys++;
- err = 0;
break;
case KEY_CMD_RELEASE:
-
Re: [dpdk-dev] [PATCH v5 0/7] Port ownership and synchronization
Hi all Since there is not agreement for testpmd to be ownership aware by using the new ownership mechanism, I think we can drop testpmd patch for now(app/testpmd: adjust ethdev port ownership). Maybe we can add example application to use this API in future. Thanks! From: Matan Azrad > Add ownership mechanism to DPDK Ethernet devices to avoid multiple > management of a device by different DPDK entities. > The port ownership mechanism is a good point to redefine the > synchronization rules in ethdev: > > 1. The port allocation and port release synchronization will be > managed by ethdev. > 2. The port usage synchronization will be managed by the port > owner. > 3. The port ownership synchronization will be managed by ethdev. > 4. DPDK entity which want to use a port safely must take ownership > before. > > > V2: > Synchronize ethdev port creation. > Synchronize port ownership mechanism. > Rename owner remove API to rte_eth_dev_owner_unset. > Remove "ethdev: free a port by a dedicated API" patch - passed to another > series. > Add "ethdev: fix port data reset timing" patch. > Cahnge owner get API to return int value and to pass copy of the owner > structure. > Adjust testpmd to the improved owner get API. > Adjust documentations. > > V3: > Change RTE_ETH_FOREACH_DEV iterator to skip owned ports(Gaetan > suggestion). > Prevent goto in set\unset APIs by adding internal API - this also adds reuse > of > code(Konstantin suggestion). > Group all the shared processes variables in one struct to allow easy > allocation > of it(Konstantin suggestion). > Take owner name truncation as warning and not as error(Konstantin > suggestion). > Mark the new APIs as EXPERIMENTAL. > Rebase on top of master_net_mlx. > Rebase on top of "[PATCH v6 0/6] Fail-safe\ethdev: fix removal handling lack" > series. > Rebase on top of "[PATCH v5 0/8] Introduce virtual driver for Hyper-V/Azure > platforms" . > Add "ethdev: fix used portid allocation" patch suggested y Konstantin. > > v4: > Share => shared in ethdev patches(Thomas suggestion). > Rephase some code comments(Thomas suggestion). > Fix compilation issue caused by wrong rebase with "fix used portid allocation" > patch. > Add assert check for the correct port state to above fix patch. > > V5: > Use defferent print message type as Ferruh suggested. > Fix the name parameter description in set\unset APIs(Ferruh suggestion). > Rebase on top of 18.02-rc1. > Fix issue: ownership API must check that the shared data was allocated > before using the shared ownership lock(relevant when no port was created). > > Matan Azrad (7): > ethdev: fix port data reset timing > ethdev: fix used portid allocation > ethdev: add port ownership > ethdev: synchronize port allocation > net/failsafe: free an eth port by a dedicated API > net/failsafe: use ownership mechanism to own ports > app/testpmd: adjust ethdev port ownership > > app/test-pmd/cmdline.c | 89 +-- > app/test-pmd/cmdline_flow.c | 2 +- > app/test-pmd/config.c | 37 ++--- > app/test-pmd/parameters.c | 4 +- > app/test-pmd/testpmd.c | 63 +--- > app/test-pmd/testpmd.h | 3 + > doc/guides/prog_guide/poll_mode_drv.rst | 14 +- > drivers/net/failsafe/failsafe.c | 7 + > drivers/net/failsafe/failsafe_eal.c | 16 ++ > drivers/net/failsafe/failsafe_ether.c | 2 +- > drivers/net/failsafe/failsafe_private.h | 2 + > lib/librte_ether/rte_ethdev.c | 267 > +++- > lib/librte_ether/rte_ethdev.h | 115 +- > lib/librte_ether/rte_ethdev_core.h | 2 + > lib/librte_ether/rte_ethdev_version.map | 6 + > 15 files changed, 486 insertions(+), 143 deletions(-) > > -- > 1.8.3.1
[dpdk-dev] [PATCH v2] app/testpmd: do not enable Rx offloads by default
Removed the hardcoded preconfigured Rx offload configuration from
testpmd and changed the Rx offload command line parameters from
disable to enable.
Testers who wish to use these offloads will now have to explicitly
write them in the command-line when running testpmd.
Motivation:
Some PMDs such at the mlx4 may not implement all the offloads.
After the offload API rework assuming no offload is enabled by default,
commit ce17eddefc20 ("ethdev: introduce Rx queue offloads API")
commit cba7f53b717d ("ethdev: introduce Tx queue offloads API") trying
to enable a not supported offload is clearly an error which will cause
configuration failing.
Considering that testpmd is an application to test the PMD, it should
not fail on a configuration which was not explicitly requested.
The behavior of this test application is then turned to an opt-in
model.
Signed-off-by: Moti Haimovsky
---
V2:
Modified Rx offload command line parameters from disable to enable.
This way the user can choose the offload parameters to configure the
device with in a consistent manner.
---
app/test-pmd/parameters.c | 30 +++---
app/test-pmd/testpmd.c| 4 +---
doc/guides/nics/thunderx.rst | 2 +-
doc/guides/testpmd_app_ug/run_app.rst | 20 ++--
4 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index fd59071..134fd99 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -580,15 +580,15 @@
#ifdef RTE_LIBRTE_BITRATE
{ "bitrate-stats", 1, 0, 0 },
#endif
- { "disable-crc-strip", 0, 0, 0 },
+ { "enable-crc-strip", 0, 0, 0 },
{ "enable-lro", 0, 0, 0 },
{ "enable-rx-cksum",0, 0, 0 },
{ "enable-rx-timestamp",0, 0, 0 },
{ "enable-scatter", 0, 0, 0 },
- { "disable-hw-vlan",0, 0, 0 },
- { "disable-hw-vlan-filter", 0, 0, 0 },
- { "disable-hw-vlan-strip", 0, 0, 0 },
- { "disable-hw-vlan-extend", 0, 0, 0 },
+ { "enable-hw-vlan", 0, 0, 0 },
+ { "enable-hw-vlan-filter", 0, 0, 0 },
+ { "enable-hw-vlan-strip", 0, 0, 0 },
+ { "enable-hw-vlan-extend", 0, 0, 0 },
{ "enable-drop-en",0, 0, 0 },
{ "disable-rss",0, 0, 0 },
{ "port-topology", 1, 0, 0 },
@@ -875,8 +875,8 @@
" must be >= 0\n", n);
}
#endif
- if (!strcmp(lgopts[opt_idx].name, "disable-crc-strip"))
- rx_offloads &= ~DEV_RX_OFFLOAD_CRC_STRIP;
+ if (!strcmp(lgopts[opt_idx].name, "enable-crc-strip"))
+ rx_offloads |= DEV_RX_OFFLOAD_CRC_STRIP;
if (!strcmp(lgopts[opt_idx].name, "enable-lro"))
rx_offloads |= DEV_RX_OFFLOAD_TCP_LRO;
if (!strcmp(lgopts[opt_idx].name, "enable-scatter"))
@@ -886,20 +886,20 @@
if (!strcmp(lgopts[opt_idx].name,
"enable-rx-timestamp"))
rx_offloads |= DEV_RX_OFFLOAD_TIMESTAMP;
- if (!strcmp(lgopts[opt_idx].name, "disable-hw-vlan"))
- rx_offloads &= ~DEV_RX_OFFLOAD_VLAN;
+ if (!strcmp(lgopts[opt_idx].name, "enable-hw-vlan"))
+ rx_offloads |= DEV_RX_OFFLOAD_VLAN;
if (!strcmp(lgopts[opt_idx].name,
- "disable-hw-vlan-filter"))
- rx_offloads &= ~DEV_RX_OFFLOAD_VLAN_FILTER;
+ "enable-hw-vlan-filter"))
+ rx_offloads |= DEV_RX_OFFLOAD_VLAN_FILTER;
if (!strcmp(lgopts[opt_idx].name,
- "disable-hw-vlan-strip"))
- rx_offloads &= ~DEV_RX_OFFLOAD_VLAN_STRIP;
+ "enable-hw-vlan-strip"))
+ rx_offloads |= DEV_RX_OFFLOAD_VLAN_STRIP;
if (!strcmp(lgopts[opt_idx].name,
- "disable-hw-vlan-extend"))
- rx_offloads &= ~DEV_RX_OFFLOAD_VLAN_EXTEND;
+ "enable-hw-vlan-extend"))
+ rx_offloads |= DEV_RX_OFFLOAD_VLAN_EXTEND;
if (!strcmp(lgopts[opt_idx].name, "enable-drop-en"))
rx_drop_en = 1;
diff --git a/app/test-pmd/testpmd.c b/a
Re: [dpdk-dev] [RFC 0/3] set protocol specific metadata using set_pkt_metadata API
Hi Akhil, On 01/29/2018 02:38 PM, Akhil Goyal wrote: On 1/29/2018 1:33 PM, Anoob Joseph wrote: Hi Akhil, Radu, On 01/29/2018 01:02 PM, Akhil Goyal wrote: On 1/26/2018 8:38 PM, Nicolau, Radu wrote: -Original Message- From: Anoob Joseph [mailto:anoob.jos...@caviumnetworks.com] Sent: Friday, January 26, 2018 2:38 PM To: Nicolau, Radu ; Akhil Goyal Cc: anoob.jos...@caviumnetworks.com; Doherty, Declan ; Gonzalez Monroy, Sergio ; Jerin Jacob ; Narayana Prasad ; Nelio Laranjeiro ; dev@dpdk.org Subject: Re: [RFC 0/3] set protocol specific metadata using set_pkt_metadata API Hi Radu, On 01/26/2018 04:52 PM, Nicolau, Radu wrote: -Original Message- From: Anoob Joseph [mailto:anoob.jos...@caviumnetworks.com] Sent: Thursday, January 25, 2018 5:13 PM To: Akhil Goyal ; Nicolau, Radu Cc: Doherty, Declan ; Gonzalez Monroy, Sergio ; anoob.jos...@caviumnetworks.com; Jerin Jacob ; Narayana Prasad ; Nelio Laranjeiro ; dev@dpdk.org Subject: Re: [RFC 0/3] set protocol specific metadata using set_pkt_metadata API Hi Akhil, Radu, Could you review the patch and share your thoughts on the proposed change? Hi, I've had a quick look. From what I can see you can do everything you do in this patch with the current API. For example you can store an internal struct pointer in the private section of the security context and you can increment the ESP SN with every tx or set metadata call. With the current API, PMD could store the ESN with the security session, but there is no means for the application to read this. Application should be aware of the sequence number used per packet. This is required to monitor sequence number overflow.In the proposal, the sequence number field is IN-OUT. So application could either dictate the sequence number, or read the value from the PMD. Thanks, Anoob My concern is that we are adding too much and too specific to the security API. Overflow situation can be monitored with a tx callback event or a crypto callback event, depending on the device type. Agreed with Radu, this looks too specific information. Instead, we can do overflow checking in the driver and add a macro in rte_crypto_op_status for overflow. We could do the callback when sequence number over flow happens, and IPsec processing fails subsequently. But ideally, application should be able to detect that the sequence number is about to over flow and renegotiate the SA while the original SA is still valid. I agree that we would be better off by handling this in the driver. But application would need some sort of event which would say, "sequence number is about to overflow, renegotiate SA", before the current SA becomes invalid. Do we have any mechanism to register a callback (acting on mbuf), when a particular event occurs (without dropping the mbuf)? If yes, we could move to that approach. rte_crypto_op_status could be leveraged for lookaside_protocol, but can we do something similar for inline protocol? Thoughts? Even in case of inline protocol, what is the issue in doing that? You can write a similar code in the driver(if hardware doesn't support that) instead of application for handling the sequence number overflow as well as anti-replay. Both of these errors are protocol specific and for full protocol offload, application need not bother about this. Application should be as clean as possible in case of protocol offload. When SA expires, IKE needs to be notified to initiate new SAs. So there has to be an event from PMD to application indicating SA expiry. This needs to happen independently for outbound and inbound SAs. Even with inline protocol, IKE is still handled by application. And, in inline_protocol, the protocol processing is done after the packet is submitted to eth_dev. Unlike crypto dev, there is no status of operation returned which could be leveraged to check about sequence number over flow. We need a way to know about overflow, when the packet is successfully processed and sent. Anoob
Re: [dpdk-dev] [PATCH 2/2] test: improve test validation in NULL AUTH case
> -Original Message- > From: Trahe, Fiona > Sent: Thursday, January 25, 2018 5:19 PM > To: dev@dpdk.org > Cc: Nicolau, Radu ; De Lara Guarch, Pablo > ; Trahe, Fiona > Subject: [PATCH 2/2] test: improve test validation in NULL AUTH case > > Add comparison to make sure memory pointed to by digest pointer is not > overwritten in NULL auth case. > > Signed-off-by: Fiona Trahe Acked-by: Pablo de Lara
Re: [dpdk-dev] [PATCH v2] app/testpmd: do not enable Rx offloads by default
29/01/2018 12:33, Moti Haimovsky:
> Removed the hardcoded preconfigured Rx offload configuration from
> testpmd and changed the Rx offload command line parameters from
> disable to enable.
> Testers who wish to use these offloads will now have to explicitly
> write them in the command-line when running testpmd.
>
> Motivation:
> Some PMDs such at the mlx4 may not implement all the offloads.
> After the offload API rework assuming no offload is enabled by default,
> commit ce17eddefc20 ("ethdev: introduce Rx queue offloads API")
> commit cba7f53b717d ("ethdev: introduce Tx queue offloads API") trying
> to enable a not supported offload is clearly an error which will cause
> configuration failing.
>
> Considering that testpmd is an application to test the PMD, it should
> not fail on a configuration which was not explicitly requested.
> The behavior of this test application is then turned to an opt-in
> model.
>
> Signed-off-by: Moti Haimovsky
This is a very good step in the right direction
because testpmd is a tool app.
So testpmd must not enable anything without explicit user request.
The next step will be to check the offload capabilities
before enabling them.
If a requested capability is not available, it should return
either an error, or a warning.
I want to merge this first patch in 18.02-rc2,
because some drivers (lacking some capabilities) cannot be tested
without explicitly disabling the forced offloads.
Re: [dpdk-dev] [PATCH v2 2/4] eal: add function to release internal resources
29/01/2018 12:10, Van Haaren, Harry: > > From: Thomas Monjalon [mailto:tho...@monjalon.net] > > Sent: Monday, January 29, 2018 10:56 AM > > To: Van Haaren, Harry > > Cc: dev@dpdk.org; Varghese, Vipin > > Subject: Re: [PATCH v2 2/4] eal: add function to release internal resources > > > > 29/01/2018 11:45, Harry van Haaren: > > > --- a/doc/guides/prog_guide/env_abstraction_layer.rst > > > +++ b/doc/guides/prog_guide/env_abstraction_layer.rst > > > +Finalizing and Cleanup > > > +~~ > > > + > > > +During the initialization of EAL resources such as hugepage backed memory > > can be > > > +allocated by core components. The memory allocated during > > ``rte_eal_init()`` > > > +can be released by calling the ``rte_eal_finalize()`` function. Refer to > > the > > > +API documentation for details. > > > > About naming, what is better between > > rte_eal_finalize() and > > rte_eal_cleanup() ? > > I tend to think that "cleanup" is more descriptive. > > Sure cleanup() is fine for me, I'll spin a v3 with the function name change. Harry, it is a real question! If someone thinks "finalize" is better, I would like to hear it because we may use the same wording in more DPDK functions.
Re: [dpdk-dev] [PATCH v2 2/4] eal: add function to release internal resources
On Mon, Jan 29, 2018 at 12:55:35PM +0100, Thomas Monjalon wrote: > 29/01/2018 12:10, Van Haaren, Harry: > > > From: Thomas Monjalon [mailto:tho...@monjalon.net] > > > Sent: Monday, January 29, 2018 10:56 AM > > > To: Van Haaren, Harry > > > Cc: dev@dpdk.org; Varghese, Vipin > > > Subject: Re: [PATCH v2 2/4] eal: add function to release internal > > > resources > > > > > > 29/01/2018 11:45, Harry van Haaren: > > > > --- a/doc/guides/prog_guide/env_abstraction_layer.rst > > > > +++ b/doc/guides/prog_guide/env_abstraction_layer.rst > > > > +Finalizing and Cleanup > > > > +~~ > > > > + > > > > +During the initialization of EAL resources such as hugepage backed > > > > memory > > > can be > > > > +allocated by core components. The memory allocated during > > > ``rte_eal_init()`` > > > > +can be released by calling the ``rte_eal_finalize()`` function. Refer > > > > to > > > the > > > > +API documentation for details. > > > > > > About naming, what is better between > > > rte_eal_finalize() and > > > rte_eal_cleanup() ? > > > I tend to think that "cleanup" is more descriptive. > > > > Sure cleanup() is fine for me, I'll spin a v3 with the function name change. > > Harry, it is a real question! > If someone thinks "finalize" is better, I would like to hear it > because we may use the same wording in more DPDK functions. > I like finalize better. 1) Both initialize and finalize sound similar as both end in "ize" so sound like they are a pair 2) The use of .init and .fini elf sessions are precedent for the naming /Bruce
[dpdk-dev] [PATCH v3 1/4] service: move finalize to internal
This commit moves the rte_service_finalize() function to be in the component header, and marks it as @internal. The function is only called internally by rte_eal_finalize(). Signed-off-by: Harry van Haaren --- Cc: tho...@monjalon.net Cc: vipin.vargh...@intel.com --- lib/librte_eal/common/include/rte_service.h | 11 --- lib/librte_eal/common/include/rte_service_component.h | 11 +++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/librte_eal/common/include/rte_service.h b/lib/librte_eal/common/include/rte_service.h index 5e3e3a6..02b1512 100644 --- a/lib/librte_eal/common/include/rte_service.h +++ b/lib/librte_eal/common/include/rte_service.h @@ -429,17 +429,6 @@ int32_t rte_service_attr_get(uint32_t id, uint32_t attr_id, */ int32_t rte_service_attr_reset_all(uint32_t id); -/** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * - * Free up the memory that has been initialized. This routine - * is to be invoked prior to process termination. - * - * @retval None - */ -void rte_service_finalize(void); - #ifdef __cplusplus } #endif diff --git a/lib/librte_eal/common/include/rte_service_component.h b/lib/librte_eal/common/include/rte_service_component.h index 849c71d..f881ac0 100644 --- a/lib/librte_eal/common/include/rte_service_component.h +++ b/lib/librte_eal/common/include/rte_service_component.h @@ -139,4 +139,15 @@ int32_t rte_service_component_runstate_set(uint32_t id, uint32_t runstate); */ int32_t rte_service_init(void); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + * + * @internal Free up the memory that has been initialized. + * This routine is to be invoked prior to process termination. + * + * @retval None + */ +void rte_service_finalize(void); + #endif /* _RTE_SERVICE_PRIVATE_H_ */ -- 2.7.4
[dpdk-dev] [PATCH v3 3/4] app/pdump: call eal cleanup before exit
This patch adds a call to the newly introduced cleanup()
function just before quitting the pdump app.
Adding this function call before quitting from a secondary processes
is important, as otherwise it will leak hugepage memory. For a secondary
process that is run multiple times, this could cause hugepage memory
to become depleted and stop a secondary process from starting.
Signed-off-by: Harry van Haaren
---
v3:
- Rework to new cleanup() function name (Thomas)
Cc: tho...@monjalon.net
Cc: vipin.vargh...@intel.com
---
app/pdump/main.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/app/pdump/main.c b/app/pdump/main.c
index 0f70c75..50772cb 100644
--- a/app/pdump/main.c
+++ b/app/pdump/main.c
@@ -882,5 +882,10 @@ main(int argc, char **argv)
/* dump debug stats */
print_pdump_stats();
+ ret = rte_eal_cleanup();
+ if (ret)
+ printf("Error from rte_eal_cleanup(), %d\n", ret);
+
+
return 0;
}
--
2.7.4
[dpdk-dev] [PATCH v3 2/4] eal: add function to release internal resources
This commit adds a new function rte_eal_cleanup(). The function serves as a hook to allow DPDK to release internal resources (e.g.: hugepage allocations). This function allows DPDK to become more like an ordinary library, where the library context itself can be initialized and cleaned up by the application. The rte_exit() and rte_panic() functions must be considered, particularly if they should call rte_eal_cleanup() to release any resources or not. This patch adds the cleanup to rte_exit(), but does not clean up on rte_panic(). The reason to not clean up on panicing is that the developer may wish to inspect the exact internal state of EAL and hugepages. Signed-off-by: Harry van Haaren --- v3: - Rename function to cleanup (Thomas) v2: - Add eal_common.c file commit (Vipin) Cc: tho...@monjalon.net Cc: vipin.vargh...@intel.com --- doc/guides/prog_guide/env_abstraction_layer.rst | 8 doc/guides/rel_notes/release_18_02.rst | 9 + lib/librte_eal/bsdapp/eal/Makefile | 1 + lib/librte_eal/bsdapp/eal/eal_debug.c | 5 + lib/librte_eal/common/eal_common.c | 11 +++ lib/librte_eal/common/include/rte_eal.h | 16 lib/librte_eal/linuxapp/eal/Makefile| 1 + lib/librte_eal/linuxapp/eal/eal_debug.c | 5 + lib/librte_eal/rte_eal_version.map | 1 + 9 files changed, 57 insertions(+) create mode 100644 lib/librte_eal/common/eal_common.c diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst index 34d871c..04bd776 100644 --- a/doc/guides/prog_guide/env_abstraction_layer.rst +++ b/doc/guides/prog_guide/env_abstraction_layer.rst @@ -99,6 +99,14 @@ It consist of calls to the pthread library (more specifically, pthread_self(), p The creation and initialization functions for these objects are not multi-thread safe. However, once initialized, the objects themselves can safely be used in multiple threads simultaneously. +Shutdown and Cleanup + + +During the initialization of EAL resources such as hugepage backed memory can be +allocated by core components. The memory allocated during ``rte_eal_init()`` +can be released by calling the ``rte_eal_cleanup()`` function. Refer to the +API documentation for details. + Multi-process Support ~ diff --git a/doc/guides/rel_notes/release_18_02.rst b/doc/guides/rel_notes/release_18_02.rst index 00b3224..8c3968e 100644 --- a/doc/guides/rel_notes/release_18_02.rst +++ b/doc/guides/rel_notes/release_18_02.rst @@ -41,6 +41,15 @@ New Features Also, make sure to start the actual text at the margin. = +* **Add function to allow releasing internal EAL resources on exit** + + During ``rte_eal_init()`` EAL allocates memory from hugepages to enable its + core libraries to perform their tasks. The ``rte_eal_cleanup()`` function + releases these resources, ensuring that no hugepage memory is leaked. It is + expected that all DPDK applications call ``rte_eal_cleanup()`` before + exiting. Not calling this function could result in leaking hugepages, leading + to failure during initialization of secondary processes. + * **Added the ixgbe ethernet driver to support RSS with flow API.** Rte_flow actually defined to include RSS, but till now, RSS is out of diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile index c694076..7480f98 100644 --- a/lib/librte_eal/bsdapp/eal/Makefile +++ b/lib/librte_eal/bsdapp/eal/Makefile @@ -34,6 +34,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_interrupts.c SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_alarm.c # from common dir +SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common.c SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_lcore.c SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_timer.c SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_memzone.c diff --git a/lib/librte_eal/bsdapp/eal/eal_debug.c b/lib/librte_eal/bsdapp/eal/eal_debug.c index b0ae2b7..f66e504 100644 --- a/lib/librte_eal/bsdapp/eal/eal_debug.c +++ b/lib/librte_eal/bsdapp/eal/eal_debug.c @@ -14,6 +14,7 @@ #include #include #include +#include #define BACKTRACE_SIZE 256 @@ -79,6 +80,10 @@ rte_exit(int exit_code, const char *format, ...) va_end(ap); #ifndef RTE_EAL_ALWAYS_PANIC_ON_ERROR + int ret = rte_eal_cleanup(); + if (ret) + RTE_LOG(CRIT, EAL, + "EAL could not release all resources, code %d\n", ret); exit(exit_code); #else rte_dump_stack(); diff --git a/lib/librte_eal/common/eal_common.c b/lib/librte_eal/common/eal_common.c new file mode 100644 index 000..52771e7 --- /dev/null +++ b/lib/librte_eal/common/eal_common.c @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018 Intel Corporation + */ + +#include + +int rt
[dpdk-dev] [PATCH v3 4/4] app/proc_info: call eal cleanup before exit
This patch adds a call to the newly introduced cleanup()
function just before quitting the app.
Adding this function call before quitting from a secondary processes
is important, as otherwise it will leak hugepage memory. For a secondary
process that is run multiple times, this could cause hugepage memory
to become depleted and stop a secondary process from starting.
Signed-off-by: Harry van Haaren
---
v3:
- Rework to use cleanup() function name (Thomas)
Cc: tho...@monjalon.net
Cc: vipin.vargh...@intel.com
---
app/proc_info/main.c | 4
1 file changed, 4 insertions(+)
diff --git a/app/proc_info/main.c b/app/proc_info/main.c
index 94d53f5..2f53e3c 100644
--- a/app/proc_info/main.c
+++ b/app/proc_info/main.c
@@ -660,5 +660,9 @@ main(int argc, char **argv)
if (enable_metrics)
metrics_display(RTE_METRICS_GLOBAL);
+ ret = rte_eal_cleanup();
+ if (ret)
+ printf("Error from rte_eal_cleanup(), %d\n", ret);
+
return 0;
}
--
2.7.4
Re: [dpdk-dev] [PATCH v2 2/4] eal: add function to release internal resources
> From: Thomas Monjalon [mailto:tho...@monjalon.net] > Sent: Monday, January 29, 2018 11:56 AM > To: Van Haaren, Harry > Cc: dev@dpdk.org; Varghese, Vipin > Subject: Re: [PATCH v2 2/4] eal: add function to release internal resources > > 29/01/2018 12:10, Van Haaren, Harry: > > > From: Thomas Monjalon [mailto:tho...@monjalon.net] > > > Sent: Monday, January 29, 2018 10:56 AM > > > To: Van Haaren, Harry > > > Cc: dev@dpdk.org; Varghese, Vipin > > > Subject: Re: [PATCH v2 2/4] eal: add function to release internal > resources > > > > > > 29/01/2018 11:45, Harry van Haaren: > > > > --- a/doc/guides/prog_guide/env_abstraction_layer.rst > > > > +++ b/doc/guides/prog_guide/env_abstraction_layer.rst > > > > +Finalizing and Cleanup > > > > +~~ > > > > + > > > > +During the initialization of EAL resources such as hugepage backed > memory > > > can be > > > > +allocated by core components. The memory allocated during > > > ``rte_eal_init()`` > > > > +can be released by calling the ``rte_eal_finalize()`` function. Refer > to > > > the > > > > +API documentation for details. > > > > > > About naming, what is better between > > > rte_eal_finalize() and > > > rte_eal_cleanup() ? > > > I tend to think that "cleanup" is more descriptive. > > > > Sure cleanup() is fine for me, I'll spin a v3 with the function name > change. > > Harry, it is a real question! Yup, > If someone thinks "finalize" is better, I would like to hear it > because we may use the same wording in more DPDK functions. To me, finalize() and cleanup() mean the same thing. I think cleanup() is a simpler term (and I like simple :) Hence, v3 sent with cleanup()
Re: [dpdk-dev] [RFC v3 1/1] lib: add compressdev API
Hi > -Original Message- > From: Trahe, Fiona [mailto:fiona.tr...@intel.com] > Sent: 26 January 2018 00:13 > To: Verma, Shally ; Ahmed Mansour > ; dev@dpdk.org; Akhil Goyal > > Cc: Challa, Mahipal ; Athreya, Narayana > Prasad ; De Lara Guarch, Pablo > ; Gupta, Ashish > ; Sahu, Sunila ; > Jain, Deepak K ; Hemant Agrawal > ; Roy Pledge ; Youri > Querry ; Trahe, Fiona > Subject: RE: [RFC v3 1/1] lib: add compressdev API > > Hi Shally, Ahmed, > > > > -Original Message- > > From: Verma, Shally [mailto:shally.ve...@cavium.com] > > Sent: Thursday, January 25, 2018 10:25 AM > > To: Ahmed Mansour ; Trahe, Fiona > ; > > dev@dpdk.org; Akhil Goyal > > Cc: Challa, Mahipal ; Athreya, Narayana > Prasad > > ; De Lara Guarch, Pablo > ; > > Gupta, Ashish ; Sahu, Sunila > ; Jain, Deepak K > > ; Hemant Agrawal > ; Roy Pledge > > ; Youri Querry > > Subject: RE: [RFC v3 1/1] lib: add compressdev API > > > > > > > > > -Original Message- > > > From: Ahmed Mansour [mailto:ahmed.mans...@nxp.com] > > > Sent: 25 January 2018 01:06 > > > To: Verma, Shally ; Trahe, Fiona > > > ; dev@dpdk.org; Akhil Goyal > > > > > > Cc: Challa, Mahipal ; Athreya, Narayana > > > Prasad ; De Lara Guarch, Pablo > > > ; Gupta, Ashish > > > ; Sahu, Sunila ; > > > Jain, Deepak K ; Hemant Agrawal > > > ; Roy Pledge ; Youri > > > Querry > > > Subject: Re: [RFC v3 1/1] lib: add compressdev API > > > > > > Hi All, > > > > > > Please see responses in line. > > > > > > Thanks, > > > > > > Ahmed > > > > > > On 1/23/2018 6:58 AM, Verma, Shally wrote: > > > > Hi Fiona > > > > > > > >> -Original Message- > > > >> From: Trahe, Fiona [mailto:fiona.tr...@intel.com] > > > >> Sent: 19 January 2018 17:30 > > > >> To: Verma, Shally ; dev@dpdk.org; > > > >> akhil.go...@nxp.com > > > >> Cc: Challa, Mahipal ; Athreya, Narayana > > > >> Prasad ; De Lara Guarch, > Pablo > > > >> ; Gupta, Ashish > > > >> ; Sahu, Sunila > ; > > > >> Jain, Deepak K ; Hemant Agrawal > > > >> ; Roy Pledge ; > Youri > > > >> Querry ; Ahmed Mansour > > > >> ; Trahe, Fiona > > > >> Subject: RE: [RFC v3 1/1] lib: add compressdev API > > > >> > > > >> Hi Shally, > > > >> > > > >>> -Original Message- > > > >>> From: Verma, Shally [mailto:shally.ve...@cavium.com] > > > >>> Sent: Thursday, January 18, 2018 12:54 PM > > > >>> To: Trahe, Fiona ; dev@dpdk.org > > > >>> Cc: Challa, Mahipal ; Athreya, > Narayana > > > >> Prasad > > > >>> ; De Lara Guarch, Pablo > > > >> ; > > > >>> Gupta, Ashish ; Sahu, Sunila > > > >> ; Jain, Deepak K > > > >>> ; Hemant Agrawal > > > >> ; Roy Pledge > > > >>> ; Youri Querry ; > > > >> Ahmed Mansour > > > >>> > > > >>> Subject: RE: [RFC v3 1/1] lib: add compressdev API > > > >>> > > > >>> Hi Fiona > > > >>> > > > >>> While revisiting this, we identified few questions and additions. > Please > > > see > > > >> them inline. > > > >>> > > > -Original Message- > > > From: Trahe, Fiona [mailto:fiona.tr...@intel.com] > > > Sent: 15 December 2017 23:19 > > > To: dev@dpdk.org; Verma, Shally > > > Cc: Challa, Mahipal ; Athreya, > Narayana > > > Prasad ; > > > pablo.de.lara.gua...@intel.com; fiona.tr...@intel.com > > > Subject: [RFC v3 1/1] lib: add compressdev API > > > > > > Signed-off-by: Trahe, Fiona > > > --- > > > >>> //snip > > > >>> > > > + > > > +int > > > +rte_compressdev_queue_pair_setup(uint8_t dev_id, uint16_t > > > queue_pair_id, > > > +uint32_t max_inflight_ops, int socket_id) > > > >>> [Shally] Is max_inflights_ops different from nb_streams_per_qp in > > > struct > > > >> rte_compressdev_info? > > > >>> I assume they both carry same purpose. If yes, then it will be better > to > > > use > > > >> single naming convention to > > > >>> avoid confusion. > > > >> [Fiona] No, I think they have different purposes. > > > >> max_inflight_ops should be used to configure the qp with the number > of > > > ops > > > >> the application expects to be able to submit to the qp before it needs > to > > > poll > > > >> for a response. It can be configured differently for each qp. In the > > > >> QAT > > > case it > > > >> dictates the depth of the qp created, it may have different > implications on > > > >> other PMDs. > > > >> nb_sessions_per_qp and nb_streams_per_qp are limitations the > devices > > > >> reports and are same for all qps on the device. QAT doesn't have > those > > > >> limitations and so would report 0, however I assumed they may be > > > necessary > > > >> for other devices. > > > >> This assumption is based on the patch submitted by NXP to cryptodev > in > > > Feb > > > >> 2017 > > > >> > > > > https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdpd > > > k.org%2Fml%2Farchives%2Fdev%2F2017- > > > > March%2F060740.html&data=02%7C01%7Cahmed.mansour%40nxp.com%7C > > > > b012d74d7530493b155108d56258955f%7C686ea1d3bc2b4c6fa92cd99c5c30163 > > > > 5%7C0%7C0%7C636523054981379413&sdata=2SazlEazMxcBGS7R58CpNrX0G5 > > >
Re: [dpdk-dev] [RFC v2] doc compression API for DPDK
Hi Ahmed > -Original Message- > From: Ahmed Mansour [mailto:ahmed.mans...@nxp.com] > Sent: 25 January 2018 23:49 > To: Verma, Shally ; Trahe, Fiona > ; dev@dpdk.org > Cc: Athreya, Narayana Prasad ; > Gupta, Ashish ; Sahu, Sunila > ; De Lara Guarch, Pablo > ; Challa, Mahipal > ; Jain, Deepak K ; > Hemant Agrawal ; Roy Pledge > ; Youri Querry > Subject: Re: [RFC v2] doc compression API for DPDK > > Hi All, > > Sorry for the delay. Please see responses inline. > > Ahmed > > On 1/12/2018 8:50 AM, Verma, Shally wrote: > > Hi Fiona > > > >> -Original Message- > >> From: Trahe, Fiona [mailto:fiona.tr...@intel.com] > >> Sent: 12 January 2018 00:24 > >> To: Verma, Shally ; Ahmed Mansour > >> ; dev@dpdk.org > >> Cc: Athreya, Narayana Prasad ; > >> Gupta, Ashish ; Sahu, Sunila > >> ; De Lara Guarch, Pablo > >> ; Challa, Mahipal > >> ; Jain, Deepak K > ; > >> Hemant Agrawal ; Roy Pledge > >> ; Youri Querry ; > Trahe, > >> Fiona > >> Subject: RE: [RFC v2] doc compression API for DPDK > >> > >> Hi Shally, Ahmed, > >> > >> > >>> -Original Message- > >>> From: Verma, Shally [mailto:shally.ve...@cavium.com] > >>> Sent: Wednesday, January 10, 2018 12:55 PM > >>> To: Ahmed Mansour ; Trahe, Fiona > >> ; dev@dpdk.org > >>> Cc: Athreya, Narayana Prasad ; > >> Gupta, Ashish > >>> ; Sahu, Sunila ; > >> De Lara Guarch, Pablo > >>> ; Challa, Mahipal > >> ; Jain, Deepak K > >>> ; Hemant Agrawal > >> ; Roy Pledge > >>> ; Youri Querry > >>> Subject: RE: [RFC v2] doc compression API for DPDK > >>> > >>> HI Ahmed > >>> > -Original Message- > From: Ahmed Mansour [mailto:ahmed.mans...@nxp.com] > Sent: 10 January 2018 00:38 > To: Verma, Shally ; Trahe, Fiona > ; dev@dpdk.org > Cc: Athreya, Narayana Prasad > ; > Gupta, Ashish ; Sahu, Sunila > ; De Lara Guarch, Pablo > ; Challa, Mahipal > ; Jain, Deepak K > >> ; > Hemant Agrawal ; Roy Pledge > ; Youri Querry > Subject: Re: [RFC v2] doc compression API for DPDK > > Hi Shally, > > Thanks for the summary. It is very helpful. Please see comments below > > > On 1/4/2018 6:45 AM, Verma, Shally wrote: > > This is an RFC v2 document to brief understanding and requirements > on > compression API proposal in DPDK. It is based on "[RFC v3] > Compression > >> API > in DPDK > > >> > https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdpd > >> > k.org%2Fdev%2Fpatchwork%2Fpatch%2F32331%2F&data=02%7C01%7Cahm > >> > ed.mansour%40nxp.com%7C80bd3270430c473fa71d08d55368a0e1%7C686ea > >> > 1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636506631207323264&sdata=JF > tOnJxajgXX7s3DMZ79K7VVM7TXO8lBd6rNeVlsHDg%3D&reserved=0 ". > > Intention of this document is to align on concepts built into > >> compression > API, its usage and identify further requirements. > > Going further it could be a base to Compression Module Programmer > Guide. > > Current scope is limited to > > - definition of the terminology which makes up foundation of > >> compression > API > > - typical API flow expected to use by applications > > - Stateless and Stateful operation definition and usage after RFC v1 > doc > review > > >> > https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdev. > dpdk.narkive.com%2FCHS5l01B%2Fdpdk-dev-rfc-v1-doc-compression- > >> api- > for- > > >> > dpdk&data=02%7C01%7Cahmed.mansour%40nxp.com%7C80bd3270430c473 > >> > fa71d08d55368a0e1%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C6 > >> > 36506631207323264&sdata=Fy7xKIyxZX97i7vEM6NqgrvnqKrNrWOYLwIA5dEH > QNQ%3D&reserved=0 > > 1. Overview > > ~~~ > > > > A. Compression Methodologies in compression API > > === > > DPDK compression supports two types of compression > methodologies: > > - Stateless - each data object is compressed individually without any > reference to previous data, > > - Stateful - each data object is compressed with reference to previous > >> data > object i.e. history of data is needed for compression / decompression > > For more explanation, please refer RFC > >> > https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fw > >> > ww.ietf.org%2Frfc%2Frfc1951.txt&data=02%7C01%7Cahmed.mansour%40nx > >> > p.com%7C80bd3270430c473fa71d08d55368a0e1%7C686ea1d3bc2b4c6fa92cd9 > >> > 9c5c301635%7C0%7C0%7C636506631207323264&sdata=pfp2VX1w3UxH5YLcL > 2R%2BvKXNeS7jP46CsASq0B1SETw%3D&reserved=0 > > To support both methodologies, DPDK compression introduces two > key > concepts: Session and Stream. > > B. Notion of a session in compression API > > == > > A Session in DPDK compression is a logical entity which is setup one- > >> time > with immutable parameters i.e. parameters that don't change across > operations and devices. > > A session can
[dpdk-dev] [PATCH 03/17] mempool: use SPDX tags
Signed-off-by: Olivier Matz --- lib/librte_mempool/rte_mempool.c | 35 +++ lib/librte_mempool/rte_mempool.h | 35 +++ lib/librte_mempool/rte_mempool_ops.c | 35 +++ 3 files changed, 9 insertions(+), 96 deletions(-) diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c index 6d1702252..6fdb723ac 100644 --- a/lib/librte_mempool/rte_mempool.c +++ b/lib/librte_mempool/rte_mempool.c @@ -1,35 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * Copyright(c) 2016 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation. + * Copyright(c) 2016 6WIND S.A. */ #include diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h index e21026aa7..8b1b7f7ed 100644 --- a/lib/librte_mempool/rte_mempool.h +++ b/lib/librte_mempool/rte_mempool.h @@ -1,35 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * Copyright(c) 2016 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation. + * Copyright(c) 2016 6WIND S.A. */ #ifndef _RTE_MEMPOOL_H_ diff --git a/lib/librte_mempool/rte_mempool_ops.c b/lib/librte_mempool/rte_mempool_ops.c index 92b9f90c4..0732255c0 100644 --- a/lib/librte_mempool/rte_mempool_ops.c +++ b/lib/librte_mempool/rte_mempool_ops.c @@ -1,35 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2016 Intel Corporation. All rights reserved. - * Copyright(c) 2016 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or withou
[dpdk-dev] [PATCH 01/17] cmdline: use SPDX tags
Signed-off-by: Olivier Matz --- lib/librte_cmdline/cmdline.c | 58 +--- lib/librte_cmdline/cmdline.h | 58 +--- lib/librte_cmdline/cmdline_cirbuf.c | 58 +--- lib/librte_cmdline/cmdline_cirbuf.h | 58 +--- lib/librte_cmdline/cmdline_parse.c | 58 +--- lib/librte_cmdline/cmdline_parse.h | 58 +--- lib/librte_cmdline/cmdline_parse_etheraddr.c | 58 +--- lib/librte_cmdline/cmdline_parse_etheraddr.h | 58 +--- lib/librte_cmdline/cmdline_parse_ipaddr.c| 58 +--- lib/librte_cmdline/cmdline_parse_ipaddr.h| 58 +--- lib/librte_cmdline/cmdline_parse_num.c | 58 +--- lib/librte_cmdline/cmdline_parse_num.h | 58 +--- lib/librte_cmdline/cmdline_parse_portlist.c | 58 +--- lib/librte_cmdline/cmdline_parse_portlist.h | 58 +--- lib/librte_cmdline/cmdline_parse_string.c| 58 +--- lib/librte_cmdline/cmdline_parse_string.h| 58 +--- lib/librte_cmdline/cmdline_rdline.c | 58 +--- lib/librte_cmdline/cmdline_rdline.h | 58 +--- lib/librte_cmdline/cmdline_socket.c | 58 +--- lib/librte_cmdline/cmdline_socket.h | 58 +--- lib/librte_cmdline/cmdline_vt100.c | 58 +--- lib/librte_cmdline/cmdline_vt100.h | 58 +--- 22 files changed, 44 insertions(+), 1232 deletions(-) diff --git a/lib/librte_cmdline/cmdline.c b/lib/librte_cmdline/cmdline.c index d74916515..591b78b0f 100644 --- a/lib/librte_cmdline/cmdline.c +++ b/lib/librte_cmdline/cmdline.c @@ -1,61 +1,7 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation. * Copyright (c) 2009, Olivier MATZ * All rights reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the University of California, Berkeley nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LI
[dpdk-dev] [PATCH 00/17] use SPDX tags on 6WIND copyrighted files
This patchset updates the license on files that contain a 6WIND copyright to use a SPDX tag. It applies on master + https://dpdk.org/dev/patchwork/patch/34604/ For components I am maintaining (mempool, mbuf, cmdline, kvargs, net), I update all the *.[ch] files. For the other components, I only update files where there is a 6WIND copyright. The change is done automatically: the copyrights stay as is, except: - standardisation of the text for 6WIND copyright - as discussed with Bruce, Thomas, and Ferruh, the "All rights reserved" mention is removed if the copyright are from 6WIND, Intel or Mellanox. For each patch, the maintainers are Cc'd. Olivier Matz (17): cmdline: use SPDX tags mbuf: use SPDX tags mempool: use SPDX tags kvargs: use SPDX tags net: use SPDX tags eal: use SPDX tags on 6WIND copyrighted files ethdev: use SPDX tags on 6WIND copyrighted files pci: use SPDX tags on 6WIND copyrighted files app/testpmd: use SPDX tags on 6WIND copyrighted files test: use SPDX tags on 6WIND copyrighted files net/mlx5: use SPDX tags on 6WIND copyrighted files net/mlx4: use SPDX tags on 6WIND copyrighted files bus/pci: use SPDX tags on 6WIND copyrighted files net/af_packet: use SPDX tags on 6WIND copyrighted files net/failsafe: use SPDX tags on 6WIND copyrighted files net/ixgbe: use SPDX tags on 6WIND copyrighted files net/tap: use SPDX tags on 6WIND copyrighted files app/test-pmd/cmdline.c | 35 ++--- app/test-pmd/cmdline_flow.c| 34 ++--- app/test-pmd/config.c | 35 ++--- app/test-pmd/csumonly.c| 35 ++--- app/test-pmd/icmpecho.c| 34 + drivers/bus/pci/pci_common.c | 35 ++--- drivers/bus/pci/private.h | 33 +--- drivers/bus/pci/rte_bus_pci.h | 35 ++--- drivers/net/af_packet/rte_eth_af_packet.c | 42 +++- drivers/net/failsafe/failsafe.c| 34 ++--- drivers/net/failsafe/failsafe_args.c | 34 ++--- drivers/net/failsafe/failsafe_eal.c| 34 ++--- drivers/net/failsafe/failsafe_ether.c | 34 ++--- drivers/net/failsafe/failsafe_flow.c | 34 ++--- drivers/net/failsafe/failsafe_ops.c| 34 ++--- drivers/net/failsafe/failsafe_private.h| 34 ++--- drivers/net/failsafe/failsafe_rxtx.c | 34 ++--- drivers/net/ixgbe/ixgbe_rxtx.c | 35 ++--- drivers/net/mlx4/mlx4.c| 34 ++--- drivers/net/mlx4/mlx4.h| 34 ++--- drivers/net/mlx4/mlx4_ethdev.c | 34 ++--- drivers/net/mlx4/mlx4_flow.c | 34 ++--- drivers/net/mlx4/mlx4_flow.h | 34 ++--- drivers/net/mlx4/mlx4_intr.c | 34 ++--- drivers/net/mlx4/mlx4_mr.c | 34 ++--- drivers/net/mlx4/mlx4_prm.h| 34 ++--- drivers/net/mlx4/mlx4_rxq.c| 34 ++--- drivers/net/mlx4/mlx4_rxtx.c | 34 ++--- drivers/net/mlx4/mlx4_rxtx.h | 34 ++--- drivers/net/mlx4/mlx4_txq.c| 34 ++--- drivers/net/mlx4/mlx4_utils.c | 34 ++--- drivers/net/mlx4/mlx4_utils.h | 34 ++--- drivers/net/mlx5/mlx5.c| 34 ++--- drivers/net/mlx5/mlx5.h| 34 ++--- drivers/net/mlx5/mlx5_defs.h | 34 ++--- drivers/net/mlx5/mlx5_ethdev.c | 34 ++--- drivers/net/mlx5/mlx5_flow.c | 34 ++--- drivers/net/mlx5/mlx5_mac.c| 34 ++--- drivers/net/mlx5/mlx5_mr.c | 36 ++ drivers/net/mlx5/mlx5_prm.h| 34 ++--- drivers/net/mlx5/mlx5_rss.c| 34 ++--- drivers/net/mlx5/mlx5_rxmode.c | 34 ++--- drivers/net/mlx5/mlx5_rxq.c| 34 ++--- drivers/net/mlx5/mlx5_rxtx.c | 34 ++--- drivers/net/mlx5/mlx5_rxtx.h | 34 ++--- drivers/net/mlx5/mlx5_rxtx_vec.c | 34 ++--- drivers/net/mlx5/mlx5_rxtx_vec.h | 34 ++--- drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 34 ++--- drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 34 ++--- drivers/net/mlx5/mlx5_socket.c | 33 ++-- drivers/net/mlx5/mlx5_sta
[dpdk-dev] [PATCH 02/17] mbuf: use SPDX tags
Signed-off-by: Olivier Matz --- lib/librte_mbuf/rte_mbuf.c | 35 +++ lib/librte_mbuf/rte_mbuf.h | 35 +++ lib/librte_mbuf/rte_mbuf_ptype.c | 33 ++--- lib/librte_mbuf/rte_mbuf_ptype.h | 35 +++ 4 files changed, 11 insertions(+), 127 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c index 937fd70ea..b928e1402 100644 --- a/lib/librte_mbuf/rte_mbuf.c +++ b/lib/librte_mbuf/rte_mbuf.c @@ -1,35 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * Copyright 2014 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation. + * Copyright 2014 6WIND S.A. */ #include diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 719d04dda..e133386a1 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -1,35 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * Copyright 2014 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation. + * Copyright 2014 6WIND S.A. */ #ifndef _RTE_MBUF_H_ diff --git a/lib/librte_mbuf/rte_mbuf_ptype.c b/lib/librte_mbuf/rte_mbuf_ptype.c index e0f2a92d1..1feefacc6 100644 --- a/lib/librte_mbuf/rte_mbuf_ptype.c +++ b/lib/librte_mbuf/rte_mbuf_ptype.c @@ -1,34 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright 2016 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are
[dpdk-dev] [PATCH 04/17] kvargs: use SPDX tags
Signed-off-by: Olivier Matz --- lib/librte_kvargs/rte_kvargs.c | 36 lib/librte_kvargs/rte_kvargs.h | 35 +++ 2 files changed, 7 insertions(+), 64 deletions(-) diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c index 854ac83f5..9662375e8 100644 --- a/lib/librte_kvargs/rte_kvargs.c +++ b/lib/librte_kvargs/rte_kvargs.c @@ -1,36 +1,8 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2013 Intel Corporation. All rights reserved. - * Copyright(c) 2014 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2013 Intel Corporation. + * Copyright(c) 2014 6WIND S.A. */ + #include #include diff --git a/lib/librte_kvargs/rte_kvargs.h b/lib/librte_kvargs/rte_kvargs.h index 5821c726a..51b8120b8 100644 --- a/lib/librte_kvargs/rte_kvargs.h +++ b/lib/librte_kvargs/rte_kvargs.h @@ -1,35 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2013 Intel Corporation. All rights reserved. - * Copyright(c) 2014 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2013 Intel Corporation. + * Copyright(c) 2014 6WIND S.A. */ #ifndef _RTE_KVARGS_H_ -- 2.11.0
[dpdk-dev] [PATCH 06/17] eal: use SPDX tags on 6WIND copyrighted files
Cc: Bruce Richardson Cc: Konstantin Ananyev Signed-off-by: Olivier Matz --- lib/librte_eal/bsdapp/eal/eal.c| 35 ++ lib/librte_eal/common/eal_common_dev.c | 35 ++ lib/librte_eal/common/eal_common_devargs.c | 32 ++-- lib/librte_eal/common/eal_common_options.c | 34 ++--- lib/librte_eal/common/eal_options.h| 32 ++-- .../common/include/arch/x86/rte_cycles.h | 35 ++ lib/librte_eal/common/include/generic/rte_cycles.h | 35 ++ lib/librte_eal/common/include/generic/rte_vect.h | 32 ++-- lib/librte_eal/common/include/rte_dev.h| 33 ++-- lib/librte_eal/common/include/rte_devargs.h| 32 ++-- lib/librte_eal/common/include/rte_vfio.h | 33 ++-- lib/librte_eal/linuxapp/eal/eal.c | 35 ++ lib/librte_eal/linuxapp/eal/eal_memory.c | 35 ++ lib/librte_eal/linuxapp/eal/eal_timer.c| 35 ++ 14 files changed, 36 insertions(+), 437 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index 04cbd81c5..947378cf1 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -1,35 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2016 Intel Corporation. All rights reserved. - * Copyright(c) 2014 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2016 Intel Corporation. + * Copyright(c) 2014 6WIND S.A. */ #include diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c index dda8f5835..c5856fadf 100644 --- a/lib/librte_eal/common/eal_common_dev.c +++ b/lib/librte_eal/common/eal_common_dev.c @@ -1,35 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * Copyright(c) 2014 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE
[dpdk-dev] [PATCH 05/17] net: use SPDX tags
Signed-off-by: Olivier Matz --- lib/librte_net/rte_arp.h | 31 ++- lib/librte_net/rte_esp.h | 32 ++-- lib/librte_net/rte_gre.h | 32 ++-- lib/librte_net/rte_net.c | 33 ++--- lib/librte_net/rte_net.h | 33 ++--- 5 files changed, 10 insertions(+), 151 deletions(-) diff --git a/lib/librte_net/rte_arp.h b/lib/librte_net/rte_arp.h index 457a39b15..0e956fd5d 100644 --- a/lib/librte_net/rte_arp.h +++ b/lib/librte_net/rte_arp.h @@ -1,32 +1,5 @@ -/* BSD LICENSE - * - * Copyright(c) 2013 6WIND. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of 6WIND S.A. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2013 6WIND S.A. */ #ifndef _RTE_ARP_H_ diff --git a/lib/librte_net/rte_esp.h b/lib/librte_net/rte_esp.h index 148c06e09..0fc99ac69 100644 --- a/lib/librte_net/rte_esp.h +++ b/lib/librte_net/rte_esp.h @@ -1,33 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright (c) 2016-2017, Mellanox Technologies. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2016-2017, Mellanox Technologies. */ #ifndef _RTE_ESP_H_ diff --git a/lib/librte_net/rte_gre.h b/lib/librte_net/rte_gre.h index 46568ff57..69499bb82 100644 --- a/lib/librte_net/rte_gre.h +++ b/lib/librte_net/rte_gre.h @@ -1,33 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright 2016 6WIND S.A. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions
[dpdk-dev] [PATCH 07/17] ethdev: use SPDX tags on 6WIND copyrighted files
Cc: Adrien Mazarguil Cc: Thomas Monjalon Signed-off-by: Olivier Matz --- lib/librte_ether/rte_flow.c| 34 +++--- lib/librte_ether/rte_flow.h| 34 +++--- lib/librte_ether/rte_flow_driver.h | 34 +++--- 3 files changed, 9 insertions(+), 93 deletions(-) diff --git a/lib/librte_ether/rte_flow.c b/lib/librte_ether/rte_flow.c index a86bfbd1a..38f2d27be 100644 --- a/lib/librte_ether/rte_flow.c +++ b/lib/librte_ether/rte_flow.c @@ -1,34 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright 2016 6WIND S.A. - * Copyright 2016 Mellanox. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of 6WIND S.A. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2016 6WIND S.A. + * Copyright 2016 Mellanox. */ #include diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h index 07ec217ca..13e420218 100644 --- a/lib/librte_ether/rte_flow.h +++ b/lib/librte_ether/rte_flow.h @@ -1,34 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright 2016 6WIND S.A. - * Copyright 2016 Mellanox. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of 6WIND S.A. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2016 6WIND S.A. + * Copyright 2016 Mellanox. */ #ifndef RTE_FLOW_H_ diff --git a/lib/librte_ether/rte_flow_driver.h b/lib/librte_ether/rte_flow_driver.h index 254d1cb26..7778c8e0f 100644 --- a/lib/librte_ether/rte_flow_driver.h +++ b/lib/librte_ether/rte_flow_driver.h @@ -1,34 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright 2016 6WIND S.A. - * Copyright 2016 Mellanox. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in bi
[dpdk-dev] [PATCH 08/17] pci: use SPDX tags on 6WIND copyrighted files
Cc: Gaetan Rivet Signed-off-by: Olivier Matz --- lib/librte_pci/rte_pci.c | 35 +++ lib/librte_pci/rte_pci.h | 35 +++ 2 files changed, 6 insertions(+), 64 deletions(-) diff --git a/lib/librte_pci/rte_pci.c b/lib/librte_pci/rte_pci.c index 0160fc1eb..1a6d74856 100644 --- a/lib/librte_pci/rte_pci.c +++ b/lib/librte_pci/rte_pci.c @@ -1,35 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * Copyright 2013-2014 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation. + * Copyright 2013-2014 6WIND S.A. */ #include diff --git a/lib/librte_pci/rte_pci.h b/lib/librte_pci/rte_pci.h index 4f2cd1875..eaa9d072c 100644 --- a/lib/librte_pci/rte_pci.h +++ b/lib/librte_pci/rte_pci.h @@ -1,35 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. - * Copyright 2013-2014 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2015 Intel Corporation. + * Copyright 2013-2014 6WIND S.A. */ #ifndef _RTE_PCI_H_ -- 2.11.0
[dpdk-dev] [PATCH 09/17] app/testpmd: use SPDX tags on 6WIND copyrighted files
Cc: Wenzhuo Lu Cc: Jingjing Wu Signed-off-by: Olivier Matz --- app/test-pmd/cmdline.c | 35 +++ app/test-pmd/cmdline_flow.c | 34 +++--- app/test-pmd/config.c | 35 +++ app/test-pmd/csumonly.c | 35 +++ app/test-pmd/icmpecho.c | 34 ++ 5 files changed, 14 insertions(+), 159 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 9f12c0fd2..accdfe1e8 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -1,35 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2016 Intel Corporation. All rights reserved. - * Copyright(c) 2014 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2016 Intel Corporation. + * Copyright(c) 2014 6WIND S.A. */ #include diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 561e0579a..a5cf84f79 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -1,34 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright 2016 6WIND S.A. - * Copyright 2016 Mellanox. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of 6WIND S.A. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2016 6WIND S.A. + * Copyright 2016 Mellanox. */ #include diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 957b82098..97b33f198 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1,35 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2016 Intel Corporation. All rights reserved. - * Copyright 2013-2014 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -
[dpdk-dev] [PATCH 12/17] net/mlx4: use SPDX tags on 6WIND copyrighted files
Cc: Adrien Mazarguil Signed-off-by: Olivier Matz --- drivers/net/mlx4/mlx4.c| 34 +++--- drivers/net/mlx4/mlx4.h| 34 +++--- drivers/net/mlx4/mlx4_ethdev.c | 34 +++--- drivers/net/mlx4/mlx4_flow.c | 34 +++--- drivers/net/mlx4/mlx4_flow.h | 34 +++--- drivers/net/mlx4/mlx4_intr.c | 34 +++--- drivers/net/mlx4/mlx4_mr.c | 34 +++--- drivers/net/mlx4/mlx4_prm.h| 34 +++--- drivers/net/mlx4/mlx4_rxq.c| 34 +++--- drivers/net/mlx4/mlx4_rxtx.c | 34 +++--- drivers/net/mlx4/mlx4_rxtx.h | 34 +++--- drivers/net/mlx4/mlx4_txq.c| 34 +++--- drivers/net/mlx4/mlx4_utils.c | 34 +++--- drivers/net/mlx4/mlx4_utils.h | 34 +++--- 14 files changed, 42 insertions(+), 434 deletions(-) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 2a721e7e2..7b42e3a2d 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -1,34 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright 2012 6WIND S.A. - * Copyright 2012 Mellanox - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of 6WIND S.A. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2012 6WIND S.A. + * Copyright 2012 Mellanox */ /** diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h index 30a544f9a..449166275 100644 --- a/drivers/net/mlx4/mlx4.h +++ b/drivers/net/mlx4/mlx4.h @@ -1,34 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright 2012 6WIND S.A. - * Copyright 2012 Mellanox - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of 6WIND S.A. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2012 6
[dpdk-dev] [PATCH 10/17] test: use SPDX tags on 6WIND copyrighted files
Signed-off-by: Olivier Matz --- test/test/commands.c | 35 +++ test/test/test_devargs.c | 32 ++-- test/test/test_eal_flags.c | 36 test/test/test_kvargs.c| 31 +-- 4 files changed, 10 insertions(+), 124 deletions(-) diff --git a/test/test/commands.c b/test/test/commands.c index b7f60680b..cf0b726bb 100644 --- a/test/test/commands.c +++ b/test/test/commands.c @@ -1,35 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * Copyright(c) 2014 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation. + * Copyright(c) 2014 6WIND S.A. */ #include diff --git a/test/test/test_devargs.c b/test/test/test_devargs.c index 18f54edc1..b8f3146f6 100644 --- a/test/test/test_devargs.c +++ b/test/test/test_devargs.c @@ -1,33 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright 2014 6WIND S.A. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of 6WIND S.A nor the names of its contributors - * may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2014 6WIND S.A. */ #include diff --git a/test/test/test_eal_flags.c b/test/test/test_eal_flags.c index 310109e6d..37c42efe8 100644 --- a/test/test/test_eal_flags.c +++ b/test/test/test_eal_flags.c @@ -1,36 +1,8 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * Copyright(c) 2014 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Re
[dpdk-dev] [PATCH 13/17] bus/pci: use SPDX tags on 6WIND copyrighted files
Signed-off-by: Olivier Matz --- drivers/bus/pci/pci_common.c | 35 +++ drivers/bus/pci/private.h | 33 ++--- drivers/bus/pci/rte_bus_pci.h | 35 +++ 3 files changed, 8 insertions(+), 95 deletions(-) diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index 104fdf904..2a00f365a 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -1,35 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * Copyright 2013-2014 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation. + * Copyright 2013-2014 6WIND S.A. */ #include diff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h index 2283f0938..88fa587e7 100644 --- a/drivers/bus/pci/private.h +++ b/drivers/bus/pci/private.h @@ -1,34 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2017 6WIND. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of 6WIND nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2017 6WIND S.A. */ #ifndef _PCI_PRIVATE_H_ diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h index d4a299641..357afb912 100644 --- a/drivers/bus/pci/rte_bus_pci.h +++ b/drivers/bus/pci/rte_bus_pci.h @@ -1,35 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. - * Copyright 2013-2014 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list
[dpdk-dev] [PATCH 11/17] net/mlx5: use SPDX tags on 6WIND copyrighted files
Cc: Adrien Mazarguil Cc: Nelio Laranjeiro Cc: Yongseok Koh Signed-off-by: Olivier Matz --- drivers/net/mlx5/mlx5.c | 34 +++-- drivers/net/mlx5/mlx5.h | 34 +++-- drivers/net/mlx5/mlx5_defs.h | 34 +++-- drivers/net/mlx5/mlx5_ethdev.c| 34 +++-- drivers/net/mlx5/mlx5_flow.c | 34 +++-- drivers/net/mlx5/mlx5_mac.c | 34 +++-- drivers/net/mlx5/mlx5_mr.c| 36 +++ drivers/net/mlx5/mlx5_prm.h | 34 +++-- drivers/net/mlx5/mlx5_rss.c | 34 +++-- drivers/net/mlx5/mlx5_rxmode.c| 34 +++-- drivers/net/mlx5/mlx5_rxq.c | 34 +++-- drivers/net/mlx5/mlx5_rxtx.c | 34 +++-- drivers/net/mlx5/mlx5_rxtx.h | 34 +++-- drivers/net/mlx5/mlx5_rxtx_vec.c | 34 +++-- drivers/net/mlx5/mlx5_rxtx_vec.h | 34 +++-- drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 34 +++-- drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 34 +++-- drivers/net/mlx5/mlx5_socket.c| 33 +++- drivers/net/mlx5/mlx5_stats.c | 34 +++-- drivers/net/mlx5/mlx5_trigger.c | 35 -- drivers/net/mlx5/mlx5_txq.c | 34 +++-- drivers/net/mlx5/mlx5_utils.h | 34 +++-- drivers/net/mlx5/mlx5_vlan.c | 34 +++-- 23 files changed, 70 insertions(+), 714 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 9d1de366b..db7b35b5c 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -1,34 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright 2015 6WIND S.A. - * Copyright 2015 Mellanox. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of 6WIND S.A. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2015 6WIND S.A. + * Copyright 2015 Mellanox. */ #include diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index eb0894fa5..a022f444a 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1,34 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright 2015 6WIND S.A. - * Copyright 2015 Mellanox. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of 6WIND S.A. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIG
[dpdk-dev] [PATCH 16/17] net/ixgbe: use SPDX tags on 6WIND copyrighted files
Cc: Wenzhuo Lu Cc: Konstantin Ananyev Signed-off-by: Olivier Matz --- drivers/net/ixgbe/ixgbe_rxtx.c | 35 +++ 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index eeff91b0d..6c582b4be 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -1,35 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2016 Intel Corporation. All rights reserved. - * Copyright 2014 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2016 Intel Corporation. + * Copyright 2014 6WIND S.A. */ #include -- 2.11.0
[dpdk-dev] [PATCH 14/17] net/af_packet: use SPDX tags on 6WIND copyrighted files
Cc: "John W. Linville" Signed-off-by: Olivier Matz --- drivers/net/af_packet/rte_eth_af_packet.c | 42 +-- 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index ac58ad6b2..57eccfd04 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -1,39 +1,9 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2014 John W. Linville - * - * Originally based upon librte_pmd_pcap code: - * - * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. - * Copyright(c) 2014 6WIND S.A. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2014 John W. Linville + * Originally based upon librte_pmd_pcap code: + * Copyright(c) 2010-2015 Intel Corporation. + * Copyright(c) 2014 6WIND S.A. + * All rights reserved. */ #include -- 2.11.0
[dpdk-dev] [PATCH 15/17] net/failsafe: use SPDX tags on 6WIND copyrighted files
Cc: Gaetan Rivet Signed-off-by: Olivier Matz --- drivers/net/failsafe/failsafe.c | 34 +++-- drivers/net/failsafe/failsafe_args.c| 34 +++-- drivers/net/failsafe/failsafe_eal.c | 34 +++-- drivers/net/failsafe/failsafe_ether.c | 34 +++-- drivers/net/failsafe/failsafe_flow.c| 34 +++-- drivers/net/failsafe/failsafe_ops.c | 34 +++-- drivers/net/failsafe/failsafe_private.h | 34 +++-- drivers/net/failsafe/failsafe_rxtx.c| 34 +++-- 8 files changed, 24 insertions(+), 248 deletions(-) diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c index cb274eb76..3e42d82fe 100644 --- a/drivers/net/failsafe/failsafe.c +++ b/drivers/net/failsafe/failsafe.c @@ -1,34 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright 2017 6WIND S.A. - * Copyright 2017 Mellanox. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of 6WIND S.A. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2017 6WIND S.A. + * Copyright 2017 Mellanox. */ #include diff --git a/drivers/net/failsafe/failsafe_args.c b/drivers/net/failsafe/failsafe_args.c index b049b7526..366dbea16 100644 --- a/drivers/net/failsafe/failsafe_args.c +++ b/drivers/net/failsafe/failsafe_args.c @@ -1,34 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright 2017 6WIND S.A. - * Copyright 2017 Mellanox. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of 6WIND S.A. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2017 6WIND S.A. + * Copyright 2017 Mellanox. */ #include diff --git a/drivers/net/failsafe/failsafe_eal.c b/drivers/net/failsafe/failsafe_eal.c index 33a5adfc8..3c262746c 100644 --- a/drivers/net/failsafe/failsafe_eal.c +++ b/drivers/net/failsafe/failsafe_eal.c @@ -1,34 +1,6 @@
[dpdk-dev] [PATCH 17/17] net/tap: use SPDX tags on 6WIND copyrighted files
Cc: Pascal Mazon Signed-off-by: Olivier Matz --- drivers/net/tap/rte_eth_tap.h | 34 +++--- drivers/net/tap/tap_flow.c| 34 +++--- drivers/net/tap/tap_flow.h| 34 +++--- drivers/net/tap/tap_netlink.c | 34 +++--- drivers/net/tap/tap_netlink.h | 34 +++--- drivers/net/tap/tap_tcmsgs.c | 34 +++--- drivers/net/tap/tap_tcmsgs.h | 34 +++--- 7 files changed, 21 insertions(+), 217 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h index d4f1e6c55..382575b36 100644 --- a/drivers/net/tap/rte_eth_tap.h +++ b/drivers/net/tap/rte_eth_tap.h @@ -1,34 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright 2017 6WIND S.A. - * Copyright 2017 Mellanox. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of 6WIND S.A. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2017 6WIND S.A. + * Copyright 2017 Mellanox. */ #ifndef _RTE_ETH_TAP_H_ diff --git a/drivers/net/tap/tap_flow.c b/drivers/net/tap/tap_flow.c index 6aa53a714..e1a15609e 100644 --- a/drivers/net/tap/tap_flow.c +++ b/drivers/net/tap/tap_flow.c @@ -1,34 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright 2017 6WIND S.A. - * Copyright 2017 Mellanox. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of 6WIND S.A. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2017 6WIND S.A. + * Copyright 2017 Mellanox. */ #include diff --git a/drivers/net/tap/tap_flow.h b/drivers/net/tap/tap_flow.h index daaf00b8b..ac6a952d3 100644 --- a/drivers/net/tap/tap_flow.h +++ b/drivers/net/tap/tap_flow.h @@ -1,34 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright 2017 6WIND S.A. - * Copyright 2017 Mellanox. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that
[dpdk-dev] [PATCH v2] examples/ip_pipeline: update copyright and license
This updates the Intel and Oliver Matz licenses on a file in examples to be the standard BSD-3-Clause license used for the rest of DPDK, bringing the files in compliance with the DPDK licensing policy. Signed-off-by: Lee Daly --- V2: Combined Intel and Olivier Matz license blocks --- --- examples/ip_pipeline/parser.c | 60 ++- 1 file changed, 2 insertions(+), 58 deletions(-) diff --git a/examples/ip_pipeline/parser.c b/examples/ip_pipeline/parser.c index 689e206..42d8d2a 100644 --- a/examples/ip_pipeline/parser.c +++ b/examples/ip_pipeline/parser.c @@ -1,63 +1,7 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2016 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * For my_ether_aton() function: - * +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2016 Intel Corporation. All rights reserved. * Copyright (c) 2009, Olivier MATZ * All rights reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the University of California, Berkeley nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* -- 2.7.4
[dpdk-dev] [PATCH 00/14] implement packed virtqueues
This is a basic implementation of packed virtqueues as specified in the Virtio 1.1 draft. A compiled version of the current draft is available at https://github.com/oasis-tcs/virtio-docs.git (or as .pdf at https://github.com/oasis-tcs/virtio-docs/blob/master/virtio-v1.1-packed-wd07.pdf It does not implement yet indirect descriptors and checksum offloading. VIRTIO_F_IN_ORER is not implemented, as well as support for mergeable buffers with packed queues. Patches for this will follow soon. A packed virtqueue is different from a split virtqueue in that it consists of only a single descriptor ring that replaces available and used ring, index and descriptor buffer. Each descriptor is readable and writable and has a flags field. These flags will mark if a descriptor is available or used. To detect new available descriptors even after the ring has wrapped, device and driver each have a single-bit wrap counter that is flipped from 0 to 1 and vice versa every time the last descriptor in the ring is used/made available. The idea behind this is to 1. improve performance by avoiding cache misses and 2. be easier for devices to implement. Regarding performance: with these patches I get 21.13 Mpps on my system as compared to 18.8 Mpps with the virtio 1.0 code. Packet size was 64 bytes, 0.05% acceptable loss. Test setup is described as in http://dpdk.org/doc/guides/howto/pvp_reference_benchmark.html Packet generator: MoonGen Intel(R) Xeon(R) CPU E5-2665 0 @ 2.40GHz Intel X710 NIC RHEL 7.4 Device under test: Intel(R) Xeon(R) CPU E5-2667 v4 @ 3.20GHz Intel X710 NIC RHEL 7.4 VM on DuT: RHEL7.4 I plan to do more performance test with bigger frame sizes. This patch series is based on a prototype implemented by Yuanhan Liu and Tiwei Bie. regards, Jens Freimann (10): net/virtio: vring init for packed queues net/virtio: don't call virtio_disable_intr() for packed queues net/virtio: add virtio 1.1 defines net/virtio: add packed virtqueue helpers net/virtio: don't dump split virtqueue data net/virtio: implement transmit path for packed queues vhost: add virtio 1.1 defines vhost: add helpers for packed virtqueues vhost: dequeue for packed queues vhost: packed queue enqueue path Yuanhan Liu (4): net/virtio-user: add option to use packed queues net/virtio: implement receive path for packed queues vhost: vring address setup for packed queues vhost: enable packed virtqueues drivers/net/virtio/Makefile | 1 + drivers/net/virtio/virtio_ethdev.c | 50 ++-- drivers/net/virtio/virtio_ethdev.h | 5 + drivers/net/virtio/virtio_pci.h | 8 + drivers/net/virtio/virtio_ring.h | 63 - drivers/net/virtio/virtio_rxtx.c | 141 +- drivers/net/virtio/virtio_rxtx_1.1.c | 161 drivers/net/virtio/virtio_user/virtio_user_dev.c | 12 +- drivers/net/virtio/virtio_user/virtio_user_dev.h | 3 +- drivers/net/virtio/virtio_user_ethdev.c | 15 +- drivers/net/virtio/virtqueue.c | 3 + drivers/net/virtio/virtqueue.h | 14 +- lib/librte_vhost/vhost.c | 5 + lib/librte_vhost/vhost.h | 7 +- lib/librte_vhost/vhost_user.c| 17 +- lib/librte_vhost/virtio-1.1.h| 63 + lib/librte_vhost/virtio_net.c| 321 ++- 17 files changed, 859 insertions(+), 30 deletions(-) create mode 100644 drivers/net/virtio/virtio_rxtx_1.1.c create mode 100644 lib/librte_vhost/virtio-1.1.h -- 2.14.3
[dpdk-dev] [PATCH 01/14] net/virtio: vring init for packed queues
Add and initialize descriptor data structures.
Signed-off-by: Jens Freimann
---
drivers/net/virtio/virtio_ethdev.c | 22 --
drivers/net/virtio/virtio_pci.h| 8
drivers/net/virtio/virtio_ring.h | 25 +++--
drivers/net/virtio/virtqueue.h | 10 ++
4 files changed, 53 insertions(+), 12 deletions(-)
diff --git a/drivers/net/virtio/virtio_ethdev.c
b/drivers/net/virtio/virtio_ethdev.c
index 65cb71fa6..825b6c303 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -310,19 +310,21 @@ virtio_init_vring(struct virtqueue *vq)
PMD_INIT_FUNC_TRACE();
- /*
-* Reinitialise since virtio port might have been stopped and restarted
-*/
memset(ring_mem, 0, vq->vq_ring_size);
- vring_init(vr, size, ring_mem, VIRTIO_PCI_VRING_ALIGN);
- vq->vq_used_cons_idx = 0;
- vq->vq_desc_head_idx = 0;
- vq->vq_avail_idx = 0;
- vq->vq_desc_tail_idx = (uint16_t)(vq->vq_nentries - 1);
+ vring_init(vq->hw, vr, size, ring_mem, VIRTIO_PCI_VRING_ALIGN);
+
vq->vq_free_cnt = vq->vq_nentries;
memset(vq->vq_descx, 0, sizeof(struct vq_desc_extra) * vq->vq_nentries);
+ vq->vq_used_cons_idx = 0;
+ vq->vq_avail_idx = 0;
+ if (vtpci_packed_queue(vq->hw)) {
+ vring_desc_init_1_1(vr, size);
+ } else {
+ vq->vq_desc_head_idx = 0;
+ vq->vq_desc_tail_idx = (uint16_t)(vq->vq_nentries - 1);
- vring_desc_init(vr->desc, size);
+ vring_desc_init(vr->desc, size);
+ }
/*
* Disable device(host) interrupting guest
@@ -397,7 +399,7 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t
vtpci_queue_idx)
/*
* Reserve a memzone for vring elements
*/
- size = vring_size(vq_size, VIRTIO_PCI_VRING_ALIGN);
+ size = vring_size(hw, vq_size, VIRTIO_PCI_VRING_ALIGN);
vq->vq_ring_size = RTE_ALIGN_CEIL(size, VIRTIO_PCI_VRING_ALIGN);
PMD_INIT_LOG(DEBUG, "vring_size: %d, rounded_vring_size: %d",
size, vq->vq_ring_size);
diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
index a28ba8339..307a116d2 100644
--- a/drivers/net/virtio/virtio_pci.h
+++ b/drivers/net/virtio/virtio_pci.h
@@ -112,6 +112,8 @@ struct virtnet_ctl;
#define VIRTIO_F_VERSION_1 32
#define VIRTIO_F_IOMMU_PLATFORM33
+#define VIRTIO_F_PACKED34
+#define VIRTIO_F_IN_ORDER 35
/*
* Some VirtIO feature bits (currently bits 28 through 31) are
@@ -304,6 +306,12 @@ vtpci_with_feature(struct virtio_hw *hw, uint64_t bit)
return (hw->guest_features & (1ULL << bit)) != 0;
}
+static inline int
+vtpci_packed_queue(struct virtio_hw *hw)
+{
+ return vtpci_with_feature(hw, VIRTIO_F_PACKED);
+}
+
/*
* Function declaration from virtio_pci.c
*/
diff --git a/drivers/net/virtio/virtio_ring.h b/drivers/net/virtio/virtio_ring.h
index 9e3c2a015..1cafef41b 100644
--- a/drivers/net/virtio/virtio_ring.h
+++ b/drivers/net/virtio/virtio_ring.h
@@ -9,6 +9,7 @@
#include
+
/* This marks a buffer as continuing via the next field. */
#define VRING_DESC_F_NEXT 1
/* This marks a buffer as write-only (otherwise read-only). */
@@ -54,11 +55,23 @@ struct vring_used {
struct vring_used_elem ring[0];
};
+/* For support of packed virtqueues in Virtio 1.1 the format of descriptors
+ * looks like this.
+ */
+struct vring_desc_1_1 {
+ uint64_t addr;
+ uint32_t len;
+ uint16_t index;
+ uint16_t flags;
+};
+
+
struct vring {
unsigned int num;
struct vring_desc *desc;
struct vring_avail *avail;
struct vring_used *used;
+ struct vring_desc_1_1 *desc_1_1;
};
/* The standard layout for the ring is a continuous chunk of memory which
@@ -95,10 +108,13 @@ struct vring {
#define vring_avail_event(vr) (*(uint16_t *)&(vr)->used->ring[(vr)->num])
static inline size_t
-vring_size(unsigned int num, unsigned long align)
+vring_size(struct virtio_hw *hw, unsigned int num, unsigned long align)
{
size_t size;
+ if (vtpci_packed_queue(hw))
+ return num * sizeof(struct vring_desc_1_1);
+
size = num * sizeof(struct vring_desc);
size += sizeof(struct vring_avail) + (num * sizeof(uint16_t));
size = RTE_ALIGN_CEIL(size, align);
@@ -108,10 +124,15 @@ vring_size(unsigned int num, unsigned long align)
}
static inline void
-vring_init(struct vring *vr, unsigned int num, uint8_t *p,
+vring_init(struct virtio_hw *hw, struct vring *vr, unsigned int num, uint8_t
*p,
unsigned long align)
{
vr->num = num;
+ if (vtpci_packed_queue(hw)) {
+ vr->desc_1_1 = (struct vring_desc_1_1 *)p;
+ return;
+ }
+
vr->desc = (struct vring_desc *) p;
vr->avail = (struct vring_avail *) (p +
[dpdk-dev] [PATCH 02/14] net/virtio: don't call virtio_disable_intr() for packed queues
When VIRTIO_F_PACKED_RING is set, don't call virtio_disable_intr(). This function accesses data structures which are not available when packed virtqueues are enabled. Signed-off-by: Jens Freimann --- drivers/net/virtio/virtio_ethdev.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 825b6c303..76879d87f 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -324,12 +324,11 @@ virtio_init_vring(struct virtqueue *vq) vq->vq_desc_tail_idx = (uint16_t)(vq->vq_nentries - 1); vring_desc_init(vr->desc, size); + /* +* Disable device(host) interrupting guest +*/ + virtqueue_disable_intr(vq); } - - /* -* Disable device(host) interrupting guest -*/ - virtqueue_disable_intr(vq); } static int @@ -747,7 +746,8 @@ virtio_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id) struct virtnet_rx *rxvq = dev->data->rx_queues[queue_id]; struct virtqueue *vq = rxvq->vq; - virtqueue_disable_intr(vq); + if (!vtpci_packed_queue(vq->hw)) + virtqueue_disable_intr(vq); return 0; } -- 2.14.3
[dpdk-dev] [PATCH 04/14] net/virtio: add packed virtqueue helpers
Add helper functions to set/clear and check descriptor flags.
Signed-off-by: Jens Freimann
---
drivers/net/virtio/virtio_ring.h | 32
drivers/net/virtio/virtqueue.c | 3 +++
2 files changed, 35 insertions(+)
diff --git a/drivers/net/virtio/virtio_ring.h b/drivers/net/virtio/virtio_ring.h
index 839359444..47df96aac 100644
--- a/drivers/net/virtio/virtio_ring.h
+++ b/drivers/net/virtio/virtio_ring.h
@@ -74,12 +74,44 @@ struct vring_desc_1_1 {
struct vring {
unsigned int num;
+ unsigned int avail_wrap_counter;
struct vring_desc *desc;
struct vring_avail *avail;
struct vring_used *used;
struct vring_desc_1_1 *desc_1_1;
};
+static inline void toggle_wrap_counter(struct vring *vr)
+{
+ vr->avail_wrap_counter ^= 1;
+}
+
+static inline void _set_desc_avail(struct vring_desc_1_1 *desc,
+ int wrap_counter)
+{
+ uint16_t flags = desc->flags;
+
+ if (wrap_counter) {
+ flags |= DESC_AVAIL;
+ flags &= ~DESC_USED;
+ } else {
+ flags &= ~DESC_AVAIL;
+ flags |= DESC_USED;
+ }
+
+ desc->flags = flags;
+}
+
+static inline void set_desc_avail(struct vring *vr, struct vring_desc_1_1
*desc)
+{
+ _set_desc_avail(desc, vr->avail_wrap_counter);
+}
+
+static inline int desc_is_used(struct vring_desc_1_1 *desc)
+{
+ return !(desc->flags & DESC_AVAIL) == !(desc->flags & DESC_USED);
+}
+
/* The standard layout for the ring is a continuous chunk of memory which
* looks like this. We assume num is a power of 2.
*
diff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c
index 1ada4fe08..052444756 100644
--- a/drivers/net/virtio/virtqueue.c
+++ b/drivers/net/virtio/virtqueue.c
@@ -43,6 +43,9 @@ virtqueue_rxvq_flush(struct virtqueue *vq)
uint16_t used_idx, desc_idx;
uint16_t nb_used, i;
+ if (vtpci_packed_queue(vq->hw))
+ return;
+
nb_used = VIRTQUEUE_NUSED(vq);
for (i = 0; i < nb_used; i++) {
--
2.14.3
[dpdk-dev] [PATCH 03/14] net/virtio: add virtio 1.1 defines
Signed-off-by: Jens Freimann --- drivers/net/virtio/virtio_ring.h | 6 ++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/virtio/virtio_ring.h b/drivers/net/virtio/virtio_ring.h index 1cafef41b..839359444 100644 --- a/drivers/net/virtio/virtio_ring.h +++ b/drivers/net/virtio/virtio_ring.h @@ -17,6 +17,12 @@ /* This means the buffer contains a list of buffer descriptors. */ #define VRING_DESC_F_INDIRECT 4 +#define VIRTQ_DESC_F_AVAIL 7 +#define VIRTQ_DESC_F_USED 15 +#define DESC_USED (1ULL << VIRTQ_DESC_F_USED) +#define DESC_AVAIL (1ULL << VIRTQ_DESC_F_AVAIL) + + /* The Host uses this in used->flags to advise the Guest: don't kick me * when you add a buffer. It's unreliable, so it's simply an * optimization. Guest will still kick if it's out of buffers. */ -- 2.14.3
[dpdk-dev] [PATCH 05/14] net/virtio: don't dump split virtqueue data
VIRTQUEUE_DUMP access split virtqueue data which is not
correct when packed virtqueues are used.
Signed-off-by: Jens Freimann
---
drivers/net/virtio/virtqueue.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
index 0cc9268a4..63ced5b6f 100644
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -348,7 +348,9 @@ virtqueue_notify(struct virtqueue *vq)
}
#ifdef RTE_LIBRTE_VIRTIO_DEBUG_DUMP
-#define VIRTQUEUE_DUMP(vq) do { \
+#define VIRTQUEUE_DUMP(vq) \
+ do { \
+ if (vtpci_packed_queue((vq)->hw)) break; \
uint16_t used_idx, nused; \
used_idx = (vq)->vq_ring.used->idx; \
nused = (uint16_t)(used_idx - (vq)->vq_used_cons_idx); \
--
2.14.3
[dpdk-dev] [PATCH 06/14] net/virtio-user: add option to use packed queues
From: Yuanhan Liu
Add option to enable packed queue support for virtio-user
devices.
Signed-off-by: Yuanhan Liu
---
drivers/net/virtio/virtio_user/virtio_user_dev.c | 12 ++--
drivers/net/virtio/virtio_user/virtio_user_dev.h | 3 ++-
drivers/net/virtio/virtio_user_ethdev.c | 15 ++-
3 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c
b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 7a70c1867..05e3f2c28 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -305,11 +305,13 @@ virtio_user_dev_setup(struct virtio_user_dev *dev)
1ULL << VIRTIO_NET_F_GUEST_CSUM| \
1ULL << VIRTIO_NET_F_GUEST_TSO4| \
1ULL << VIRTIO_NET_F_GUEST_TSO6| \
-1ULL << VIRTIO_F_VERSION_1)
+1ULL << VIRTIO_F_VERSION_1 | \
+1ULL << VIRTIO_F_PACKED)
int
virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
-int cq, int queue_size, const char *mac, char **ifname)
+int cq, int queue_size, const char *mac, char **ifname,
+int version_1_1)
{
snprintf(dev->path, PATH_MAX, "%s", path);
dev->max_queue_pairs = queues;
@@ -337,6 +339,12 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char
*path, int queues,
PMD_INIT_LOG(ERR, "get_features failed: %s", strerror(errno));
return -1;
}
+
+ if (version_1_1)
+ dev->device_features |= (1ull << VIRTIO_F_PACKED);
+ else
+ dev->device_features &= ~(1ull << VIRTIO_F_PACKED);
+
if (dev->mac_specified)
dev->device_features |= (1ull << VIRTIO_NET_F_MAC);
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h
b/drivers/net/virtio/virtio_user/virtio_user_dev.h
index 64467b4f9..ce1e1034c 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.h
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h
@@ -42,7 +42,8 @@ int is_vhost_user_by_type(const char *path);
int virtio_user_start_device(struct virtio_user_dev *dev);
int virtio_user_stop_device(struct virtio_user_dev *dev);
int virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
-int cq, int queue_size, const char *mac, char
**ifname);
+int cq, int queue_size, const char *mac, char **ifname,
+int version_1_1);
void virtio_user_dev_uninit(struct virtio_user_dev *dev);
void virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_idx);
#endif
diff --git a/drivers/net/virtio/virtio_user_ethdev.c
b/drivers/net/virtio/virtio_user_ethdev.c
index 452cdfc88..59d786434 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -274,6 +274,8 @@ static const char *valid_args[] = {
VIRTIO_USER_ARG_QUEUE_SIZE,
#define VIRTIO_USER_ARG_INTERFACE_NAME "iface"
VIRTIO_USER_ARG_INTERFACE_NAME,
+#define VIRTIO_USER_ARG_VERSION_1_1 "version_1_1"
+ VIRTIO_USER_ARG_VERSION_1_1,
NULL
};
@@ -378,6 +380,7 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
char *ifname = NULL;
char *mac_addr = NULL;
int ret = -1;
+ uint64_t version_1_1 = 0;
kvlist = rte_kvargs_parse(rte_vdev_device_args(dev), valid_args);
if (!kvlist) {
@@ -452,6 +455,15 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
cq = 1;
}
+ if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_VERSION_1_1) == 1) {
+ if (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_VERSION_1_1,
+ &get_integer_arg, &version_1_1) < 0) {
+ PMD_INIT_LOG(ERR, "error to parse %s",
+VIRTIO_USER_ARG_VERSION_1_1);
+ goto end;
+ }
+ }
+
if (queues > 1 && cq == 0) {
PMD_INIT_LOG(ERR, "multi-q requires ctrl-q");
goto end;
@@ -473,7 +485,8 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
hw = eth_dev->data->dev_private;
if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
-queue_size, mac_addr, &ifname) < 0) {
+queue_size, mac_addr, &ifname,
+version_1_1) < 0) {
PMD_INIT_LOG(ERR, "virtio_user_dev_init fails");
virtio_user_eth_dev_free(eth_dev);
goto end;
--
2.14.3
[dpdk-dev] [PATCH 07/14] net/virtio: implement transmit path for packed queues
This implements the transmit path for devices with
support for Virtio 1.1.
Add the feature bit for Virtio 1.1 and enable code to
add buffers to vring and mark descriptors as available.
This is based on a patch by Yuanhan Liu.
Signed-off-by: Jens Freiman
---
drivers/net/virtio/Makefile | 1 +
drivers/net/virtio/virtio_ethdev.c | 11 ++-
drivers/net/virtio/virtio_ethdev.h | 3 +
drivers/net/virtio/virtio_rxtx.c | 7 +-
drivers/net/virtio/virtio_rxtx_1.1.c | 161 +++
5 files changed, 180 insertions(+), 3 deletions(-)
create mode 100644 drivers/net/virtio/virtio_rxtx_1.1.c
diff --git a/drivers/net/virtio/Makefile b/drivers/net/virtio/Makefile
index b215ada97..482bb2c52 100644
--- a/drivers/net/virtio/Makefile
+++ b/drivers/net/virtio/Makefile
@@ -27,6 +27,7 @@ LIBABIVER := 1
SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtqueue.c
SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_pci.c
SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx.c
+SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_1.1.c
SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_ethdev.c
SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple.c
diff --git a/drivers/net/virtio/virtio_ethdev.c
b/drivers/net/virtio/virtio_ethdev.c
index 76879d87f..b30e0d4a9 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -394,6 +394,8 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t
vtpci_queue_idx)
vq->hw = hw;
vq->vq_queue_index = vtpci_queue_idx;
vq->vq_nentries = vq_size;
+ if (vtpci_packed_queue(hw))
+ vq->vq_ring.avail_wrap_counter = 1;
/*
* Reserve a memzone for vring elements
@@ -614,7 +616,8 @@ virtio_dev_close(struct rte_eth_dev *dev)
}
vtpci_reset(hw);
- virtio_dev_free_mbufs(dev);
+ if (!vtpci_packed_queue(hw))
+ virtio_dev_free_mbufs(dev);
virtio_free_queues(hw);
}
@@ -1371,7 +1374,11 @@ set_rxtx_funcs(struct rte_eth_dev *eth_dev)
eth_dev->rx_pkt_burst = &virtio_recv_pkts;
}
- if (hw->use_simple_tx) {
+ if (vtpci_packed_queue(hw)) {
+ PMD_INIT_LOG(INFO, "virtio: using virtio 1.1 Tx path on port
%u",
+ eth_dev->data->port_id);
+ eth_dev->tx_pkt_burst = virtio_xmit_pkts_1_1;
+ } else if (hw->use_simple_tx) {
PMD_INIT_LOG(INFO, "virtio: using simple Tx path on port %u",
eth_dev->data->port_id);
eth_dev->tx_pkt_burst = virtio_xmit_pkts_simple;
diff --git a/drivers/net/virtio/virtio_ethdev.h
b/drivers/net/virtio/virtio_ethdev.h
index 4539d2e44..0fee979cb 100644
--- a/drivers/net/virtio/virtio_ethdev.h
+++ b/drivers/net/virtio/virtio_ethdev.h
@@ -36,6 +36,7 @@
1ULL << VIRTIO_NET_F_GUEST_ANNOUNCE | \
1u << VIRTIO_RING_F_INDIRECT_DESC |\
1ULL << VIRTIO_F_VERSION_1 | \
+1ULL << VIRTIO_F_PACKED | \
1ULL << VIRTIO_F_IOMMU_PLATFORM)
#define VIRTIO_PMD_SUPPORTED_GUEST_FEATURES\
@@ -77,6 +78,8 @@ uint16_t virtio_recv_mergeable_pkts(void *rx_queue, struct
rte_mbuf **rx_pkts,
uint16_t virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts);
+uint16_t virtio_xmit_pkts_1_1(void *tx_queue, struct rte_mbuf **tx_pkts,
+ uint16_t nb_pkts);
uint16_t virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts);
diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 854af399e..39489e3f6 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -541,6 +541,10 @@ virtio_dev_tx_queue_setup_finish(struct rte_eth_dev *dev,
PMD_INIT_FUNC_TRACE();
+ if (vtpci_packed_queue(hw)) {
+ vq->vq_ring.avail_wrap_counter = 1;
+ }
+
if (hw->use_simple_tx) {
for (desc_idx = 0; desc_idx < mid_idx; desc_idx++) {
vq->vq_ring.avail->ring[desc_idx] =
@@ -561,7 +565,8 @@ virtio_dev_tx_queue_setup_finish(struct rte_eth_dev *dev,
vq->vq_ring.avail->ring[desc_idx] = desc_idx;
}
- VIRTQUEUE_DUMP(vq);
+ if (!vtpci_packed_queue(hw))
+ VIRTQUEUE_DUMP(vq);
return 0;
}
diff --git a/drivers/net/virtio/virtio_rxtx_1.1.c
b/drivers/net/virtio/virtio_rxtx_1.1.c
new file mode 100644
index 0..97a502212
--- /dev/null
+++ b/drivers/net/virtio/virtio_rxtx_1.1.c
@@ -0,0 +1,161 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *
[dpdk-dev] [PATCH 08/14] net/virtio: implement receive path for packed queues
From: Yuanhan Liu
Implement the receive part here. No support for mergeable buffers yet.
Signed-off-by: Jens Freimann
Signed-off-by: Yuanhan Liu
---
drivers/net/virtio/virtio_ethdev.c | 5 +-
drivers/net/virtio/virtio_ethdev.h | 2 +
drivers/net/virtio/virtio_rxtx.c | 134 +
3 files changed, 140 insertions(+), 1 deletion(-)
diff --git a/drivers/net/virtio/virtio_ethdev.c
b/drivers/net/virtio/virtio_ethdev.c
index b30e0d4a9..7a6dd1586 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1363,6 +1363,8 @@ set_rxtx_funcs(struct rte_eth_dev *eth_dev)
PMD_INIT_LOG(INFO, "virtio: using simple Rx path on port %u",
eth_dev->data->port_id);
eth_dev->rx_pkt_burst = virtio_recv_pkts_vec;
+ } else if (vtpci_packed_queue(hw)) {
+ eth_dev->rx_pkt_burst = &virtio_recv_pkts_1_1;
} else if (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF)) {
PMD_INIT_LOG(INFO,
"virtio: using mergeable buffer Rx path on port %u",
@@ -1513,7 +1515,8 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t
req_features)
/* Setting up rx_header size for the device */
if (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF) ||
- vtpci_with_feature(hw, VIRTIO_F_VERSION_1))
+ vtpci_with_feature(hw, VIRTIO_F_VERSION_1) ||
+ vtpci_with_feature(hw, VIRTIO_F_PACKED))
hw->vtnet_hdr_size = sizeof(struct virtio_net_hdr_mrg_rxbuf);
else
hw->vtnet_hdr_size = sizeof(struct virtio_net_hdr);
diff --git a/drivers/net/virtio/virtio_ethdev.h
b/drivers/net/virtio/virtio_ethdev.h
index 0fee979cb..c7d5228a2 100644
--- a/drivers/net/virtio/virtio_ethdev.h
+++ b/drivers/net/virtio/virtio_ethdev.h
@@ -72,6 +72,8 @@ int virtio_dev_tx_queue_setup_finish(struct rte_eth_dev *dev,
uint16_t virtio_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts);
+uint16_t virtio_recv_pkts_1_1(void *rx_queue, struct rte_mbuf **rx_pkts,
+ uint16_t nb_pkts);
uint16_t virtio_recv_mergeable_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts);
diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 39489e3f6..70d393412 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -30,6 +30,7 @@
#include "virtio_pci.h"
#include "virtqueue.h"
#include "virtio_rxtx.h"
+#include "virtio_ring.h"
#ifdef RTE_LIBRTE_VIRTIO_DEBUG_DUMP
#define VIRTIO_DUMP_PACKET(m, len) rte_pktmbuf_dump(stdout, m, len)
@@ -427,6 +428,34 @@ virtio_dev_rx_queue_setup_finish(struct rte_eth_dev *dev,
uint16_t queue_idx)
PMD_INIT_FUNC_TRACE();
+ if (vtpci_packed_queue(hw)) {
+ struct vring_desc_1_1 *desc;
+ struct vq_desc_extra *dxp;
+
+ for (desc_idx = 0; desc_idx < vq->vq_nentries;
+ desc_idx++) {
+ m = rte_mbuf_raw_alloc(rxvq->mpool);
+ if (unlikely(m == NULL))
+ return -ENOMEM;
+
+ dxp = &vq->vq_descx[desc_idx];
+ dxp->cookie = m;
+ dxp->ndescs = 1;
+
+ desc = &vq->vq_ring.desc_1_1[desc_idx];
+ desc->addr = VIRTIO_MBUF_ADDR(m, vq) +
+ RTE_PKTMBUF_HEADROOM - hw->vtnet_hdr_size;
+ desc->len = m->buf_len - RTE_PKTMBUF_HEADROOM +
+ hw->vtnet_hdr_size;
+ desc->flags |= VRING_DESC_F_WRITE;
+ rte_smp_wmb();
+ set_desc_avail(&vq->vq_ring, desc);
+ }
+ toggle_wrap_counter(&vq->vq_ring);
+
+ return 0;
+ }
+
/* Allocate blank mbufs for the each rx descriptor */
nbufs = 0;
@@ -698,6 +727,111 @@ rx_offload_enabled(struct virtio_hw *hw)
vtpci_with_feature(hw, VIRTIO_NET_F_GUEST_TSO6);
}
+uint16_t
+virtio_recv_pkts_1_1(void *rx_queue, struct rte_mbuf **rx_pkts,
+uint16_t nb_pkts)
+{
+ struct virtnet_rx *rxvq = rx_queue;
+ struct virtqueue *vq = rxvq->vq;
+ struct virtio_hw *hw = vq->hw;
+ struct rte_mbuf *rxm, *nmb;
+ uint16_t nb_rx;
+ uint32_t len;
+ uint32_t i;
+ uint32_t hdr_size;
+ int offload;
+ struct virtio_net_hdr *hdr;
+ struct vring_desc_1_1 *descs = vq->vq_ring.desc_1_1;
+ struct vring_desc_1_1 *desc;
+ uint16_t used_idx = vq->vq_used_cons_idx;
+ struct vq_desc_extra *dxp;
+
+ nb_rx = 0;
+ if (unlikely(hw->started == 0))
+ return nb_rx;
+
+ hdr_size = hw->vtnet_hdr_size;
+ offload = rx_offload_enabled(hw);
+
+ for (i = 0; i < nb_pkts; i++)
[dpdk-dev] [PATCH 09/14] vhost: add virtio 1.1 defines
This should actually be in the kernel header file, but it isn't
yet. For now let's use our own headers.
Signed-off-by: Jens Freimann
---
lib/librte_vhost/vhost.h | 4 +++-
lib/librte_vhost/virtio-1.1.h | 20
2 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 lib/librte_vhost/virtio-1.1.h
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index e52a9b69c..152e8bce1 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -167,7 +167,9 @@ struct vhost_msg {
#ifndef VIRTIO_F_VERSION_1
#define VIRTIO_F_VERSION_1 32
#endif
-
+#ifndef VIRTIO_F_PACKED
+ #define VIRTIO_F_PACKED 34
+#endif
#define VHOST_USER_F_PROTOCOL_FEATURES 30
/* Features supported by this builtin vhost-user net driver. */
diff --git a/lib/librte_vhost/virtio-1.1.h b/lib/librte_vhost/virtio-1.1.h
new file mode 100644
index 0..5ca0bc33f
--- /dev/null
+++ b/lib/librte_vhost/virtio-1.1.h
@@ -0,0 +1,20 @@
+#ifndef __VIRTIO_1_1_H
+#define __VIRTIO_1_1_H
+
+#define VRING_DESC_F_NEXT 1
+#define VRING_DESC_F_WRITE 2
+#define VRING_DESC_F_INDIRECT 4
+
+#define VIRTQ_DESC_F_AVAIL 7
+#define VIRTQ_DESC_F_USED 15
+#define DESC_USED (1ULL << VIRTQ_DESC_F_USED)
+#define DESC_AVAIL (1ULL << VIRTQ_DESC_F_AVAIL)
+
+struct vring_desc_1_1 {
+ uint64_t addr;
+ uint32_t len;
+ uint16_t index;
+ uint16_t flags;
+};
+
+#endif /* __VIRTIO_1_1_H */
--
2.14.3
[dpdk-dev] [PATCH 10/14] vhost: vring address setup for packed queues
From: Yuanhan Liu
Add code to set up packed queues when enabled.
Signed-off-by: Yuanhan Liu
Signed-off-by: Jens Freimann
---
lib/librte_vhost/vhost.c | 4
lib/librte_vhost/vhost.h | 1 +
lib/librte_vhost/vhost_user.c | 17 -
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index 1dd9adbc7..78913912c 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -536,6 +536,9 @@ rte_vhost_enable_guest_notification(int vid, uint16_t
queue_id, int enable)
{
struct virtio_net *dev = get_device(vid);
+ if (dev->features & (1ULL << VIRTIO_F_PACKED))
+ return 0;
+
if (dev == NULL)
return -1;
@@ -545,6 +548,7 @@ rte_vhost_enable_guest_notification(int vid, uint16_t
queue_id, int enable)
return -1;
}
+
dev->virtqueue[queue_id]->used->flags = VRING_USED_F_NO_NOTIFY;
return 0;
}
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 152e8bce1..8554d51d8 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -68,6 +68,7 @@ struct batch_copy_elem {
*/
struct vhost_virtqueue {
struct vring_desc *desc;
+ struct vring_desc_1_1 *desc_1_1;
struct vring_avail *avail;
struct vring_used *used;
uint32_tsize;
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 1dd1a61b6..979bffe1a 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -414,6 +414,19 @@ translate_ring_addresses(struct virtio_net *dev, int
vq_index)
struct vhost_virtqueue *vq = dev->virtqueue[vq_index];
struct vhost_vring_addr *addr = &vq->ring_addrs;
+ if (dev->features & (1ULL << VIRTIO_F_PACKED)) {
+ vq->desc_1_1 = (struct vring_desc_1_1 *) ring_addr_to_vva
+ (dev, vq, addr->desc_user_addr, sizeof(vq->desc_1_1));
+ vq->desc = NULL;
+ vq->avail = NULL;
+ vq->used = NULL;
+ vq->log_guest_addr = 0;
+
+ assert(vq->last_used_idx == 0);
+
+ return dev;
+ }
+
/* The addresses are converted from QEMU virtual to Vhost virtual. */
if (vq->desc && vq->avail && vq->used)
return dev;
@@ -426,6 +439,7 @@ translate_ring_addresses(struct virtio_net *dev, int
vq_index)
dev->vid);
return dev;
}
+ vq->desc_1_1 = NULL;
dev = numa_realloc(dev, vq_index);
vq = dev->virtqueue[vq_index];
@@ -763,7 +777,8 @@ vhost_user_set_mem_table(struct virtio_net *dev, struct
VhostUserMsg *pmsg)
static int
vq_is_ready(struct vhost_virtqueue *vq)
{
- return vq && vq->desc && vq->avail && vq->used &&
+ return vq &&
+ (vq->desc_1_1 || (vq->desc && vq->avail && vq->used)) &&
vq->kickfd != VIRTIO_UNINITIALIZED_EVENTFD &&
vq->callfd != VIRTIO_UNINITIALIZED_EVENTFD;
}
--
2.14.3
[dpdk-dev] [PATCH 12/14] vhost: dequeue for packed queues
Implement code to dequeue and process descriptors from
the vring if VIRTIO_F_PACKED is enabled.
Check if descriptor was made available by driver by looking at
VIRTIO_F_DESC_AVAIL flag in descriptor. If so dequeue and set
the used flag VIRTIO_F_DESC_USED to the current value of the
used wrap counter.
Used ring wrap counter needs to be toggled when last descriptor is
written out. This allows the host/guest to detect new descriptors even
after the ring has wrapped.
Signed-off-by: Jens Freimann
---
lib/librte_vhost/vhost.c | 1 +
lib/librte_vhost/vhost.h | 1 +
lib/librte_vhost/virtio_net.c | 194 ++
3 files changed, 196 insertions(+)
diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index 78913912c..e5f58d9c8 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -191,6 +191,7 @@ init_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
vq->kickfd = VIRTIO_UNINITIALIZED_EVENTFD;
vq->callfd = VIRTIO_UNINITIALIZED_EVENTFD;
+ vq->used_wrap_counter = 1;
vhost_user_iotlb_init(dev, vring_idx);
/* Backends are set to -1 indicating an inactive device. */
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 8554d51d8..a3d4214b6 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -106,6 +106,7 @@ struct vhost_virtqueue {
struct batch_copy_elem *batch_copy_elems;
uint16_tbatch_copy_nb_elems;
+ uint32_tused_wrap_counter;
rte_rwlock_tiotlb_lock;
rte_rwlock_tiotlb_pending_lock;
diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
index edfab3ba6..5d4cfe8cc 100644
--- a/lib/librte_vhost/virtio_net.c
+++ b/lib/librte_vhost/virtio_net.c
@@ -19,6 +19,7 @@
#include "iotlb.h"
#include "vhost.h"
+#include "virtio-1.1.h"
#define MAX_PKT_BURST 32
@@ -,6 +1112,199 @@ restore_mbuf(struct rte_mbuf *m)
}
}
+static inline uint16_t
+dequeue_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
+struct rte_mempool *mbuf_pool, struct rte_mbuf *m,
+struct vring_desc_1_1 *descs)
+{
+ struct vring_desc_1_1 *desc;
+ uint64_t desc_addr;
+ uint32_t desc_avail, desc_offset;
+ uint32_t mbuf_avail, mbuf_offset;
+ uint32_t cpy_len;
+ struct rte_mbuf *cur = m, *prev = m;
+ struct virtio_net_hdr *hdr = NULL;
+ uint16_t head_idx = vq->last_used_idx & (vq->size - 1);
+ int wrap_counter = vq->used_wrap_counter;
+
+ desc = &descs[vq->last_used_idx & (vq->size - 1)];
+ if (unlikely((desc->len < dev->vhost_hlen)) ||
+ (desc->flags & VRING_DESC_F_INDIRECT))
+ rte_panic("INDIRECT not supported yet");
+
+ desc_addr = rte_vhost_gpa_to_vva(dev->mem, desc->addr);
+ if (unlikely(!desc_addr))
+ return -1;
+
+ if (virtio_net_with_host_offload(dev)) {
+ hdr = (struct virtio_net_hdr *)((uintptr_t)desc_addr);
+ rte_prefetch0(hdr);
+ }
+
+ /*
+* A virtio driver normally uses at least 2 desc buffers
+* for Tx: the first for storing the header, and others
+* for storing the data.
+*/
+ if (likely((desc->len == dev->vhost_hlen) &&
+ (desc->flags & VRING_DESC_F_NEXT) != 0)) {
+ if ((++vq->last_used_idx & (vq->size - 1)) == 0)
+ toggle_wrap_counter(vq);
+
+ desc = &descs[vq->last_used_idx & (vq->size - 1)];
+
+ if (unlikely(desc->flags & VRING_DESC_F_INDIRECT))
+ rte_panic("INDIRECT not supported yet");
+
+ desc_addr = rte_vhost_gpa_to_vva(dev->mem, desc->addr);
+ if (unlikely(!desc_addr))
+ return -1;
+
+ desc_offset = 0;
+ desc_avail = desc->len;
+ } else {
+ desc_avail = desc->len - dev->vhost_hlen;
+ desc_offset = dev->vhost_hlen;
+ }
+
+ rte_prefetch0((void *)(uintptr_t)(desc_addr + desc_offset));
+
+ PRINT_PACKET(dev, (uintptr_t)(desc_addr + desc_offset), desc_avail, 0);
+
+ mbuf_offset = 0;
+ mbuf_avail = m->buf_len - RTE_PKTMBUF_HEADROOM;
+ while (1) {
+ uint64_t hpa;
+
+ cpy_len = RTE_MIN(desc_avail, mbuf_avail);
+
+ /*
+* A desc buf might across two host physical pages that are
+* not continuous. In such case (gpa_to_hpa returns 0), data
+* will be copied even though zero copy is enabled.
+*/
+ if (unlikely(dev->dequeue_zero_copy && (hpa = gpa_to_hpa(dev,
+ desc->addr + desc_offset, cpy_len {
+ cur->data_len = cpy_len;
+ cur->data_off = 0;
+ cur->buf_addr = (v
[dpdk-dev] [PATCH 13/14] vhost: packed queue enqueue path
Implement enqueue of packets to the receive virtqueue.
Set descriptor flag VIRTQ_DESC_F_USED and toggle used wrap counter if
last descriptor in ring is used. Perform a write memory barrier before
flags are written to descriptor.
Chained descriptors are not supported with this patch.
Signed-off-by: Jens Freimann
---
lib/librte_vhost/virtio_net.c | 120 ++
1 file changed, 120 insertions(+)
diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
index 5d4cfe8cc..c1b77fff5 100644
--- a/lib/librte_vhost/virtio_net.c
+++ b/lib/librte_vhost/virtio_net.c
@@ -695,6 +695,126 @@ virtio_dev_merge_rx(struct virtio_net *dev, uint16_t
queue_id,
return pkt_idx;
}
+static inline uint32_t __attribute__((always_inline))
+vhost_enqueue_burst_1_1(struct virtio_net *dev, uint16_t queue_id,
+ struct rte_mbuf **pkts, uint32_t count)
+{
+ struct vhost_virtqueue *vq;
+ struct vring_desc_1_1 *descs;
+ uint16_t idx;
+ uint16_t mask;
+ uint16_t i;
+
+ vq = dev->virtqueue[queue_id];
+
+ rte_spinlock_lock(&vq->access_lock);
+
+ if (unlikely(vq->enabled == 0)) {
+ i = 0;
+ goto out_access_unlock;
+ }
+
+ descs = vq->desc_1_1;
+ mask = vq->size - 1;
+
+ for (i = 0; i < count; i++) {
+ uint32_t desc_avail, desc_offset;
+ uint32_t mbuf_avail, mbuf_offset;
+ uint32_t cpy_len;
+ struct vring_desc_1_1 *desc;
+ uint64_t desc_addr;
+ struct virtio_net_hdr_mrg_rxbuf *hdr;
+ struct rte_mbuf *m = pkts[i];
+
+ /* XXX: there is an assumption that no desc will be chained */
+ idx = vq->last_used_idx & mask;
+ desc = &descs[idx];
+
+ if (!desc_is_avail(vq, desc))
+ break;
+ rte_smp_rmb();
+
+ desc_addr = rte_vhost_gpa_to_vva(dev->mem, desc->addr);
+ /*
+* Checking of 'desc_addr' placed outside of 'unlikely' macro
+* to avoid performance issue with some versions of gcc (4.8.4
+* and 5.3.0) which otherwise stores offset on the stack instead
+* of in a register.
+*/
+ if (unlikely(desc->len < dev->vhost_hlen) || !desc_addr)
+ break;
+
+ hdr = (struct virtio_net_hdr_mrg_rxbuf *)(uintptr_t)desc_addr;
+ virtio_enqueue_offload(m, &hdr->hdr);
+ vhost_log_write(dev, desc->addr, dev->vhost_hlen);
+ PRINT_PACKET(dev, (uintptr_t)desc_addr, dev->vhost_hlen, 0);
+
+ desc_offset = dev->vhost_hlen;
+ desc_avail = desc->len - dev->vhost_hlen;
+
+ mbuf_avail = rte_pktmbuf_data_len(m);
+ mbuf_offset = 0;
+ while (mbuf_avail != 0 || m->next != NULL) {
+ /* done with current mbuf, fetch next */
+ if (mbuf_avail == 0) {
+ m = m->next;
+
+ mbuf_offset = 0;
+ mbuf_avail = rte_pktmbuf_data_len(m);
+ }
+
+ /* done with current desc buf, fetch next */
+ if (desc_avail == 0) {
+ if ((desc->flags & VRING_DESC_F_NEXT) == 0) {
+ /* Room in vring buffer is not enough */
+ goto end_of_tx;
+ }
+
+ idx = (idx + 1);
+ desc = &descs[idx];
+ if (unlikely(!desc_is_avail(vq, desc)))
+ goto end_of_tx;
+
+ desc_addr = rte_vhost_gpa_to_vva(dev->mem,
+desc->addr);
+ if (unlikely(!desc_addr))
+ goto end_of_tx;
+
+ desc_offset = 0;
+ desc_avail = desc->len;
+ }
+
+ cpy_len = RTE_MIN(desc_avail, mbuf_avail);
+ rte_memcpy((void *)((uintptr_t)(desc_addr +
desc_offset)),
+ rte_pktmbuf_mtod_offset(m, void *, mbuf_offset),
+ cpy_len);
+ vhost_log_write(dev, desc->addr + desc_offset, cpy_len);
+ PRINT_PACKET(dev, (uintptr_t)(desc_addr + desc_offset),
+cpy_len, 0);
+
+ mbuf_avail -= cpy_len;
+ mbuf_offset += cpy_len;
+ desc_avail -= cpy_len;
+ desc_offset += cpy_len;
+ }
+
+
[dpdk-dev] [PATCH 11/14] vhost: add helpers for packed virtqueues
Add some helper functions to set/check descriptor flags
and toggle the used wrap counter.
Signed-off-by: Jens Freimann
---
lib/librte_vhost/virtio-1.1.h | 43 +++
1 file changed, 43 insertions(+)
diff --git a/lib/librte_vhost/virtio-1.1.h b/lib/librte_vhost/virtio-1.1.h
index 5ca0bc33f..84039797e 100644
--- a/lib/librte_vhost/virtio-1.1.h
+++ b/lib/librte_vhost/virtio-1.1.h
@@ -17,4 +17,47 @@ struct vring_desc_1_1 {
uint16_t flags;
};
+static inline void
+toggle_wrap_counter(struct vhost_virtqueue *vq)
+{
+ vq->used_wrap_counter ^= 1;
+}
+
+static inline int
+desc_is_avail(struct vhost_virtqueue *vq, struct vring_desc_1_1 *desc)
+{
+ if (!vq)
+ return -1;
+
+ if (vq->used_wrap_counter == 1)
+ if ((desc->flags & DESC_AVAIL) && !(desc->flags & DESC_USED))
+ return 1;
+ if (vq->used_wrap_counter == 0)
+ if (!(desc->flags & DESC_AVAIL) && (desc->flags & DESC_USED))
+ return 1;
+ return 0;
+}
+
+static inline void
+_set_desc_used(struct vring_desc_1_1 *desc, int wrap_counter)
+{
+ uint16_t flags = desc->flags;
+
+ if (wrap_counter == 1) {
+ flags |= DESC_USED;
+ flags |= DESC_AVAIL;
+ } else {
+ flags &= ~DESC_USED;
+ flags &= ~DESC_AVAIL;
+ }
+
+ desc->flags = flags;
+}
+
+static inline void
+set_desc_used(struct vhost_virtqueue *vq, struct vring_desc_1_1 *desc)
+{
+ _set_desc_used(desc, vq->used_wrap_counter);
+}
+
#endif /* __VIRTIO_1_1_H */
--
2.14.3
[dpdk-dev] [PATCH 14/14] vhost: enable packed virtqueues
From: Yuanhan Liu
This patch enables the code do enqueue and dequeue packed to/from a
packed virtqueue. Add feature bit for packed virtqueues as defined in
Virtio 1.1 draft.
Signed-off-by: Jens Freimann
Signed-off-by: Yuanhan Liu
---
lib/librte_vhost/vhost.h | 1 +
lib/librte_vhost/virtio_net.c | 7 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index a3d4214b6..fbde54f9a 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -181,6 +181,7 @@ struct vhost_msg {
(1ULL << VIRTIO_NET_F_GUEST_ANNOUNCE) | \
(1ULL << VIRTIO_NET_F_MQ) | \
(1ULL << VIRTIO_F_VERSION_1) | \
+ (1ULL << VIRTIO_F_PACKED) | \
(1ULL << VHOST_F_LOG_ALL) | \
(1ULL << VHOST_USER_F_PROTOCOL_FEATURES) | \
(1ULL << VIRTIO_NET_F_GSO) | \
diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
index c1b77fff5..309178b3e 100644
--- a/lib/librte_vhost/virtio_net.c
+++ b/lib/librte_vhost/virtio_net.c
@@ -824,7 +824,9 @@ rte_vhost_enqueue_burst(int vid, uint16_t queue_id,
if (!dev)
return 0;
- if (dev->features & (1 << VIRTIO_NET_F_MRG_RXBUF))
+ if (dev->features & (1ULL << VIRTIO_F_PACKED))
+ return vhost_enqueue_burst_1_1(dev, queue_id, pkts, count);
+ else if (dev->features & (1 << VIRTIO_NET_F_MRG_RXBUF))
return virtio_dev_merge_rx(dev, queue_id, pkts, count);
else
return virtio_dev_rx(dev, queue_id, pkts, count);
@@ -1456,6 +1458,9 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id,
if (unlikely(vq->enabled == 0))
goto out_access_unlock;
+ if (dev->features & (1ULL << VIRTIO_F_PACKED))
+ return vhost_dequeue_burst_1_1(dev, vq, mbuf_pool, pkts, count);
+
vq->batch_copy_nb_elems = 0;
if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))
--
2.14.3
[dpdk-dev] [PATCH] net/null: add set MAC address dev op
Needed if used with net/bonding
Signed-off-by: Radu Nicolau
---
drivers/net/null/rte_eth_null.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index 7cd5c71..511e2b7 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -456,6 +456,12 @@ eth_rss_hash_conf_get(struct rte_eth_dev *dev,
return 0;
}
+static void
+eth_mac_address_set(struct rte_eth_dev *dev, struct ether_addr *addr)
+{
+ memcpy(dev->data->mac_addrs, addr, sizeof(struct ether_addr));
+}
+
static const struct eth_dev_ops ops = {
.dev_start = eth_dev_start,
.dev_stop = eth_dev_stop,
@@ -466,6 +472,7 @@ static const struct eth_dev_ops ops = {
.rx_queue_release = eth_queue_release,
.tx_queue_release = eth_queue_release,
.link_update = eth_link_update,
+ .mac_addr_set = eth_mac_address_set,
.stats_get = eth_stats_get,
.stats_reset = eth_stats_reset,
.reta_update = eth_rss_reta_update,
--
2.7.5
[dpdk-dev] [PATCH] test/virtual_pmd: add set MAC address dev op
Needed if used with net/bonding
Signed-off-by: Radu Nicolau
---
test/test/virtual_pmd.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/test/test/virtual_pmd.c b/test/test/virtual_pmd.c
index 7a7adbb..2b5383a 100644
--- a/test/test/virtual_pmd.c
+++ b/test/test/virtual_pmd.c
@@ -216,6 +216,11 @@ static void
virtual_ethdev_promiscuous_mode_disable(struct rte_eth_dev *dev __rte_unused)
{}
+static void
+virtual_ethdev_mac_address_set(struct rte_eth_dev *dev, struct ether_addr
*addr)
+{
+ memcpy(dev->data->mac_addrs, addr, sizeof(struct ether_addr));
+}
static const struct eth_dev_ops virtual_ethdev_default_dev_ops = {
.dev_configure = virtual_ethdev_configure_success,
@@ -228,13 +233,13 @@ static const struct eth_dev_ops
virtual_ethdev_default_dev_ops = {
.rx_queue_release = virtual_ethdev_rx_queue_release,
.tx_queue_release = virtual_ethdev_tx_queue_release,
.link_update = virtual_ethdev_link_update_success,
+ .mac_addr_set = virtual_ethdev_mac_address_set,
.stats_get = virtual_ethdev_stats_get,
.stats_reset = virtual_ethdev_stats_reset,
.promiscuous_enable = virtual_ethdev_promiscuous_mode_enable,
.promiscuous_disable = virtual_ethdev_promiscuous_mode_disable
};
-
void
virtual_ethdev_start_fn_set_success(uint16_t port_id, uint8_t success)
{
--
2.7.5
Re: [dpdk-dev] [PATCH 09/14] vhost: add virtio 1.1 defines
On Mon, Jan 29, 2018 at 10:24:49PM +0800, Yuanhan Liu wrote:
On Mon, Jan 29, 2018 at 03:11:38PM +0100, Jens Freimann wrote:
This should actually be in the kernel header file, but it isn't
yet. For now let's use our own headers.
Signed-off-by: Jens Freimann
---
lib/librte_vhost/vhost.h | 4 +++-
lib/librte_vhost/virtio-1.1.h | 20
2 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 lib/librte_vhost/virtio-1.1.h
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index e52a9b69c..152e8bce1 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -167,7 +167,9 @@ struct vhost_msg {
#ifndef VIRTIO_F_VERSION_1
#define VIRTIO_F_VERSION_1 32
#endif
-
+#ifndef VIRTIO_F_PACKED
+ #define VIRTIO_F_PACKED 34
+#endif
#define VHOST_USER_F_PROTOCOL_FEATURES 30
/* Features supported by this builtin vhost-user net driver. */
diff --git a/lib/librte_vhost/virtio-1.1.h b/lib/librte_vhost/virtio-1.1.h
new file mode 100644
index 0..5ca0bc33f
--- /dev/null
+++ b/lib/librte_vhost/virtio-1.1.h
@@ -0,0 +1,20 @@
+#ifndef __VIRTIO_1_1_H
+#define __VIRTIO_1_1_H
+
+#define VRING_DESC_F_NEXT 1
+#define VRING_DESC_F_WRITE 2
+#define VRING_DESC_F_INDIRECT 4
+
+#define VIRTQ_DESC_F_AVAIL 7
+#define VIRTQ_DESC_F_USED 15
+#define DESC_USED (1ULL << VIRTQ_DESC_F_USED)
+#define DESC_AVAIL (1ULL << VIRTQ_DESC_F_AVAIL)
+
+struct vring_desc_1_1 {
Is it how it's named in the spec? If not, I'm wondering "vring_desc_packed"
might be a better name?
If so, we could rename others, like rename "_dequeue_1_1" to "_dequeue_packed".
I tried to name everything _packed, but obviously missed this one.
Will change it in the next version. Thanks!
regards,
Jens
[dpdk-dev] [PATCH] test/bonding: assign non-zero MAC to null devices
Signed-off-by: Radu Nicolau
---
test/test/test_link_bonding_rssconf.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/test/test/test_link_bonding_rssconf.c
b/test/test/test_link_bonding_rssconf.c
index cf9c4b0..518c4c1 100644
--- a/test/test/test_link_bonding_rssconf.c
+++ b/test/test/test_link_bonding_rssconf.c
@@ -505,6 +505,7 @@ test_setup(void)
int port_id;
char name[256];
struct slave_conf *port;
+ struct ether_addr mac_addr = {0};
if (test_params.mbuf_pool == NULL) {
@@ -536,6 +537,10 @@ test_setup(void)
TEST_ASSERT_SUCCESS(retval, "Failed to configure virtual ethdev
%s\n",
name);
+ /* assign a non-zero MAC */
+ mac_addr.addr_bytes[5] = 0x10 + port->port_id;
+ rte_eth_dev_default_mac_addr_set(port->port_id, &mac_addr);
+
rte_eth_dev_info_get(port->port_id, &port->dev_info);
}
--
2.7.5
[dpdk-dev] [PATCH] net/bonding: fix burst hash computation
Fixes: 09150784a776 ("net/bonding: burst mode hash calculation")
Cc: sta...@dpdk.org
Wrong function was used for l23 and l34 hashing
slave index was incremented twice.
Signed-off-by: Radu Nicolau
---
drivers/net/bonding/rte_eth_bond_api.c | 3 +++
drivers/net/bonding/rte_eth_bond_pmd.c | 8
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/net/bonding/rte_eth_bond_api.c
b/drivers/net/bonding/rte_eth_bond_api.c
index 03b73be..e69b199 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -665,12 +665,15 @@ rte_eth_bond_xmit_policy_set(uint16_t bonded_port_id,
uint8_t policy)
switch (policy) {
case BALANCE_XMIT_POLICY_LAYER2:
internals->balance_xmit_policy = policy;
+ internals->burst_xmit_hash = burst_xmit_l2_hash;
break;
case BALANCE_XMIT_POLICY_LAYER23:
internals->balance_xmit_policy = policy;
+ internals->burst_xmit_hash = burst_xmit_l23_hash;
break;
case BALANCE_XMIT_POLICY_LAYER34:
internals->balance_xmit_policy = policy;
+ internals->burst_xmit_hash = burst_xmit_l34_hash;
break;
default:
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c
b/drivers/net/bonding/rte_eth_bond_pmd.c
index a86bcaf..3e5f023 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -800,7 +800,7 @@ burst_xmit_l2_hash(struct rte_mbuf **buf, uint16_t nb_pkts,
hash = ether_hash(eth_hdr);
- slaves[i++] = (hash ^= hash >> 8) % slave_count;
+ slaves[i] = (hash ^= hash >> 8) % slave_count;
}
}
@@ -838,7 +838,7 @@ burst_xmit_l23_hash(struct rte_mbuf **buf, uint16_t nb_pkts,
hash ^= hash >> 16;
hash ^= hash >> 8;
- slaves[i++] = hash % slave_count;
+ slaves[i] = hash % slave_count;
}
}
@@ -907,7 +907,7 @@ burst_xmit_l34_hash(struct rte_mbuf **buf, uint16_t nb_pkts,
hash ^= hash >> 16;
hash ^= hash >> 8;
- slaves[i++] = hash % slave_count;
+ slaves[i] = hash % slave_count;
}
}
@@ -1229,7 +1229,7 @@ bond_ethdev_tx_burst_balance(void *queue, struct rte_mbuf
**bufs,
/* Number of mbufs for transmission on each slave */
uint16_t slave_nb_bufs[RTE_MAX_ETHPORTS] = { 0 };
/* Mapping array generated by hash function to map mbufs to slaves */
- uint16_t bufs_slave_port_idxs[RTE_MAX_ETHPORTS] = { 0 };
+ uint16_t bufs_slave_port_idxs[nb_bufs];
uint16_t slave_tx_count, slave_tx_fail_count[RTE_MAX_ETHPORTS] = { 0 };
uint16_t total_tx_count = 0, total_tx_fail_count = 0;
--
2.7.5
