[dpdk-dev] [PATCH v2 15/17] e1000: always log init messages
'init' messages should always be logged and filtered at runtime by rte_log.
All the more so as these messages are not in the datapath.
Signed-off-by: David Marchand
---
lib/librte_pmd_e1000/e1000_logs.h |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/librte_pmd_e1000/e1000_logs.h
b/lib/librte_pmd_e1000/e1000_logs.h
index 4dd7208..4a92804 100644
--- a/lib/librte_pmd_e1000/e1000_logs.h
+++ b/lib/librte_pmd_e1000/e1000_logs.h
@@ -34,12 +34,13 @@
#ifndef _E1000_LOGS_H_
#define _E1000_LOGS_H_
-#ifdef RTE_LIBRTE_E1000_DEBUG_INIT
#define PMD_INIT_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+ rte_log(RTE_LOG_ ## level, RTE_LOGTYPE_PMD, \
+ "PMD: %s(): " fmt "\n", __func__, ##args)
+
+#ifdef RTE_LIBRTE_E1000_DEBUG_INIT
#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
#else
-#define PMD_INIT_LOG(level, fmt, args...) do { } while (0)
#define PMD_INIT_FUNC_TRACE() do { } while (0)
#endif
--
1.7.10.4
[dpdk-dev] [PATCH v2 16/17] e1000: add a message when forcing scatter mode
Signed-off-by: David Marchand
---
lib/librte_pmd_e1000/em_rxtx.c |4
lib/librte_pmd_e1000/igb_rxtx.c | 14 ++
2 files changed, 18 insertions(+)
diff --git a/lib/librte_pmd_e1000/em_rxtx.c b/lib/librte_pmd_e1000/em_rxtx.c
index 83ecb33..a6cea32 100644
--- a/lib/librte_pmd_e1000/em_rxtx.c
+++ b/lib/librte_pmd_e1000/em_rxtx.c
@@ -1707,6 +1707,8 @@ eth_em_rx_init(struct rte_eth_dev *dev)
*/
if (dev->data->dev_conf.rxmode.jumbo_frame ||
rctl_bsize < ETHER_MAX_LEN) {
+ if (!dev->data->scattered_rx)
+ PMD_INIT_LOG(DEBUG, "forcing scatter mode\n");
dev->rx_pkt_burst =
(eth_rx_burst_t)eth_em_recv_scattered_pkts;
dev->data->scattered_rx = 1;
@@ -1714,6 +1716,8 @@ eth_em_rx_init(struct rte_eth_dev *dev)
}
if (dev->data->dev_conf.rxmode.enable_scatter) {
+ if (!dev->data->scattered_rx)
+ PMD_INIT_LOG(DEBUG, "forcing scatter mode\n");
dev->rx_pkt_burst = eth_em_recv_scattered_pkts;
dev->data->scattered_rx = 1;
}
diff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c
index 5ca06c9..1d8f74a 100644
--- a/lib/librte_pmd_e1000/igb_rxtx.c
+++ b/lib/librte_pmd_e1000/igb_rxtx.c
@@ -1978,6 +1978,9 @@ eth_igb_rx_init(struct rte_eth_dev *dev)
/* It adds dual VLAN length for supporting dual VLAN */
if ((dev->data->dev_conf.rxmode.max_rx_pkt_len +
2 * VLAN_TAG_SIZE) > buf_size){
+ if (!dev->data->scattered_rx)
+ PMD_INIT_LOG(DEBUG,
+"forcing scatter mode\n");
dev->rx_pkt_burst = eth_igb_recv_scattered_pkts;
dev->data->scattered_rx = 1;
}
@@ -1987,6 +1990,8 @@ eth_igb_rx_init(struct rte_eth_dev *dev)
*/
if ((rctl_bsize == 0) || (rctl_bsize > buf_size))
rctl_bsize = buf_size;
+ if (!dev->data->scattered_rx)
+ PMD_INIT_LOG(DEBUG, "forcing scatter mode\n");
dev->rx_pkt_burst = eth_igb_recv_scattered_pkts;
dev->data->scattered_rx = 1;
}
@@ -2008,6 +2013,8 @@ eth_igb_rx_init(struct rte_eth_dev *dev)
}
if (dev->data->dev_conf.rxmode.enable_scatter) {
+ if (!dev->data->scattered_rx)
+ PMD_INIT_LOG(DEBUG, "forcing scatter mode\n");
dev->rx_pkt_burst = eth_igb_recv_scattered_pkts;
dev->data->scattered_rx = 1;
}
@@ -2242,6 +2249,9 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev)
/* It adds dual VLAN length for supporting dual VLAN */
if ((dev->data->dev_conf.rxmode.max_rx_pkt_len +
2 * VLAN_TAG_SIZE) > buf_size){
+ if (!dev->data->scattered_rx)
+ PMD_INIT_LOG(DEBUG,
+"forcing scatter mode\n");
dev->rx_pkt_burst = eth_igb_recv_scattered_pkts;
dev->data->scattered_rx = 1;
}
@@ -2251,6 +2261,8 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev)
*/
if ((rctl_bsize == 0) || (rctl_bsize > buf_size))
rctl_bsize = buf_size;
+ if (!dev->data->scattered_rx)
+ PMD_INIT_LOG(DEBUG, "forcing scatter mode\n");
dev->rx_pkt_burst = eth_igb_recv_scattered_pkts;
dev->data->scattered_rx = 1;
}
@@ -2282,6 +2294,8 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev)
}
if (dev->data->dev_conf.rxmode.enable_scatter) {
+ if (!dev->data->scattered_rx)
+ PMD_INIT_LOG(DEBUG, "forcing scatter mode\n");
dev->rx_pkt_burst = eth_igb_recv_scattered_pkts;
dev->data->scattered_rx = 1;
}
--
1.7.10.4
[dpdk-dev] [PATCH v2 17/17] eal: set log level from command line
Add a --log-level option to set the default eal log level.
Signed-off-by: David Marchand
---
lib/librte_eal/bsdapp/eal/eal.c| 42 +++
.../bsdapp/eal/include/eal_internal_cfg.h |1 +
lib/librte_eal/linuxapp/eal/eal.c | 44 +++-
.../linuxapp/eal/include/eal_internal_cfg.h|1 +
4 files changed, 87 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index 71f93e0..2f84742 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -94,6 +94,7 @@
#define OPT_PCI_BLACKLIST "pci-blacklist"
#define OPT_VDEV"vdev"
#define OPT_SYSLOG "syslog"
+#define OPT_LOG_LEVEL "log-level"
#define MEMSIZE_IF_NO_HUGE_PAGE (64ULL * 1024ULL * 1024ULL)
@@ -293,6 +294,7 @@ eal_usage(const char *prgname)
" -v : Display version information on startup\n"
" -m MB: memory to allocate\n"
" -r NUM : force number of memory ranks (don't detect)\n"
+ " --"OPT_LOG_LEVEL" : set default log level\n"
" --"OPT_PROC_TYPE" : type of this process\n"
" --"OPT_PCI_BLACKLIST", -b: add a PCI device in black list.\n"
" Prevent EAL from using this PCI device. The
argument\n"
@@ -440,6 +442,28 @@ eal_parse_syslog(const char *facility)
return -1;
}
+static int
+eal_parse_log_level(const char *level, uint32_t *log_level)
+{
+ char *end;
+ unsigned long tmp;
+
+ errno = 0;
+ tmp = strtoul(level, &end, 0);
+
+ /* check for errors */
+ if ((errno != 0) || (level[0] == '\0') ||
+ end == NULL || (*end != '\0'))
+ return -1;
+
+ /* log_level is a uint32_t */
+ if (tmp >= UINT32_MAX)
+ return -1;
+
+ *log_level = tmp;
+ return 0;
+}
+
static inline size_t
eal_get_hugepage_mem_size(void)
{
@@ -494,6 +518,7 @@ eal_parse_args(int argc, char **argv)
{OPT_PCI_BLACKLIST, 1, 0, 0},
{OPT_VDEV, 1, 0, 0},
{OPT_SYSLOG, 1, NULL, 0},
+ {OPT_LOG_LEVEL, 1, NULL, 0},
{0, 0, 0, 0}
};
@@ -506,6 +531,8 @@ eal_parse_args(int argc, char **argv)
internal_config.hugepage_dir = NULL;
internal_config.force_sockets = 0;
internal_config.syslog_facility = LOG_DAEMON;
+ /* default value from build option */
+ internal_config.log_level = RTE_LOG_LEVEL;
#ifdef RTE_LIBEAL_USE_HPET
internal_config.no_hpet = 0;
#else
@@ -652,6 +679,18 @@ eal_parse_args(int argc, char **argv)
eal_usage(prgname);
return -1;
}
+ } else if (!strcmp(lgopts[option_index].name,
+OPT_LOG_LEVEL)) {
+ uint32_t log;
+
+ if (eal_parse_log_level(optarg, &log) < 0) {
+ RTE_LOG(ERR, EAL,
+ "invalid parameters for --"
+ OPT_LOG_LEVEL "\n");
+ eal_usage(prgname);
+ return -1;
+ }
+ internal_config.log_level = log;
}
break;
@@ -793,6 +832,9 @@ rte_eal_init(int argc, char **argv)
if (fctret < 0)
exit(1);
+ /* set log level as early as possible */
+ rte_set_log_level(internal_config.log_level);
+
if (internal_config.no_hugetlbfs == 0 &&
internal_config.process_type != RTE_PROC_SECONDARY &&
eal_hugepage_info_init() < 0)
diff --git a/lib/librte_eal/bsdapp/eal/include/eal_internal_cfg.h
b/lib/librte_eal/bsdapp/eal/include/eal_internal_cfg.h
index 2d06c7f..24cefc2 100644
--- a/lib/librte_eal/bsdapp/eal/include/eal_internal_cfg.h
+++ b/lib/librte_eal/bsdapp/eal/include/eal_internal_cfg.h
@@ -75,6 +75,7 @@ struct internal_config {
volatile uint64_t socket_mem[RTE_MAX_NUMA_NODES]; /**< amount of memory
per socket */
uintptr_t base_virtaddr; /**< base address to try and reserve
memory from */
volatile int syslog_facility; /**< facility passed to openlog() */
+ volatile uint32_t log_level; /**< default log level */
const char *hugefile_prefix; /**< the base filename of hugetlbfs
files */
const char *hugepage_dir; /**< specific hugetlbfs directory to
use */
diff --git a/lib/librte_eal/linuxapp/eal/eal.c
b/lib/librte_eal/linuxapp/eal/eal.c
index 4869e7c..38cace6 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
[dpdk-dev] [PATCH] testpmd: fix crash in txonly mode and when using tx_first
From: Adrien Mazarguil
This crash was believed fixed by commit
5886ae07d211e4b5e49806dd183812beb31c67ad,
but the actual issue is that the core ID provided to rte_lcore_to_socket_id() is
wrong. It must be looked up in fwd_lcores_cpuids[].
Signed-off-by: Adrien Mazarguil
Signed-off-by: David Marchand
---
app/test-pmd/testpmd.c |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index a112559..8f5f9ad 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -614,7 +614,9 @@ init_config(void)
* Records which Mbuf pool to use by each logical core, if needed.
*/
for (lc_id = 0; lc_id < nb_lcores; lc_id++) {
- mbp = mbuf_pool_find(rte_lcore_to_socket_id(lc_id));
+ mbp = mbuf_pool_find(
+ rte_lcore_to_socket_id(fwd_lcores_cpuids[lc_id]));
+
if (mbp == NULL)
mbp = mbuf_pool_find(0);
fwd_lcores[lc_id]->mbp = mbp;
--
1.7.10.4
[dpdk-dev] [PATCH] testpmd: fix crash in txonly mode and when using tx_first
2014-09-01 12:31, David Marchand: > From: Adrien Mazarguil > > This crash was believed fixed by commit > 5886ae07d211e4b5e49806dd183812beb31c67ad, > but the actual issue is that the core ID provided to rte_lcore_to_socket_id() > is > wrong. It must be looked up in fwd_lcores_cpuids[]. > > Signed-off-by: Adrien Mazarguil > Signed-off-by: David Marchand Applied for version 1.7.1. Thanks -- Thomas
[dpdk-dev] [PATCHv4] librte_acl make it build/work for 'default' target
2014-08-29 17:58, Ananyev, Konstantin: > Good way to overcome the problem. > From what I am seeing it adds a tiny slowdown (as expected) ... > Though it provides a good flexibility and I don't have any better ideas. > So I'd say let stick with that approach. Nice work guys. I'd like to have this patch for release 1.7.1 which must be tagged tomorrow (Spetember, 2nd). Do you think it's possible to have a final version of this patch? Thanks -- Thomas
[dpdk-dev] [PATCH 1/2] igb_uio: fix compability on old kernel
Hi Robert, 2014-08-26 11:08, Sanford, Robert: > >> This is what we came up with. It works for us. In our kernel headers' > >> linux/pci.h, pci_num_vf is enclosed within "#ifdef > >>CONFIG_PCI_IOV/#endif"; > >> pci_intx_mask_supported and pci_check_and_mask_intx are enclosed within > >> "#ifdef HAVE_PCI_SET_MWI/#endif". > >> > >> What do you think? > > > >Maybe we can just get rid of kernel version checks all together and > >just use the HAVE_ checks. > > > >I will test on stock 2.6.32. > > Sorry, I spoke too soon. Although it builds with the ifdefs, I just found > that it does not load. > "kernel: igb_uio: Unknown symbol irq_to_desc" Do you have some progress on this side? Release 1.7.1 should be closed tomorrow and your help would be greatly appreciated. Thanks -- Thomas
[dpdk-dev] [PATCH 1/2] igb_uio: fix compability on old kernel
On 07/25/2014 07:36 PM, Stephen Hemminger wrote:
> Add more compatibility wrappers, and split out all the wrapper
> code to a separate file. Builds on Debian Squeeze (2.6.32) which
> is oldest version of kernel current DPDK supports.
>
> Signed-off-by: Stephen Hemminger
>
> ---
> lib/librte_eal/linuxapp/igb_uio/compat.h | 103
> ++
> lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 81 ---
> 2 files changed, 104 insertions(+), 80 deletions(-)
>
> --- /dev/null 1970-01-01 00:00:00.0 +
> +++ b/lib/librte_eal/linuxapp/igb_uio/compat.h2014-07-25
> 10:29:58.664127988 -0700
> @@ -0,0 +1,103 @@
> +/*
> + * Minimal wrappers to allow compiling igb_uio on older kernels.
> + */
> +
> +
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
> +#define pci_cfg_access_lock pci_block_user_cfg_access
> +#define pci_cfg_access_unlock pci_unblock_user_cfg_access
> +#endif
> +
> +#ifndef PCI_MSIX_ENTRY_SIZE
> +#define PCI_MSIX_ENTRY_SIZE 16
> +#define PCI_MSIX_ENTRY_LOWER_ADDR 0
> +#define PCI_MSIX_ENTRY_UPPER_ADDR 4
> +#define PCI_MSIX_ENTRY_DATA8
> +#define PCI_MSIX_ENTRY_VECTOR_CTRL 12
> +#define PCI_MSIX_ENTRY_CTRL_MASKBIT 1
> +#endif
> +
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34)
> +static int pci_num_vf(struct pci_dev *dev)
> +{
> + struct iov {
> + int pos;
> + int nres;
> + u32 cap;
> + u16 ctrl;
> + u16 total;
> + u16 initial;
> + u16 nr_virtfn;
> + } *iov = (struct iov *)dev->sriov;
> +
> + if (!dev->is_physfn)
> + return 0;
> +
> + return iov->nr_virtfn;
> +}
> +#endif
> +
> +
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
> +
> +/* Check if INTX works to control irq's.
> + * Set's INTX_DISABLE flag and reads it back
> + */
> +static bool pci_intx_mask_supported(struct pci_dev *pdev)
> +{
> + bool mask_supported = false;
> + uint16_t orig, new;
> +
> + pci_block_user_cfg_access(pdev);
> + pci_read_config_word(pdev, PCI_COMMAND, &orig);
> + pci_write_config_word(pdev, PCI_COMMAND,
> + orig ^ PCI_COMMAND_INTX_DISABLE);
> + pci_read_config_word(pdev, PCI_COMMAND, &new);
> +
> + if ((new ^ orig) & ~PCI_COMMAND_INTX_DISABLE) {
> + dev_err(&pdev->dev, "Command register changed from "
> + "0x%x to 0x%x: driver or hardware bug?\n", orig, new);
> + } else if ((new ^ orig) & PCI_COMMAND_INTX_DISABLE) {
> + mask_supported = true;
> + pci_write_config_word(pdev, PCI_COMMAND, orig);
> + }
> + pci_unblock_user_cfg_access(pdev);
> +
> + return mask_supported;
> +}
> +
> +static bool pci_check_and_mask_intx(struct pci_dev *pdev)
> +{
> + bool pending;
> + uint32_t status;
> +
> + pci_block_user_cfg_access(pdev);
> + pci_read_config_dword(pdev, PCI_COMMAND, &status);
> +
> + /* interrupt is not ours, goes to out */
> + pending = (((status >> 16) & PCI_STATUS_INTERRUPT) != 0);
> + if (pending) {
> + uint16_t old, new;
> +
> + old = status;
> + if (status != 0)
> + new = old & (~PCI_COMMAND_INTX_DISABLE);
> + else
> + new = old | PCI_COMMAND_INTX_DISABLE;
> +
> + if (old != new)
> + pci_write_config_word(pdev, PCI_COMMAND, new);
> + }
> + pci_unblock_user_cfg_access(pdev);
> +
> + return pending;
> +}
> +#endif
> +
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37)
> +/* Compatability wrapper for new kernel API for IRQ */
> +#define irq_data irq_desc
> +#define irq_get_irq_data(irq)irq_to_desc(irq)
> +#define irq_data_get_msi(data) get_irq_desc_msi(data)
> +#endif
> +
irq_to_desc is not exported to modules before kernel 3.4 and commit
3911ff30.
On Red Hat 6.5 the module fails to load due to an unknow symbol error.
I've seen
another post saying that it also fails to insert on kernel 2.6.34. I
guess it should not work
either on debian squeeze (kernel 2.6.32), did you compile it in built-in?
For now, I don't see how we could fix it, since it is not exported we
are not allowed to use it in a kernel
module. Do you have a way to fix this issue?
Thanks,
Guillaume
> --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c 2014-07-25
> 10:29:58.668128002 -0700
> +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c 2014-07-25
> 10:29:58.664127988 -0700
> @@ -37,10 +37,7 @@
> #endif
> #include
>
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
> -#define pci_cfg_access_lock pci_block_user_cfg_access
> -#define pci_cfg_access_unlock pci_unblock_user_cfg_access
> -#endif
> +#include "compat.h"
>
> #ifdef RTE_PCI_CONFIG
> #define PCI_SYS_FILE_BUF_SIZE 10
> @@ -70,26 +67,6 @@ igbuio_get_uio_pci_dev(struct uio_info *
> }
>
> /* sriov sysfs */
> -#if LINUX_VERSION_CODE <
[dpdk-dev] [PATCH 1/2] igb_uio: fix compability on old kernel
On 08/22/2014 08:09 PM, Robert Sanford wrote:
> This is what we came up with. It works for us. In our kernel headers'
> linux/pci.h, pci_num_vf is enclosed within "#ifdef CONFIG_PCI_IOV/#endif";
> pci_intx_mask_supported and pci_check_and_mask_intx are enclosed within
> "#ifdef HAVE_PCI_SET_MWI/#endif".
Testing on HAVE_PCI_SET_MWI seems not correct. It is defined since linux
2.6.12.
There is no define associated with the commit that adds
pci_intx_mask_supported and
pci_check_and_mask_intx.
So I think we'll have to check the distribution, something like:
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && \
+ (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE ==
RHEL_RELEASE_VERSION(6,5)))
What do you think?
--
Best regards,
Guillaume
>
> What do you think?
>
> --
> Thanks,
> Robert
>
>
> ---
> lib/librte_eal/linuxapp/igb_uio/compat.h |4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_eal/linuxapp/igb_uio/compat.h
> b/lib/librte_eal/linuxapp/igb_uio/compat.h
> index 2a16540..f7404d8 100644
> --- a/lib/librte_eal/linuxapp/igb_uio/compat.h
> +++ b/lib/librte_eal/linuxapp/igb_uio/compat.h
> @@ -17,7 +17,7 @@
> #define PCI_MSIX_ENTRY_CTRL_MASKBIT 1
> #endif
>
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34)
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) &&
> !defined(CONFIG_PCI_IOV)
> static int pci_num_vf(struct pci_dev *dev)
> {
> struct iov {
> @@ -38,7 +38,7 @@ static int pci_num_vf(struct pci_dev *dev)
> #endif
>
>
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) &&
> !defined(HAVE_PCI_SET_MWI)
>
> /* Check if INTX works to control irq's.
>* Set's INTX_DISABLE flag and reads it back
[dpdk-dev] [PATCHv5] librte_acl make it build/work for 'default' target
Make ACL library to build/work on 'default' architecture:
- make rte_acl_classify_scalar really scalar
(make sure it wouldn't use sse4 instrincts through resolve_priority()).
- Provide two versions of rte_acl_classify code path:
rte_acl_classify_sse() - could be build and used only on systems with sse4.2
and upper, return -ENOTSUP on lower arch.
rte_acl_classify_scalar() - a slower version, but could be build and used
on all systems.
- keep common code shared between these two codepaths.
v2 chages:
run-time selection of most appropriate code-path for given ISA.
By default the highest supprted one is selected.
User can still override that selection by manually assigning new value to
the global function pointer rte_acl_default_classify.
rte_acl_classify() becomes a macro calling whatever rte_acl_default_classify
points to.
V3 Changes
Updated classify pointer to be a function so as to better preserve ABI
REmoved macro definitions for match check functions to make them static inline
V4 Changes
Rewrote classification selection mechanim to use a function table, so that we
can just store the preferred alg in the rte_acl_ctx struct so that multiprocess
access works. I understand that leaves us with an extra load instruction, but I
think thats ok, because it also allows...
Addition of a new function rte_acl_classify_alg. This function lets you
specify an enum value to override the acl contexts default algorith when doing a
classification. This allows an application to specify a classification
algorithm without needing to pulicize each method. I know there was concern
over keeping those methods public, but we don't have a static ABI at the moment,
so this seems to me a reasonable thing to do, as it gives us less of an ABI
surface to worry about.
Fixed misc missed static declarations
Removed acl_match_check.h and moved match_check function to acl_run.h
typdeffed function pointer to match check.
V5 Changes
Updated examples/l3fwd-acl to comply with latest changes.
Applied other code review comments (mostly style changes).
Signed-off-by: Konstantin Ananyev
---
app/test-acl/main.c | 20 +-
app/test/test_acl.c | 19 +-
examples/l3fwd-acl/main.c | 22 +-
lib/librte_acl/Makefile | 5 +-
lib/librte_acl/acl.h| 15 +
lib/librte_acl/acl_bld.c| 5 +-
lib/librte_acl/acl_run.c| 944
lib/librte_acl/acl_run.h| 268
lib/librte_acl/acl_run_scalar.c | 193
lib/librte_acl/acl_run_sse.c| 626 ++
lib/librte_acl/rte_acl.c| 55 +++
lib/librte_acl/rte_acl.h| 56 ++-
12 files changed, 1239 insertions(+), 989 deletions(-)
delete mode 100644 lib/librte_acl/acl_run.c
create mode 100644 lib/librte_acl/acl_run.h
create mode 100644 lib/librte_acl/acl_run_scalar.c
create mode 100644 lib/librte_acl/acl_run_sse.c
diff --git a/app/test-acl/main.c b/app/test-acl/main.c
index d654409..44add10 100644
--- a/app/test-acl/main.c
+++ b/app/test-acl/main.c
@@ -772,6 +772,15 @@ acx_init(void)
if (config.acx == NULL)
rte_exit(rte_errno, "failed to create ACL context\n");
+ /* set default classify method to scalar for this context. */
+ if (config.scalar) {
+ ret = rte_acl_set_ctx_classify(config.acx,
+ RTE_ACL_CLASSIFY_SCALAR);
+ if (ret != 0)
+ rte_exit(ret, "failed to setup classify method "
+ "for ACL context\n");
+ }
+
/* add ACL rules. */
f = fopen(config.rule_file, "r");
if (f == NULL)
@@ -780,7 +789,7 @@ acx_init(void)
ret = add_cb_rules(f, config.acx);
if (ret != 0)
- rte_exit(rte_errno, "failed to add rules into ACL context\n");
+ rte_exit(ret, "failed to add rules into ACL context\n");
fclose(f);
@@ -815,13 +824,8 @@ search_ip5tuples_once(uint32_t categories, uint32_t step,
int scalar)
v += config.trace_sz;
}
- if (scalar != 0)
- ret = rte_acl_classify_scalar(config.acx, data,
- results, n, categories);
-
- else
- ret = rte_acl_classify(config.acx, data,
- results, n, categories);
+ ret = rte_acl_classify(config.acx, data, results,
+ n, categories);
if (ret != 0)
rte_exit(ret, "classify for ipv%c_5tuples returns %d\n",
diff --git a/app/test/test_acl.c b/app/test/test_acl.c
index c6b3f86..356d620 100644
--- a/app/test/test_acl.c
+++ b/app/test/test_acl.c
@@ -146,8 +146,9 @@ test_classify_run(struct rte_acl_ctx *acx)
}
/* make a quick check for scalar */
- ret = rte_acl_classify_scalar(acx, data, results,
- RTE_DIM(
[dpdk-dev] [PATCH v2 2/6] bond: removing switch statement from rx burst method
Signed-off-by: Declan Doherty
---
lib/librte_pmd_bond/rte_eth_bond_pmd.c | 62 ++--
1 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/lib/librte_pmd_bond/rte_eth_bond_pmd.c
b/lib/librte_pmd_bond/rte_eth_bond_pmd.c
index cd3eecf..683b146 100644
--- a/lib/librte_pmd_bond/rte_eth_bond_pmd.c
+++ b/lib/librte_pmd_bond/rte_eth_bond_pmd.c
@@ -59,33 +59,37 @@ bond_ethdev_rx_burst(void *queue, struct rte_mbuf **bufs,
uint16_t nb_pkts)
internals = bd_rx_q->dev_private;
- switch (internals->mode) {
- case BONDING_MODE_ROUND_ROBIN:
- case BONDING_MODE_BROADCAST:
- case BONDING_MODE_BALANCE:
- for (i = 0; i < internals->active_slave_count && nb_pkts; i++) {
- /* Offset of pointer to *bufs increases as packets are
received
-* from other slaves */
- num_rx_slave =
rte_eth_rx_burst(internals->active_slaves[i],
- bd_rx_q->queue_id, bufs + num_rx_total,
nb_pkts);
- if (num_rx_slave) {
- num_rx_total += num_rx_slave;
- nb_pkts -= num_rx_slave;
- }
+ for (i = 0; i < internals->active_slave_count && nb_pkts; i++) {
+ /* Offset of pointer to *bufs increases as packets are received
+* from other slaves */
+ num_rx_slave = rte_eth_rx_burst(internals->active_slaves[i],
+ bd_rx_q->queue_id, bufs + num_rx_total,
nb_pkts);
+ if (num_rx_slave) {
+ num_rx_total += num_rx_slave;
+ nb_pkts -= num_rx_slave;
}
- break;
- case BONDING_MODE_ACTIVE_BACKUP:
- num_rx_slave = rte_eth_rx_burst(internals->current_primary_port,
- bd_rx_q->queue_id, bufs, nb_pkts);
- if (num_rx_slave)
- num_rx_total = num_rx_slave;
- break;
}
+
return num_rx_total;
}
static uint16_t
-bond_ethdev_tx_round_robin(void *queue, struct rte_mbuf **bufs,
+bond_ethdev_rx_burst_active_backup(void *queue, struct rte_mbuf **bufs,
+ uint16_t nb_pkts)
+{
+ struct bond_dev_private *internals;
+
+ /* Cast to structure, containing bonded device's port id and queue id */
+ struct bond_rx_queue *bd_rx_q = (struct bond_rx_queue *)queue;
+
+ internals = bd_rx_q->dev_private;
+
+ return rte_eth_rx_burst(internals->current_primary_port,
+ bd_rx_q->queue_id, bufs, nb_pkts);
+}
+
+static uint16_t
+bond_ethdev_tx_burst_round_robin(void *queue, struct rte_mbuf **bufs,
uint16_t nb_pkts)
{
struct bond_dev_private *dev_private;
@@ -134,7 +138,7 @@ bond_ethdev_tx_round_robin(void *queue, struct rte_mbuf
**bufs,
}
static uint16_t
-bond_ethdev_tx_active_backup(void *queue,
+bond_ethdev_tx_burst_active_backup(void *queue,
struct rte_mbuf **bufs, uint16_t nb_pkts)
{
struct bond_dev_private *internals;
@@ -270,7 +274,8 @@ xmit_slave_hash(const struct rte_mbuf *buf, uint8_t
slave_count, uint8_t policy)
}
static uint16_t
-bond_ethdev_tx_balance(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
+bond_ethdev_tx_burst_balance(void *queue, struct rte_mbuf **bufs,
+ uint16_t nb_pkts)
{
struct bond_dev_private *internals;
struct bond_tx_queue *bd_tx_q;
@@ -480,22 +485,25 @@ bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, int
mode)
switch (mode) {
case BONDING_MODE_ROUND_ROBIN:
- eth_dev->tx_pkt_burst = bond_ethdev_tx_round_robin;
+ eth_dev->tx_pkt_burst = bond_ethdev_tx_burst_round_robin;
+ eth_dev->rx_pkt_burst = bond_ethdev_rx_burst;
break;
case BONDING_MODE_ACTIVE_BACKUP:
- eth_dev->tx_pkt_burst = bond_ethdev_tx_active_backup;
+ eth_dev->tx_pkt_burst = bond_ethdev_tx_burst_active_backup;
+ eth_dev->rx_pkt_burst = bond_ethdev_rx_burst_active_backup;
break;
case BONDING_MODE_BALANCE:
- eth_dev->tx_pkt_burst = bond_ethdev_tx_balance;
+ eth_dev->tx_pkt_burst = bond_ethdev_tx_burst_balance;
+ eth_dev->rx_pkt_burst = bond_ethdev_rx_burst;
break;
case BONDING_MODE_BROADCAST:
eth_dev->tx_pkt_burst = bond_ethdev_tx_burst_broadcast;
+ eth_dev->rx_pkt_burst = bond_ethdev_rx_burst;
break;
default:
return -1;
}
- eth_dev->rx_pkt_burst = bond_ethdev_rx_burst;
internals->mode = mode;
return 0;
--
1.7.0.7
[dpdk-dev] [PATCH v2 1/6] bond: link status interrupt support
Adding support for lsc interrupt from bonded device to link
bonding library with supporting unit tests in the test application.
Signed-off-by: Declan Doherty
---
app/test/test_link_bonding.c | 213 +++-
lib/librte_pmd_bond/rte_eth_bond_api.c |4 +
lib/librte_pmd_bond/rte_eth_bond_pmd.c |6 +
3 files changed, 189 insertions(+), 34 deletions(-)
diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
index db5b180..cce32ed 100644
--- a/app/test/test_link_bonding.c
+++ b/app/test/test_link_bonding.c
@@ -39,6 +39,7 @@
#include
#include
#include
+#include
#include
#include
@@ -224,10 +225,15 @@ static struct rte_eth_txconf tx_conf_default = {
};
static int
-configure_ethdev(uint8_t port_id, uint8_t start)
+configure_ethdev(uint8_t port_id, uint8_t start, uint8_t en_isr)
{
int q_id;
+ if (en_isr)
+ default_pmd_conf.intr_conf.lsc = 1;
+ else
+ default_pmd_conf.intr_conf.lsc = 0;
+
if (rte_eth_dev_configure(port_id, test_params->nb_rx_q,
test_params->nb_tx_q, &default_pmd_conf) != 0) {
goto error;
@@ -312,7 +318,7 @@ test_setup(void)
printf("Created virtual ethdev %s\n", pmd_name);
- retval =
configure_ethdev(test_params->slave_port_ids[i], 1);
+ retval =
configure_ethdev(test_params->slave_port_ids[i], 1, 0);
if (retval != 0) {
printf("Failed to configure virtual ethdev
%s\n", pmd_name);
return -1;
@@ -341,7 +347,7 @@ test_create_bonded_device(void)
TEST_ASSERT(test_params->bonded_port_id >= 0,
"Failed to create bonded ethdev %s",
BONDED_DEV_NAME);
-
TEST_ASSERT_SUCCESS(configure_ethdev(test_params->bonded_port_id, 0),
+
TEST_ASSERT_SUCCESS(configure_ethdev(test_params->bonded_port_id, 0, 0),
"Failed to configure bonded ethdev %s",
BONDED_DEV_NAME);
}
@@ -1078,12 +1084,12 @@ test_set_explicit_bonded_mac(void)
static int
-initialize_bonded_device_with_slaves(uint8_t bonding_mode,
+initialize_bonded_device_with_slaves(uint8_t bonding_mode, uint8_t bond_en_isr,
uint8_t number_of_slaves, uint8_t enable_slave)
{
/* configure bonded device */
- TEST_ASSERT_SUCCESS(configure_ethdev(test_params->bonded_port_id, 0),
- "Failed to configure bonding port (%d) in mode %d "
+ TEST_ASSERT_SUCCESS(configure_ethdev(test_params->bonded_port_id, 0,
+ bond_en_isr), "Failed to configure bonding port (%d) in
mode %d "
"with (%d) slaves.", test_params->bonded_port_id,
bonding_mode,
number_of_slaves);
@@ -1116,8 +1122,8 @@ test_adding_slave_after_bonded_device_started(void)
{
int i;
- if (initialize_bonded_device_with_slaves(BONDING_MODE_ROUND_ROBIN, 4,
0) !=
- 0)
+ if (initialize_bonded_device_with_slaves(BONDING_MODE_ROUND_ROBIN, 0,
4, 0)
+ != 0)
return -1;
/* Enabled slave devices */
@@ -1141,6 +1147,144 @@ test_adding_slave_after_bonded_device_started(void)
return remove_slaves_and_stop_bonded_device();
}
+#define TEST_STATUS_INTERRUPT_SLAVE_COUNT 4
+#define TEST_LSC_WAIT_TIMEOUT_MS 500
+
+int test_lsc_interupt_count;
+
+static pthread_mutex_t mutex;
+static pthread_cond_t cvar;
+
+static void
+test_bonding_lsc_event_callback(uint8_t port_id __rte_unused,
+ enum rte_eth_event_type type __rte_unused, void *param
__rte_unused)
+{
+ pthread_mutex_lock(&mutex);
+ test_lsc_interupt_count++;
+
+ pthread_cond_signal(&cvar);
+ pthread_mutex_unlock(&mutex);
+}
+
+static inline int
+lsc_timeout(int wait_us)
+{
+ int retval = 0;
+
+ struct timespec ts;
+ struct timeval tp;
+
+ gettimeofday(&tp, NULL);
+
+ /* Convert from timeval to timespec */
+ ts.tv_sec = tp.tv_sec;
+ ts.tv_nsec = tp.tv_usec * 1000;
+ ts.tv_nsec += wait_us * 1000;
+
+ pthread_mutex_lock(&mutex);
+ if (test_lsc_interupt_count < 1)
+ retval = pthread_cond_timedwait(&cvar, &mutex, &ts);
+
+ pthread_mutex_unlock(&mutex);
+
+ return retval;
+}
+
+static int
+test_status_interrupt(void)
+{
+ int slave_count;
+ uint8_t slaves[RTE_MAX_ETHPORTS];
+
+ pthread_mutex_init(&mutex, NULL);
+ pthread_cond_init(&cvar, NULL);
+
+ /* initialized bonding device with T slaves */
+ if (initialize_bonded_device_with_slaves(BONDING_MODE_ROUND_ROBIN, 1,
+ TEST_STATUS_INTERRUPT_SLAVE_COUNT, 1) != 0)
+ return -1;
+
+ test_lsc_interupt_count = 0;
+
+ /* register link status change interrupt callba
[dpdk-dev] [PATCH v2 5/6] test app: adding support for generating variable sized packets
Signed-off-by: Declan Doherty
---
app/test/packet_burst_generator.c | 22 +++---
app/test/packet_burst_generator.h |6 +-
app/test/test_link_bonding.c | 14 +-
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/app/test/packet_burst_generator.c
b/app/test/packet_burst_generator.c
index 5d539f1..9ce6472 100644
--- a/app/test/packet_burst_generator.c
+++ b/app/test/packet_burst_generator.c
@@ -190,20 +190,12 @@ initialize_ipv4_header(struct ipv4_hdr *ip_hdr, uint32_t
src_addr,
*/
#define RTE_MAX_SEGS_PER_PKT 255 /**< pkt.nb_segs is a 8-bit unsigned char. */
-#define TXONLY_DEF_PACKET_LEN 64
-#define TXONLY_DEF_PACKET_LEN_128 128
-
-uint16_t tx_pkt_length = TXONLY_DEF_PACKET_LEN;
-uint16_t tx_pkt_seg_lengths[RTE_MAX_SEGS_PER_PKT] = {
- TXONLY_DEF_PACKET_LEN_128,
-};
-
-uint8_t tx_pkt_nb_segs = 1;
int
generate_packet_burst(struct rte_mempool *mp, struct rte_mbuf **pkts_burst,
struct ether_hdr *eth_hdr, uint8_t vlan_enabled, void *ip_hdr,
- uint8_t ipv4, struct udp_hdr *udp_hdr, int nb_pkt_per_burst)
+ uint8_t ipv4, struct udp_hdr *udp_hdr, int nb_pkt_per_burst,
+ uint8_t pkt_len, uint8_t nb_pkt_segs)
{
int i, nb_pkt = 0;
size_t eth_hdr_size;
@@ -220,9 +212,9 @@ nomore_mbuf:
break;
}
- pkt->pkt.data_len = tx_pkt_seg_lengths[0];
+ pkt->pkt.data_len = pkt_len;
pkt_seg = pkt;
- for (i = 1; i < tx_pkt_nb_segs; i++) {
+ for (i = 1; i < nb_pkt_segs; i++) {
pkt_seg->pkt.next = rte_pktmbuf_alloc(mp);
if (pkt_seg->pkt.next == NULL) {
pkt->pkt.nb_segs = i;
@@ -230,7 +222,7 @@ nomore_mbuf:
goto nomore_mbuf;
}
pkt_seg = pkt_seg->pkt.next;
- pkt_seg->pkt.data_len = tx_pkt_seg_lengths[i];
+ pkt_seg->pkt.data_len = pkt_len;
}
pkt_seg->pkt.next = NULL; /* Last segment of packet. */
@@ -258,8 +250,8 @@ nomore_mbuf:
* Complete first mbuf of packet and append it to the
* burst of packets to be transmitted.
*/
- pkt->pkt.nb_segs = tx_pkt_nb_segs;
- pkt->pkt.pkt_len = tx_pkt_length;
+ pkt->pkt.nb_segs = nb_pkt_segs;
+ pkt->pkt.pkt_len = pkt_len;
pkt->pkt.vlan_macip.f.l2_len = eth_hdr_size;
if (ipv4) {
diff --git a/app/test/packet_burst_generator.h
b/app/test/packet_burst_generator.h
index 5b3cd6c..f86589e 100644
--- a/app/test/packet_burst_generator.h
+++ b/app/test/packet_burst_generator.h
@@ -47,6 +47,9 @@ extern "C" {
#define IPV4_ADDR(a, b, c, d)(((a & 0xff) << 24) | ((b & 0xff) << 16) | \
((c & 0xff) << 8) | (d & 0xff))
+#define PACKET_BURST_GEN_PKT_LEN 60
+#define PACKET_BURST_GEN_PKT_LEN_128 128
+
void
initialize_eth_header(struct ether_hdr *eth_hdr, struct ether_addr *src_mac,
@@ -68,7 +71,8 @@ initialize_ipv4_header(struct ipv4_hdr *ip_hdr, uint32_t
src_addr,
int
generate_packet_burst(struct rte_mempool *mp, struct rte_mbuf **pkts_burst,
struct ether_hdr *eth_hdr, uint8_t vlan_enabled, void *ip_hdr,
- uint8_t ipv4, struct udp_hdr *udp_hdr, int nb_pkt_per_burst);
+ uint8_t ipv4, struct udp_hdr *udp_hdr, int nb_pkt_per_burst,
+ uint8_t pkt_len, uint8_t nb_pkt_segs);
#ifdef __cplusplus
}
diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
index c5aaa80..1c06e2d 100644
--- a/app/test/test_link_bonding.c
+++ b/app/test/test_link_bonding.c
@@ -1338,7 +1338,8 @@ generate_test_burst(struct rte_mbuf **pkts_burst,
uint16_t burst_size,
/* Generate burst of packets to transmit */
generated_burst_size = generate_packet_burst(test_params->mbuf_pool,
pkts_burst, test_params->pkt_eth_hdr, vlan, ip_hdr,
ipv4,
- test_params->pkt_udp_hdr, burst_size);
+ test_params->pkt_udp_hdr, burst_size,
PACKET_BURST_GEN_PKT_LEN_128,
+ 1);
if (generated_burst_size != burst_size) {
printf("Failed to generate packet burst");
return -1;
@@ -2056,7 +2057,7 @@ test_activebackup_tx_burst(void)
/* Generate a burst of packets to transmit */
generated_burst_size = generate_packet_burst(test_params->mbuf_pool,
pkts_burst, test_params->pkt_eth_hdr, 0,
test_params->pkt_ipv4_hdr,
- 1, test_params->pkt_udp_hdr, burst_size);
+ 1, test_params->pkt_udp_hdr, burst_size,
PACKET_BURST_GEN_PKT_LEN, 1);
if (generated_burst_size != burst_size)
return -1;
@@ -2709,7 +2710,
[dpdk-dev] [PATCH v2 4/6] bond: free mbufs if transmission fails in bonding tx_burst functions
Fixing a number of corner cases that if transmission failed on slave devices
then this
could lead to leaked mbufs
V2 addresses behaviouraly issues in the first version and packets are no longer
freed in
the bonding layer, except in the case of broadcast mode where in failures
happen on
more than a single slave then mbufs will be freed in all slaves except the one
where
the least errors occured. Also contains new unit tests to test the transmission
failure case in slaves for
round-robin, balance, and broadcast modes.
Signed-off-by: Declan Doherty
---
app/test/test_link_bonding.c | 393 +++-
app/test/virtual_pmd.c | 80 +--
app/test/virtual_pmd.h |7 +
lib/librte_pmd_bond/rte_eth_bond_pmd.c | 83 ++--
4 files changed, 525 insertions(+), 38 deletions(-)
diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
index cce32ed..c5aaa80 100644
--- a/app/test/test_link_bonding.c
+++ b/app/test/test_link_bonding.c
@@ -663,6 +663,9 @@ enable_bonded_slaves(void)
int i;
for (i = 0; i < test_params->bonded_slave_count; i++) {
+
virtual_ethdev_tx_burst_fn_set_success(test_params->slave_port_ids[i],
+ 1);
+
virtual_ethdev_simulate_link_status_interrupt(
test_params->slave_port_ids[i], 1);
}
@@ -1413,6 +1416,135 @@ test_roundrobin_tx_burst(void)
}
static int
+verify_mbufs_ref_count(struct rte_mbuf **mbufs, int nb_mbufs, int val)
+{
+ int i, refcnt;
+
+ for (i = 0; i < nb_mbufs; i++) {
+ refcnt = rte_mbuf_refcnt_read(mbufs[i]);
+ TEST_ASSERT_EQUAL(refcnt, val,
+ "mbuf ref count (%d)is not the expected value (%d)",
+ refcnt, val);
+ }
+ return 0;
+}
+
+
+static void
+free_mbufs(struct rte_mbuf **mbufs, int nb_mbufs)
+{
+ int i;
+
+ for (i = 0; i < nb_mbufs; i++)
+ rte_pktmbuf_free(mbufs[i]);
+}
+
+#define TEST_RR_SLAVE_TX_FAIL_SLAVE_COUNT (2)
+#define TEST_RR_SLAVE_TX_FAIL_BURST_SIZE (64)
+#define TEST_RR_SLAVE_TX_FAIL_PACKETS_COUNT(22)
+#define TEST_RR_SLAVE_TX_FAIL_FAILING_SLAVE_IDX(1)
+
+static int
+test_roundrobin_tx_burst_slave_tx_fail(void)
+{
+ struct rte_mbuf *pkt_burst[MAX_PKT_BURST];
+ struct rte_mbuf *expected_tx_fail_pkts[MAX_PKT_BURST];
+
+ struct rte_eth_stats port_stats;
+
+ int i, first_fail_idx, tx_count;
+
+ TEST_ASSERT_SUCCESS(initialize_bonded_device_with_slaves(
+ BONDING_MODE_ROUND_ROBIN, 0,
+ TEST_RR_SLAVE_TX_FAIL_SLAVE_COUNT, 1),
+ "Failed to intialise bonded device");
+
+ /* Generate test bursts of packets to transmit */
+ TEST_ASSERT_EQUAL(generate_test_burst(pkt_burst,
+ TEST_RR_SLAVE_TX_FAIL_BURST_SIZE, 0, 1, 0, 0, 0),
+ TEST_RR_SLAVE_TX_FAIL_BURST_SIZE,
+ "Failed to generate test packet burst");
+
+ /* Copy references to packets which we expect not to be transmitted */
+ first_fail_idx = (TEST_RR_SLAVE_TX_FAIL_BURST_SIZE -
+ (TEST_RR_SLAVE_TX_FAIL_PACKETS_COUNT *
+ TEST_RR_SLAVE_TX_FAIL_SLAVE_COUNT)) +
+ TEST_RR_SLAVE_TX_FAIL_FAILING_SLAVE_IDX;
+
+ for (i = 0; i < TEST_RR_SLAVE_TX_FAIL_PACKETS_COUNT; i++) {
+ expected_tx_fail_pkts[i] = pkt_burst[first_fail_idx +
+ (i * TEST_RR_SLAVE_TX_FAIL_SLAVE_COUNT)];
+ }
+
+ /* Set virtual slave to only fail transmission of
+* TEST_RR_SLAVE_TX_FAIL_PACKETS_COUNT packets in burst */
+ virtual_ethdev_tx_burst_fn_set_success(
+
test_params->slave_port_ids[TEST_RR_SLAVE_TX_FAIL_FAILING_SLAVE_IDX],
+ 0);
+
+ virtual_ethdev_tx_burst_fn_set_tx_pkt_fail_count(
+
test_params->slave_port_ids[TEST_RR_SLAVE_TX_FAIL_FAILING_SLAVE_IDX],
+ TEST_RR_SLAVE_TX_FAIL_PACKETS_COUNT);
+
+ tx_count = rte_eth_tx_burst(test_params->bonded_port_id, 0, pkt_burst,
+ TEST_RR_SLAVE_TX_FAIL_BURST_SIZE);
+
+ TEST_ASSERT_EQUAL(tx_count, TEST_RR_SLAVE_TX_FAIL_BURST_SIZE -
+ TEST_RR_SLAVE_TX_FAIL_PACKETS_COUNT,
+ "Transmitted (%d) an unexpected (%d) number of
packets", tx_count,
+ TEST_RR_SLAVE_TX_FAIL_BURST_SIZE -
+ TEST_RR_SLAVE_TX_FAIL_PACKETS_COUNT);
+
+ /* Verify that failed packet are expected failed packets */
+ for (i = 0; i < TEST_RR_SLAVE_TX_FAIL_PACKETS_COUNT; i++) {
+ TEST_ASSERT_EQUAL(expected_tx_fail_pkts[i], pkt_burst[i +
tx_count],
+ "expected mbuf (%d) pointer %p not expected
pointer
[dpdk-dev] [PATCH v2 0/6] link bonding
This patch set adds support for link status interrupt in the link bonding pmd. It also contains some patches to tidy up the code structure and to of the link bonding code and to fix bugs relating to transmission failures in the under lying slave pmd which could lead to leaked mbufs. V2 addresses issues with the logic around the handling of fail transmissions. In this version all modei behave in a manner similar to a standard PMD, returning the number of successfully transmitted mbufs and with the failing mbufs at the end of bufs array for freeing / retansmission by the application software Declan Doherty (6): bond: link status interrupt support bond: removing switch statement from rx burst method bond: fix naming inconsistency in tx_burst_round_robin bond: free mbufs if transmission fails in bonding tx_burst functions test app: adding support for generating variable sized packets testpmd: adding parameter to reconfig method to set socket_id when adding new port to portlist app/test-pmd/cmdline.c |2 +- app/test-pmd/testpmd.c |3 +- app/test-pmd/testpmd.h |2 +- app/test/packet_burst_generator.c | 22 +- app/test/packet_burst_generator.h |6 +- app/test/test_link_bonding.c | 620 +--- app/test/virtual_pmd.c | 80 - app/test/virtual_pmd.h |7 + lib/librte_pmd_bond/rte_eth_bond_api.c |4 + lib/librte_pmd_bond/rte_eth_bond_pmd.c | 161 ++--- 10 files changed, 779 insertions(+), 128 deletions(-)
[dpdk-dev] [PATCH v2 6/6] testpmd: adding parameter to reconfig method to set socket_id when adding new port to portlist
Signed-off-by: Declan Doherty
---
app/test-pmd/cmdline.c |2 +-
app/test-pmd/testpmd.c |3 ++-
app/test-pmd/testpmd.h |2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index b04a4e8..a0d88df 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -3614,7 +3614,7 @@ static void cmd_create_bonded_device_parsed(void
*parsed_result,
/* Update number of ports */
nb_ports = rte_eth_dev_count();
- reconfig(port_id);
+ reconfig(port_id, res->socket);
rte_eth_promiscuous_enable(port_id);
}
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index a112559..d843f77 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -627,7 +627,7 @@ init_config(void)
void
-reconfig(portid_t new_port_id)
+reconfig(portid_t new_port_id, unsigned socket_id)
{
struct rte_port *port;
@@ -646,6 +646,7 @@ reconfig(portid_t new_port_id)
/* set flag to initialize port/queue */
port->need_reconfig = 1;
port->need_reconfig_queues = 1;
+ port->socket_id = socket_id;
init_port_config();
}
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index b8322a2..f34b5d1 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -455,7 +455,7 @@ void fwd_config_display(void);
void rxtx_config_display(void);
void fwd_config_setup(void);
void set_def_fwd_config(void);
-void reconfig(portid_t new_port_id);
+void reconfig(portid_t new_port_id, unsigned socket_id);
int init_fwd_streams(void);
void port_mtu_set(portid_t port_id, uint16_t mtu);
--
1.7.0.7
[dpdk-dev] [PATCH v2 3/6] bond: fix naming inconsistency in tx_burst_round_robin
Signed-off-by: Declan Doherty
---
lib/librte_pmd_bond/rte_eth_bond_pmd.c | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/librte_pmd_bond/rte_eth_bond_pmd.c
b/lib/librte_pmd_bond/rte_eth_bond_pmd.c
index 683b146..70123fc 100644
--- a/lib/librte_pmd_bond/rte_eth_bond_pmd.c
+++ b/lib/librte_pmd_bond/rte_eth_bond_pmd.c
@@ -92,7 +92,7 @@ static uint16_t
bond_ethdev_tx_burst_round_robin(void *queue, struct rte_mbuf **bufs,
uint16_t nb_pkts)
{
- struct bond_dev_private *dev_private;
+ struct bond_dev_private *internals;
struct bond_tx_queue *bd_tx_q;
struct rte_mbuf *slave_bufs[RTE_MAX_ETHPORTS][nb_pkts];
@@ -107,13 +107,13 @@ bond_ethdev_tx_burst_round_robin(void *queue, struct
rte_mbuf **bufs,
int i, cs_idx = 0;
bd_tx_q = (struct bond_tx_queue *)queue;
- dev_private = bd_tx_q->dev_private;
+ internals = bd_tx_q->dev_private;
/* Copy slave list to protect against slave up/down changes during tx
* bursting */
- num_of_slaves = dev_private->active_slave_count;
- memcpy(slaves, dev_private->active_slaves,
- sizeof(dev_private->active_slaves[0]) * num_of_slaves);
+ num_of_slaves = internals->active_slave_count;
+ memcpy(slaves, internals->active_slaves,
+ sizeof(internals->active_slaves[0]) * num_of_slaves);
if (num_of_slaves < 1)
return num_tx_total;
--
1.7.0.7
[dpdk-dev] reg : adding grub entry with hugepages.
Hello everyone, I am using fedora 16, i want to Add additional Grub entry with hugepages enabled permanently can u tell me how can i add? and wher can i add? -- Thanks & Regards, ANAND
[dpdk-dev] reg : adding grub entry with hugepages.
Hi, Here is an example to enable both 1G and 2M in kernel parameters. default_hugepagesz=1G hugepagesz=1G hugepages=8 hugepagesz=2M hugepages=512 -Original Message- From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Anand S Angadi Sent: Monday, September 1, 2014 4:44 PM To: dev at dpdk.org Subject: [dpdk-dev] reg : adding grub entry with hugepages. Hello everyone, I am using fedora 16, i want to Add additional Grub entry with hugepages enabled permanently can u tell me how can i add? and wher can i add? -- Thanks & Regards, ANAND
[dpdk-dev] reg : adding grub entry with hugepages.
On 09/01/2014 02:22 PM, Zhang, Jerry wrote: > Hi, > >Here is an example to enable both 1G and 2M in kernel parameters. > > default_hugepagesz=1G hugepagesz=1G hugepages=8 hugepagesz=2M hugepages=512 > > > -Original Message- > From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Anand S Angadi > Sent: Monday, September 1, 2014 4:44 PM > To: dev at dpdk.org > Subject: [dpdk-dev] reg : adding grub entry with hugepages. > > > Hello everyone, > I am using fedora 16, i want to Add additional Grub entry with hugepages > enabled permanently can u tell me how can i add? > and wher can i add? > > -- > Thanks & Regards, > ANAND > > > > Hi Zhang, Thank you for your reply, now I am using same thing but i want it permanently to add. means after every time reboot i have write again it, please help me. -- Thanks & Regards, ANAND
[dpdk-dev] reg : adding grub entry with hugepages.
On Mon, Sep 01, 2014 at 02:32:40PM +0530, Anand S Angadi wrote: > >Hello everyone, > >I am using fedora 16, i want to Add additional Grub entry with hugepages > >enabled permanently can u tell me how can i add? > >and wher can i add? Try /etc/default/grub .
[dpdk-dev] reg : adding grub entry with hugepages.
> -Original Message- > From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Matthew Hall > Sent: Monday, September 01, 2014 10:06 AM > To: Anand S Angadi > Cc: dev at dpdk.org > Subject: Re: [dpdk-dev] reg : adding grub entry with hugepages. > > On Mon, Sep 01, 2014 at 02:32:40PM +0530, Anand S Angadi wrote: > > >Hello everyone, > > >I am using fedora 16, i want to Add additional Grub entry with hugepages > enabled permanently can u tell me how can i add? > > >and wher can i add? > > Try /etc/default/grub . ... and use grub2-mkconfig to regenerate the grub configuration afterwards.
[dpdk-dev] reg : adding grub entry with hugepages.
> -Original Message- > From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Zhang, Jerry > Sent: Monday, September 01, 2014 9:52 AM > To: Anand S Angadi; dev at dpdk.org > Subject: Re: [dpdk-dev] reg : adding grub entry with hugepages. > > Hi, > > Here is an example to enable both 1G and 2M in kernel parameters. > > default_hugepagesz=1G hugepagesz=1G hugepages=8 hugepagesz=2M > hugepages=512 Just FYI: the default_hugepagesz part is not necessary, so I'd generally leave it out and let the system default be 2MB as normal. You can always get a hugetlbfs mount of a particular hugepage size by passing the pagesize= parameter when doing the mount. /Bruce
[dpdk-dev] reg : adding grub entry with hugepages.
On 09/01/2014 02:36 PM, Matthew Hall wrote: > On Mon, Sep 01, 2014 at 02:32:40PM +0530, Anand S Angadi wrote: >>> Hello everyone, >>> I am using fedora 16, i want to Add additional Grub entry with hugepages >>> enabled permanently can u tell me how can i add? >>> and wher can i add? > Try /etc/default/grub . > Hi Matthew, I added "default_hugepagesz=2M hugepagesz=2M hugepages=1024" and did reboot. after i did cat /proc/meminfo but i am not getting Hugepages_total 1024. the output is as mentioned bellow. $cat /proc/meminfo : : : HardwareCorrupted: 0 kB AnonHugePages: 43008 kB HugePages_Total: 0 HugePages_Free:0 HugePages_Rsvd:0 HugePages_Surp:0 Hugepagesize: 2048 kB DirectMap4k: 12288 kB DirectMap2M: 4024320 kB $ -- Thanks & Regards, ANAND
[dpdk-dev] reg : adding grub entry with hugepages.
>> Hello everyone, >> I am using fedora 16, i want to Add additional Grub entry with hugepages >enabled permanently can u tell me how can i add? >> and wher can i add? >> >> -- >> Thanks & Regards, >> ANAND >> >> >> >> >Hi Zhang, >Thank you for your reply, now I am using same thing but i want it permanently >to >add. means after every time reboot i have write again it, please help me. You may add this parameter in /etc/default/grub GRUB_CMDLINE_LINUX="default_hugepagesz=1G hugepagesz=1G hugepages=8 hugepagesz=2M hugepages=512"
[dpdk-dev] reg : adding grub entry with hugepages.
>-Original Message- >From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Anand S Angadi >Sent: Monday, September 1, 2014 5:27 PM >To: Matthew Hall >Cc: dev at dpdk.org >Subject: Re: [dpdk-dev] reg : adding grub entry with hugepages. > >On 09/01/2014 02:36 PM, Matthew Hall wrote: >> On Mon, Sep 01, 2014 at 02:32:40PM +0530, Anand S Angadi wrote: Hello everyone, I am using fedora 16, i want to Add additional Grub entry with hugepages >enabled permanently can u tell me how can i add? and wher can i add? >> Try /etc/default/grub . >> >Hi Matthew, >I added "default_hugepagesz=2M hugepagesz=2M hugepages=1024" and did >reboot. >after i did cat /proc/meminfo but i am not getting Hugepages_total 1024. >the output is as mentioned bellow. > >$cat /proc/meminfo >: >: >: >HardwareCorrupted: 0 kB >AnonHugePages: 43008 kB >HugePages_Total: 0 >HugePages_Free:0 >HugePages_Rsvd:0 >HugePages_Surp:0 >Hugepagesize: 2048 kB >DirectMap4k: 12288 kB >DirectMap2M: 4024320 kB >$ > Make sure current kernel parameters is correct by below command. $cat /proc/cmdline
[dpdk-dev] reg : adding grub entry with hugepages.
> -Original Message- > From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Zhang, Jerry > Sent: Monday, September 01, 2014 10:37 AM > To: Anand S Angadi > Cc: dev at dpdk.org > Subject: Re: [dpdk-dev] reg : adding grub entry with hugepages. > > >> Hello everyone, > >> I am using fedora 16, i want to Add additional Grub entry with hugepages > >enabled permanently can u tell me how can i add? > >> and wher can i add? > >> > >> -- > >> Thanks & Regards, > >> ANAND > >> > >> > >> > >> > >Hi Zhang, > >Thank you for your reply, now I am using same thing but i want it permanently > to > >add. means after every time reboot i have write again it, please help me. > > You may add this parameter in /etc/default/grub > > GRUB_CMDLINE_LINUX="default_hugepagesz=1G hugepagesz=1G > hugepages=8 hugepagesz=2M hugepages=512" Again, please note that after changing the grub defaults you still need to regenerate the grub configuration file, which is generally in /boot (on fedora 20 it's in /boot/grub2/grub.cfg). This is the file actually read at boot time by grub. /Bruce
[dpdk-dev] [PATCH v2 00/17] cleanup logs in main PMDs
Here is a patchset that reworks the log macro in e1000, ixgbe and i40e PMDs. The idea behind this is to make it easier to debug some init failures and to be sure of the datapath selected in these PMDs (rx / tx handlers selection). The PMDs changes involve adding more debug messages in the default build. A new eal option has been added to set the default log level, so that you can render the eal a little less noisy. I did not change the default log level for now, as some eal log messages are marked as DEBUG while being interesting (from my point of view). I suppose we can change the default log level later once the eal has been cleaned up. Changes since v2: - continue clean up by always using PMD_*_LOG when logging something in PMD (i.e. no more printf, RTE_LOG, DEBUGOUT) - introduce PMD_DRV_LOG_RAW macro for use by shared driver code - adopt 'second approach': no more \n in PMD_*_LOG callers. This means that we will enforce a 'no \n' policy in logs for PMD. -- David Marchand David Marchand (17): ixgbe: use the right debug macro ixgbe/base: add a _RAW macro for use by shared code ixgbe: clean log messages ixgbe: always log init messages ixgbe: add a message when forcing scatter mode ixgbe: add log messages when rx bulk mode is not usable i40e: use the right debug macro i40e/base: add a _RAW macro for use by shared code i40e: clean log messages i40e: always log init messages i40e: add log messages when rx bulk mode is not usable e1000: use the right debug macro e1000/base: add a _RAW macro for use by shared code e1000: clean log messages e1000: always log init messages e1000: add a message when forcing scatter mode eal: set log level from command line lib/librte_eal/bsdapp/eal/eal.c| 42 ++ .../bsdapp/eal/include/eal_internal_cfg.h |1 + lib/librte_eal/linuxapp/eal/eal.c | 44 +- .../linuxapp/eal/include/eal_internal_cfg.h|1 + lib/librte_pmd_e1000/e1000/e1000_osdep.h |4 +- lib/librte_pmd_e1000/e1000_logs.h | 18 +- lib/librte_pmd_e1000/em_ethdev.c | 64 ++- lib/librte_pmd_e1000/em_rxtx.c | 137 +++--- lib/librte_pmd_e1000/igb_ethdev.c | 100 +++-- lib/librte_pmd_e1000/igb_pf.c |5 +- lib/librte_pmd_e1000/igb_rxtx.c| 69 ++-- lib/librte_pmd_i40e/i40e/i40e_osdep.h |8 +- lib/librte_pmd_i40e/i40e_ethdev.c | 434 ++-- lib/librte_pmd_i40e/i40e_ethdev_vf.c | 168 lib/librte_pmd_i40e/i40e_logs.h| 16 +- lib/librte_pmd_i40e/i40e_pf.c | 79 ++-- lib/librte_pmd_i40e/i40e_rxtx.c| 201 + lib/librte_pmd_ixgbe/ixgbe/ixgbe_osdep.h |4 +- lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c | 14 +- lib/librte_pmd_ixgbe/ixgbe_bypass.c| 26 +- lib/librte_pmd_ixgbe/ixgbe_ethdev.c| 177 lib/librte_pmd_ixgbe/ixgbe_fdir.c |6 +- lib/librte_pmd_ixgbe/ixgbe_logs.h | 16 +- lib/librte_pmd_ixgbe/ixgbe_pf.c|4 +- lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 169 +--- 25 files changed, 979 insertions(+), 828 deletions(-) -- 1.7.10.4
[dpdk-dev] [PATCH v2 01/17] ixgbe: use the right debug macro
- We should not use DEBUGOUT*/DEBUGFUNC macros in non-shared code.
These macros come as compat wrappers for shared code.
- We should avoid calling RTE_LOG directly as pmd provides a wrapper for logs.
Signed-off-by: David Marchand
---
lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c | 14
lib/librte_pmd_ixgbe/ixgbe_bypass.c | 26 +++---
lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 27 +++
lib/librte_pmd_ixgbe/ixgbe_pf.c |4 +--
lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 53 +++--
5 files changed, 63 insertions(+), 61 deletions(-)
diff --git a/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c
b/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c
index 0fc..2623419 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c
@@ -63,7 +63,7 @@ ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw,
ixgbe_link_speed speed)
rs = IXGBE_SFF_SOFT_RS_SELECT_1G;
break;
default:
- DEBUGOUT("Invalid fixed module speed\n");
+ PMD_DRV_LOG("Invalid fixed module speed");
return;
}
@@ -72,7 +72,7 @@ ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw,
ixgbe_link_speed speed)
IXGBE_I2C_EEPROM_DEV_ADDR2,
&eeprom_data);
if (status) {
- DEBUGOUT("Failed to read Rx Rate Select RS0\n");
+ PMD_DRV_LOG("Failed to read Rx Rate Select RS0");
goto out;
}
@@ -82,7 +82,7 @@ ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw,
ixgbe_link_speed speed)
IXGBE_I2C_EEPROM_DEV_ADDR2,
eeprom_data);
if (status) {
- DEBUGOUT("Failed to write Rx Rate Select RS0\n");
+ PMD_DRV_LOG("Failed to write Rx Rate Select RS0");
goto out;
}
@@ -91,7 +91,7 @@ ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw,
ixgbe_link_speed speed)
IXGBE_I2C_EEPROM_DEV_ADDR2,
&eeprom_data);
if (status) {
- DEBUGOUT("Failed to read Rx Rate Select RS1\n");
+ PMD_DRV_LOG("Failed to read Rx Rate Select RS1");
goto out;
}
@@ -101,7 +101,7 @@ ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw,
ixgbe_link_speed speed)
IXGBE_I2C_EEPROM_DEV_ADDR2,
eeprom_data);
if (status) {
- DEBUGOUT("Failed to write Rx Rate Select RS1\n");
+ PMD_DRV_LOG("Failed to write Rx Rate Select RS1");
goto out;
}
out:
@@ -130,7 +130,7 @@ ixgbe_setup_mac_link_multispeed_fixed_fiber(struct ixgbe_hw
*hw,
bool link_up = false;
bool negotiation;
- DEBUGFUNC("");
+ PMD_INIT_FUNC_TRACE();
/* Mask off requested but non-supported speeds */
status = ixgbe_get_link_capabilities(hw, &link_speed, &negotiation);
@@ -261,7 +261,7 @@ ixgbe_bypass_get_media_type(struct ixgbe_hw *hw)
{
enum ixgbe_media_type media_type;
- DEBUGFUNC("");
+ PMD_INIT_FUNC_TRACE();
if (hw->device_id == IXGBE_DEV_ID_82599_BYPASS) {
media_type = ixgbe_media_type_fiber;
diff --git a/lib/librte_pmd_ixgbe/ixgbe_bypass.c
b/lib/librte_pmd_ixgbe/ixgbe_bypass.c
index 1d21dc0..1a980b8 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_bypass.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_bypass.c
@@ -40,20 +40,20 @@
#defineBYPASS_STATUS_OFF_MASK 3
/* Macros to check for invlaid function pointers. */
-#defineFUNC_PTR_OR_ERR_RET(func, retval) do { \
- if ((func) == NULL) { \
- DEBUGOUT("%s:%d function not supported\n", \
- __func__, __LINE__); \
- return (retval); \
- } \
+#defineFUNC_PTR_OR_ERR_RET(func, retval) do { \
+ if ((func) == NULL) { \
+ PMD_DRV_LOG("%s:%d function not supported", \
+ __func__, __LINE__);\
+ return retval;\
+ } \
} while(0)
-#defineFUNC_PTR_OR_RET(func) do { \
- if ((func) == NULL) { \
- DEBUGOUT("%s:%d function not supported\n", \
- __func__, __LINE__); \
- return;\
- } \
+#defineFUNC_PTR_OR_RET(func) do { \
+ if ((func) == NULL)
[dpdk-dev] [PATCH v2 02/17] ixgbe/base: add a _RAW macro for use by shared code
Since shared code always add a trailing \n, add a PMD_DRV_LOG_RAW macro that
will not add one.
Signed-off-by: David Marchand
---
lib/librte_pmd_ixgbe/ixgbe/ixgbe_osdep.h |4 ++--
lib/librte_pmd_ixgbe/ixgbe_logs.h|9 ++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_osdep.h
b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_osdep.h
index 2bf1a6d..ae9c280 100644
--- a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_osdep.h
+++ b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_osdep.h
@@ -54,8 +54,8 @@
#define usec_delay(x) DELAY(x)
#define msec_delay(x) DELAY(1000*(x))
-#define DEBUGFUNC(F)DEBUGOUT(F);
-#define DEBUGOUT(S, args...)PMD_DRV_LOG(DEBUG, S, ##args)
+#define DEBUGFUNC(F)DEBUGOUT(F "\n");
+#define DEBUGOUT(S, args...)PMD_DRV_LOG_RAW(DEBUG, S, ##args)
#define DEBUGOUT1(S, args...) DEBUGOUT(S, ##args)
#define DEBUGOUT2(S, args...) DEBUGOUT(S, ##args)
#define DEBUGOUT3(S, args...) DEBUGOUT(S, ##args)
diff --git a/lib/librte_pmd_ixgbe/ixgbe_logs.h
b/lib/librte_pmd_ixgbe/ixgbe_logs.h
index 9f0a684..4685c18 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_logs.h
+++ b/lib/librte_pmd_ixgbe/ixgbe_logs.h
@@ -65,10 +65,13 @@
#endif
#ifdef RTE_LIBRTE_IXGBE_DEBUG_DRIVER
-#define PMD_DRV_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+#define PMD_DRV_LOG_RAW(level, fmt, args...) \
+ RTE_LOG(level, PMD, "%s(): " fmt, __func__, ## args)
#else
-#define PMD_DRV_LOG(level, fmt, args...) do { } while(0)
+#define PMD_DRV_LOG_RAW(level, fmt, args...) do { } while (0)
#endif
+#define PMD_DRV_LOG(level, fmt, args...) \
+ PMD_DRV_LOG_RAW(level, fmt "\n", ## args)
+
#endif /* _IXGBE_LOGS_H_ */
--
1.7.10.4
[dpdk-dev] [PATCH v2 03/17] ixgbe: clean log messages
Clean log messages:
- remove leading \n in some messages,
- remove trailing \n in some messages,
- split multi lines messages,
- replace some PMD_INIT_LOG(DEBUG, "some_func") with PMD_INIT_FUNC_TRACE().
Signed-off-by: David Marchand
---
lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 150 +--
lib/librte_pmd_ixgbe/ixgbe_fdir.c |6 +-
lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 93 +++---
3 files changed, 124 insertions(+), 125 deletions(-)
diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
index a8a7ed6..1419494 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
@@ -547,12 +547,12 @@ ixgbe_dev_queue_stats_mapping_set(struct rte_eth_dev
*eth_dev,
if ((hw->mac.type != ixgbe_mac_82599EB) && (hw->mac.type !=
ixgbe_mac_X540))
return -ENOSYS;
- PMD_INIT_LOG(INFO, "Setting port %d, %s queue_id %d to stat index %d\n",
+ PMD_INIT_LOG(INFO, "Setting port %d, %s queue_id %d to stat index %d",
(int)(eth_dev->data->port_id), is_rx ? "RX" : "TX",
queue_id, stat_idx);
n = (uint8_t)(queue_id / NB_QMAP_FIELDS_PER_QSM_REG);
if (n >= IXGBE_NB_STAT_MAPPING_REGS) {
- PMD_INIT_LOG(ERR, "Nb of stat mapping registers exceeded\n");
+ PMD_INIT_LOG(ERR, "Nb of stat mapping registers exceeded");
return -EIO;
}
offset = (uint8_t)(queue_id % NB_QMAP_FIELDS_PER_QSM_REG);
@@ -572,19 +572,20 @@ ixgbe_dev_queue_stats_mapping_set(struct rte_eth_dev
*eth_dev,
else
stat_mappings->rqsmr[n] |= qsmr_mask;
- PMD_INIT_LOG(INFO, "Set port %d, %s queue_id %d to stat index %d\n"
-"%s[%d] = 0x%08x\n",
-(int)(eth_dev->data->port_id), is_rx ? "RX" : "TX",
queue_id, stat_idx,
-is_rx ? "RQSMR" : "TQSM",n, is_rx ?
stat_mappings->rqsmr[n] : stat_mappings->tqsm[n]);
+ PMD_INIT_LOG(INFO, "Set port %d, %s queue_id %d to stat index %d",
+(int)(eth_dev->data->port_id), is_rx ? "RX" : "TX",
+queue_id, stat_idx);
+ PMD_INIT_LOG(INFO, "%s[%d] = 0x%08x", is_rx ? "RQSMR" : "TQSM", n,
+is_rx ? stat_mappings->rqsmr[n] : stat_mappings->tqsm[n]);
/* Now write the mapping in the appropriate register */
if (is_rx) {
- PMD_INIT_LOG(INFO, "Write 0x%x to RX IXGBE stat mapping
reg:%d\n",
+ PMD_INIT_LOG(INFO, "Write 0x%x to RX IXGBE stat mapping reg:%d",
stat_mappings->rqsmr[n], n);
IXGBE_WRITE_REG(hw, IXGBE_RQSMR(n), stat_mappings->rqsmr[n]);
}
else {
- PMD_INIT_LOG(INFO, "Write 0x%x to TX IXGBE stat mapping
reg:%d\n",
+ PMD_INIT_LOG(INFO, "Write 0x%x to TX IXGBE stat mapping reg:%d",
stat_mappings->tqsm[n], n);
IXGBE_WRITE_REG(hw, IXGBE_TQSM(n), stat_mappings->tqsm[n]);
}
@@ -790,12 +791,13 @@ eth_ixgbe_dev_init(__attribute__((unused)) struct
eth_driver *eth_drv,
if (diag == IXGBE_ERR_EEPROM_VERSION) {
PMD_INIT_LOG(ERR, "This device is a pre-production adapter/"
- "LOM. Please be aware there may be issues associated "
- "with your hardware.\n If you are experiencing problems "
+ "LOM. Please be aware there may be issues associated "
+ "with your hardware.");
+ PMD_INIT_LOG(ERR, "If you are experiencing problems "
"please contact your Intel or hardware representative "
- "who provided you with this hardware.\n");
+ "who provided you with this hardware.");
} else if (diag == IXGBE_ERR_SFP_NOT_SUPPORTED)
- PMD_INIT_LOG(ERR, "Unsupported SFP+ Module\n");
+ PMD_INIT_LOG(ERR, "Unsupported SFP+ Module");
if (diag) {
PMD_INIT_LOG(ERR, "Hardware Initialization Failure: %d", diag);
return -EIO;
@@ -811,10 +813,9 @@ eth_ixgbe_dev_init(__attribute__((unused)) struct
eth_driver *eth_drv,
eth_dev->data->mac_addrs = rte_zmalloc("ixgbe", ETHER_ADDR_LEN *
hw->mac.num_rar_entries, 0);
if (eth_dev->data->mac_addrs == NULL) {
- PMD_INIT_LOG(ERR,
- "Failed to allocate %u bytes needed to store "
- "MAC addresses",
- ETHER_ADDR_LEN * hw->mac.num_rar_entries);
+ PMD_INIT_LOG(ERR, "Failed to allocate %u bytes needed to store "
+"MAC addresses",
+ETHER_ADDR_LEN * hw->mac.num_rar_entries);
return -ENOMEM;
}
/* Copy the permanent MAC address */
@@ -825,9 +826,9 @@ eth_ixgbe_dev_init(__attribute__((unused)) struct
eth_driver *eth_drv,
[dpdk-dev] [PATCH v2 04/17] ixgbe: always log init messages
'init' messages should always be logged and filtered at runtime by rte_log.
All the more so as these messages are not in the datapath.
Signed-off-by: David Marchand
---
lib/librte_pmd_ixgbe/ixgbe_logs.h |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/librte_pmd_ixgbe/ixgbe_logs.h
b/lib/librte_pmd_ixgbe/ixgbe_logs.h
index 4685c18..572e030 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_logs.h
+++ b/lib/librte_pmd_ixgbe/ixgbe_logs.h
@@ -34,12 +34,13 @@
#ifndef _IXGBE_LOGS_H_
#define _IXGBE_LOGS_H_
-#ifdef RTE_LIBRTE_IXGBE_DEBUG_INIT
#define PMD_INIT_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+ rte_log(RTE_LOG_ ## level, RTE_LOGTYPE_PMD, \
+ "PMD: %s(): " fmt "\n", __func__, ##args)
+
+#ifdef RTE_LIBRTE_IXGBE_DEBUG_INIT
#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
#else
-#define PMD_INIT_LOG(level, fmt, args...) do { } while(0)
#define PMD_INIT_FUNC_TRACE() do { } while(0)
#endif
--
1.7.10.4
[dpdk-dev] [PATCH v2 05/17] ixgbe: add a message when forcing scatter mode
Signed-off-by: David Marchand
---
lib/librte_pmd_ixgbe/ixgbe_rxtx.c |8
1 file changed, 8 insertions(+)
diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
index 981df60..dbbe612 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
@@ -3488,12 +3488,16 @@ ixgbe_dev_rx_init(struct rte_eth_dev *dev)
/* It adds dual VLAN length for supporting dual VLAN */
if ((dev->data->dev_conf.rxmode.max_rx_pkt_len +
2 * IXGBE_VLAN_TAG_SIZE) > buf_size){
+ if (!dev->data->scattered_rx)
+ PMD_INIT_LOG(DEBUG, "forcing scatter mode");
dev->data->scattered_rx = 1;
dev->rx_pkt_burst = ixgbe_recv_scattered_pkts;
}
}
if (dev->data->dev_conf.rxmode.enable_scatter) {
+ if (!dev->data->scattered_rx)
+ PMD_INIT_LOG(DEBUG, "forcing scatter mode");
dev->rx_pkt_burst = ixgbe_recv_scattered_pkts;
dev->data->scattered_rx = 1;
}
@@ -3981,12 +3985,16 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev)
/* It adds dual VLAN length for supporting dual VLAN */
if ((dev->data->dev_conf.rxmode.max_rx_pkt_len +
2 * IXGBE_VLAN_TAG_SIZE) > buf_size) {
+ if (!dev->data->scattered_rx)
+ PMD_INIT_LOG(DEBUG, "forcing scatter mode");
dev->data->scattered_rx = 1;
dev->rx_pkt_burst = ixgbe_recv_scattered_pkts;
}
}
if (dev->data->dev_conf.rxmode.enable_scatter) {
+ if (!dev->data->scattered_rx)
+ PMD_INIT_LOG(DEBUG, "forcing scatter mode");
dev->rx_pkt_burst = ixgbe_recv_scattered_pkts;
dev->data->scattered_rx = 1;
}
--
1.7.10.4
[dpdk-dev] [PATCH v2 06/17] ixgbe: add log messages when rx bulk mode is not usable
Signed-off-by: David Marchand
---
lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 29 -
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
index dbbe612..f1cecf7 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
@@ -1975,15 +1975,34 @@ check_rx_burst_bulk_alloc_preconditions(__rte_unused
struct igb_rx_queue *rxq)
* outside of this function.
*/
#ifdef RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC
- if (! (rxq->rx_free_thresh >= RTE_PMD_IXGBE_RX_MAX_BURST))
+ if (!(rxq->rx_free_thresh >= RTE_PMD_IXGBE_RX_MAX_BURST)) {
+ PMD_INIT_LOG(DEBUG, "Rx Burst Bulk Alloc Preconditions: "
+"rxq->rx_free_thresh=%d, "
+"RTE_PMD_IXGBE_RX_MAX_BURST=%d",
+rxq->rx_free_thresh, RTE_PMD_IXGBE_RX_MAX_BURST);
ret = -EINVAL;
- else if (! (rxq->rx_free_thresh < rxq->nb_rx_desc))
+ } else if (!(rxq->rx_free_thresh < rxq->nb_rx_desc)) {
+ PMD_INIT_LOG(DEBUG, "Rx Burst Bulk Alloc Preconditions: "
+"rxq->rx_free_thresh=%d, "
+"rxq->nb_rx_desc=%d",
+rxq->rx_free_thresh, rxq->nb_rx_desc);
ret = -EINVAL;
- else if (! ((rxq->nb_rx_desc % rxq->rx_free_thresh) == 0))
+ } else if (!((rxq->nb_rx_desc % rxq->rx_free_thresh) == 0)) {
+ PMD_INIT_LOG(DEBUG, "Rx Burst Bulk Alloc Preconditions: "
+"rxq->nb_rx_desc=%d, "
+"rxq->rx_free_thresh=%d",
+rxq->nb_rx_desc, rxq->rx_free_thresh);
ret = -EINVAL;
- else if (! (rxq->nb_rx_desc <
- (IXGBE_MAX_RING_DESC - RTE_PMD_IXGBE_RX_MAX_BURST)))
+ } else if (!(rxq->nb_rx_desc <
+ (IXGBE_MAX_RING_DESC - RTE_PMD_IXGBE_RX_MAX_BURST))) {
+ PMD_INIT_LOG(DEBUG, "Rx Burst Bulk Alloc Preconditions: "
+"rxq->nb_rx_desc=%d, "
+"IXGBE_MAX_RING_DESC=%d, "
+"RTE_PMD_IXGBE_RX_MAX_BURST=%d",
+rxq->nb_rx_desc, IXGBE_MAX_RING_DESC,
+RTE_PMD_IXGBE_RX_MAX_BURST);
ret = -EINVAL;
+ }
#else
ret = -EINVAL;
#endif
--
1.7.10.4
[dpdk-dev] [PATCH v2 07/17] i40e: use the right debug macro
- Don't use DEBUGFUNC macro in non-shared code.
- Don't use printf for logs.
- We should avoid calling RTE_LOG directly as pmd provides a wrapper for logs.
Signed-off-by: David Marchand
---
lib/librte_pmd_i40e/i40e_ethdev.c| 146 +-
lib/librte_pmd_i40e/i40e_ethdev_vf.c |2 +-
lib/librte_pmd_i40e/i40e_pf.c|6 +-
lib/librte_pmd_i40e/i40e_rxtx.c | 64 +++
4 files changed, 110 insertions(+), 108 deletions(-)
diff --git a/lib/librte_pmd_i40e/i40e_ethdev.c
b/lib/librte_pmd_i40e/i40e_ethdev.c
index 4e65ca4..352beb1 100644
--- a/lib/librte_pmd_i40e/i40e_ethdev.c
+++ b/lib/librte_pmd_i40e/i40e_ethdev.c
@@ -1059,24 +1059,23 @@ i40e_update_vsi_stats(struct i40e_vsi *vsi)
&oes->tx_errors, &nes->tx_errors);
vsi->offset_loaded = true;
-#ifdef RTE_LIBRTE_I40E_DEBUG_DRIVER
- printf("* VSI[%u] stats start ***\n",
- vsi->vsi_id);
- printf("rx_bytes:%lu\n", nes->rx_bytes);
- printf("rx_unicast: %lu\n", nes->rx_unicast);
- printf("rx_multicast:%lu\n", nes->rx_multicast);
- printf("rx_broadcast:%lu\n", nes->rx_broadcast);
- printf("rx_discards: %lu\n", nes->rx_discards);
- printf("rx_unknown_protocol: %lu\n", nes->rx_unknown_protocol);
- printf("tx_bytes:%lu\n", nes->tx_bytes);
- printf("tx_unicast: %lu\n", nes->tx_unicast);
- printf("tx_multicast:%lu\n", nes->tx_multicast);
- printf("tx_broadcast:%lu\n", nes->tx_broadcast);
- printf("tx_discards: %lu\n", nes->tx_discards);
- printf("tx_errors: %lu\n", nes->tx_errors);
- printf("* VSI[%u] stats end ***\n",
- vsi->vsi_id);
-#endif /* RTE_LIBRTE_I40E_DEBUG_DRIVER */
+ PMD_DRV_LOG(DEBUG, "* VSI[%u] stats start
***\n",
+ vsi->vsi_id);
+ PMD_DRV_LOG(DEBUG, "rx_bytes:%lu\n", nes->rx_bytes);
+ PMD_DRV_LOG(DEBUG, "rx_unicast: %lu\n", nes->rx_unicast);
+ PMD_DRV_LOG(DEBUG, "rx_multicast:%lu\n", nes->rx_multicast);
+ PMD_DRV_LOG(DEBUG, "rx_broadcast:%lu\n", nes->rx_broadcast);
+ PMD_DRV_LOG(DEBUG, "rx_discards: %lu\n", nes->rx_discards);
+ PMD_DRV_LOG(DEBUG, "rx_unknown_protocol: %lu\n",
+ nes->rx_unknown_protocol);
+ PMD_DRV_LOG(DEBUG, "tx_bytes:%lu\n", nes->tx_bytes);
+ PMD_DRV_LOG(DEBUG, "tx_unicast: %lu\n", nes->tx_unicast);
+ PMD_DRV_LOG(DEBUG, "tx_multicast:%lu\n", nes->tx_multicast);
+ PMD_DRV_LOG(DEBUG, "tx_broadcast:%lu\n", nes->tx_broadcast);
+ PMD_DRV_LOG(DEBUG, "tx_discards: %lu\n", nes->tx_discards);
+ PMD_DRV_LOG(DEBUG, "tx_errors: %lu\n", nes->tx_errors);
+ PMD_DRV_LOG(DEBUG, "* VSI[%u] stats end
***\n",
+ vsi->vsi_id);
}
/* Get all statistics of a port */
@@ -1277,69 +1276,74 @@ i40e_dev_stats_get(struct rte_eth_dev *dev, struct
rte_eth_stats *stats)
if (pf->main_vsi)
i40e_update_vsi_stats(pf->main_vsi);
-#ifdef RTE_LIBRTE_I40E_DEBUG_DRIVER
- printf("* PF stats start ***\n");
- printf("rx_bytes:%lu\n", ns->eth.rx_bytes);
- printf("rx_unicast: %lu\n", ns->eth.rx_unicast);
- printf("rx_multicast:%lu\n", ns->eth.rx_multicast);
- printf("rx_broadcast:%lu\n", ns->eth.rx_broadcast);
- printf("rx_discards: %lu\n", ns->eth.rx_discards);
- printf("rx_unknown_protocol: %lu\n", ns->eth.rx_unknown_protocol);
- printf("tx_bytes:%lu\n", ns->eth.tx_bytes);
- printf("tx_unicast: %lu\n", ns->eth.tx_unicast);
- printf("tx_multicast:%lu\n", ns->eth.tx_multicast);
- printf("tx_broadcast:%lu\n", ns->eth.tx_broadcast);
- printf("tx_discards: %lu\n", ns->eth.tx_discards);
- printf("tx_errors: %lu\n", ns->eth.tx_errors);
-
- printf("tx_dropped_link_down: %lu\n", ns->tx_dropped_link_down);
- printf("crc_errors: %lu\n", ns->crc_errors);
- printf("illegal_bytes:%lu\n", ns->illegal_bytes);
- printf("error_bytes: %lu\n", ns->error_bytes);
- printf("mac_local_faults: %lu\n", ns->mac_local_faults);
- printf("mac_remote_faults:%lu\n", ns->mac_remote_faults);
- printf("rx_length_errors: %lu\n", ns->rx_length_errors);
- printf("link_xon_rx: %lu\n", ns->link_xon_rx);
- printf("link_xoff_rx: %lu\n", ns->link_xoff_rx);
+ PMD_DRV_LOG(DEBUG, "
[dpdk-dev] [PATCH v2 08/17] i40e/base: add a _RAW macro for use by shared code
Since shared code always add a trailing \n, add a PMD_DRV_LOG_RAW macro that
will not add one.
Signed-off-by: David Marchand
---
lib/librte_pmd_i40e/i40e/i40e_osdep.h |8
lib/librte_pmd_i40e/i40e_logs.h |9 ++---
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/lib/librte_pmd_i40e/i40e/i40e_osdep.h
b/lib/librte_pmd_i40e/i40e/i40e_osdep.h
index 0ed4b65..de71b0d 100644
--- a/lib/librte_pmd_i40e/i40e/i40e_osdep.h
+++ b/lib/librte_pmd_i40e/i40e/i40e_osdep.h
@@ -100,10 +100,10 @@ typedef enum i40e_status_code i40e_status;
#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
#define ASSERT(x) if(!(x)) rte_panic("IXGBE: x")
-#define DEBUGOUT(S)PMD_DRV_LOG(DEBUG, S)
-#define DEBUGOUT1(S, A...) PMD_DRV_LOG(DEBUG, S, ##A)
+#define DEBUGOUT(S)PMD_DRV_LOG_RAW(DEBUG, S)
+#define DEBUGOUT1(S, A...) PMD_DRV_LOG_RAW(DEBUG, S, ##A)
-#define DEBUGFUNC(F) DEBUGOUT(F)
+#define DEBUGFUNC(F) DEBUGOUT(F "\n")
#define DEBUGOUT2 DEBUGOUT1
#define DEBUGOUT3 DEBUGOUT2
#define DEBUGOUT6 DEBUGOUT3
@@ -112,7 +112,7 @@ typedef enum i40e_status_code i40e_status;
#define i40e_debug(h, m, s, ...)\
do {\
if (((m) & (h)->debug_mask))\
- PMD_DRV_LOG(DEBUG, "i40e %02x.%x " s, \
+ PMD_DRV_LOG_RAW(DEBUG, "i40e %02x.%x " s, \
(h)->bus.device, (h)->bus.func, \
##__VA_ARGS__); \
} while (0)
diff --git a/lib/librte_pmd_i40e/i40e_logs.h b/lib/librte_pmd_i40e/i40e_logs.h
index f991dd2..043ecba 100644
--- a/lib/librte_pmd_i40e/i40e_logs.h
+++ b/lib/librte_pmd_i40e/i40e_logs.h
@@ -65,10 +65,13 @@
#endif
#ifdef RTE_LIBRTE_I40E_DEBUG_DRIVER
-#define PMD_DRV_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+#define PMD_DRV_LOG_RAW(level, fmt, args...) \
+ RTE_LOG(level, PMD, "%s(): " fmt, __func__, ## args)
#else
-#define PMD_DRV_LOG(level, fmt, args...) do { } while(0)
+#define PMD_DRV_LOG_RAW(level, fmt, args...) do { } while (0)
#endif
+#define PMD_DRV_LOG(level, fmt, args...) \
+ PMD_DRV_LOG_RAW(level, fmt "\n", ## args)
+
#endif /* _I40E_LOGS_H_ */
--
1.7.10.4
[dpdk-dev] [PATCH v2 09/17] i40e: clean log messages
Clean log messages:
- remove leading \n in some messages,
- remove trailing \n in some messages,
- split multi lines messages,
- replace some PMD_INIT_LOG(DEBUG, "some_func") with PMD_INIT_FUNC_TRACE().
Signed-off-by: David Marchand
---
lib/librte_pmd_i40e/i40e_ethdev.c| 418 +-
lib/librte_pmd_i40e/i40e_ethdev_vf.c | 166 +++---
lib/librte_pmd_i40e/i40e_pf.c| 75 +++---
lib/librte_pmd_i40e/i40e_rxtx.c | 118 +-
4 files changed, 385 insertions(+), 392 deletions(-)
diff --git a/lib/librte_pmd_i40e/i40e_ethdev.c
b/lib/librte_pmd_i40e/i40e_ethdev.c
index 352beb1..1a5b55d 100644
--- a/lib/librte_pmd_i40e/i40e_ethdev.c
+++ b/lib/librte_pmd_i40e/i40e_ethdev.c
@@ -371,7 +371,7 @@ eth_i40e_dev_init(__rte_unused struct eth_driver *eth_drv,
hw->hw_addr = (uint8_t *)(pci_dev->mem_resource[0].addr);
if (!hw->hw_addr) {
PMD_INIT_LOG(ERR, "Hardware is not available, "
- "as address is NULL\n");
+"as address is NULL");
return -ENODEV;
}
@@ -395,7 +395,8 @@ eth_i40e_dev_init(__rte_unused struct eth_driver *eth_drv,
/* Initialize the shared code (base driver) */
ret = i40e_init_shared_code(hw);
if (ret) {
- PMD_INIT_LOG(ERR, "Failed to init shared code (base driver):
%d", ret);
+ PMD_INIT_LOG(ERR, "Failed to init shared code (base driver):"
+"%d", ret);
return ret;
}
@@ -406,8 +407,7 @@ eth_i40e_dev_init(__rte_unused struct eth_driver *eth_drv,
PMD_INIT_LOG(ERR, "Failed to init adminq: %d", ret);
return -EIO;
}
- PMD_INIT_LOG(INFO, "FW %d.%d API %d.%d NVM "
- "%02d.%02d.%02d eetrack %04x\n",
+ PMD_INIT_LOG(INFO, "FW %d.%d API %d.%d NVM %02d.%02d.%02d eetrack %04x",
hw->aq.fw_maj_ver, hw->aq.fw_min_ver,
hw->aq.api_maj_ver, hw->aq.api_min_ver,
((hw->nvm.version >> 12) & 0xf),
@@ -417,7 +417,7 @@ eth_i40e_dev_init(__rte_unused struct eth_driver *eth_drv,
/* Disable LLDP */
ret = i40e_aq_stop_lldp(hw, true, NULL);
if (ret != I40E_SUCCESS) /* Its failure can be ignored */
- PMD_INIT_LOG(INFO, "Failed to stop lldp\n");
+ PMD_INIT_LOG(INFO, "Failed to stop lldp");
/* Clear PXE mode */
i40e_clear_pxe_mode(hw);
@@ -439,13 +439,13 @@ eth_i40e_dev_init(__rte_unused struct eth_driver *eth_drv,
/* Initialize the queue management */
ret = i40e_res_pool_init(&pf->qp_pool, 0, hw->func_caps.num_tx_qp);
if (ret < 0) {
- PMD_INIT_LOG(ERR, "Failed to init queue pool\n");
+ PMD_INIT_LOG(ERR, "Failed to init queue pool");
goto err_qp_pool_init;
}
ret = i40e_res_pool_init(&pf->msix_pool, 1,
hw->func_caps.num_msix_vectors - 1);
if (ret < 0) {
- PMD_INIT_LOG(ERR, "Failed to init MSIX pool\n");
+ PMD_INIT_LOG(ERR, "Failed to init MSIX pool");
goto err_msix_pool_init;
}
@@ -499,8 +499,8 @@ eth_i40e_dev_init(__rte_unused struct eth_driver *eth_drv,
/* Should be after VSI initialized */
dev->data->mac_addrs = rte_zmalloc("i40e", len, 0);
if (!dev->data->mac_addrs) {
- PMD_INIT_LOG(ERR, "Failed to allocated memory "
- "for storing mac address");
+ PMD_INIT_LOG(ERR, "Failed to allocated memory for storing "
+"mac address");
goto err_get_mac_addr;
}
ether_addr_copy((struct ether_addr *)hw->mac.perm_addr,
@@ -723,9 +723,9 @@ i40e_phy_conf_link(struct i40e_hw *hw, uint8_t abilities,
uint8_t force_speed)
phy_conf.eeer = phy_ab.eeer_val;
phy_conf.low_power_ctrl = phy_ab.d3_lpan;
- PMD_DRV_LOG(DEBUG, "\n\tCurrent: abilities %x, link_speed %x\n"
- "\tConfig: abilities %x, link_speed %x",
- phy_ab.abilities, phy_ab.link_speed,
+ PMD_DRV_LOG(DEBUG, "\tCurrent: abilities %x, link_speed %x",
+ phy_ab.abilities, phy_ab.link_speed);
+ PMD_DRV_LOG(DEBUG, "\tConfig: abilities %x, link_speed %x",
phy_conf.abilities, phy_conf.link_speed);
status = i40e_aq_set_phy_config(hw, &phy_conf, NULL);
@@ -763,7 +763,7 @@ i40e_dev_start(struct rte_eth_dev *dev)
if ((dev->data->dev_conf.link_duplex != ETH_LINK_AUTONEG_DUPLEX) &&
(dev->data->dev_conf.link_duplex != ETH_LINK_FULL_DUPLEX)) {
- PMD_INIT_LOG(ERR, "Invalid link_duplex (%hu) for port %hhu\n",
+ PMD_INIT_LOG(ERR, "Invalid link_duplex (%hu) for port %hhu",
dev->data->dev_conf.link_duplex,
[dpdk-dev] [PATCH v2 10/17] i40e: always log init messages
'init' messages should always be logged and filtered at runtime by rte_log.
All the more so as these messages are not in the datapath.
Signed-off-by: David Marchand
---
lib/librte_pmd_i40e/i40e_logs.h |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/librte_pmd_i40e/i40e_logs.h b/lib/librte_pmd_i40e/i40e_logs.h
index 043ecba..399867f 100644
--- a/lib/librte_pmd_i40e/i40e_logs.h
+++ b/lib/librte_pmd_i40e/i40e_logs.h
@@ -34,12 +34,13 @@
#ifndef _I40E_LOGS_H_
#define _I40E_LOGS_H_
-#ifdef RTE_LIBRTE_I40E_DEBUG_INIT
#define PMD_INIT_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+ rte_log(RTE_LOG_ ## level, RTE_LOGTYPE_PMD, \
+ "PMD: %s(): " fmt "\n", __func__, ##args)
+
+#ifdef RTE_LIBRTE_I40E_DEBUG_INIT
#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
#else
-#define PMD_INIT_LOG(level, fmt, args...) do { } while(0)
#define PMD_INIT_FUNC_TRACE() do { } while(0)
#endif
--
1.7.10.4
[dpdk-dev] [PATCH v2 11/17] i40e: add log messages when rx bulk mode is not usable
Signed-off-by: David Marchand
---
lib/librte_pmd_i40e/i40e_rxtx.c | 29 -
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/lib/librte_pmd_i40e/i40e_rxtx.c b/lib/librte_pmd_i40e/i40e_rxtx.c
index 70fabaa..f410600 100644
--- a/lib/librte_pmd_i40e/i40e_rxtx.c
+++ b/lib/librte_pmd_i40e/i40e_rxtx.c
@@ -537,15 +537,34 @@ check_rx_burst_bulk_alloc_preconditions(__rte_unused
struct i40e_rx_queue *rxq)
int ret = 0;
#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC
- if (!(rxq->rx_free_thresh >= RTE_PMD_I40E_RX_MAX_BURST))
+ if (!(rxq->rx_free_thresh >= RTE_PMD_I40E_RX_MAX_BURST)) {
+ PMD_INIT_LOG(DEBUG, "Rx Burst Bulk Alloc Preconditions: "
+"rxq->rx_free_thresh=%d, "
+"RTE_PMD_I40E_RX_MAX_BURST=%d",
+rxq->rx_free_thresh, RTE_PMD_I40E_RX_MAX_BURST);
ret = -EINVAL;
- else if (!(rxq->rx_free_thresh < rxq->nb_rx_desc))
+ } else if (!(rxq->rx_free_thresh < rxq->nb_rx_desc)) {
+ PMD_INIT_LOG(DEBUG, "Rx Burst Bulk Alloc Preconditions: "
+"rxq->rx_free_thresh=%d, "
+"rxq->nb_rx_desc=%d",
+rxq->rx_free_thresh, rxq->nb_rx_desc);
ret = -EINVAL;
- else if (!(rxq->nb_rx_desc % rxq->rx_free_thresh) == 0)
+ } else if (!(rxq->nb_rx_desc % rxq->rx_free_thresh) == 0) {
+ PMD_INIT_LOG(DEBUG, "Rx Burst Bulk Alloc Preconditions: "
+"rxq->nb_rx_desc=%d, "
+"rxq->rx_free_thresh=%d",
+rxq->nb_rx_desc, rxq->rx_free_thresh);
ret = -EINVAL;
- else if (!(rxq->nb_rx_desc < (I40E_MAX_RING_DESC -
- RTE_PMD_I40E_RX_MAX_BURST)))
+ } else if (!(rxq->nb_rx_desc < (I40E_MAX_RING_DESC -
+ RTE_PMD_I40E_RX_MAX_BURST))) {
+ PMD_INIT_LOG(DEBUG, "Rx Burst Bulk Alloc Preconditions: "
+"rxq->nb_rx_desc=%d, "
+"I40E_MAX_RING_DESC=%d, "
+"RTE_PMD_I40E_RX_MAX_BURST=%d",
+rxq->nb_rx_desc, I40E_MAX_RING_DESC,
+RTE_PMD_I40E_RX_MAX_BURST);
ret = -EINVAL;
+ }
#else
ret = -EINVAL;
#endif
--
1.7.10.4
[dpdk-dev] [PATCH v2 12/17] e1000: use the right debug macro
- We should not use DEBUGOUT* / DEBUGFUNC macros in non-shared code.
These macros come as compat wrappers for shared code.
- We should avoid calling RTE_LOG directly as pmd provides a wrapper for logs.
Signed-off-by: David Marchand
---
lib/librte_pmd_e1000/em_rxtx.c| 32 ++--
lib/librte_pmd_e1000/igb_ethdev.c |9 +
lib/librte_pmd_e1000/igb_pf.c |5 +++--
lib/librte_pmd_e1000/igb_rxtx.c | 16 +++-
4 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/lib/librte_pmd_e1000/em_rxtx.c b/lib/librte_pmd_e1000/em_rxtx.c
index f254858..01efa50 100644
--- a/lib/librte_pmd_e1000/em_rxtx.c
+++ b/lib/librte_pmd_e1000/em_rxtx.c
@@ -1211,18 +1211,21 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev,
DEFAULT_TX_RS_THRESH);
if (tx_free_thresh >= (nb_desc - 3)) {
- RTE_LOG(ERR, PMD, "tx_free_thresh must be less than the "
- "number of TX descriptors minus 3. (tx_free_thresh=%u "
- "port=%d queue=%d)\n", (unsigned int)tx_free_thresh,
- (int)dev->data->port_id, (int)queue_idx);
+ PMD_INIT_LOG(ERR, "tx_free_thresh must be less than the "
+"number of TX descriptors minus 3. "
+"(tx_free_thresh=%u port=%d queue=%d)\n",
+(unsigned int)tx_free_thresh,
+(int)dev->data->port_id, (int)queue_idx);
return -(EINVAL);
}
if (tx_rs_thresh > tx_free_thresh) {
- RTE_LOG(ERR, PMD, "tx_rs_thresh must be less than or equal to "
- "tx_free_thresh. (tx_free_thresh=%u tx_rs_thresh=%u "
- "port=%d queue=%d)\n", (unsigned int)tx_free_thresh,
- (unsigned int)tx_rs_thresh, (int)dev->data->port_id,
- (int)queue_idx);
+ PMD_INIT_LOG(ERR, "tx_rs_thresh must be less than or equal to "
+"tx_free_thresh. (tx_free_thresh=%u "
+"tx_rs_thresh=%u port=%d queue=%d)\n",
+(unsigned int)tx_free_thresh,
+(unsigned int)tx_rs_thresh,
+(int)dev->data->port_id,
+(int)queue_idx);
return -(EINVAL);
}
@@ -1233,10 +1236,10 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev,
* accumulates WTHRESH descriptors.
*/
if (tx_conf->tx_thresh.wthresh != 0 && tx_rs_thresh != 1) {
- RTE_LOG(ERR, PMD, "TX WTHRESH must be set to 0 if "
- "tx_rs_thresh is greater than 1. (tx_rs_thresh=%u "
- "port=%d queue=%d)\n", (unsigned int)tx_rs_thresh,
- (int)dev->data->port_id, (int)queue_idx);
+ PMD_INIT_LOG(ERR, "TX WTHRESH must be set to 0 if "
+"tx_rs_thresh is greater than 1. (tx_rs_thresh=%u "
+"port=%d queue=%d)\n", (unsigned int)tx_rs_thresh,
+(int)dev->data->port_id, (int)queue_idx);
return -(EINVAL);
}
@@ -1366,7 +1369,8 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,
* EM devices don't support drop_en functionality
*/
if (rx_conf->rx_drop_en) {
- RTE_LOG(ERR, PMD, "drop_en functionality not supported by
device\n");
+ PMD_INIT_LOG(ERR, "drop_en functionality not supported by "
+"device\n");
return (-EINVAL);
}
diff --git a/lib/librte_pmd_e1000/igb_ethdev.c
b/lib/librte_pmd_e1000/igb_ethdev.c
index 3187d92..b45eb24 100644
--- a/lib/librte_pmd_e1000/igb_ethdev.c
+++ b/lib/librte_pmd_e1000/igb_ethdev.c
@@ -400,7 +400,7 @@ igb_reset_swfw_lock(struct e1000_hw *hw)
* So force the release of the faulty lock.
*/
if (e1000_get_hw_semaphore_generic(hw) < 0) {
- DEBUGOUT("SMBI lock released");
+ PMD_DRV_LOG(DEBUG, "SMBI lock released");
}
e1000_put_hw_semaphore_generic(hw);
@@ -416,7 +416,8 @@ igb_reset_swfw_lock(struct e1000_hw *hw)
if (hw->bus.func > E1000_FUNC_1)
mask <<= 2;
if (hw->mac.ops.acquire_swfw_sync(hw, mask) < 0) {
- DEBUGOUT1("SWFW phy%d lock released", hw->bus.func);
+ PMD_DRV_LOG(DEBUG, "SWFW phy%d lock released",
+ hw->bus.func);
}
hw->mac.ops.release_swfw_sync(hw, mask);
@@ -428,7 +429,7 @@ igb_reset_swfw_lock(struct e1000_hw *hw)
*/
mask = E1000_SWFW_EEP_SM;
if (hw->mac.ops.acquire_swfw_sync(hw, mask) < 0) {
- DEBUGOUT("SWFW common
[dpdk-dev] [PATCH v2 13/17] e1000/base: add a _RAW macro for use by shared code
Since shared code always add a trailing \n, add a PMD_DRV_LOG_RAW macro that
will not add one.
Signed-off-by: David Marchand
---
lib/librte_pmd_e1000/e1000/e1000_osdep.h |4 ++--
lib/librte_pmd_e1000/e1000_logs.h|9 ++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/lib/librte_pmd_e1000/e1000/e1000_osdep.h
b/lib/librte_pmd_e1000/e1000/e1000_osdep.h
index b083a82..438641e 100644
--- a/lib/librte_pmd_e1000/e1000/e1000_osdep.h
+++ b/lib/librte_pmd_e1000/e1000/e1000_osdep.h
@@ -52,8 +52,8 @@
#define msec_delay(x) DELAY(1000*(x))
#define msec_delay_irq(x) DELAY(1000*(x))
-#define DEBUGFUNC(F)DEBUGOUT(F);
-#define DEBUGOUT(S, args...)PMD_DRV_LOG(DEBUG, S, ##args)
+#define DEBUGFUNC(F)DEBUGOUT(F "\n");
+#define DEBUGOUT(S, args...)PMD_DRV_LOG_RAW(DEBUG, S, ##args)
#define DEBUGOUT1(S, args...) DEBUGOUT(S, ##args)
#define DEBUGOUT2(S, args...) DEBUGOUT(S, ##args)
#define DEBUGOUT3(S, args...) DEBUGOUT(S, ##args)
diff --git a/lib/librte_pmd_e1000/e1000_logs.h
b/lib/librte_pmd_e1000/e1000_logs.h
index b6b3bb7..fe6e023 100644
--- a/lib/librte_pmd_e1000/e1000_logs.h
+++ b/lib/librte_pmd_e1000/e1000_logs.h
@@ -63,10 +63,13 @@
#endif
#ifdef RTE_LIBRTE_E1000_DEBUG_DRIVER
-#define PMD_DRV_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+#define PMD_DRV_LOG_RAW(level, fmt, args...) \
+ RTE_LOG(level, PMD, "%s(): " fmt, __func__, ## args)
#else
-#define PMD_DRV_LOG(level, fmt, args...) do { } while(0)
+#define PMD_DRV_LOG_RAW(level, fmt, args...) do { } while (0)
#endif
+#define PMD_DRV_LOG(level, fmt, args...) \
+ PMD_DRV_LOG_RAW(level, fmt "\n", ## args)
+
#endif /* _E1000_LOGS_H_ */
--
1.7.10.4
[dpdk-dev] [PATCH v2 14/17] e1000: clean log messages
Clean log messages:
- remove leading \n in some messages,
- remove trailing \n in some messages,
- split multi lines messages,
- replace some PMD_INIT_LOG(DEBUG, "some_func") with PMD_INIT_FUNC_TRACE().
Signed-off-by: David Marchand
---
lib/librte_pmd_e1000/e1000_logs.h |4 +-
lib/librte_pmd_e1000/em_ethdev.c | 64 ++
lib/librte_pmd_e1000/em_rxtx.c| 109 ++---
lib/librte_pmd_e1000/igb_ethdev.c | 91 +++
lib/librte_pmd_e1000/igb_pf.c |4 +-
lib/librte_pmd_e1000/igb_rxtx.c | 45 +++
6 files changed, 153 insertions(+), 164 deletions(-)
diff --git a/lib/librte_pmd_e1000/e1000_logs.h
b/lib/librte_pmd_e1000/e1000_logs.h
index fe6e023..4dd7208 100644
--- a/lib/librte_pmd_e1000/e1000_logs.h
+++ b/lib/librte_pmd_e1000/e1000_logs.h
@@ -37,8 +37,10 @@
#ifdef RTE_LIBRTE_E1000_DEBUG_INIT
#define PMD_INIT_LOG(level, fmt, args...) \
RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
#else
-#define PMD_INIT_LOG(level, fmt, args...) do { } while(0)
+#define PMD_INIT_LOG(level, fmt, args...) do { } while (0)
+#define PMD_INIT_FUNC_TRACE() do { } while (0)
#endif
#ifdef RTE_LIBRTE_E1000_DEBUG_RX
diff --git a/lib/librte_pmd_e1000/em_ethdev.c b/lib/librte_pmd_e1000/em_ethdev.c
index 4555294..fd36b37 100644
--- a/lib/librte_pmd_e1000/em_ethdev.c
+++ b/lib/librte_pmd_e1000/em_ethdev.c
@@ -249,9 +249,9 @@ eth_em_dev_init(__attribute__((unused)) struct eth_driver
*eth_drv,
if (e1000_setup_init_funcs(hw, TRUE) != E1000_SUCCESS ||
em_hw_init(hw) != 0) {
PMD_INIT_LOG(ERR, "port_id %d vendorID=0x%x deviceID=0x%x: "
- "failed to init HW",
- eth_dev->data->port_id, pci_dev->id.vendor_id,
- pci_dev->id.device_id);
+"failed to init HW",
+eth_dev->data->port_id, pci_dev->id.vendor_id,
+pci_dev->id.device_id);
return -(ENODEV);
}
@@ -260,8 +260,8 @@ eth_em_dev_init(__attribute__((unused)) struct eth_driver
*eth_drv,
hw->mac.rar_entry_count, 0);
if (eth_dev->data->mac_addrs == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate %d bytes needed to "
- "store MAC addresses",
- ETHER_ADDR_LEN * hw->mac.rar_entry_count);
+"store MAC addresses",
+ETHER_ADDR_LEN * hw->mac.rar_entry_count);
return -(ENOMEM);
}
@@ -272,9 +272,9 @@ eth_em_dev_init(__attribute__((unused)) struct eth_driver
*eth_drv,
/* initialize the vfta */
memset(shadow_vfta, 0, sizeof(*shadow_vfta));
- PMD_INIT_LOG(INFO, "port_id %d vendorID=0x%x deviceID=0x%x\n",
- eth_dev->data->port_id, pci_dev->id.vendor_id,
- pci_dev->id.device_id);
+ PMD_INIT_LOG(INFO, "port_id %d vendorID=0x%x deviceID=0x%x",
+eth_dev->data->port_id, pci_dev->id.vendor_id,
+pci_dev->id.device_id);
rte_intr_callback_register(&(pci_dev->intr_handle),
eth_em_interrupt_handler, (void *)eth_dev);
@@ -306,17 +306,17 @@ em_hw_init(struct e1000_hw *hw)
diag = hw->mac.ops.init_params(hw);
if (diag != 0) {
- PMD_INIT_LOG(ERR, "MAC Initialization Error\n");
+ PMD_INIT_LOG(ERR, "MAC Initialization Error");
return diag;
}
diag = hw->nvm.ops.init_params(hw);
if (diag != 0) {
- PMD_INIT_LOG(ERR, "NVM Initialization Error\n");
+ PMD_INIT_LOG(ERR, "NVM Initialization Error");
return diag;
}
diag = hw->phy.ops.init_params(hw);
if (diag != 0) {
- PMD_INIT_LOG(ERR, "PHY Initialization Error\n");
+ PMD_INIT_LOG(ERR, "PHY Initialization Error");
return diag;
}
(void) e1000_get_bus_info(hw);
@@ -375,7 +375,7 @@ em_hw_init(struct e1000_hw *hw)
diag = e1000_check_reset_block(hw);
if (diag < 0) {
PMD_INIT_LOG(ERR, "PHY reset is blocked due to "
- "SOL/IDER session");
+"SOL/IDER session");
}
return (0);
@@ -390,11 +390,10 @@ eth_em_configure(struct rte_eth_dev *dev)
struct e1000_interrupt *intr =
E1000_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
- PMD_INIT_LOG(DEBUG, ">>");
-
+ PMD_INIT_FUNC_TRACE();
intr->flags |= E1000_FLAG_NEED_LINK_UPDATE;
+ PMD_INIT_FUNC_TRACE();
- PMD_INIT_LOG(DEBUG, "<<");
return (0);
}
@@ -453,7 +452,7 @@ eth_em_start(struct rte_eth_dev *dev)
E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
int
