[dpdk-dev] [Bug 446] rte_lcore_index(-1) returns invalid data for non DPDK thread.
https://bugs.dpdk.org/show_bug.cgi?id=446 Thomas Monjalon (tho...@monjalon.net) changed: What|Removed |Added Resolution|--- |FIXED Status|UNCONFIRMED |RESOLVED --- Comment #1 from Thomas Monjalon (tho...@monjalon.net) --- Resolved in http://git.dpdk.org/dpdk/commit/?id=67ae5936c4 -- You are receiving this mail because: You are the assignee for the bug.
Re: [dpdk-dev] [PATCH v2] lib/librte_timer:fix corruption with reset
On Wed, Jul 8, 2020 at 8:08 PM Stephen Hemminger
wrote:
> On Wed, 8 Jul 2020 10:06:26 +0500
> Sarosh Arif wrote:
>
> > rte_timer_stop_sync(struct rte_timer *tim)
> > {
> > + struct rte_timer_data *timer_data;
> > + TIMER_DATA_VALID_GET_OR_ERR_RET(default_data_id, timer_data,
> -EINVAL);
> > + unsigned int lcore_id = rte_lcore_id();
>
> This mixing code and declarations. since the macro has a return statement.
>
> Maybe:
>
> struct rte_timer_data *timer_data;
> unsigned int lcore_id = rte_lcore_id();
>
> TIMER_DATA_VALID_GET_OR_ERR_RET(default_data_id, timer_data,
> -EINVAL);
>
I will fix this in the next version.
Re: [dpdk-dev] [PATCH v2] lib/librte_timer:fix corruption with reset
On Wed, Jul 8, 2020 at 8:07 PM Stephen Hemminger wrote: > On Wed, 8 Jul 2020 10:06:26 +0500 > Sarosh Arif wrote: > > > /* loop until rte_timer_reset() succeed */ > > -void > > +int > > rte_timer_reset_sync(struct rte_timer *tim, uint64_t ticks, > >enum rte_timer_type type, unsigned tim_lcore, > >rte_timer_cb_t fct, void *arg) > > This is an API change and needs to wait until a breaking release like > 20.11. > Okay,waiting till the next breaking release sounds fine to me. > Also most applications won't test the result. >
Re: [dpdk-dev] [PATCH v4 01/10] eal: introduce macros for getting valuefor bit
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Parav Pandit
> Sent: Thursday, July 9, 2020 8:24 AM
>
> Hi Morten,
>
> > From: Morten Brørup
> > Sent: Tuesday, July 7, 2020 6:11 PM
>
> > Adding Joyce Kong to this discussion as the rte_bitops maintainer.
> >
> > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > Sent: Tuesday, July 7, 2020 2:13 PM
> > >
> > > 07/07/2020 13:38, Parav Pandit:
> > > > From: Morten Brørup
> > > > > From: Parav Pandit
> > > > > > --- a/lib/librte_eal/include/rte_bitops.h
> > > > > > +++ b/lib/librte_eal/include/rte_bitops.h
> > > > > > @@ -17,6 +17,8 @@
> > > > > > #include
> > > > > > #include
> > > > > >
> > > > > > +#define RTE_BIT(bit_num) (1UL << (bit_num))
> > > > >
> > > > > Is the return value 32 or 64 bit, or is intended to depend on
> the
> > > target
> > > > > architecture?
> > > > >
> > > > It should be 64-bit.
> > > >
> > > > > Please be explicit by using UINT32_C(1) or UINT64_C(1) instead
> of
> > > 1UL, if you
> > > > > want a specific size.
> > > > >
> > > > Will do UINT64_C(1).
> > > >
> > > > > It could be a static inline __attribute__((__pure__)) function
> > > instead of a macro,
> > > > > but it's not important for me.
> > > > >
> > > > > The macro/function needs a description for the documentation.
> > > > >
> > > > In this header file or outside?
> > >
> > > It is asked to add a doxygen comment.
> Ok. will add.
>
> > >
> > >
> > > > > I'm also concerned about the name of the macro being too
> generic.
> > > But the
> > > > > effort of changing all the drivers where it is being used
> already
> > > could be too big
> > > > > if the name changes too.
> > > > >
> > > > Right. Currently drivers have generic name as BIT(). Close to
> 3000
> > > entries.
> > > > So doing at RTE_BIT to match other rte_ APIs.
> > > > Drivers can slowly migrate at their pace to this one.
> > > >
> > > > > And the macro/function is new, so shouldn't it - in theory - be
> > > marked as
> > > > > experimental?
> > > >
> > > > How to mark a macro as experimental?
> > >
> > > A macro cannot be experimental.
> > >
> >
> > OK. If the macro is given a future proof name, I guess it should be
> accepted.
> >
> > If we want boundary checks, I suggest a macro like:
> >
> > #define RTE_BIT64(nr) \
> > ({ \
> > typeof(nr) n = nr; \
> > RTE_BUILD_BUG_ON((n > 64) || (n < 0)); \
> > UINT64_C(1) << (n); \
> > })
> >
> Compiler doesn't like it.
>
> ../lib/librte_eal/include/rte_bitops.h:21:2: error: braced-group within
> expression allowed only inside a function
> ({ \
> ^
>
> > Or a function:
> >
> > __rte_experimental
> > static __rte_always_inline __attribute__((const)) uint64_t
> rte_bit64(const
> > unsigned int nr) {
> > RTE_ASSERT(nr < 64);
> >
> > return UINT64_C(1) << nr;
> > }
> >
> Value retrieved using this macro is used an enum. Don't see how a
> function call like above can solve it.
>
> For a below macro definition, compiler is already catching for negative
> value when RTE_BIT64(-1) is done,
>
> ../lib/librte_eal/include/rte_bitops.h:36:36: warning: left shift count
> is negative [-Wshift-count-negative]
> #define RTE_BIT64(nr) (UINT64_C(1) << (nr))
>
> And when RTE_BIT64(259) is done below error is done,
>
> ../lib/librte_eal/include/rte_bitops.h:36:36: warning: left shift count
> >= width of type [-Wshift-count-overflow]
> #define RTE_BIT64(nr) (UINT64_C(1) << (nr))
>
> So below definition is good covering all needed cases.
>
> #define RTE_BIT64(nr) (UINT64_C(1) << (nr))
Great. Then, when you have added a doxygen comment:
Acked-by: Morten Brørup
Re: [dpdk-dev] [PATCH v4 01/10] eal: introduce macros for getting valuefor bit
> From: Morten Brørup
> Sent: Thursday, July 9, 2020 12:46 PM
>
> > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Parav Pandit
> > Sent: Thursday, July 9, 2020 8:24 AM
> >
> > Hi Morten,
> >
> > > From: Morten Brørup
> > > Sent: Tuesday, July 7, 2020 6:11 PM
> >
> > > Adding Joyce Kong to this discussion as the rte_bitops maintainer.
> > >
> > > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > > Sent: Tuesday, July 7, 2020 2:13 PM
> > > >
> > > > 07/07/2020 13:38, Parav Pandit:
> > > > > From: Morten Brørup
> > > > > > From: Parav Pandit
> > > > > > > --- a/lib/librte_eal/include/rte_bitops.h
> > > > > > > +++ b/lib/librte_eal/include/rte_bitops.h
> > > > > > > @@ -17,6 +17,8 @@
> > > > > > > #include
> > > > > > > #include
> > > > > > >
> > > > > > > +#define RTE_BIT(bit_num) (1UL << (bit_num))
> > > > > >
> > > > > > Is the return value 32 or 64 bit, or is intended to depend on
> > the
> > > > target
> > > > > > architecture?
> > > > > >
> > > > > It should be 64-bit.
> > > > >
> > > > > > Please be explicit by using UINT32_C(1) or UINT64_C(1) instead
> > of
> > > > 1UL, if you
> > > > > > want a specific size.
> > > > > >
> > > > > Will do UINT64_C(1).
> > > > >
> > > > > > It could be a static inline __attribute__((__pure__)) function
> > > > instead of a macro,
> > > > > > but it's not important for me.
> > > > > >
> > > > > > The macro/function needs a description for the documentation.
> > > > > >
> > > > > In this header file or outside?
> > > >
> > > > It is asked to add a doxygen comment.
> > Ok. will add.
> >
> > > >
> > > >
> > > > > > I'm also concerned about the name of the macro being too
> > generic.
> > > > But the
> > > > > > effort of changing all the drivers where it is being used
> > already
> > > > could be too big
> > > > > > if the name changes too.
> > > > > >
> > > > > Right. Currently drivers have generic name as BIT(). Close to
> > 3000
> > > > entries.
> > > > > So doing at RTE_BIT to match other rte_ APIs.
> > > > > Drivers can slowly migrate at their pace to this one.
> > > > >
> > > > > > And the macro/function is new, so shouldn't it - in theory -
> > > > > > be
> > > > marked as
> > > > > > experimental?
> > > > >
> > > > > How to mark a macro as experimental?
> > > >
> > > > A macro cannot be experimental.
> > > >
> > >
> > > OK. If the macro is given a future proof name, I guess it should be
> > accepted.
> > >
> > > If we want boundary checks, I suggest a macro like:
> > >
> > > #define RTE_BIT64(nr) \
> > > ({ \
> > > typeof(nr) n = nr; \
> > > RTE_BUILD_BUG_ON((n > 64) || (n < 0)); \
> > > UINT64_C(1) << (n); \
> > > })
> > >
> > Compiler doesn't like it.
> >
> > ../lib/librte_eal/include/rte_bitops.h:21:2: error: braced-group
> > within expression allowed only inside a function
> > ({ \
> > ^
> >
> > > Or a function:
> > >
> > > __rte_experimental
> > > static __rte_always_inline __attribute__((const)) uint64_t
> > rte_bit64(const
> > > unsigned int nr) {
> > > RTE_ASSERT(nr < 64);
> > >
> > > return UINT64_C(1) << nr;
> > > }
> > >
> > Value retrieved using this macro is used an enum. Don't see how a
> > function call like above can solve it.
> >
> > For a below macro definition, compiler is already catching for
> > negative value when RTE_BIT64(-1) is done,
> >
> > ../lib/librte_eal/include/rte_bitops.h:36:36: warning: left shift
> > count is negative [-Wshift-count-negative] #define RTE_BIT64(nr)
> > (UINT64_C(1) << (nr))
> >
> > And when RTE_BIT64(259) is done below error is done,
> >
> > ../lib/librte_eal/include/rte_bitops.h:36:36: warning: left shift
> > count
> > >= width of type [-Wshift-count-overflow]
> > #define RTE_BIT64(nr) (UINT64_C(1) << (nr))
> >
> > So below definition is good covering all needed cases.
> >
> > #define RTE_BIT64(nr) (UINT64_C(1) << (nr))
>
> Great. Then, when you have added a doxygen comment:
>
> Acked-by: Morten Brørup
Thanks Morten; adding it.
Re: [dpdk-dev] [PATCH] net/ice: fix invalid RSS type
> -Original Message-
> From: Zhang, Qi Z
> Sent: Thursday, July 9, 2020 2:47 PM
> To: Su, Simei
> Cc: dev@dpdk.org; Guo, Jia
> Subject: RE: [PATCH] net/ice: fix invalid RSS type
>
>
>
> > -Original Message-
> > From: Su, Simei
> > Sent: Thursday, July 9, 2020 2:27 PM
> > To: Zhang, Qi Z
> > Cc: dev@dpdk.org; Guo, Jia ; Su, Simei
> >
> > Subject: [PATCH] net/ice: fix invalid RSS type
> >
> > When a RSS rule with only RSS type modifirer L2/L3/L4 SRC/DST_ONLY, it
> > should return failure. This patch adds invalid RSS type check.
> >
> > Fixes: dfaedcf20170 ("net/ice: refactor PF hash flow")
> >
> > Signed-off-by: Simei Su
> > ---
> > drivers/net/ice/ice_hash.c | 5 +
> > 1 file changed, 5 insertions(+)
> >
> > diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
> > index cbd6116..777bd6d 100644
> > --- a/drivers/net/ice/ice_hash.c
> > +++ b/drivers/net/ice/ice_hash.c
> > @@ -721,6 +721,11 @@ struct ice_hash_match_type ice_hash_type_list[] =
> {
> > * of the same level.
> > */
> > rss_type = rte_eth_rss_hf_refine(rss_type);
> > + /* Check if only L2/L3/L4 src/dst-only exists. */
> > + if ((rss_type & 0x) == 0)
>
> Why 0x? We should not hard code.
Ok, got it. My purpose is to check if rss type is 0 except SRC/DST_ONLY bit to
make sure there exist ipv4, ipv6, udp, tcp or sctp type, etc. I will modify it
in v2. Thanks.
Br
Simei
>
> > + return rte_flow_error_set(error, ENOTSUP,
> > + RTE_FLOW_ERROR_TYPE_ACTION, action,
> > + "rss type with only L2/L3/L4 src/dst
> > only is invalid");
> >
> > combine_type = ETH_RSS_L2_SRC_ONLY |
> > ETH_RSS_L2_DST_ONLY |
> > --
> > 1.8.3.1
>
[dpdk-dev] [PATCH v5 4/9] common/mlx5: change mlx5 class enum values as bits
mlx5 PCI Device supports multiple classes of devices such as net, vdpa,
and/or regex.
To support these multiple classes, change mlx5_class to a
bitmap values so that if users asks to enable multiple of them, all
supported classes can be parsed.
Signed-off-by: Parav Pandit
Acked-by: Matan Azrad
---
Changelog:
v1->v2:
- Rebasd due to removal previous patch
---
drivers/common/mlx5/mlx5_common.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.h
b/drivers/common/mlx5/mlx5_common.h
index da01ffa1c..00ccba622 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -13,6 +13,7 @@
#include
#include
#include
+#include
#include "mlx5_prm.h"
#include "mlx5_devx_cmds.h"
@@ -207,9 +208,9 @@ int mlx5_get_ifname_sysfs(const char *ibdev_path, char
*ifname);
#define MLX5_CLASS_ARG_NAME "class"
enum mlx5_class {
- MLX5_CLASS_NET,
- MLX5_CLASS_VDPA,
MLX5_CLASS_INVALID,
+ MLX5_CLASS_NET = RTE_BIT64(0),
+ MLX5_CLASS_VDPA = RTE_BIT64(1),
};
#define MLX5_DBR_PAGE_SIZE 4096 /* Must be >= 512. */
--
2.26.2
[dpdk-dev] [PATCH v5 2/9] eal: introduce RTE common initialization level
Currently mlx5_common uses CLASS priority to initialize common code before initializing the PMD. However mlx5_common is not really a class, it is the pre-initialization code needed for the PMDs. In subsequent patch a needed initialization sequence is: (a) Initialize bus (say pci) (b) Initialize common code of a driver (mlx5_common) (c) Register mlx5 class PMDs (mlx5 net, mlx5 vdpa) Information registered by these PMDs is used by mlx5_bus_pci PMD. This mlx5 class PMDs should not confused with rte_class. (d) Register mlx5 PCI bus PMD Hence, introduce a new RTE priority level RTE_PRIO_COMMON which can be used for common initialization and RTE_PRIO_CLASS by mlx5 PMDs for class driver initialization. Signed-off-by: Parav Pandit Acked-by: Matan Azrad --- Changelog: v2->v3: - new patch --- lib/librte_eal/include/rte_common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_eal/include/rte_common.h b/lib/librte_eal/include/rte_common.h index 0843ce69e..d4653ea77 100644 --- a/lib/librte_eal/include/rte_common.h +++ b/lib/librte_eal/include/rte_common.h @@ -126,6 +126,7 @@ typedef uint16_t unaligned_uint16_t; #define RTE_PRIORITY_LOG 101 #define RTE_PRIORITY_BUS 110 +#define RTE_PRIORITY_COMMON 119 #define RTE_PRIORITY_CLASS 120 #define RTE_PRIORITY_LAST 65535 -- 2.26.2
[dpdk-dev] [PATCH v5 1/9] eal: introduce macros for getting value for bit
There are several drivers which duplicate bit generation macro. Introduce a generic bit macros so that such drivers avoid redefining same in multiple drivers. Signed-off-by: Parav Pandit Acked-by: Matan Azrad Acked-by: Morten Brørup --- Changelog: v4->v5: - Addressed comments from Morten Brørup - Renamed newly added macro to RTE_BIT64 - Added doxygen comment section for the macro v1->v2: - Addressed comments from Thomas and Gaten. - Avoided new file, added macro to rte_bitops.h --- lib/librte_eal/include/rte_bitops.h | 8 1 file changed, 8 insertions(+) diff --git a/lib/librte_eal/include/rte_bitops.h b/lib/librte_eal/include/rte_bitops.h index 740927f3b..ca46a110f 100644 --- a/lib/librte_eal/include/rte_bitops.h +++ b/lib/librte_eal/include/rte_bitops.h @@ -17,6 +17,14 @@ #include #include +/** + * Get the uint64_t value for a specified bit set. + * + * @param nr + * The bit number in range of 0 to 63. + */ +#define RTE_BIT64(nr) (UINT64_C(1) << (nr)) + /* 32-bit relaxed operations */ /** -- 2.26.2
[dpdk-dev] [PATCH v5 3/9] common/mlx5: fix empty input style in glue wrappers
Following two errors are reported when compiled with
gcc (GCC) 8.3.1 20191121 (Red Hat 8.3.1-5).
drivers/common/mlx5/linux/mlx5_glue.h:188:2:
error: function declaration isn't a prototype [-Werror=strict-prototypes]
drivers/common/mlx5/linux/mlx5_glue.h:188:2:
error: function declaration isn't a prototype [-Werror=strict-prototypes]
Fix them by adding void data type in empty argument list.
Fixes: 34fa7c0268e7 ("net/mlx5: add drop action to Direct Verbs E-Switch")
Fixes: 400d985eb586 ("net/mlx5: add VLAN push/pop DR commands to glue")
Signed-off-by: Parav Pandit
Acked-by: Matan Azrad
---
Changelog:
v2->v3:
- new patch
---
drivers/common/mlx5/linux/mlx5_glue.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/common/mlx5/linux/mlx5_glue.h
b/drivers/common/mlx5/linux/mlx5_glue.h
index 069d8540c..e5e052a6a 100644
--- a/drivers/common/mlx5/linux/mlx5_glue.h
+++ b/drivers/common/mlx5/linux/mlx5_glue.h
@@ -185,11 +185,11 @@ struct mlx5_glue {
void *(*dr_create_flow_action_dest_flow_tbl)(void *tbl);
void *(*dr_create_flow_action_dest_port)(void *domain,
uint32_t port);
- void *(*dr_create_flow_action_drop)();
+ void *(*dr_create_flow_action_drop)(void);
void *(*dr_create_flow_action_push_vlan)
(struct mlx5dv_dr_domain *domain,
rte_be32_t vlan_tag);
- void *(*dr_create_flow_action_pop_vlan)();
+ void *(*dr_create_flow_action_pop_vlan)(void);
void *(*dr_create_flow_tbl)(void *domain, uint32_t level);
int (*dr_destroy_flow_tbl)(void *tbl);
void *(*dr_create_domain)(struct ibv_context *ctx,
--
2.26.2
[dpdk-dev] [PATCH v5 0/9] Improve mlx5 PMD driver framework for multiple classes
This series introduces mlx5 bus to support multiple class of devices for a single PCI device. Motivation and example -- mlx5 PCI device supports multiple class of devices such as net, vdpa and regex devices. Currently only one pmd (either net or vdpa) can bind to this device. This design limits use of PCI device only for single device class. To support multiple classes simultaneously for a mlx5 PCI device, a new mlx5 PCI bus is created. This bus allows binding multiple class drivers (such as net, vdpa, regex(future)) to bind to the mlx5 PCI bus driver. Change description -- Patch-1 Introduces RTE_BIT() macro Patch-2 Introduces new RTE constructor priority for common initialization Patch-3 Fixes compilation error Patch-4 Define mlx5 class as bit fields Patch-5 Uses new RTE common priority Patch-6 Adds mlx5 PCI bus Patch-7 Implements a mlx5 PCI bus driver Patch-8 Migrates mlx5 net and vdpa driver to use mlx5 PCI bus API instead of rte PCI bus API Patch-9 Removed class check code as its already part of the bus now Patch-10 Add maintainers for the new bus Design overview --- ---- | mlx5 || mlx5 || mlx5| | net pmd || vdpa pmd || regex pmd | ---- \ |/ \ | / \ - / \__| mlx5|_ / | pci bus | - | --- | mlx5 | | pci dev | --- - mlx5 pci bus driver binds to mlx5 PCI devices defined by PCI ID table of all related mlx5 PCI devices. - mlx5 class driver such as net, vdpa, regex PMD defines its specific PCI ID table and mlx5 bus driver probes matching class drivers. - mlx5 pci bus driver is cental place that validates supported class combinations. - In future as code evolves, more device setup/cleanup and resource creation code moves to mlx5 PCI bus driver. Alternatives considered --- 1. Instead of creating mlx5 pci bus, a common driver is implemented which exposes class registration API. However, bus model fits better with existing DPDK design similar to ifpga driver. Class registration API need to create a new callbacks and ID signature; instead it is better to utilize current well defined methods. 2. Enhance pci core to allow multiple driver binding to single rte PCI device. This approach is not taken, because peer drivers using one PCI device won't be aware of other's presence. This requires cross-driver syncronization of who initializes common resources (such as irq, eq and more). This also requires refcounting common objects etc among peer drivers. Instead of layered approach delivers and allows putting common resource sharing, setup code in common bus driver. It also eliminates peer blind zone problem as bottom pci bus layer provides necessary setup without any reference counting. 3. In future mlx5 prefers to use RDMA MR cache of the mbuf used between net and regex pmd so that same mbuf use across multiple device can be possible. Examples: A user who wish to use a specific class(es) provides list of classes at command line such as, ./testpmd -w ,class=net:vdpa ./testpmd -w ,class=vdpa In future, ./testpmd -w ,class=net:regex Changelog: v4->v5: - Squash the maintainers update path with other patch which adds the bus - Addressed comments from Morten Brørup - Renamed newly added macro to RTE_BIT64 - Added doxygen comment section for the macro v3->v4: - Fixed dma_map error unwinding flow to follow same order for unmap v2->v3: - Added RTE priority for common driver initialization - Addressed comments from Thomas and Asaf - Fixed compilation error in glue wrapper - Moved pci_driver structure instance as first in driver - Removed white spaces at the end of line in diagram - Address commnts from Matan - Removed CONFIG_RTE_LIBRTE_MLX5_PCI_BUS from config files - Renamed mlx5_valid_class_combo to mlx5_class_combinations - Added cross check for class drivers to support only 3 flags for now - Added full stop at the end of comment block - Using full names in function names - Added new line before function name in multiple functions - Added example string to parse for multiple classes - Dropped mlx5 prefix from static function - Removed empty lines - Fixed issue to remove multiple classes for a driver - Using define for drv_flags at multiple places - Deriving drv_flags based on the class drivers - Fixed alignment for id_table - Perform dma map on best effort basis for all supported drivers - Dynamically build pci id table - Using PCI to mlx5 device helper routines v1->v2: - Addressed most comments from Thomas and Gaetan. - Symbols starting with prefix rte_bus_pci_mlx5 may be confusing as it may appear as it
[dpdk-dev] [PATCH v5 9/9] common/mlx5: remove class checks from individual driver
Now that mlx5_pci bus does the check for enabled classes and performs
probe(), remove() of associated classes, individual class driver
doesn't need to check if other driver is enabled.
Signed-off-by: Parav Pandit
Acked-by: Matan Azrad
---
Changelog:
v2->v3:
- Removed empty line
v1->v2:
- New patch
---
drivers/common/mlx5/mlx5_common.c | 37 ---
drivers/common/mlx5/mlx5_common.h | 2 -
.../common/mlx5/rte_common_mlx5_version.map | 2 -
drivers/net/mlx5/linux/mlx5_os.c | 5 ---
drivers/net/mlx5/linux/mlx5_os.h | 1 -
drivers/vdpa/mlx5/mlx5_vdpa.c | 5 ---
6 files changed, 52 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.c
b/drivers/common/mlx5/mlx5_common.c
index 0ce5e4db1..771e046c1 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -22,43 +22,6 @@ const struct mlx5_glue *mlx5_glue;
uint8_t haswell_broadwell_cpu;
-static int
-mlx5_class_check_handler(__rte_unused const char *key, const char *value,
-void *opaque)
-{
- enum mlx5_class *ret = opaque;
-
- if (strcmp(value, "vdpa") == 0) {
- *ret = MLX5_CLASS_VDPA;
- } else if (strcmp(value, "net") == 0) {
- *ret = MLX5_CLASS_NET;
- } else {
- DRV_LOG(ERR, "Invalid mlx5 class %s. Maybe typo in device"
- " class argument setting?", value);
- *ret = MLX5_CLASS_INVALID;
- }
- return 0;
-}
-
-enum mlx5_class
-mlx5_class_get(struct rte_devargs *devargs)
-{
- struct rte_kvargs *kvlist;
- const char *key = MLX5_CLASS_ARG_NAME;
- enum mlx5_class ret = MLX5_CLASS_NET;
-
- if (devargs == NULL)
- return ret;
- kvlist = rte_kvargs_parse(devargs->args, NULL);
- if (kvlist == NULL)
- return ret;
- if (rte_kvargs_count(kvlist, key))
- rte_kvargs_process(kvlist, key, mlx5_class_check_handler, &ret);
- rte_kvargs_free(kvlist);
- return ret;
-}
-
-
/* In case this is an x86_64 intel processor to check if
* we should use relaxed ordering.
*/
diff --git a/drivers/common/mlx5/mlx5_common.h
b/drivers/common/mlx5/mlx5_common.h
index 00ccba622..0effaab1d 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -243,8 +243,6 @@ struct mlx5_klm {
LIST_HEAD(mlx5_dbr_page_list, mlx5_devx_dbr_page);
-__rte_internal
-enum mlx5_class mlx5_class_get(struct rte_devargs *devargs);
__rte_internal
void mlx5_translate_port_name(const char *port_name_in,
struct mlx5_switch_info *port_info_out);
diff --git a/drivers/common/mlx5/rte_common_mlx5_version.map
b/drivers/common/mlx5/rte_common_mlx5_version.map
index ae57ebdba..01b4358a0 100644
--- a/drivers/common/mlx5/rte_common_mlx5_version.map
+++ b/drivers/common/mlx5/rte_common_mlx5_version.map
@@ -1,8 +1,6 @@
INTERNAL {
global:
- mlx5_class_get;
-
mlx5_common_verbs_reg_mr;
mlx5_common_verbs_dereg_mr;
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index b6042b7ef..2bd2b664d 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -1308,11 +1308,6 @@ mlx5_os_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
struct mlx5_dev_config dev_config;
int ret;
- if (mlx5_class_get(pci_dev->device.devargs) != MLX5_CLASS_NET) {
- DRV_LOG(DEBUG, "Skip probing - should be probed by other mlx5"
- " driver.");
- return 1;
- }
if (rte_eal_process_type() == RTE_PROC_PRIMARY)
mlx5_pmd_socket_init();
ret = mlx5_init_once();
diff --git a/drivers/net/mlx5/linux/mlx5_os.h b/drivers/net/mlx5/linux/mlx5_os.h
index 695722520..31add3988 100644
--- a/drivers/net/mlx5/linux/mlx5_os.h
+++ b/drivers/net/mlx5/linux/mlx5_os.h
@@ -15,5 +15,4 @@ enum {
#define PCI_DRV_FLAGS (RTE_PCI_DRV_INTR_LSC | \
RTE_PCI_DRV_INTR_RMV | \
RTE_PCI_DRV_PROBE_AGAIN)
-
#endif /* RTE_PMD_MLX5_OS_H_ */
diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c
index 09c9cb935..41d69e8a8 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa.c
@@ -680,11 +680,6 @@ mlx5_vdpa_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
struct mlx5_hca_attr attr;
int ret;
- if (mlx5_class_get(pci_dev->device.devargs) != MLX5_CLASS_VDPA) {
- DRV_LOG(DEBUG, "Skip probing - should be probed by other mlx5"
- " driver.");
- return 1;
- }
ibv = mlx5_vdpa_get_ib_device_match(&pci_dev->addr);
if (!ibv) {
DRV_LOG(ERR, "No matching IB device for PCI slot "
--
2.26.2
[dpdk-dev] [PATCH v5 5/9] common/mlx5: use common rte priority
Use RTE_PRIO_COMMON for mlx5 common initialization and use
RTE_PRIO_CLASS for mlx5 net, vdpa PMDs.
This enables to do following initialization sequence.
(a) Initialize bus (say pci)
(b) Initialize common code of a driver (mlx5_common)
(c) Register mlx5 class PMDs (mlx5 net, mlx5 vdpa)
Information registered by these PMDs is used by mlx5_bus_pci PMD.
This mlx5 class PMDs should not confused with rte_class.
(d) Register mlx5 PCI bus PMD
Signed-off-by: Parav Pandit
Acked-by: Matan Azrad
---
drivers/common/mlx5/mlx5_common.c | 2 +-
drivers/net/mlx5/mlx5.c | 2 +-
drivers/vdpa/mlx5/mlx5_vdpa.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.c
b/drivers/common/mlx5/mlx5_common.c
index 693e2c68c..0ce5e4db1 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -92,7 +92,7 @@ RTE_INIT_PRIO(mlx5_log_init, LOG)
/**
* Initialization routine for run-time dependency on glue library.
*/
-RTE_INIT_PRIO(mlx5_glue_init, CLASS)
+RTE_INIT_PRIO(mlx5_glue_init, COMMON)
{
mlx5_glue_constructor();
}
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 07c6addd5..bb10c63bb 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1907,7 +1907,7 @@ struct rte_pci_driver mlx5_driver = {
/**
* Driver initialization routine.
*/
-RTE_INIT(rte_mlx5_pmd_init)
+RTE_INIT_PRIO(rte_mlx5_pmd_init, CLASS)
{
/* Initialize driver log type. */
mlx5_logtype = rte_log_register("pmd.net.mlx5");
diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c
index dbd36ab0c..f043166ef 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa.c
@@ -842,7 +842,7 @@ static struct rte_pci_driver mlx5_vdpa_driver = {
/**
* Driver initialization routine.
*/
-RTE_INIT(rte_mlx5_vdpa_init)
+RTE_INIT_PRIO(rte_mlx5_vdpa_init, CLASS)
{
/* Initialize common log type. */
mlx5_vdpa_logtype = rte_log_register("pmd.vdpa.mlx5");
--
2.26.2
[dpdk-dev] [PATCH v5 7/9] bus/mlx5_pci: register a PCI driver
Create a mlx5 bus driver framework for invoking drivers of
multiple classes who have registered with the mlx5_pci bus
driver.
Validate user class arguments for supported class combinations.
Signed-off-by: Parav Pandit
Acked-by: Matan Azrad
---
Changelog:
v3->v4:
- Fixed dma_map error unwinding flow to follow same order for unmap
v2->v3:
- Addressed comments from Asaf
- Using full names in function names
- Added new line before function name in multiple functions
- Added example string to parse for multiple classes
- Dropped mlx5 prefix from static function
- Addressed comments from Matan.
- Renamed mlx5_valid_class_combo to mlx5_class_combinations
- Added cross check for class drivers to support only 3 flags for now
- Added full stop at the end of comment block.
- Removed empty lines
- Fixed issue to remove multiple classes for a driver
- Using define for drv_flags at multiple places
- Maintaining class driver list to keep load/unload order symmetric and
mirror of each other.
- Deriving drv_flags based on the class drivers
- Using PCI address comparision helper instead of pointer comparision
- Fixed alignment for id_table
- Continue to probe_err if device is already probed
- Perform dma map on best effort basis for all supported drivers
- Removed drv_flags check
- Dynamically build pci id table
- Using PCI to mlx5 device helper routines
v1->v2:
- Address comments from Thomas and Gaetan
- Enhanced driver to honor RTE_PCI_DRV_PROBE_AGAIN drv_flag
- Use anonymous structure for class search and code changes around it
- Define static for class comination array
- Use RTE_DIM to find array size
- Added OOM check for strdup()
- Renamed copy variable to nstr_orig
- Returning negagive error code
- Returning directly if match entry found
- Use compat condition check
- Avoided cutting error message string
- USe uint32_t datatype instead of enum mlx5_class
- Changed logic to parse device arguments only once during probe()
- Added check to fail driver probe if multiple classes register with
DMA ops
- Renamed function to parse_class_options
---
drivers/bus/mlx5_pci/Makefile | 2 +
drivers/bus/mlx5_pci/meson.build| 2 +-
drivers/bus/mlx5_pci/mlx5_pci_bus.c | 508
3 files changed, 511 insertions(+), 1 deletion(-)
diff --git a/drivers/bus/mlx5_pci/Makefile b/drivers/bus/mlx5_pci/Makefile
index de4ccd83f..1a005ee32 100644
--- a/drivers/bus/mlx5_pci/Makefile
+++ b/drivers/bus/mlx5_pci/Makefile
@@ -15,7 +15,9 @@ CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5
CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5
CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux
CFLAGS += -I$(RTE_SDK)/drivers/bus/pci
+CFLAGS += -D_DEFAULT_SOURCE
LDLIBS += -lrte_eal
+LDLIBS += -lrte_kvargs
LDLIBS += -lrte_common_mlx5
LDLIBS += -lrte_pci -lrte_bus_pci
diff --git a/drivers/bus/mlx5_pci/meson.build b/drivers/bus/mlx5_pci/meson.build
index 64a17cbad..0532a9dfd 100644
--- a/drivers/bus/mlx5_pci/meson.build
+++ b/drivers/bus/mlx5_pci/meson.build
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2020 Mellanox Technologies Ltd
-deps += ['pci', 'bus_pci', 'common_mlx5']
+deps += ['pci', 'bus_pci', 'common_mlx5', 'kvargs']
install_headers('rte_bus_mlx5_pci.h')
sources = files('mlx5_pci_bus.c')
diff --git a/drivers/bus/mlx5_pci/mlx5_pci_bus.c
b/drivers/bus/mlx5_pci/mlx5_pci_bus.c
index 66db3c7b0..6f219730c 100644
--- a/drivers/bus/mlx5_pci/mlx5_pci_bus.c
+++ b/drivers/bus/mlx5_pci/mlx5_pci_bus.c
@@ -2,13 +2,521 @@
* Copyright 2020 Mellanox Technologies, Ltd
*/
+#include
+#include
#include "rte_bus_mlx5_pci.h"
+#include
+struct mlx5_pci_device {
+ struct rte_pci_device *pci_dev;
+ TAILQ_ENTRY(mlx5_pci_device) next;
+ uint32_t classes_loaded;
+};
+
+/* Head of list of class drivers. */
static TAILQ_HEAD(mlx5_pci_bus_drv_head, rte_mlx5_pci_driver) drv_list =
TAILQ_HEAD_INITIALIZER(drv_list);
+/* Head of mlx5 pci devices. */
+static TAILQ_HEAD(mlx5_pci_devices_head, mlx5_pci_device) devices_list =
+ TAILQ_HEAD_INITIALIZER(devices_list);
+
+static const struct {
+ const char *name;
+ unsigned int dev_class;
+} mlx5_classes[] = {
+ { .name = "vdpa", .dev_class = MLX5_CLASS_VDPA },
+ { .name = "net", .dev_class = MLX5_CLASS_NET },
+};
+
+static const unsigned int mlx5_class_combinations[] = {
+ MLX5_CLASS_NET,
+ MLX5_CLASS_VDPA,
+ /* New class combination should be added here.
+* For example a new multi class device combination
+* can be MLX5_CLASS_FOO | MLX5_CLASS_BAR.
+*/
+};
+
+static int
+class_name_to_value(const char *class_name)
+{
+ unsigned int i;
+
+ for (i = 0; i < RTE_DIM(mlx5_classes); i++) {
+ if (strcmp(class_name, mlx5_classes[i].name) == 0)
+ return mlx5_classes[i].dev_class;
+ }
+ return -EINVAL;
+}
+
+static struct
[dpdk-dev] [PATCH v5 6/9] bus/mlx5_pci: add mlx5 PCI bus
Add mlx5 PCI bus which enables multiple mlx5 drivers to bind to single
pci device.
Signed-off-by: Parav Pandit
Acked-by: Matan Azrad
---
Changelog:
v4->v5:
- Merged maintainers update patch with this patch
v2->v3:
- Addressed comments from Thomas and Asaf
- Moved pci_driver structure instance as first in driver
- Removed white spaces at the end of line in diagram
- Address comments from Matan
- Removed CONFIG_RTE_LIBRTE_MLX5_PCI_BUS from config files
- Changed alignedment to mlx5 specific aligment instead of standard
DPDK
- Using uint32_t instead of mlx5_class enum
v1->v2:
- Address comments from Thomas and Gaetan
- Inheriting ret_pci_driver instead of rte_driver
- Added design and description of the mlx5_pci bus
---
MAINTAINERS | 5 ++
drivers/bus/meson.build | 2 +-
drivers/bus/mlx5_pci/Makefile | 38 +
drivers/bus/mlx5_pci/meson.build | 19 +
drivers/bus/mlx5_pci/mlx5_pci_bus.c | 14
drivers/bus/mlx5_pci/rte_bus_mlx5_pci.h | 84 +++
.../bus/mlx5_pci/rte_bus_mlx5_pci_version.map | 5 ++
7 files changed, 166 insertions(+), 1 deletion(-)
create mode 100644 drivers/bus/mlx5_pci/Makefile
create mode 100644 drivers/bus/mlx5_pci/meson.build
create mode 100644 drivers/bus/mlx5_pci/mlx5_pci_bus.c
create mode 100644 drivers/bus/mlx5_pci/rte_bus_mlx5_pci.h
create mode 100644 drivers/bus/mlx5_pci/rte_bus_mlx5_pci_version.map
diff --git a/MAINTAINERS b/MAINTAINERS
index 53a5e9a9e..e3fec55ca 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -517,6 +517,11 @@ Intel FPGA bus
M: Rosen Xu
F: drivers/bus/ifpga/
+Melllanox mlx5 PCI bus driver
+M: Parav Pandit
+M: Matan Azrad
+F: drivers/bus/mlx5_pci
+
NXP buses
M: Hemant Agrawal
M: Sachin Saxena
diff --git a/drivers/bus/meson.build b/drivers/bus/meson.build
index 80de2d91d..b1381838d 100644
--- a/drivers/bus/meson.build
+++ b/drivers/bus/meson.build
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
-drivers = ['dpaa', 'fslmc', 'ifpga', 'pci', 'vdev', 'vmbus']
+drivers = ['dpaa', 'fslmc', 'ifpga', 'pci', 'mlx5_pci', 'vdev', 'vmbus']
std_deps = ['eal']
config_flag_fmt = 'RTE_LIBRTE_@0@_BUS'
driver_name_fmt = 'rte_bus_@0@'
diff --git a/drivers/bus/mlx5_pci/Makefile b/drivers/bus/mlx5_pci/Makefile
new file mode 100644
index 0..de4ccd83f
--- /dev/null
+++ b/drivers/bus/mlx5_pci/Makefile
@@ -0,0 +1,38 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright 2020 Mellanox Technologies, Ltd
+
+include $(RTE_SDK)/mk/rte.vars.mk
+
+#
+# library name
+#
+LIB = librte_bus_mlx5_pci.a
+
+CFLAGS += -O3 -Wall -Wextra
+CFLAGS += $(WERROR_FLAGS)
+CFLAGS += -Wno-strict-prototypes
+CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5
+CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5
+CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux
+CFLAGS += -I$(RTE_SDK)/drivers/bus/pci
+LDLIBS += -lrte_eal
+LDLIBS += -lrte_common_mlx5
+LDLIBS += -lrte_pci -lrte_bus_pci
+
+# versioning export map
+EXPORT_MAP := rte_bus_mlx5_pci_version.map
+
+SRCS-y += mlx5_pci_bus.c
+
+# DEBUG which is usually provided on the command-line may enable
+# CONFIG_RTE_LIBRTE_MLX5_DEBUG.
+ifeq ($(DEBUG),1)
+CONFIG_RTE_LIBRTE_MLX5_DEBUG := y
+endif
+
+#
+# Export include files
+#
+SYMLINK-y-include += rte_bus_mlx5_pci.h
+
+include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/bus/mlx5_pci/meson.build b/drivers/bus/mlx5_pci/meson.build
new file mode 100644
index 0..64a17cbad
--- /dev/null
+++ b/drivers/bus/mlx5_pci/meson.build
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2020 Mellanox Technologies Ltd
+
+deps += ['pci', 'bus_pci', 'common_mlx5']
+install_headers('rte_bus_mlx5_pci.h')
+sources = files('mlx5_pci_bus.c')
+
+cflags_options = [
+ '-std=c11',
+ '-Wno-strict-prototypes',
+ '-D_BSD_SOURCE',
+ '-D_DEFAULT_SOURCE',
+ '-D_XOPEN_SOURCE=600'
+]
+foreach option:cflags_options
+ if cc.has_argument(option)
+ cflags += option
+ endif
+endforeach
diff --git a/drivers/bus/mlx5_pci/mlx5_pci_bus.c
b/drivers/bus/mlx5_pci/mlx5_pci_bus.c
new file mode 100644
index 0..66db3c7b0
--- /dev/null
+++ b/drivers/bus/mlx5_pci/mlx5_pci_bus.c
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2020 Mellanox Technologies, Ltd
+ */
+
+#include "rte_bus_mlx5_pci.h"
+
+static TAILQ_HEAD(mlx5_pci_bus_drv_head, rte_mlx5_pci_driver) drv_list =
+ TAILQ_HEAD_INITIALIZER(drv_list);
+
+void
+rte_mlx5_pci_driver_register(struct rte_mlx5_pci_driver *driver)
+{
+ TAILQ_INSERT_TAIL(&drv_list, driver, next);
+}
diff --git a/drivers/bus/mlx5_pci/rte_bus_mlx5_pci.h
b/drivers/bus/mlx5_pci/rte_bus_mlx5_pci.h
new file mode 100644
index 0..9f8d22e2b
--- /dev/null
+++ b/drivers/bus/mlx5_pci/rte_bus_mlx5_pci.h
@@ -0,0 +1,84 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2020 Mellanox Tec
[dpdk-dev] [PATCH v5 8/9] bus/mlx5_pci: enable net and vDPA to use mlx5 PCI bus driver
Enable class driver to match with the mlx5 pci devices.
Migrate mlx5 net PMD and vdpa PMD to start using mlx5 common class
driver.
Signed-off-by: Parav Pandit
Acked-by: Matan Azrad
---
Changelog:
v2->v3:
- Avoid static table
v1->v2:
- Migreate API from rte_driver to rte_pci_driver
---
drivers/bus/Makefile | 3 +++
drivers/net/mlx5/Makefile| 3 ++-
drivers/net/mlx5/linux/mlx5_os.c | 1 -
drivers/net/mlx5/linux/mlx5_os.h | 1 +
drivers/net/mlx5/meson.build | 2 +-
drivers/net/mlx5/mlx5.c | 24 ++--
drivers/net/mlx5/mlx5.h | 1 -
drivers/vdpa/mlx5/Makefile | 3 ++-
drivers/vdpa/mlx5/meson.build| 2 +-
drivers/vdpa/mlx5/mlx5_vdpa.c| 23 +--
mk/rte.app.mk| 1 +
11 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile
index cea3b55e6..f96caa5ec 100644
--- a/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@ -9,6 +9,9 @@ DIRS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc
endif
DIRS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga
DIRS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci
+ifeq ($(findstring
y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)),y)
+DIRS-y += mlx5_pci
+endif
DIRS-$(CONFIG_RTE_LIBRTE_VDEV_BUS) += vdev
DIRS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus
diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index a458402dc..1cea7cd07 100644
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -45,16 +45,17 @@ CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux
CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5
CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5/linux
CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5
+CFLAGS += -I$(RTE_SDK)/drivers/bus/mlx5_pci
CFLAGS += -D_BSD_SOURCE
CFLAGS += -D_DEFAULT_SOURCE
CFLAGS += -D_XOPEN_SOURCE=600
CFLAGS += $(WERROR_FLAGS)
CFLAGS += -Wno-strict-prototypes
LDLIBS += -lrte_common_mlx5
+LDLIBS += -lrte_bus_mlx5_pci
LDLIBS += -lm
LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci
# A few warnings cannot be avoided in external headers.
CFLAGS += -Wno-error=cast-qual
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 2dc57b20e..b6042b7ef 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -1321,7 +1321,6 @@ mlx5_os_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
strerror(rte_errno));
return -rte_errno;
}
- MLX5_ASSERT(pci_drv == &mlx5_driver);
errno = 0;
ibv_list = mlx5_glue->get_device_list(&ret);
if (!ibv_list) {
diff --git a/drivers/net/mlx5/linux/mlx5_os.h b/drivers/net/mlx5/linux/mlx5_os.h
index 31add3988..695722520 100644
--- a/drivers/net/mlx5/linux/mlx5_os.h
+++ b/drivers/net/mlx5/linux/mlx5_os.h
@@ -15,4 +15,5 @@ enum {
#define PCI_DRV_FLAGS (RTE_PCI_DRV_INTR_LSC | \
RTE_PCI_DRV_INTR_RMV | \
RTE_PCI_DRV_PROBE_AGAIN)
+
#endif /* RTE_PMD_MLX5_OS_H_ */
diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index e95ce0267..26699a79b 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -8,7 +8,7 @@ if not (is_linux or is_windows)
subdir_done()
endif
-deps += ['hash', 'common_mlx5']
+deps += ['hash', 'common_mlx5', 'bus_mlx5_pci']
sources = files(
'mlx5.c',
'mlx5_ethdev.c',
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index bb10c63bb..2270055fe 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1892,16 +1893,19 @@ static const struct rte_pci_id mlx5_pci_id_map[] = {
}
};
-struct rte_pci_driver mlx5_driver = {
- .driver = {
- .name = MLX5_DRIVER_NAME
+static struct rte_mlx5_pci_driver mlx5_driver = {
+ .dev_class = MLX5_CLASS_NET,
+ .pci_driver = {
+ .driver = {
+ .name = MLX5_DRIVER_NAME,
+ },
+ .id_table = mlx5_pci_id_map,
+ .probe = mlx5_os_pci_probe,
+ .remove = mlx5_pci_remove,
+ .dma_map = mlx5_dma_map,
+ .dma_unmap = mlx5_dma_unmap,
+ .drv_flags = PCI_DRV_FLAGS,
},
- .id_table = mlx5_pci_id_map,
- .probe = mlx5_os_pci_probe,
- .remove = mlx5_pci_remove,
- .dma_map = mlx5_dma_map,
- .dma_unmap = mlx5_dma_unmap,
- .drv_flags = PCI_DRV_FLAGS,
};
/**
@@ -1919,7 +1923,7 @@ RTE_INIT_PRIO(rte_mlx5_pmd_init, CLASS)
mlx5_set_cksum_table();
mlx5_set_swp_types_table();
if (mlx5_glue)
- rte_pci_register(&mlx5_driver);
+ rte_mlx5_pci_driver_register(&mlx5_driver);
}
RTE_PMD_EXPORT_NAME(net_mlx5, __COUNTER__);
diff --git a/drivers/net
Re: [dpdk-dev] [PATCH v6 2/2] ethdev: fix VLAN offloads set if no relative capabilities
On 2020/7/8 18:14, Thomas Monjalon wrote: 08/07/2020 05:37, Wei Hu (Xavier): On 2020/7/7 22:11, Thomas Monjalon wrote: 06/07/2020 09:06, Wei Hu (Xavier): Currently, there is a potential problem that calling the API function rte_eth_dev_set_vlan_offload to start VLAN hardware offloads which the driver does not support. If the PMD driver does not support certain VLAN hardware offloads and does not check for it, the hardware setting will not change, but the VLAN offloads in dev->data->dev_conf.rxmode.offloads will be turned on. It is supposed to check the hardware capabilities to decide whether the relative callback needs to be called just like the behavior in the API function named rte_eth_dev_configure. And it is also needed to cleanup duplicated checks which are done in some PMDs. Also, note that it is behaviour change for some PMDs which simply ignore (with error/warning log message) unsupported VLAN offloads, but now it will fail. [...] @@ -3317,6 +3319,25 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask) if (mask == 0) return ret; + ret = rte_eth_dev_info_get(port_id, &dev_info); + if (ret != 0) + return ret; + + /* +* New added Rx VLAN offloading which are not enabled in +* rte_eth_dev_configure() must be within its device capabilities +*/ What means "New added Rx VLAN offloading"? The parameter offload_mask of rte_eth_dev_set_vlan_offload() function includes some Rx VLAN offload, and some of them maybe are not enabled in rte_eth_dev_configure(). OK I don't understand why checking only new features. All enabled features must be within capabilities, right? Yes，you are right. all enabled features must be within capabilities， Some features enabled in rte_eth_dev_configure() had been already checked, So the comment here emphasizes 'new added Rx VLAN offloading'. Thanks，Xavier .
[dpdk-dev] [PATCH v2] net/ice: fix invalid RSS type
When a RSS rule with only RSS type modifier L2/L3/L4 SRC/DST_ONLY,
it should return failure. This patch adds invalid RSS type check.
Fixes: dfaedcf20170 ("net/ice: refactor PF hash flow")
Signed-off-by: Simei Su
---
v2:
* Add specific macro value in check rather than hard code.
---
drivers/net/ice/ice_hash.c | 11 +++
1 file changed, 11 insertions(+)
diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index cbd6116..2c79458 100644
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -722,6 +722,17 @@ struct ice_hash_match_type ice_hash_type_list[] = {
*/
rss_type = rte_eth_rss_hf_refine(rss_type);
+ /* Check if only L2/L3/L4 SRC/DST_ONLY exists. */
+ if ((rss_type & ~(ETH_RSS_L2_SRC_ONLY |
+ ETH_RSS_L2_DST_ONLY |
+ ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_SRC_ONLY |
+ ETH_RSS_L4_DST_ONLY)) == 0)
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION, action,
+ "rss type with only L2/L3/L4 src/dst
only is invalid");
+
combine_type = ETH_RSS_L2_SRC_ONLY |
ETH_RSS_L2_DST_ONLY |
ETH_RSS_L3_SRC_ONLY |
--
1.8.3.1
Re: [dpdk-dev] [PATCH v2 12/20] net/ixgbe/base: modify coding style
Hi Ferruh > -Original Message- > From: Yigit, Ferruh > Sent: Wednesday, July 8, 2020 11:26 PM > To: Sun, GuinanX ; dev@dpdk.org; Zhang, Qi Z > > Cc: Guo, Jia ; Zhao1, Wei ; > Chylkowski, JakubX > Subject: Re: [dpdk-dev] [PATCH v2 12/20] net/ixgbe/base: modify coding style > > On 7/2/2020 4:13 AM, Guinan Sun wrote: > > Fix unchecked return value. > > Add cast for type mismatch. > > > > Signed-off-by: Jakub Chylkowski > > Signed-off-by: Guinan Sun > > --- > > drivers/net/ixgbe/base/ixgbe_82599.c | 12 +--- > > drivers/net/ixgbe/base/ixgbe_common.c| 6 ++ > > drivers/net/ixgbe/base/ixgbe_common.h| 2 +- > > drivers/net/ixgbe/base/ixgbe_dcb_82598.c | 2 +- > > drivers/net/ixgbe/base/ixgbe_dcb_82599.c | 2 +- > > drivers/net/ixgbe/base/ixgbe_phy.c | 25 +++- > > drivers/net/ixgbe/base/ixgbe_x540.c | 2 +- > > drivers/net/ixgbe/base/ixgbe_x550.c | 2 +- > > 8 files changed, 19 insertions(+), 34 deletions(-) > > > > diff --git a/drivers/net/ixgbe/base/ixgbe_82599.c > > b/drivers/net/ixgbe/base/ixgbe_82599.c > > index 193233746..e425f28af 100644 > > --- a/drivers/net/ixgbe/base/ixgbe_82599.c > > +++ b/drivers/net/ixgbe/base/ixgbe_82599.c > > @@ -1547,7 +1547,7 @@ void ixgbe_fdir_add_signature_filter_82599(struct > ixgbe_hw *hw, > > * is for FDIRCMD. Then do a 64-bit register write from FDIRHASH. > > */ > > fdirhashcmd = (u64)fdircmd << 32; > > - fdirhashcmd |= ixgbe_atr_compute_sig_hash_82599(input, common); > > + fdirhashcmd |= (u64)ixgbe_atr_compute_sig_hash_82599(input, > common); > > Hi Guinan, Qi, > > These are not coding style changes, as commit log says they are fixes in the > code. > > Can you please properly separate the patch based on the fix type and provide > relevant patch title? First, we will make changes to the commit log. The reason is that this is not a fix, but some unnecessary return value check is deleted. Secondly, we split this patch into two. This will make the expression clearer.
Re: [dpdk-dev] [PATCH v2] eal: use c11 atomic built-ins for interrupt status
Hi,
Noticed 2 typos:
On Thu, Jul 9, 2020 at 9:46 AM Phil Yang wrote:
>
> The event status is defined as a volatile variable and shared between
> threads. Use c11 atomic built-ins with explicit ordering instead of
> rte_atomic ops which enforce unnecessary barriers on aarch64.
>
> The event status has been cleaned up by the compare-and-swap operation
> when we free the event data, so there is no need to set it to invalid
> after that.
>
> Signed-off-by: Phil Yang
> Reviewed-by: Ruifeng Wang
> Reviewed-by: Honnappa Nagarahalli
> Reviewed-by: Harman Kalra
> ---
> v2:
> 1. Fixed typo.
> 2. Updated libabigail.abignore to pass ABI check.
> 3. Merged v1 two patches into one patch.
>
> devtools/libabigail.abignore| 4 +++
> lib/librte_eal/include/rte_eal_interrupts.h | 2 +-
> lib/librte_eal/linux/eal_interrupts.c | 48
> -
> 3 files changed, 38 insertions(+), 16 deletions(-)
>
> diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore
> index 0133f75..daa4631 100644
> --- a/devtools/libabigail.abignore
> +++ b/devtools/libabigail.abignore
> @@ -48,6 +48,10 @@
> changed_enumerators = RTE_CRYPTO_AEAD_LIST_END
> [suppress_variable]
> name = rte_crypto_aead_algorithm_strings
> +; Ignore updates of epoll event
> +[suppress_type]
> +type_kind = struct
> +name = rte_epoll_event
>
> ;;
> ; Temporary exceptions till DPDK 20.11
> diff --git a/lib/librte_eal/include/rte_eal_interrupts.h
> b/lib/librte_eal/include/rte_eal_interrupts.h
> index 773a34a..b1e8a29 100644
> --- a/lib/librte_eal/include/rte_eal_interrupts.h
> +++ b/lib/librte_eal/include/rte_eal_interrupts.h
> @@ -59,7 +59,7 @@ enum {
>
> /** interrupt epoll event obj, taken by epoll_event.ptr */
> struct rte_epoll_event {
> - volatile uint32_t status; /**< OUT: event status */
> + uint32_t status; /**< OUT: event status */
> int fd;/**< OUT: event fd */
> int epfd; /**< OUT: epoll instance the ev associated with */
> struct rte_epoll_data epdata;
> diff --git a/lib/librte_eal/linux/eal_interrupts.c
> b/lib/librte_eal/linux/eal_interrupts.c
> index 84eeaa1..7a50869 100644
> --- a/lib/librte_eal/linux/eal_interrupts.c
> +++ b/lib/librte_eal/linux/eal_interrupts.c
> @@ -26,7 +26,6 @@
> #include
> #include
> #include
> -#include
> #include
> #include
> #include
> @@ -1221,11 +1220,18 @@ eal_epoll_process_event(struct epoll_event *evs,
> unsigned int n,
> {
> unsigned int i, count = 0;
> struct rte_epoll_event *rev;
> + uint32_t valid_status;
>
> for (i = 0; i < n; i++) {
> rev = evs[i].data.ptr;
> - if (!rev || !rte_atomic32_cmpset(&rev->status,
> RTE_EPOLL_VALID,
> -RTE_EPOLL_EXEC))
> + valid_status = RTE_EPOLL_VALID;
> + /* ACQUIRE memory ordering here pairs with RELEASE
> +* ordering bellow acting as a lock to synchronize
s/bellow/below
> +* the event data updating.
> +*/
> + if (!rev || !__atomic_compare_exchange_n(&rev->status,
> + &valid_status, RTE_EPOLL_EXEC, 0,
> + __ATOMIC_ACQUIRE, __ATOMIC_RELAXED))
> continue;
>
> events[count].status= RTE_EPOLL_VALID;
> @@ -1237,8 +1243,11 @@ eal_epoll_process_event(struct epoll_event *evs,
> unsigned int n,
> rev->epdata.cb_fun(rev->fd,
>rev->epdata.cb_arg);
>
> - rte_compiler_barrier();
> - rev->status = RTE_EPOLL_VALID;
> + /* the status update should be observed after
> +* the other fields changes.
s/fields changes/fields change/
Thanks,
Stefan.
> +*/
> + __atomic_store_n(&rev->status, RTE_EPOLL_VALID,
> + __ATOMIC_RELEASE);
> count++;
> }
> return count;
> @@ -1308,10 +1317,14 @@ rte_epoll_wait(int epfd, struct rte_epoll_event
> *events,
> static inline void
> eal_epoll_data_safe_free(struct rte_epoll_event *ev)
> {
> - while (!rte_atomic32_cmpset(&ev->status, RTE_EPOLL_VALID,
> - RTE_EPOLL_INVALID))
> - while (ev->status != RTE_EPOLL_VALID)
> + uint32_t valid_status = RTE_EPOLL_VALID;
> + while (!__atomic_compare_exchange_n(&ev->status, &valid_status,
> + RTE_EPOLL_INVALID, 0, __ATOMIC_ACQUIRE,
> __ATOMIC_RELAXED)) {
> + while (__atomic_load_n(&ev->status,
> + __ATOMIC_RELAXED) != RTE_EPOLL_VALID)
> rte_pause();
> + valid_status = RTE_EPOLL_VALID;
> + }
> memset(&ev->epdata, 0, sizeof(
[dpdk-dev] [PATCH v8 0/3] RCU integration with LPM library
This patchset integrates RCU QSBR support with LPM library. Resource reclaimation implementation was splitted from the original series, and has already been part of RCU library. Rework the series to base LPM integration on RCU reclaimation APIs. New API rte_lpm_rcu_qsbr_add is introduced for application to register a RCU variable that LPM library will use. This provides user the handle to enable RCU that integrated in LPM library. Functional tests and performance tests are added to cover the integration with RCU. --- v8: Fixed ABI issue by adding internal LPM control structure. (David) Changed to use RFC5737 address in unit test. (Vladimir) v7: Fixed typos in document. v6: Remove ALLOW_EXPERIMENTAL_API from rte_lpm.c. v5: No default value for reclaim_thd. This allows reclamation triggering with every call. Pass LPM pointer instead of tbl8 as argument of reclaim callback free function. Updated group_idx check at tbl8 allocation. Use enums instead of defines for different reclamation modes. RCU QSBR integrated path is inside ALLOW_EXPERIMENTAL_API to avoid ABI change. v4: Allow user to configure defer queue: size, reclaim threshold, max entries. Return defer queue handler so user can manually trigger reclaimation. Add blocking mode support. Defer queue will not be created. Honnappa Nagarahalli (1): test/lpm: add RCU integration performance tests Ruifeng Wang (2): lib/lpm: integrate RCU QSBR test/lpm: add LPM RCU integration functional tests app/test/test_lpm.c| 291 - app/test/test_lpm_perf.c | 492 - doc/guides/prog_guide/lpm_lib.rst | 32 ++ lib/librte_lpm/Makefile| 2 +- lib/librte_lpm/meson.build | 1 + lib/librte_lpm/rte_lpm.c | 167 -- lib/librte_lpm/rte_lpm.h | 53 lib/librte_lpm/rte_lpm_version.map | 6 + 8 files changed, 1016 insertions(+), 28 deletions(-) -- 2.17.1
[dpdk-dev] [PATCH v8 2/3] test/lpm: add LPM RCU integration functional tests
Add positive and negative tests for API rte_lpm_rcu_qsbr_add.
Also test LPM library behavior when RCU QSBR is enabled.
Signed-off-by: Ruifeng Wang
Reviewed-by: Gavin Hu
Reviewed-by: Honnappa Nagarahalli
Acked-by: Vladimir Medvedkin
---
app/test/test_lpm.c | 291 +++-
1 file changed, 290 insertions(+), 1 deletion(-)
diff --git a/app/test/test_lpm.c b/app/test/test_lpm.c
index 3a3fd097f..8330501f0 100644
--- a/app/test/test_lpm.c
+++ b/app/test/test_lpm.c
@@ -8,6 +8,7 @@
#include
#include
+#include
#include "test.h"
#include "test_xmmt_ops.h"
@@ -40,6 +41,9 @@ static int32_t test15(void);
static int32_t test16(void);
static int32_t test17(void);
static int32_t test18(void);
+static int32_t test19(void);
+static int32_t test20(void);
+static int32_t test21(void);
rte_lpm_test tests[] = {
/* Test Cases */
@@ -61,7 +65,10 @@ rte_lpm_test tests[] = {
test15,
test16,
test17,
- test18
+ test18,
+ test19,
+ test20,
+ test21
};
#define MAX_DEPTH 32
@@ -1265,6 +1272,288 @@ test18(void)
return PASS;
}
+/*
+ * rte_lpm_rcu_qsbr_add positive and negative tests.
+ * - Add RCU QSBR variable to LPM
+ * - Add another RCU QSBR variable to LPM
+ * - Check returns
+ */
+int32_t
+test19(void)
+{
+ struct rte_lpm *lpm = NULL;
+ struct rte_lpm_config config;
+ size_t sz;
+ struct rte_rcu_qsbr *qsv;
+ struct rte_rcu_qsbr *qsv2;
+ int32_t status;
+ struct rte_lpm_rcu_config rcu_cfg = {0};
+
+ config.max_rules = MAX_RULES;
+ config.number_tbl8s = NUMBER_TBL8S;
+ config.flags = 0;
+
+ lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ TEST_LPM_ASSERT(lpm != NULL);
+
+ /* Create RCU QSBR variable */
+ sz = rte_rcu_qsbr_get_memsize(RTE_MAX_LCORE);
+ qsv = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz,
+ RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ TEST_LPM_ASSERT(qsv != NULL);
+
+ status = rte_rcu_qsbr_init(qsv, RTE_MAX_LCORE);
+ TEST_LPM_ASSERT(status == 0);
+
+ rcu_cfg.v = qsv;
+ /* Invalid QSBR mode */
+ rcu_cfg.mode = 2;
+ status = rte_lpm_rcu_qsbr_add(lpm, &rcu_cfg, NULL);
+ TEST_LPM_ASSERT(status != 0);
+
+ rcu_cfg.mode = RTE_LPM_QSBR_MODE_DQ;
+ /* Attach RCU QSBR to LPM table */
+ status = rte_lpm_rcu_qsbr_add(lpm, &rcu_cfg, NULL);
+ TEST_LPM_ASSERT(status == 0);
+
+ /* Create and attach another RCU QSBR to LPM table */
+ qsv2 = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz,
+ RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ TEST_LPM_ASSERT(qsv2 != NULL);
+
+ rcu_cfg.v = qsv2;
+ rcu_cfg.mode = RTE_LPM_QSBR_MODE_SYNC;
+ status = rte_lpm_rcu_qsbr_add(lpm, &rcu_cfg, NULL);
+ TEST_LPM_ASSERT(status != 0);
+
+ rte_lpm_free(lpm);
+ rte_free(qsv);
+ rte_free(qsv2);
+
+ return PASS;
+}
+
+/*
+ * rte_lpm_rcu_qsbr_add DQ mode functional test.
+ * Reader and writer are in the same thread in this test.
+ * - Create LPM which supports 1 tbl8 group at max
+ * - Add RCU QSBR variable to LPM
+ * - Add a rule with depth=28 (> 24)
+ * - Register a reader thread (not a real thread)
+ * - Reader lookup existing rule
+ * - Writer delete the rule
+ * - Reader lookup the rule
+ * - Writer re-add the rule (no available tbl8 group)
+ * - Reader report quiescent state and unregister
+ * - Writer re-add the rule
+ * - Reader lookup the rule
+ */
+int32_t
+test20(void)
+{
+ struct rte_lpm *lpm = NULL;
+ struct rte_lpm_config config;
+ size_t sz;
+ struct rte_rcu_qsbr *qsv;
+ int32_t status;
+ uint32_t ip, next_hop, next_hop_return;
+ uint8_t depth;
+ struct rte_lpm_rcu_config rcu_cfg = {0};
+
+ config.max_rules = MAX_RULES;
+ config.number_tbl8s = 1;
+ config.flags = 0;
+
+ lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ TEST_LPM_ASSERT(lpm != NULL);
+
+ /* Create RCU QSBR variable */
+ sz = rte_rcu_qsbr_get_memsize(1);
+ qsv = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz,
+ RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ TEST_LPM_ASSERT(qsv != NULL);
+
+ status = rte_rcu_qsbr_init(qsv, 1);
+ TEST_LPM_ASSERT(status == 0);
+
+ rcu_cfg.v = qsv;
+ rcu_cfg.mode = RTE_LPM_QSBR_MODE_DQ;
+ /* Attach RCU QSBR to LPM table */
+ status = rte_lpm_rcu_qsbr_add(lpm, &rcu_cfg, NULL);
+ TEST_LPM_ASSERT(status == 0);
+
+ ip = RTE_IPV4(192, 0, 2, 100);
+ depth = 28;
+ next_hop = 1;
+ status = rte_lpm_add(lpm, ip, depth, next_hop);
+ TEST_LPM_ASSERT(status == 0);
+ TEST_LPM_ASSERT(lpm->tbl24[ip>>8].valid_group);
+
+ /* Register pseudo reader */
+ status = rte_rcu_qsbr_thread_register(qsv, 0);
+ TEST_
[dpdk-dev] [PATCH v8 1/3] lib/lpm: integrate RCU QSBR
Currently, the tbl8 group is freed even though the readers might be
using the tbl8 group entries. The freed tbl8 group can be reallocated
quickly. This results in incorrect lookup results.
RCU QSBR process is integrated for safe tbl8 group reclaim.
Refer to RCU documentation to understand various aspects of
integrating RCU library into other libraries.
To avoid ABI breakage, a struct __rte_lpm is created for lpm library
internal use. This struct warps rte_lpm that has been exposed and
also includes members that don't need to be exposed such as RCU related
config.
Signed-off-by: Ruifeng Wang
Reviewed-by: Honnappa Nagarahalli
---
doc/guides/prog_guide/lpm_lib.rst | 32 ++
lib/librte_lpm/Makefile| 2 +-
lib/librte_lpm/meson.build | 1 +
lib/librte_lpm/rte_lpm.c | 167 +
lib/librte_lpm/rte_lpm.h | 53 +
lib/librte_lpm/rte_lpm_version.map | 6 ++
6 files changed, 237 insertions(+), 24 deletions(-)
diff --git a/doc/guides/prog_guide/lpm_lib.rst
b/doc/guides/prog_guide/lpm_lib.rst
index 1609a57d0..03945904b 100644
--- a/doc/guides/prog_guide/lpm_lib.rst
+++ b/doc/guides/prog_guide/lpm_lib.rst
@@ -145,6 +145,38 @@ depending on whether we need to move to the next table or
not.
Prefix expansion is one of the keys of this algorithm,
since it improves the speed dramatically by adding redundancy.
+Deletion
+
+
+When deleting a rule, a replacement rule is searched for. Replacement rule is
an existing rule that has
+the longest prefix match with the rule to be deleted, but has shorter prefix.
+
+If a replacement rule is found, target tbl24 and tbl8 entries are updated to
have the same depth and next hop
+value with the replacement rule.
+
+If no replacement rule can be found, target tbl24 and tbl8 entries will be
cleared.
+
+Prefix expansion is performed if the rule's depth is not exactly 24 bits or 32
bits.
+
+After deleting a rule, a group of tbl8s that belongs to the same tbl24 entry
are freed in following cases:
+
+* All tbl8s in the group are empty .
+
+* All tbl8s in the group have the same values and with depth no greater than
24.
+
+Free of tbl8s have different behaviors:
+
+* If RCU is not used, tbl8s are cleared and reclaimed immediately.
+
+* If RCU is used, tbl8s are reclaimed when readers are in quiescent state.
+
+When the LPM is not using RCU, tbl8 group can be freed immediately even though
the readers might be using
+the tbl8 group entries. This might result in incorrect lookup results.
+
+RCU QSBR process is integrated for safe tbl8 group reclamation. Application
has certain responsibilities
+while using this feature. Please refer to resource reclamation framework of
:ref:`RCU library `
+for more details.
+
Lookup
~~
diff --git a/lib/librte_lpm/Makefile b/lib/librte_lpm/Makefile
index d682785b6..6f06c5c03 100644
--- a/lib/librte_lpm/Makefile
+++ b/lib/librte_lpm/Makefile
@@ -8,7 +8,7 @@ LIB = librte_lpm.a
CFLAGS += -O3
CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-LDLIBS += -lrte_eal -lrte_hash
+LDLIBS += -lrte_eal -lrte_hash -lrte_rcu
EXPORT_MAP := rte_lpm_version.map
diff --git a/lib/librte_lpm/meson.build b/lib/librte_lpm/meson.build
index 021ac6d8d..6cfc083c5 100644
--- a/lib/librte_lpm/meson.build
+++ b/lib/librte_lpm/meson.build
@@ -7,3 +7,4 @@ headers = files('rte_lpm.h', 'rte_lpm6.h')
# without worrying about which architecture we actually need
headers += files('rte_lpm_altivec.h', 'rte_lpm_neon.h', 'rte_lpm_sse.h')
deps += ['hash']
+deps += ['rcu']
diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c
index 38ab512a4..4fbf5b6df 100644
--- a/lib/librte_lpm/rte_lpm.c
+++ b/lib/librte_lpm/rte_lpm.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2010-2014 Intel Corporation
+ * Copyright(c) 2020 Arm Limited
*/
#include
@@ -39,6 +40,17 @@ enum valid_flag {
VALID
};
+/** @internal LPM structure. */
+struct __rte_lpm {
+ /* LPM metadata. */
+ struct rte_lpm lpm;
+
+ /* RCU config. */
+ struct rte_rcu_qsbr *v; /* RCU QSBR variable. */
+ enum rte_lpm_qsbr_mode rcu_mode;/* Blocking, defer queue. */
+ struct rte_rcu_qsbr_dq *dq; /* RCU QSBR defer queue. */
+};
+
/* Macro to enable/disable run-time checks. */
#if defined(RTE_LIBRTE_LPM_DEBUG)
#include
@@ -122,6 +134,7 @@ rte_lpm_create(const char *name, int socket_id,
const struct rte_lpm_config *config)
{
char mem_name[RTE_LPM_NAMESIZE];
+ struct __rte_lpm *internal_lpm = NULL;
struct rte_lpm *lpm = NULL;
struct rte_tailq_entry *te;
uint32_t mem_size, rules_size, tbl8s_size;
@@ -140,12 +153,6 @@ rte_lpm_create(const char *name, int socket_id,
snprintf(mem_name, sizeof(mem_name), "LPM_%s", name);
- /* Determine the amount of memory to allocate. */
- mem_size = sizeof(*lpm);
- rules_size = sizeof(struct rte_lpm_rule) * config->max_r
[dpdk-dev] [PATCH v8 3/3] test/lpm: add RCU integration performance tests
From: Honnappa Nagarahalli
Add performance tests for RCU integration. The performance
difference with and without RCU integration is very small
(~1% to ~2%) on both Arm and x86 platforms.
Signed-off-by: Honnappa Nagarahalli
Reviewed-by: Gavin Hu
Reviewed-by: Ruifeng Wang
Acked-by: Vladimir Medvedkin
---
app/test/test_lpm_perf.c | 492 ++-
1 file changed, 489 insertions(+), 3 deletions(-)
diff --git a/app/test/test_lpm_perf.c b/app/test/test_lpm_perf.c
index 489719c40..dfe186426 100644
--- a/app/test/test_lpm_perf.c
+++ b/app/test/test_lpm_perf.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2010-2014 Intel Corporation
+ * Copyright(c) 2020 Arm Limited
*/
#include
@@ -10,12 +11,27 @@
#include
#include
#include
+#include
#include
#include
#include "test.h"
#include "test_xmmt_ops.h"
+struct rte_lpm *lpm;
+static struct rte_rcu_qsbr *rv;
+static volatile uint8_t writer_done;
+static volatile uint32_t thr_id;
+static uint64_t gwrite_cycles;
+static uint64_t gwrites;
+/* LPM APIs are not thread safe, use mutex to provide thread safety */
+static pthread_mutex_t lpm_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+/* Report quiescent state interval every 1024 lookups. Larger critical
+ * sections in reader will result in writer polling multiple times.
+ */
+#define QSBR_REPORTING_INTERVAL 1024
+
#define TEST_LPM_ASSERT(cond) do {\
if (!(cond)) {\
printf("Error at line %d: \n", __LINE__); \
@@ -24,6 +40,7 @@
} while(0)
#define ITERATIONS (1 << 10)
+#define RCU_ITERATIONS 10
#define BATCH_SIZE (1 << 12)
#define BULK_SIZE 32
@@ -35,9 +52,13 @@ struct route_rule {
};
static struct route_rule large_route_table[MAX_RULE_NUM];
+/* Route table for routes with depth > 24 */
+struct route_rule large_ldepth_route_table[MAX_RULE_NUM];
static uint32_t num_route_entries;
+static uint32_t num_ldepth_route_entries;
#define NUM_ROUTE_ENTRIES num_route_entries
+#define NUM_LDEPTH_ROUTE_ENTRIES num_ldepth_route_entries
enum {
IP_CLASS_A,
@@ -191,7 +212,7 @@ static void generate_random_rule_prefix(uint32_t ip_class,
uint8_t depth)
uint32_t ip_head_mask;
uint32_t rule_num;
uint32_t k;
- struct route_rule *ptr_rule;
+ struct route_rule *ptr_rule, *ptr_ldepth_rule;
if (ip_class == IP_CLASS_A) {/* IP Address class A */
fixed_bit_num = IP_HEAD_BIT_NUM_A;
@@ -236,10 +257,20 @@ static void generate_random_rule_prefix(uint32_t
ip_class, uint8_t depth)
*/
start = lrand48() & mask;
ptr_rule = &large_route_table[num_route_entries];
+ ptr_ldepth_rule = &large_ldepth_route_table[num_ldepth_route_entries];
for (k = 0; k < rule_num; k++) {
ptr_rule->ip = (start << (RTE_LPM_MAX_DEPTH - depth))
| ip_head_mask;
ptr_rule->depth = depth;
+ /* If the depth of the route is more than 24, store it
+* in another table as well.
+*/
+ if (depth > 24) {
+ ptr_ldepth_rule->ip = ptr_rule->ip;
+ ptr_ldepth_rule->depth = ptr_rule->depth;
+ ptr_ldepth_rule++;
+ num_ldepth_route_entries++;
+ }
ptr_rule++;
start = (start + step) & mask;
}
@@ -273,6 +304,7 @@ static void generate_large_route_rule_table(void)
uint8_t depth;
num_route_entries = 0;
+ num_ldepth_route_entries = 0;
memset(large_route_table, 0, sizeof(large_route_table));
for (ip_class = IP_CLASS_A; ip_class <= IP_CLASS_C; ip_class++) {
@@ -316,10 +348,460 @@ print_route_distribution(const struct route_rule *table,
uint32_t n)
printf("\n");
}
+/* Check condition and return an error if true. */
+static uint16_t enabled_core_ids[RTE_MAX_LCORE];
+static unsigned int num_cores;
+
+/* Simple way to allocate thread ids in 0 to RTE_MAX_LCORE space */
+static inline uint32_t
+alloc_thread_id(void)
+{
+ uint32_t tmp_thr_id;
+
+ tmp_thr_id = __atomic_fetch_add(&thr_id, 1, __ATOMIC_RELAXED);
+ if (tmp_thr_id >= RTE_MAX_LCORE)
+ printf("Invalid thread id %u\n", tmp_thr_id);
+
+ return tmp_thr_id;
+}
+
+/*
+ * Reader thread using rte_lpm data structure without RCU.
+ */
+static int
+test_lpm_reader(void *arg)
+{
+ int i;
+ uint32_t ip_batch[QSBR_REPORTING_INTERVAL];
+ uint32_t next_hop_return = 0;
+
+ RTE_SET_USED(arg);
+ do {
+ for (i = 0; i < QSBR_REPORTING_INTERVAL; i++)
+ ip_batch[i] = rte_rand();
+
+ for (i = 0; i < QSBR_REPORTING_INTERVAL; i++)
+ rte_lpm_lookup(lpm, ip_batch[i], &next_hop_return);
+
+
Re: [dpdk-dev] [PATCH v2] eal: use c11 atomic built-ins for interrupt status
> -Original Message- > From: Stefan Puiu > Sent: Thursday, July 9, 2020 4:02 PM > To: Phil Yang > Cc: david.march...@redhat.com; dev@dpdk.org; m...@ashroe.eu; > acon...@redhat.com; d...@linux.vnet.ibm.com; Honnappa Nagarahalli > ; Ruifeng Wang > ; nd ; do...@redhat.com; Neil > Horman ; hka...@marvell.com > Subject: Re: [dpdk-dev] [PATCH v2] eal: use c11 atomic built-ins for interrupt > status > > Hi, > > Noticed 2 typos: Hi Stefan, Thanks for your feedback. Will do. Thanks, Phil
[dpdk-dev] [PATCH v3 01/19] net/ixgbe/base: fix host interface shadow RAM read
Host interface Shadow RAM Read (0x31) command response
buffer length should be stored in two bytes, instead of one byte.
This patch fixes it.
Fixes: e6102361b1d4 ("net/ixgbe/base: use 2 bytes for flash read command")
Cc: sta...@dpdk.org
Signed-off-by: Mateusz Kowalski
Signed-off-by: Guinan Sun
Reviewed-by: Wei Zhao
---
drivers/net/ixgbe/base/ixgbe_common.c | 3 ++-
drivers/net/ixgbe/base/ixgbe_type.h | 12
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_common.c
b/drivers/net/ixgbe/base/ixgbe_common.c
index 4eb98dc19..5889410f9 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -4600,7 +4600,8 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32
*buffer,
* Read Flash command requires reading buffer length from
* two byes instead of one byte
*/
- if (resp->cmd == 0x30) {
+ if (resp->cmd == IXGBE_HOST_INTERFACE_FLASH_READ_CMD ||
+ resp->cmd == IXGBE_HOST_INTERFACE_SHADOW_RAM_READ_CMD) {
for (; bi < dword_len + 2; bi++) {
buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG,
bi);
diff --git a/drivers/net/ixgbe/base/ixgbe_type.h
b/drivers/net/ixgbe/base/ixgbe_type.h
index 15e937010..bc927a34e 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -4364,4 +4364,16 @@ struct ixgbe_hw {
#define IXGBE_NW_MNG_IF_SEL_MDIO_PHY_ADD \
(0x1F << IXGBE_NW_MNG_IF_SEL_MDIO_PHY_ADD_SHIFT)
+/* Code Command (Flash I/F Interface) */
+#define IXGBE_HOST_INTERFACE_FLASH_READ_CMD0x30
+#define IXGBE_HOST_INTERFACE_SHADOW_RAM_READ_CMD 0x31
+#define IXGBE_HOST_INTERFACE_FLASH_WRITE_CMD 0x32
+#define IXGBE_HOST_INTERFACE_SHADOW_RAM_WRITE_CMD 0x33
+#define IXGBE_HOST_INTERFACE_FLASH_MODULE_UPDATE_CMD 0x34
+#define IXGBE_HOST_INTERFACE_FLASH_BLOCK_EREASE_CMD0x35
+#define IXGBE_HOST_INTERFACE_SHADOW_RAM_DUMP_CMD 0x36
+#define IXGBE_HOST_INTERFACE_FLASH_INFO_CMD0x37
+#define IXGBE_HOST_INTERFACE_APPLY_UPDATE_CMD 0x38
+#define IXGBE_HOST_INTERFACE_MASK_CMD 0x00FF
+
#endif /* _IXGBE_TYPE_H_ */
--
2.17.1
[dpdk-dev] [PATCH v3 00/19] update ixgbe base code
source code of ixgbe driver:
not-released-cid-ixgbe.2020.06.09.tar.gz released by the team which develop
basic drivers for any ixgbe NIC.
changelog in ND share repo:
>From 66d7da32d8e8 ("ixgbe-shared: Add support to clear VFMBMEM and toggle VF's
>TX queues")
To 7f2d73c9742b ("ixgbe-shared: check Host Interface Return Status for Shadow
RAM Write command for X550")
66d7da32d8e8 is ignore as no use in this release.
Reviewed-by: Wei Zhao
---
v3:
* Modify hardcode.
* Remove patch "toggle VF's Tx queues"
* Remove patch "add support to clear VFMBMEM"
* Split patch into two.
v2:
* Remove codes about IXGBE_NVMUPD_SUPPORT.
* Remove codes about PREBOOT_SUPPORT.
* Remove codes about IXGBE_SFP_DETECT_RETRIES.
* Remove codes about IXGBE_EEPROM_GRANT_ATTEMPTS.
* Remove codes about IXGBE_VFWRITE_REG.
* Remove some useless defines.
* Modify commit messages.
* Split some patch to two patches and Merge some patches to one patch.
* Update README.
Guinan Sun (19):
net/ixgbe/base: fix host interface shadow RAM read
net/ixgbe/base: change flow for "Apply Update" command
net/ixgbe/base: fix x550em 10G NIC link status report
net/ixgbe/base: resolve infinite recursion on PCIe link down
net/ixgbe/base: added register definitions for NVM update
net/ixgbe/base: cleanup spelling mistakes in comments
net/ixgbe/base: remove whitespace in function comments
net/ixgbe/base: move increments after evaluations
net/ixgbe/base: create dedicated func to restart auto nego
net/ixgbe/base: add typecast for type mismatch
net/ixgbe/base: remove unnecessary return value check
net/ixgbe/base: remove unnecessary log message FC autonego
net/ixgbe/base: initialize data field in struct buffer
net/ixgbe/base: improve log about autonego being disabled
net/ixgbe/base: add ipv6 mask for FDIR feature
net/ixgbe/base: remove default advertising for x550 2.5G/5G
net/ixgbe/base: check host interface return status
net/ixgbe/base: cleanup pre-processor tags
net/ixgbe/base: update version
drivers/net/ixgbe/base/README|2 +-
drivers/net/ixgbe/base/ixgbe_82598.c | 238 ++---
drivers/net/ixgbe/base/ixgbe_82599.c | 397
drivers/net/ixgbe/base/ixgbe_api.c | 866 +-
drivers/net/ixgbe/base/ixgbe_common.c| 1055 +++---
drivers/net/ixgbe/base/ixgbe_common.h|2 +-
drivers/net/ixgbe/base/ixgbe_dcb.c |6 +-
drivers/net/ixgbe/base/ixgbe_dcb_82598.c |2 +-
drivers/net/ixgbe/base/ixgbe_dcb_82599.c |2 +-
drivers/net/ixgbe/base/ixgbe_hv_vf.c | 20 +-
drivers/net/ixgbe/base/ixgbe_mbx.c | 242 ++---
drivers/net/ixgbe/base/ixgbe_phy.c | 488 +-
drivers/net/ixgbe/base/ixgbe_phy.h |3 +-
drivers/net/ixgbe/base/ixgbe_type.h | 24 +-
drivers/net/ixgbe/base/ixgbe_vf.c| 170 ++--
drivers/net/ixgbe/base/ixgbe_x540.c | 190 ++--
drivers/net/ixgbe/base/ixgbe_x550.c | 527 ++-
17 files changed, 2102 insertions(+), 2132 deletions(-)
--
2.17.1
[dpdk-dev] [PATCH v3 02/19] net/ixgbe/base: change flow for "Apply Update" command
For the "Apply Update" command the firmware does not
given an response. For this command, success should
be return.
Signed-off-by: Mateusz Kowalski
Signed-off-by: Guinan Sun
Reviewed-by: Wei Zhao
---
drivers/net/ixgbe/base/ixgbe_common.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_common.c
b/drivers/net/ixgbe/base/ixgbe_common.c
index 5889410f9..fec6241f5 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -4528,11 +4528,18 @@ s32 ixgbe_hic_unlocked(struct ixgbe_hw *hw, u32
*buffer, u32 length,
msec_delay(1);
}
+ /* For each command except "Apply Update" perform
+* status checks in the HICR registry.
+*/
+ if ((buffer[0] & IXGBE_HOST_INTERFACE_MASK_CMD) ==
+ IXGBE_HOST_INTERFACE_APPLY_UPDATE_CMD)
+ return IXGBE_SUCCESS;
+
/* Check command completion */
if ((timeout && i == timeout) ||
!(IXGBE_READ_REG(hw, IXGBE_HICR) & IXGBE_HICR_SV)) {
ERROR_REPORT1(IXGBE_ERROR_CAUTION,
-"Command has failed with no status valid.\n");
+ "Command has failed with no status valid.\n");
return IXGBE_ERR_HOST_INTERFACE_COMMAND;
}
--
2.17.1
[dpdk-dev] [PATCH v3 05/19] net/ixgbe/base: added register definitions for NVM update
Added additional register for X550 and above device family.
Signed-off-by: Piotr Skajewski
Signed-off-by: Guinan Sun
Reviewed-by: Wei Zhao
---
drivers/net/ixgbe/base/ixgbe_type.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ixgbe/base/ixgbe_type.h
b/drivers/net/ixgbe/base/ixgbe_type.h
index bc927a34e..51cdff39d 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -1082,8 +1082,10 @@ struct ixgbe_dmac_config {
#define IXGBE_HSMC0R 0x15F04
#define IXGBE_HSMC1R 0x15F08
#define IXGBE_SWSR 0x15F10
+#define IXGBE_FWRESETCNT 0x15F40
#define IXGBE_HFDR 0x15FE8
#define IXGBE_FLEX_MNG 0x15800 /* 0x15800 - 0x15EFC */
+#define IXGBE_FLEX_MNG_PTR(_i) (IXGBE_FLEX_MNG + ((_i) * 4))
#define IXGBE_HICR_EN 0x01 /* Enable bit - RO */
/* Driver sets this bit when done to put command in RAM */
--
2.17.1
[dpdk-dev] [PATCH v3 04/19] net/ixgbe/base: resolve infinite recursion on PCIe link down
In some corner cases the functions ixgbe_clear_rar_generic and
ixgbe_clear_vmdq_generic may call one another leading to infinite
recursion.
When ixgbe_clear_vmdq_generic is called with IXGBE_CLEAR_VMDQ_ALL
flag, it's going to clear MPSAR registers, and proceed to call
ixgbe_clear_rar_generic, which in turn will clear the RAR registers,
and recursively call back ixgbe_clear_vmdq_generic. Normally, the
latter would detect that MPSAR registers have already been cleared
and terminate the recursion.
However, when PCIe link is down, and before the driver has had the
opportunity to shut itself down, all register reads return 0x,
and all register writes fail silently. In such case, because
ixgbe_clear_vmdq_generic blindly assumes that clearing MPSAR registers
succeeded, it's going to always call ixgbe_clear_rar_generic, which
in turn will always call back ixgbe_clear_vmdq_generic, creating
inifinite recursion.
This patch re-reads MPSAR register values after they had been cleared.
In case of PCIe link failure, the values read will be non-zero, which
will terminate the recursion. On the other hand, under normal
circumstances the value read from MPSAR registers is going to be equal
to the value previously written, so this patch is expected not to cause
any regressions.
Signed-off-by: Robert Konklewski
Signed-off-by: Guinan Sun
Reviewed-by: Wei Zhao
---
drivers/net/ixgbe/base/ixgbe_common.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_common.c
b/drivers/net/ixgbe/base/ixgbe_common.c
index fec6241f5..2d848a02b 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -3777,11 +3777,11 @@ s32 ixgbe_clear_vmdq_generic(struct ixgbe_hw *hw, u32
rar, u32 vmdq)
if (vmdq == IXGBE_CLEAR_VMDQ_ALL) {
if (mpsar_lo) {
IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), 0);
- mpsar_lo = 0;
+ mpsar_lo = IXGBE_READ_REG(hw, IXGBE_MPSAR_LO(rar));
}
if (mpsar_hi) {
IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), 0);
- mpsar_hi = 0;
+ mpsar_hi = IXGBE_READ_REG(hw, IXGBE_MPSAR_HI(rar));
}
} else if (vmdq < 32) {
mpsar_lo &= ~(1 << vmdq);
--
2.17.1
[dpdk-dev] [PATCH v3 03/19] net/ixgbe/base: fix x550em 10G NIC link status report
With the NVM image for x550em XFI will not report
the auto-negotiation feature correctly. The auto-negotiation
should be "No" for supports and advertised items.
At the same time update speed makes it support 1G and 10G.
Fixes: 833df43399e7 ("net/ixgbe/base: add SGMII link for X550")
Cc: sta...@dpdk.org
Signed-off-by: Piotr Skajewski
Signed-off-by: Guinan Sun
Reviewed-by: Wei Zhao
---
drivers/net/ixgbe/base/ixgbe_x550.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c
b/drivers/net/ixgbe/base/ixgbe_x550.c
index 3de406fd3..9fa999e01 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -1891,7 +1891,14 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw
*hw,
else
*speed = IXGBE_LINK_SPEED_10GB_FULL;
} else {
+ *autoneg = true;
+
switch (hw->phy.type) {
+ case ixgbe_phy_x550em_xfi:
+ *speed = IXGBE_LINK_SPEED_1GB_FULL |
+IXGBE_LINK_SPEED_10GB_FULL;
+ *autoneg = false;
+ break;
case ixgbe_phy_ext_1g_t:
#ifdef PREBOOT_SUPPORT
*speed = IXGBE_LINK_SPEED_1GB_FULL;
@@ -1925,7 +1932,6 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw
*hw,
IXGBE_LINK_SPEED_1GB_FULL;
break;
}
- *autoneg = true;
}
return IXGBE_SUCCESS;
--
2.17.1
[dpdk-dev] [PATCH v3 06/19] net/ixgbe/base: cleanup spelling mistakes in comments
Several functions in the driver code have a weird function comment
formatting which uses two spaces instead of only one space for the main
function body.
This formatting will be mechanically fixed by sed in a future patch, but
doing so leads to some checkpatch.pl warnings on that patch. Cleanup the
spelling mistakes that will be detected first. This way, it is easier to
verify the mechanical transformation done by sed in the following patch.
Signed-off-by: Jacob Keller
Signed-off-by: Guinan Sun
Reviewed-by: Wei Zhao
---
drivers/net/ixgbe/base/ixgbe_mbx.c | 4 ++--
drivers/net/ixgbe/base/ixgbe_vf.c | 2 +-
drivers/net/ixgbe/base/ixgbe_x550.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_mbx.c
b/drivers/net/ixgbe/base/ixgbe_mbx.c
index 13bdb5f68..d204db7a1 100644
--- a/drivers/net/ixgbe/base/ixgbe_mbx.c
+++ b/drivers/net/ixgbe/base/ixgbe_mbx.c
@@ -150,11 +150,11 @@ STATIC s32 ixgbe_poll_for_msg(struct ixgbe_hw *hw, u16
mbx_id)
}
/**
- * ixgbe_poll_for_ack - Wait for message acknowledgement
+ * ixgbe_poll_for_ack - Wait for message acknowledgment
* @hw: pointer to the HW structure
* @mbx_id: id of mailbox to write
*
- * returns SUCCESS if it successfully received a message acknowledgement
+ * returns SUCCESS if it successfully received a message acknowledgment
**/
STATIC s32 ixgbe_poll_for_ack(struct ixgbe_hw *hw, u16 mbx_id)
{
diff --git a/drivers/net/ixgbe/base/ixgbe_vf.c
b/drivers/net/ixgbe/base/ixgbe_vf.c
index 7f69ece10..4b2484606 100644
--- a/drivers/net/ixgbe/base/ixgbe_vf.c
+++ b/drivers/net/ixgbe/base/ixgbe_vf.c
@@ -142,7 +142,7 @@ s32 ixgbe_init_hw_vf(struct ixgbe_hw *hw)
* ixgbe_reset_hw_vf - Performs hardware reset
* @hw: pointer to hardware structure
*
- * Resets the hardware by reseting the transmit and receive units, masks and
+ * Resets the hardware by resetting the transmit and receive units, masks and
* clears all interrupts.
**/
s32 ixgbe_reset_hw_vf(struct ixgbe_hw *hw)
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c
b/drivers/net/ixgbe/base/ixgbe_x550.c
index 9fa999e01..c64cbfab1 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -1034,7 +1034,7 @@ void ixgbe_set_source_address_pruning_X550(struct
ixgbe_hw *hw, bool enable,
}
/**
- * ixgbe_set_ethertype_anti_spoofing_X550 - Enable/Disable Ethertype
anti-spoofing
+ * ixgbe_set_ethertype_anti_spoofing_X550 - Configure Ethertype anti-spoofing
* @hw: pointer to hardware structure
* @enable: enable or disable switch for Ethertype anti-spoofing
* @vf: Virtual Function pool - VF Pool to set for Ethertype anti-spoofing
--
2.17.1
[dpdk-dev] [PATCH v3 11/19] net/ixgbe/base: remove unnecessary return value check
Remove unnecessary return value check.
Signed-off-by: Jakub Chylkowski
Signed-off-by: Guinan Sun
Reviewed-by: Wei Zhao
---
drivers/net/ixgbe/base/ixgbe_82599.c | 4 +---
drivers/net/ixgbe/base/ixgbe_common.c | 4 +---
drivers/net/ixgbe/base/ixgbe_common.h | 2 +-
drivers/net/ixgbe/base/ixgbe_phy.c| 25 +++--
drivers/net/ixgbe/base/ixgbe_x540.c | 2 +-
5 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_82599.c
b/drivers/net/ixgbe/base/ixgbe_82599.c
index 38ab58d54..e425f28af 100644
--- a/drivers/net/ixgbe/base/ixgbe_82599.c
+++ b/drivers/net/ixgbe/base/ixgbe_82599.c
@@ -2093,9 +2093,7 @@ s32 ixgbe_start_hw_82599(struct ixgbe_hw *hw)
if (ret_val != IXGBE_SUCCESS)
goto out;
- ret_val = ixgbe_start_hw_gen2(hw);
- if (ret_val != IXGBE_SUCCESS)
- goto out;
+ ixgbe_start_hw_gen2(hw);
/* We need to run link autotry after the driver loads */
hw->mac.autotry_restart = true;
diff --git a/drivers/net/ixgbe/base/ixgbe_common.c
b/drivers/net/ixgbe/base/ixgbe_common.c
index a53286eb0..4e5d909ca 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -421,7 +421,7 @@ s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw)
*82599
*X540
**/
-s32 ixgbe_start_hw_gen2(struct ixgbe_hw *hw)
+void ixgbe_start_hw_gen2(struct ixgbe_hw *hw)
{
u32 i;
u32 regval;
@@ -446,8 +446,6 @@ s32 ixgbe_start_hw_gen2(struct ixgbe_hw *hw)
IXGBE_DCA_RXCTRL_HEAD_WRO_EN);
IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(i), regval);
}
-
- return IXGBE_SUCCESS;
}
/**
diff --git a/drivers/net/ixgbe/base/ixgbe_common.h
b/drivers/net/ixgbe/base/ixgbe_common.h
index 7a31f088c..5bdb48440 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.h
+++ b/drivers/net/ixgbe/base/ixgbe_common.h
@@ -23,7 +23,7 @@ u16 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw);
s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw);
s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw);
s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw);
-s32 ixgbe_start_hw_gen2(struct ixgbe_hw *hw);
+void ixgbe_start_hw_gen2(struct ixgbe_hw *hw);
s32 ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw);
s32 ixgbe_read_pba_num_generic(struct ixgbe_hw *hw, u32 *pba_num);
s32 ixgbe_read_pba_string_generic(struct ixgbe_hw *hw, u8 *pba_num,
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c
b/drivers/net/ixgbe/base/ixgbe_phy.c
index 620154a41..f859b152e 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.c
+++ b/drivers/net/ixgbe/base/ixgbe_phy.c
@@ -8,10 +8,10 @@
STATIC void ixgbe_i2c_start(struct ixgbe_hw *hw);
STATIC void ixgbe_i2c_stop(struct ixgbe_hw *hw);
-STATIC s32 ixgbe_clock_in_i2c_byte(struct ixgbe_hw *hw, u8 *data);
+STATIC void ixgbe_clock_in_i2c_byte(struct ixgbe_hw *hw, u8 *data);
STATIC s32 ixgbe_clock_out_i2c_byte(struct ixgbe_hw *hw, u8 data);
STATIC s32 ixgbe_get_i2c_ack(struct ixgbe_hw *hw);
-STATIC s32 ixgbe_clock_in_i2c_bit(struct ixgbe_hw *hw, bool *data);
+STATIC void ixgbe_clock_in_i2c_bit(struct ixgbe_hw *hw, bool *data);
STATIC s32 ixgbe_clock_out_i2c_bit(struct ixgbe_hw *hw, bool data);
STATIC void ixgbe_raise_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl);
STATIC void ixgbe_lower_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl);
@@ -46,11 +46,7 @@ STATIC s32 ixgbe_out_i2c_byte_ack(struct ixgbe_hw *hw, u8
byte)
*/
STATIC s32 ixgbe_in_i2c_byte_ack(struct ixgbe_hw *hw, u8 *byte)
{
- s32 status;
-
- status = ixgbe_clock_in_i2c_byte(hw, byte);
- if (status)
- return status;
+ ixgbe_clock_in_i2c_byte(hw, byte);
/* ACK */
return ixgbe_clock_out_i2c_bit(hw, false);
}
@@ -123,8 +119,7 @@ s32 ixgbe_read_i2c_combined_generic_int(struct ixgbe_hw
*hw, u8 addr, u16 reg,
if (ixgbe_in_i2c_byte_ack(hw, &low_bits))
goto fail;
/* Get csum */
- if (ixgbe_clock_in_i2c_byte(hw, &csum_byte))
- goto fail;
+ ixgbe_clock_in_i2c_byte(hw, &csum_byte);
/* NACK */
if (ixgbe_clock_out_i2c_bit(hw, false))
goto fail;
@@ -2034,9 +2029,7 @@ STATIC s32 ixgbe_read_i2c_byte_generic_int(struct
ixgbe_hw *hw, u8 byte_offset,
if (status != IXGBE_SUCCESS)
goto fail;
- status = ixgbe_clock_in_i2c_byte(hw, data);
- if (status != IXGBE_SUCCESS)
- goto fail;
+ ixgbe_clock_in_i2c_byte(hw, data);
status = ixgbe_clock_out_i2c_bit(hw, nack);
if (status != IXGBE_SUCCESS)
@@ -2281,7 +2274,7 @@ STATIC void ixgbe_i2c_stop(struct ixgbe_hw *hw)
*
* Clocks in one byte data via I2C data/clock
**/
-STATIC s32 ixgbe_clock_in_i2c_byte(struct ixgbe_hw *hw, u8 *data)
+STATIC void ixgbe_clock_in_i2c_byte(struct ixgbe_hw *hw,
[dpdk-dev] [PATCH v3 10/19] net/ixgbe/base: add typecast for type mismatch
Add typecast for type mismatch.
Signed-off-by: Jakub Chylkowski
Signed-off-by: Guinan Sun
Reviewed-by: Wei Zhao
---
drivers/net/ixgbe/base/ixgbe_82599.c | 8
drivers/net/ixgbe/base/ixgbe_common.c| 2 +-
drivers/net/ixgbe/base/ixgbe_dcb_82598.c | 2 +-
drivers/net/ixgbe/base/ixgbe_dcb_82599.c | 2 +-
drivers/net/ixgbe/base/ixgbe_x550.c | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_82599.c
b/drivers/net/ixgbe/base/ixgbe_82599.c
index 193233746..38ab58d54 100644
--- a/drivers/net/ixgbe/base/ixgbe_82599.c
+++ b/drivers/net/ixgbe/base/ixgbe_82599.c
@@ -1547,7 +1547,7 @@ void ixgbe_fdir_add_signature_filter_82599(struct
ixgbe_hw *hw,
* is for FDIRCMD. Then do a 64-bit register write from FDIRHASH.
*/
fdirhashcmd = (u64)fdircmd << 32;
- fdirhashcmd |= ixgbe_atr_compute_sig_hash_82599(input, common);
+ fdirhashcmd |= (u64)ixgbe_atr_compute_sig_hash_82599(input, common);
IXGBE_WRITE_REG64(hw, IXGBE_FDIRHASH, fdirhashcmd);
DEBUGOUT2("Tx Queue=%x hash=%x\n", queue, (u32)fdirhashcmd);
@@ -1636,7 +1636,7 @@ STATIC u32 ixgbe_get_fdirtcpm_82599(union ixgbe_atr_input
*input_mask)
{
u32 mask = IXGBE_NTOHS(input_mask->formatted.dst_port);
mask <<= IXGBE_FDIRTCPM_DPORTM_SHIFT;
- mask |= IXGBE_NTOHS(input_mask->formatted.src_port);
+ mask |= (u32)IXGBE_NTOHS(input_mask->formatted.src_port);
mask = ((mask & 0x) << 1) | ((mask & 0x) >> 1);
mask = ((mask & 0x) << 2) | ((mask & 0x) >> 2);
mask = ((mask & 0x0F0F0F0F) << 4) | ((mask & 0xF0F0F0F0) >> 4);
@@ -1868,14 +1868,14 @@ s32 ixgbe_fdir_write_perfect_filter_82599(struct
ixgbe_hw *hw,
/* record source and destination port (little-endian)*/
fdirport = IXGBE_NTOHS(input->formatted.dst_port);
fdirport <<= IXGBE_FDIRPORT_DESTINATION_SHIFT;
- fdirport |= IXGBE_NTOHS(input->formatted.src_port);
+ fdirport |= (u32)IXGBE_NTOHS(input->formatted.src_port);
IXGBE_WRITE_REG(hw, IXGBE_FDIRPORT, fdirport);
}
/* record VLAN (little-endian) and flex_bytes(big-endian) */
fdirvlan = IXGBE_STORE_AS_BE16(input->formatted.flex_bytes);
fdirvlan <<= IXGBE_FDIRVLAN_FLEX_SHIFT;
- fdirvlan |= IXGBE_NTOHS(input->formatted.vlan_id);
+ fdirvlan |= (u32)IXGBE_NTOHS(input->formatted.vlan_id);
IXGBE_WRITE_REG(hw, IXGBE_FDIRVLAN, fdirvlan);
if (cloud_mode) {
diff --git a/drivers/net/ixgbe/base/ixgbe_common.c
b/drivers/net/ixgbe/base/ixgbe_common.c
index 459498c7d..a53286eb0 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -738,7 +738,7 @@ s32 ixgbe_read_pba_num_generic(struct ixgbe_hw *hw, u32
*pba_num)
DEBUGOUT("NVM Read Error\n");
return ret_val;
}
- *pba_num |= data;
+ *pba_num |= (u32)data;
return IXGBE_SUCCESS;
}
diff --git a/drivers/net/ixgbe/base/ixgbe_dcb_82598.c
b/drivers/net/ixgbe/base/ixgbe_dcb_82598.c
index bb309e28f..3a049b749 100644
--- a/drivers/net/ixgbe/base/ixgbe_dcb_82598.c
+++ b/drivers/net/ixgbe/base/ixgbe_dcb_82598.c
@@ -167,7 +167,7 @@ s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw
*hw,
for (i = 0; i < IXGBE_DCB_MAX_TRAFFIC_CLASS; i++) {
max_credits = max[i];
reg = max_credits << IXGBE_TDTQ2TCCR_MCL_SHIFT;
- reg |= refill[i];
+ reg |= (u32)(refill[i]);
reg |= (u32)(bwg_id[i]) << IXGBE_TDTQ2TCCR_BWG_SHIFT;
if (tsa[i] == ixgbe_dcb_tsa_group_strict_cee)
diff --git a/drivers/net/ixgbe/base/ixgbe_dcb_82599.c
b/drivers/net/ixgbe/base/ixgbe_dcb_82599.c
index 04e0d1fb7..c26aaab91 100644
--- a/drivers/net/ixgbe/base/ixgbe_dcb_82599.c
+++ b/drivers/net/ixgbe/base/ixgbe_dcb_82599.c
@@ -166,7 +166,7 @@ s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw
*hw, u16 *refill,
for (i = 0; i < IXGBE_DCB_MAX_TRAFFIC_CLASS; i++) {
max_credits = max[i];
reg = max_credits << IXGBE_RTTDT2C_MCL_SHIFT;
- reg |= refill[i];
+ reg |= (u32)(refill[i]);
reg |= (u32)(bwg_id[i]) << IXGBE_RTTDT2C_BWG_SHIFT;
if (tsa[i] == ixgbe_dcb_tsa_group_strict_cee)
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c
b/drivers/net/ixgbe/base/ixgbe_x550.c
index 5750f79eb..d3363ff1d 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -699,7 +699,7 @@ static s32 ixgbe_setup_fw_link(struct ixgbe_hw *hw)
for (i = 0; i < sizeof(ixgbe_fw_map) / sizeof(ixgbe_fw_map[0]); ++i) {
if (hw->phy.autoneg_advertised & ixgbe_fw_map[i].phy_speed)
- setup[0] |= ixgbe_fw_map[i].fw_speed;
+ setup[0] |= (u32)(ixgbe_fw_map[i].fw_speed);
[dpdk-dev] [PATCH v3 08/19] net/ixgbe/base: move increments after evaluations
The retry variable was being incremented before it was evaluated by the
subsequent conditional against the maximum retries to figure out which
message to print. So we'll move the increment op to the end.
Signed-off-by: Jeb Cramer
Signed-off-by: Guinan Sun
Reviewed-by: Wei Zhao
---
drivers/net/ixgbe/base/ixgbe_phy.c | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c
b/drivers/net/ixgbe/base/ixgbe_phy.c
index 13f00ac67..823cf161e 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.c
+++ b/drivers/net/ixgbe/base/ixgbe_phy.c
@@ -138,12 +138,12 @@ s32 ixgbe_read_i2c_combined_generic_int(struct ixgbe_hw
*hw, u8 addr, u16 reg,
ixgbe_i2c_bus_clear(hw);
if (lock)
hw->mac.ops.release_swfw_sync(hw, swfw_mask);
- retry++;
if (retry < max_retry)
DEBUGOUT("I2C byte read combined error - Retrying.\n");
else
DEBUGOUT("I2C byte read combined error.\n");
- } while (retry < max_retry);
+ retry++;
+ } while (retry <= max_retry);
return IXGBE_ERR_I2C;
}
@@ -203,12 +203,12 @@ s32 ixgbe_write_i2c_combined_generic_int(struct ixgbe_hw
*hw, u8 addr, u16 reg,
ixgbe_i2c_bus_clear(hw);
if (lock)
hw->mac.ops.release_swfw_sync(hw, swfw_mask);
- retry++;
if (retry < max_retry)
DEBUGOUT("I2C byte write combined error - Retrying.\n");
else
DEBUGOUT("I2C byte write combined error.\n");
- } while (retry < max_retry);
+ retry++;
+ } while (retry <= max_retry);
return IXGBE_ERR_I2C;
}
@@ -2057,13 +2057,12 @@ STATIC s32 ixgbe_read_i2c_byte_generic_int(struct
ixgbe_hw *hw, u8 byte_offset,
hw->mac.ops.release_swfw_sync(hw, swfw_mask);
msec_delay(100);
}
- retry++;
if (retry < max_retry)
DEBUGOUT("I2C byte read error - Retrying.\n");
else
DEBUGOUT("I2C byte read error.\n");
-
- } while (retry < max_retry);
+ retry++;
+ } while (retry <= max_retry);
return status;
}
@@ -2161,12 +2160,12 @@ STATIC s32 ixgbe_write_i2c_byte_generic_int(struct
ixgbe_hw *hw, u8 byte_offset,
fail:
ixgbe_i2c_bus_clear(hw);
- retry++;
if (retry < max_retry)
DEBUGOUT("I2C byte write error - Retrying.\n");
else
DEBUGOUT("I2C byte write error.\n");
- } while (retry < max_retry);
+ retry++;
+ } while (retry <= max_retry);
if (lock)
hw->mac.ops.release_swfw_sync(hw, swfw_mask);
--
2.17.1
[dpdk-dev] [PATCH v3 09/19] net/ixgbe/base: create dedicated func to restart auto nego
This patch is for restarting auto negotiation on PHY.
Signed-off-by: Jakub Chylkowski
Signed-off-by: Guinan Sun
Reviewed-by: Wei Zhao
---
drivers/net/ixgbe/base/ixgbe_phy.c | 48 ++
drivers/net/ixgbe/base/ixgbe_phy.h | 1 +
2 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c
b/drivers/net/ixgbe/base/ixgbe_phy.c
index 823cf161e..620154a41 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.c
+++ b/drivers/net/ixgbe/base/ixgbe_phy.c
@@ -542,6 +542,26 @@ s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw)
return status;
}
+/**
+ * ixgbe_restart_auto_neg - Restart auto negotiation on the PHY
+ * @hw: pointer to hardware structure
+ **/
+void ixgbe_restart_auto_neg(struct ixgbe_hw *hw)
+{
+ u16 autoneg_reg;
+
+ /* Check if PHY reset is blocked by MNG FW */
+ if (ixgbe_check_reset_blocked(hw))
+ return;
+
+ /* Restart PHY auto-negotiation. */
+ hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_CONTROL,
+ IXGBE_MDIO_AUTO_NEG_DEV_TYPE, &autoneg_reg);
+ autoneg_reg |= IXGBE_MII_RESTART;
+ hw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_CONTROL,
+ IXGBE_MDIO_AUTO_NEG_DEV_TYPE, autoneg_reg);
+}
+
/**
* ixgbe_read_phy_mdi - Reads a value from a specified PHY register without
* the SWFW lock
@@ -826,19 +846,7 @@ s32 ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw)
IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
autoneg_reg);
- /* Blocked by MNG FW so don't reset PHY */
- if (ixgbe_check_reset_blocked(hw))
- return status;
-
- /* Restart PHY auto-negotiation. */
- hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_CONTROL,
-IXGBE_MDIO_AUTO_NEG_DEV_TYPE, &autoneg_reg);
-
- autoneg_reg |= IXGBE_MII_RESTART;
-
- hw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_CONTROL,
- IXGBE_MDIO_AUTO_NEG_DEV_TYPE, autoneg_reg);
-
+ ixgbe_restart_auto_neg(hw);
return status;
}
@@ -1062,19 +1070,7 @@ s32 ixgbe_setup_phy_link_tnx(struct ixgbe_hw *hw)
autoneg_reg);
}
- /* Blocked by MNG FW so don't reset PHY */
- if (ixgbe_check_reset_blocked(hw))
- return status;
-
- /* Restart PHY auto-negotiation. */
- hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_CONTROL,
-IXGBE_MDIO_AUTO_NEG_DEV_TYPE, &autoneg_reg);
-
- autoneg_reg |= IXGBE_MII_RESTART;
-
- hw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_CONTROL,
- IXGBE_MDIO_AUTO_NEG_DEV_TYPE, autoneg_reg);
-
+ ixgbe_restart_auto_neg(hw);
return status;
}
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.h
b/drivers/net/ixgbe/base/ixgbe_phy.h
index a06c3be17..e28c52a7b 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.h
+++ b/drivers/net/ixgbe/base/ixgbe_phy.h
@@ -133,6 +133,7 @@ enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id);
s32 ixgbe_get_phy_id(struct ixgbe_hw *hw);
s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw);
s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw);
+void ixgbe_restart_auto_neg(struct ixgbe_hw *hw);
s32 ixgbe_read_phy_reg_mdi(struct ixgbe_hw *hw, u32 reg_addr, u32 device_type,
u16 *phy_data);
s32 ixgbe_write_phy_reg_mdi(struct ixgbe_hw *hw, u32 reg_addr, u32 device_type,
--
2.17.1
[dpdk-dev] [PATCH v3 14/19] net/ixgbe/base: improve log about autonego being disabled
On ESXi OS, when user disables auto negotiation, the following log
appears: "(unsupported) Flow control autoneg is disabled".
It is true that auto negotiation is disabled but it is
not necessarily true that it is not supported.
Signed-off-by: Jakub Chylkowski
Signed-off-by: Guinan Sun
Reviewed-by: Wei Zhao
---
drivers/net/ixgbe/base/ixgbe_common.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_common.c
b/drivers/net/ixgbe/base/ixgbe_common.c
index 927877b6a..ca8ec907e 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -3076,8 +3076,9 @@ void ixgbe_fc_autoneg(struct ixgbe_hw *hw)
* - link is not up.
*/
if (hw->fc.disable_fc_autoneg) {
- ERROR_REPORT1(IXGBE_ERROR_UNSUPPORTED,
-"Flow control autoneg is disabled");
+ /* TODO: This should be just an informative log */
+ ERROR_REPORT1(IXGBE_ERROR_CAUTION,
+ "Flow control autoneg is disabled");
goto out;
}
--
2.17.1
[dpdk-dev] [PATCH v3 15/19] net/ixgbe/base: add ipv6 mask for FDIR feature
Write FDIRIP6M register to allow flow director filter to set ipv6 rules without setting ipv6 source/destination address. Signed-off-by: Piotr Skajewski Signed-off-by: Guinan Sun Reviewed-by: Wei Zhao --- drivers/net/ixgbe/base/ixgbe_82599.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ixgbe/base/ixgbe_82599.c b/drivers/net/ixgbe/base/ixgbe_82599.c index e425f28af..69fd4cd3f 100644 --- a/drivers/net/ixgbe/base/ixgbe_82599.c +++ b/drivers/net/ixgbe/base/ixgbe_82599.c @@ -1832,6 +1832,7 @@ s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw, ~input_mask->formatted.src_ip[0]); IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRDIP4M, ~input_mask->formatted.dst_ip[0]); + IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRIP6M, 0x); } return IXGBE_SUCCESS; } -- 2.17.1
[dpdk-dev] [PATCH v3 16/19] net/ixgbe/base: remove default advertising for x550 2.5G/5G
We are seeing interoperability issues with switches when 2.5G and 5G
in x550 are advertised by default, so default to off.
Signed-off-by: Todd Fujinaka
Signed-off-by: Guinan Sun
Reviewed-by: Wei Zhao
---
drivers/net/ixgbe/base/ixgbe_phy.c | 4
1 file changed, 4 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c
b/drivers/net/ixgbe/base/ixgbe_phy.c
index f859b152e..8d4d9bbfe 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.c
+++ b/drivers/net/ixgbe/base/ixgbe_phy.c
@@ -915,10 +915,6 @@ static s32 ixgbe_get_copper_speeds_supported(struct
ixgbe_hw *hw)
hw->phy.speeds_supported |= IXGBE_LINK_SPEED_100_FULL;
switch (hw->mac.type) {
- case ixgbe_mac_X550:
- hw->phy.speeds_supported |= IXGBE_LINK_SPEED_2_5GB_FULL;
- hw->phy.speeds_supported |= IXGBE_LINK_SPEED_5GB_FULL;
- break;
case ixgbe_mac_X550EM_x:
case ixgbe_mac_X550EM_a:
hw->phy.speeds_supported &= ~IXGBE_LINK_SPEED_100_FULL;
--
2.17.1
[dpdk-dev] [PATCH v3 12/19] net/ixgbe/base: remove unnecessary log message FC autonego
The function ixgbe_device_supports_autoneg_fc is checking whether a particular device and medium configuration is supporting Flow Control Autonegotiation. In case of non-support, the message is always logged which is confusing. The fix is removing unnecessary log entry. Signed-off-by: Zalfresso-Jundzillo Signed-off-by: Guinan Sun Reviewed-by: Wei Zhao --- drivers/net/ixgbe/base/ixgbe_common.c | 4 1 file changed, 4 deletions(-) diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c index 4e5d909ca..927877b6a 100644 --- a/drivers/net/ixgbe/base/ixgbe_common.c +++ b/drivers/net/ixgbe/base/ixgbe_common.c @@ -186,10 +186,6 @@ bool ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw) break; } - if (!supported) - ERROR_REPORT2(IXGBE_ERROR_UNSUPPORTED, - "Device %x does not support flow control autoneg", - hw->device_id); return supported; } -- 2.17.1
[dpdk-dev] [PATCH v3 13/19] net/ixgbe/base: initialize data field in struct buffer
While sending request using ixgbe_hic_unlocked() the data field in buffer struct is not used. It is set when the struct is overwritten by FW to deliver the response. To not pass random data to FW the whole structure should be zeroed before use. Signed-off-by: Krzysztof Galazka Signed-off-by: Piotr Pietruszewski Signed-off-by: Guinan Sun Reviewed-by: Wei Zhao --- drivers/net/ixgbe/base/ixgbe_x550.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c index d3363ff1d..8343efbc2 100644 --- a/drivers/net/ixgbe/base/ixgbe_x550.c +++ b/drivers/net/ixgbe/base/ixgbe_x550.c @@ -3126,6 +3126,7 @@ s32 ixgbe_read_ee_hostif_X550(struct ixgbe_hw *hw, u16 offset, u16 *data) /* one word */ buffer.length = IXGBE_CPU_TO_BE16(sizeof(u16)); buffer.pad2 = 0; + buffer.data = 0; buffer.pad3 = 0; status = hw->mac.ops.acquire_swfw_sync(hw, mask); @@ -3186,6 +3187,7 @@ s32 ixgbe_read_ee_hostif_buffer_X550(struct ixgbe_hw *hw, buffer.address = IXGBE_CPU_TO_BE32((offset + current_word) * 2); buffer.length = IXGBE_CPU_TO_BE16(words_to_read * 2); buffer.pad2 = 0; + buffer.data = 0; buffer.pad3 = 0; status = ixgbe_hic_unlocked(hw, (u32 *)&buffer, sizeof(buffer), -- 2.17.1
[dpdk-dev] [PATCH v3 17/19] net/ixgbe/base: check host interface return status
Writing to read-only fields returns a non-OK Return Status
for shadow RAM write command for X550.
This information was previously discarded.
Signed-off-by: Stanislaw Grzeszczak
Signed-off-by: Guinan Sun
Reviewed-by: Wei Zhao
---
drivers/net/ixgbe/base/ixgbe_x550.c | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c
b/drivers/net/ixgbe/base/ixgbe_x550.c
index 8343efbc2..05199abb8 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -3248,7 +3248,18 @@ s32 ixgbe_write_ee_hostif_data_X550(struct ixgbe_hw *hw,
u16 offset,
status = ixgbe_host_interface_command(hw, (u32 *)&buffer,
sizeof(buffer),
- IXGBE_HI_COMMAND_TIMEOUT, false);
+ IXGBE_HI_COMMAND_TIMEOUT, true);
+ if (status != IXGBE_SUCCESS) {
+ DEBUGOUT2("for offset %04x failed with status %d\n",
+ offset, status);
+ return status;
+ }
+
+ if (buffer.hdr.rsp.buf_lenh_status != FW_CEM_RESP_STATUS_SUCCESS) {
+ DEBUGOUT2("for offset %04x host interface return status %02x\n",
+ offset, buffer.hdr.rsp.buf_lenh_status);
+ return IXGBE_ERR_HOST_INTERFACE_COMMAND;
+ }
return status;
}
--
2.17.1
[dpdk-dev] [PATCH v3 19/19] net/ixgbe/base: update version
Update base code version in readme. Signed-off-by: Guinan Sun Reviewed-by: Wei Zhao --- drivers/net/ixgbe/base/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/base/README b/drivers/net/ixgbe/base/README index a48b14ed2..2c7469392 100644 --- a/drivers/net/ixgbe/base/README +++ b/drivers/net/ixgbe/base/README @@ -6,7 +6,7 @@ Intel® IXGBE driver === This directory contains source code of FreeBSD ixgbe driver of version -cid-ixgbe.2018.08.28.tar.gz released by the team which develop +not-released-cid-ixgbe.2020.06.09.tar.gz released by the team which develop basic drivers for any ixgbe NIC. The sub-directory of base/ contains the original source package. This driver is valid for the product(s) listed below -- 2.17.1
[dpdk-dev] [PATCH] net/bnxt: fix build issue
In existing build env, RTE_LIBRTE_BNXT_PMD_SYSTEM is unset.
Testing against a n value does not work and we end up with a link issue:
/usr/bin/ld: tf_core/tf_em_common.o: in function `tf_em_ext_common_alloc':
.../dpdk/drivers/net/bnxt/tf_core/tf_em_common.c:1040: undefined reference
to `tf_em_ext_alloc'
/usr/bin/ld: tf_core/tf_em_common.o: in function `tf_em_ext_common_free':
.../dpdk/drivers/net/bnxt/tf_core/tf_em_common.c:1047: undefined reference
to `tf_em_ext_free'
collect2: error: ld returned 1 exit status
gmake[4]: *** [.../dpdk/mk/rte.lib.mk:95: librte_pmd_bnxt.so.20.0.3]
Error 1
gmake[3]: *** [.../dpdk/mk/rte.subdir.mk:35: bnxt] Error 2
Fixes: b2da02480cb7 ("net/bnxt: support EEM system memory")
Signed-off-by: David Marchand
---
drivers/net/bnxt/tf_core/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/bnxt/tf_core/Makefile
b/drivers/net/bnxt/tf_core/Makefile
index b4fbdd00fc..806471427c 100644
--- a/drivers/net/bnxt/tf_core/Makefile
+++ b/drivers/net/bnxt/tf_core/Makefile
@@ -16,10 +16,10 @@ SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_msg.c
SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tbl.c
SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_common.c
SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_internal.c
-ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM), n)
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
+ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM),y)
+SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_system.c
else
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM) += tf_core/tf_em_system.c
+SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
endif
SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_session.c
SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device.c
--
2.23.0
[dpdk-dev] [PATCH v3 18/19] net/ixgbe/base: cleanup pre-processor tags
The codes has been exposed correctly, so remove pre-processor tags.
Signed-off-by: Guinan Sun
Reviewed-by: Wei Zhao
---
drivers/net/ixgbe/base/ixgbe_common.c | 8
drivers/net/ixgbe/base/ixgbe_phy.h| 2 --
drivers/net/ixgbe/base/ixgbe_type.h | 10 --
drivers/net/ixgbe/base/ixgbe_vf.c | 4
drivers/net/ixgbe/base/ixgbe_x550.c | 22 --
5 files changed, 46 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_common.c
b/drivers/net/ixgbe/base/ixgbe_common.c
index ca8ec907e..14e54a8bc 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -4218,17 +4218,9 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw,
ixgbe_link_speed *speed,
break;
case IXGBE_LINKS_SPEED_10_X550EM_A:
*speed = IXGBE_LINK_SPEED_UNKNOWN;
-#ifdef PREBOOT_SUPPORT
- if (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||
- hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L ||
- hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII ||
- hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII_L)
- *speed = IXGBE_LINK_SPEED_10_FULL;
-#else
if (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||
hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L)
*speed = IXGBE_LINK_SPEED_10_FULL;
-#endif /* PREBOOT_SUPPORT */
break;
default:
*speed = IXGBE_LINK_SPEED_UNKNOWN;
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.h
b/drivers/net/ixgbe/base/ixgbe_phy.h
index e28c52a7b..ceefbb3e6 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.h
+++ b/drivers/net/ixgbe/base/ixgbe_phy.h
@@ -117,10 +117,8 @@
#define IXGBE_I2C_T_SU_STO 4
#define IXGBE_I2C_T_BUF5
-#ifndef IXGBE_SFP_DETECT_RETRIES
#define IXGBE_SFP_DETECT_RETRIES 10
-#endif /* IXGBE_SFP_DETECT_RETRIES */
#define IXGBE_TN_LASI_STATUS_REG 0x9005
#define IXGBE_TN_LASI_STATUS_TEMP_ALARM0x0008
diff --git a/drivers/net/ixgbe/base/ixgbe_type.h
b/drivers/net/ixgbe/base/ixgbe_type.h
index 51cdff39d..b7eec4563 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -2413,9 +2413,7 @@ enum {
#define IXGBE_EEPROM_CTRL_21 /* EEPROM CTRL word 2 */
#define IXGBE_EEPROM_CCD_BIT 2
-#ifndef IXGBE_EEPROM_GRANT_ATTEMPTS
#define IXGBE_EEPROM_GRANT_ATTEMPTS1000 /* EEPROM attempts to gain grant */
-#endif
/* Number of 5 microseconds we wait for EERD read and
* EERW write to complete */
@@ -3145,11 +3143,7 @@ enum ixgbe_fdir_pballoc_type {
/* Host Interface Command Structures */
-#ifdef C99
#pragma pack(push, 1)
-#else
-#pragma pack (1)
-#endif /* C99 */
struct ixgbe_hic_hdr {
u8 cmd;
@@ -3262,11 +3256,7 @@ struct ixgbe_hic_phy_activity_resp {
__be32 data[FW_PHY_ACT_DATA_COUNT];
};
-#ifdef C99
#pragma pack(pop)
-#else
-#pragma pack()
-#endif /* C99 */
/* Transmit Descriptor - Legacy */
struct ixgbe_legacy_tx_desc {
diff --git a/drivers/net/ixgbe/base/ixgbe_vf.c
b/drivers/net/ixgbe/base/ixgbe_vf.c
index 2a3e25834..91a5775eb 100644
--- a/drivers/net/ixgbe/base/ixgbe_vf.c
+++ b/drivers/net/ixgbe/base/ixgbe_vf.c
@@ -7,12 +7,8 @@
#include "ixgbe_type.h"
#include "ixgbe_vf.h"
-#ifndef IXGBE_VFWRITE_REG
#define IXGBE_VFWRITE_REG IXGBE_WRITE_REG
-#endif
-#ifndef IXGBE_VFREAD_REG
#define IXGBE_VFREAD_REG IXGBE_READ_REG
-#endif
/**
* ixgbe_init_ops_vf - Initialize the pointers for vf
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c
b/drivers/net/ixgbe/base/ixgbe_x550.c
index 05199abb8..8810d1658 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -1642,7 +1642,6 @@ STATIC s32 ixgbe_restart_an_internal_phy_x550em(struct
ixgbe_hw *hw)
return status;
}
-#ifndef PREBOOT_SUPPORT
/**
* ixgbe_setup_sgmii - Set up link for sgmii
* @hw: pointer to hardware structure
@@ -1712,7 +1711,6 @@ STATIC s32 ixgbe_setup_sgmii(struct ixgbe_hw *hw,
ixgbe_link_speed speed,
return hw->phy.ops.setup_link_speed(hw, speed, autoneg_wait);
}
-#endif /* PREBOOT_SUPPORT */
/**
* ixgbe_setup_sgmii_fw - Set up link for internal PHY SGMII auto-negotiation
* @hw: pointer to hardware structure
@@ -1837,11 +1835,7 @@ void ixgbe_init_mac_link_ops_X550em(struct ixgbe_hw *hw)
case ixgbe_media_type_backplane:
if (hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII ||
hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII_L)
-#ifdef PREBOOT_SUPPORT
- mac->ops.setup_link = ixgbe_setup_sgmii_fw;
-#else
mac->ops.setup_link = ixgbe_setup_sgmii;
-#endif /* PREBOOT_SUPPORT */
break;
default:
break;
@@ -1900,18 +1894,8 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw
*hw,
*autoneg = false;
[dpdk-dev] [PATCH v3] eal: use c11 atomic built-ins for interrupt status
The event status is defined as a volatile variable and shared between
threads. Use c11 atomic built-ins with explicit ordering instead of
rte_atomic ops which enforce unnecessary barriers on aarch64.
The event status has been cleaned up by the compare-and-swap operation
when we free the event data, so there is no need to set it to invalid
after that.
Signed-off-by: Phil Yang
Reviewed-by: Ruifeng Wang
Reviewed-by: Honnappa Nagarahalli
Reviewed-by: Harman Kalra
---
v3:
Fixed typo.
v2:
1. Fixed typo.
2. Updated libabigail.abignore to pass ABI check.
3. Merged v1 two patches into one patch.
devtools/libabigail.abignore| 4 +++
lib/librte_eal/include/rte_eal_interrupts.h | 2 +-
lib/librte_eal/linux/eal_interrupts.c | 48 -
3 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore
index 0133f75..daa4631 100644
--- a/devtools/libabigail.abignore
+++ b/devtools/libabigail.abignore
@@ -48,6 +48,10 @@
changed_enumerators = RTE_CRYPTO_AEAD_LIST_END
[suppress_variable]
name = rte_crypto_aead_algorithm_strings
+; Ignore updates of epoll event
+[suppress_type]
+type_kind = struct
+name = rte_epoll_event
;;
; Temporary exceptions till DPDK 20.11
diff --git a/lib/librte_eal/include/rte_eal_interrupts.h
b/lib/librte_eal/include/rte_eal_interrupts.h
index 773a34a..b1e8a29 100644
--- a/lib/librte_eal/include/rte_eal_interrupts.h
+++ b/lib/librte_eal/include/rte_eal_interrupts.h
@@ -59,7 +59,7 @@ enum {
/** interrupt epoll event obj, taken by epoll_event.ptr */
struct rte_epoll_event {
- volatile uint32_t status; /**< OUT: event status */
+ uint32_t status; /**< OUT: event status */
int fd;/**< OUT: event fd */
int epfd; /**< OUT: epoll instance the ev associated with */
struct rte_epoll_data epdata;
diff --git a/lib/librte_eal/linux/eal_interrupts.c
b/lib/librte_eal/linux/eal_interrupts.c
index 84eeaa1..ad09049 100644
--- a/lib/librte_eal/linux/eal_interrupts.c
+++ b/lib/librte_eal/linux/eal_interrupts.c
@@ -26,7 +26,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -1221,11 +1220,18 @@ eal_epoll_process_event(struct epoll_event *evs,
unsigned int n,
{
unsigned int i, count = 0;
struct rte_epoll_event *rev;
+ uint32_t valid_status;
for (i = 0; i < n; i++) {
rev = evs[i].data.ptr;
- if (!rev || !rte_atomic32_cmpset(&rev->status, RTE_EPOLL_VALID,
-RTE_EPOLL_EXEC))
+ valid_status = RTE_EPOLL_VALID;
+ /* ACQUIRE memory ordering here pairs with RELEASE
+* ordering below acting as a lock to synchronize
+* the event data updating.
+*/
+ if (!rev || !__atomic_compare_exchange_n(&rev->status,
+ &valid_status, RTE_EPOLL_EXEC, 0,
+ __ATOMIC_ACQUIRE, __ATOMIC_RELAXED))
continue;
events[count].status= RTE_EPOLL_VALID;
@@ -1237,8 +1243,11 @@ eal_epoll_process_event(struct epoll_event *evs,
unsigned int n,
rev->epdata.cb_fun(rev->fd,
rev->epdata.cb_arg);
- rte_compiler_barrier();
- rev->status = RTE_EPOLL_VALID;
+ /* the status update should be observed after
+* the other fields change.
+*/
+ __atomic_store_n(&rev->status, RTE_EPOLL_VALID,
+ __ATOMIC_RELEASE);
count++;
}
return count;
@@ -1308,10 +1317,14 @@ rte_epoll_wait(int epfd, struct rte_epoll_event *events,
static inline void
eal_epoll_data_safe_free(struct rte_epoll_event *ev)
{
- while (!rte_atomic32_cmpset(&ev->status, RTE_EPOLL_VALID,
- RTE_EPOLL_INVALID))
- while (ev->status != RTE_EPOLL_VALID)
+ uint32_t valid_status = RTE_EPOLL_VALID;
+ while (!__atomic_compare_exchange_n(&ev->status, &valid_status,
+ RTE_EPOLL_INVALID, 0, __ATOMIC_ACQUIRE, __ATOMIC_RELAXED)) {
+ while (__atomic_load_n(&ev->status,
+ __ATOMIC_RELAXED) != RTE_EPOLL_VALID)
rte_pause();
+ valid_status = RTE_EPOLL_VALID;
+ }
memset(&ev->epdata, 0, sizeof(ev->epdata));
ev->fd = -1;
ev->epfd = -1;
@@ -1333,7 +1346,8 @@ rte_epoll_ctl(int epfd, int op, int fd,
epfd = rte_intr_tls_epfd();
if (op == EPOLL_CTL_ADD) {
- event->status = RTE_EPOLL_VALID;
+ __atomic_store_n(&event->status, RTE_EPOLL_VALID,
+ __ATOMIC_RE
Re: [dpdk-dev] [PATCH v2 1/4] lib: introduce IF Proxy library
First of all let me thank you all one again for the time you took looking at this and summarize your feedback as I understand it. 1. Don't use interrupt thread because in heavy load scenarios this might cause problems. 2. Provide higher level functionality - so that application can just use it instead of maintaining the info on their own. 3. Provide way to have control over the changes - if I remember correctly someone wanted apps to be able to reject the changes (meaning rolling back the changes to the kernel) 4. Don't parse netlink on your own (use e.g. libmnl) 5. Don't use callbacks These are the specific things that I managed to understand. Have I missed anything? If so please add this to the list! To that I say: Ad1. Agree, will change that. Ad2. OK, but this can be added later. Ad3. Currently the lib was meant to be one way but as in previous point this can change in the future. Ad4. As mentioned in previous mail I judged it not worthy of adding dependency but I'm OK with using it. This might be more relevant when we address point 3 and can be introduced then, but I can do it now. Ad5. There are now notification queues and I'm fine with adapting to any standard of notification/communication that DPDK will agree on. In addition may I ask your opinion on the changes that are required before the library can be accepted? Thank you in advance With regards Andrzej Ostruszka
[dpdk-dev] [PATCH v1 1/2] raw/ifpga/base: fix spi transaction issue
From: Tianfei Zhang
0x4a means idle status on physical layer. when encounter
0x4a on raw data, it need insert a ESCAPE character for
indication.
Fixes: 96ebfcf8 ("raw/ifpga/base: add SPI and MAX10 device driver")
Cc: sta...@dpdk.org
Signed-off-by: Tianfei Zhang
---
drivers/raw/ifpga/base/opae_spi_transaction.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/raw/ifpga/base/opae_spi_transaction.c
b/drivers/raw/ifpga/base/opae_spi_transaction.c
index 013efee3e..d13d2fbc8 100644
--- a/drivers/raw/ifpga/base/opae_spi_transaction.c
+++ b/drivers/raw/ifpga/base/opae_spi_transaction.c
@@ -166,7 +166,7 @@ static int byte_to_core_convert(struct spi_transaction_dev
*dev,
current_byte = send_data[i];
switch (current_byte) {
case SPI_BYTE_IDLE:
- *p++ = SPI_BYTE_IDLE;
+ *p++ = SPI_BYTE_ESC;
*p++ = xor_20(current_byte);
break;
case SPI_BYTE_ESC:
--
2.17.1
[dpdk-dev] [PATCH v1 2/2] raw/ifpga/base: fix NIOS SPI initial
From: Tianfei Zhang
Add fecmode setting on NIOS SPI master initialization.
this SPI is shared by NIOS core inside FPGA, NIOS will
use this SPI master to do some one time initialization
after power up, and then release the control to DPDK.
Fix the timeout initialization for polling the
NIOS_INIT_DONE.
Fixes: bc44402f ("raw/ifpga/base: configure FEC mode")
Cc: sta...@dpdk.org
Signed-off-by: Tianfei Zhang
---
drivers/raw/ifpga/base/ifpga_fme.c | 27 ---
drivers/raw/ifpga/base/opae_spi.h | 1 +
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/drivers/raw/ifpga/base/ifpga_fme.c
b/drivers/raw/ifpga/base/ifpga_fme.c
index c31a94cf8..9057087b5 100644
--- a/drivers/raw/ifpga/base/ifpga_fme.c
+++ b/drivers/raw/ifpga/base/ifpga_fme.c
@@ -979,28 +979,32 @@ struct ifpga_feature_ops fme_spi_master_ops = {
static int nios_spi_wait_init_done(struct altera_spi_device *dev)
{
u32 val = 0;
- unsigned long timeout = msecs_to_timer_cycles(1);
+ unsigned long timeout = rte_get_timer_cycles() +
+ msecs_to_timer_cycles(1);
unsigned long ticks;
int major_version;
+ int fecmode = FEC_MODE_NO;
if (spi_reg_read(dev, NIOS_VERSION, &val))
return -EIO;
- major_version = (val >> NIOS_VERSION_MAJOR_SHIFT) &
- NIOS_VERSION_MAJOR;
- dev_debug(dev, "A10 NIOS FW version %d\n", major_version);
+ major_version =
+ (val & NIOS_VERSION_MAJOR) >> NIOS_VERSION_MAJOR_SHIFT;
+ dev_info(dev, "A10 NIOS FW version %d\n", major_version);
if (major_version >= 3) {
/* read NIOS_INIT to check if PKVL INIT done or not */
if (spi_reg_read(dev, NIOS_INIT, &val))
return -EIO;
+ dev_debug(dev, "read NIOS_INIT: 0x%x\n", val);
+
/* check if PKVLs are initialized already */
if (val & NIOS_INIT_DONE || val & NIOS_INIT_START)
goto nios_init_done;
/* start to config the default FEC mode */
- val = NIOS_INIT_START;
+ val = fecmode | NIOS_INIT_START;
if (spi_reg_write(dev, NIOS_INIT, val))
return -EIO;
@@ -1010,14 +1014,23 @@ static int nios_spi_wait_init_done(struct
altera_spi_device *dev)
do {
if (spi_reg_read(dev, NIOS_INIT, &val))
return -EIO;
- if (val)
+ if (val & NIOS_INIT_DONE)
break;
ticks = rte_get_timer_cycles();
if (time_after(ticks, timeout))
return -ETIMEDOUT;
msleep(100);
- } while (!val);
+ } while (1);
+
+ /* get the fecmode */
+ if (spi_reg_read(dev, NIOS_INIT, &val))
+ return -EIO;
+ dev_debug(dev, "read NIOS_INIT: 0x%x\n", val);
+ fecmode = (val & REQ_FEC_MODE) >> REQ_FEC_MODE_SHIFT;
+ dev_info(dev, "fecmode: 0x%x, %s\n", fecmode,
+ (fecmode == FEC_MODE_KR) ? "kr" :
+ ((fecmode == FEC_MODE_RS) ? "rs" : "no"));
return 0;
}
diff --git a/drivers/raw/ifpga/base/opae_spi.h
b/drivers/raw/ifpga/base/opae_spi.h
index d20a4c3ed..73a227673 100644
--- a/drivers/raw/ifpga/base/opae_spi.h
+++ b/drivers/raw/ifpga/base/opae_spi.h
@@ -153,6 +153,7 @@ int spi_reg_read(struct altera_spi_device *dev, u32 reg,
u32 *val);
#define NIOS_INIT 0x1000
#define REQ_FEC_MODE GENMASK(23, 8)
+#define REQ_FEC_MODE_SHIFT 8
#define FEC_MODE_NO0x0
#define FEC_MODE_KR0x
#define FEC_MODE_RS0x
--
2.17.1
[dpdk-dev] [PATCH v2 2/2] raw/ifpga/base: fix NIOS SPI initial
From: Tianfei Zhang
Add fecmode setting on NIOS SPI primary initialization.
this SPI is shared by NIOS core inside FPGA, NIOS will
use this SPI primary to do some one time initialization
after power up, and then release the control to DPDK.
Fix the timeout initialization for polling the
NIOS_INIT_DONE.
Fixes: bc44402f ("raw/ifpga/base: configure FEC mode")
Cc: sta...@dpdk.org
Signed-off-by: Tianfei Zhang
---
drivers/raw/ifpga/base/ifpga_fme.c | 27 ---
drivers/raw/ifpga/base/opae_spi.h | 1 +
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/drivers/raw/ifpga/base/ifpga_fme.c
b/drivers/raw/ifpga/base/ifpga_fme.c
index c31a94cf8..9057087b5 100644
--- a/drivers/raw/ifpga/base/ifpga_fme.c
+++ b/drivers/raw/ifpga/base/ifpga_fme.c
@@ -979,28 +979,32 @@ struct ifpga_feature_ops fme_spi_master_ops = {
static int nios_spi_wait_init_done(struct altera_spi_device *dev)
{
u32 val = 0;
- unsigned long timeout = msecs_to_timer_cycles(1);
+ unsigned long timeout = rte_get_timer_cycles() +
+ msecs_to_timer_cycles(1);
unsigned long ticks;
int major_version;
+ int fecmode = FEC_MODE_NO;
if (spi_reg_read(dev, NIOS_VERSION, &val))
return -EIO;
- major_version = (val >> NIOS_VERSION_MAJOR_SHIFT) &
- NIOS_VERSION_MAJOR;
- dev_debug(dev, "A10 NIOS FW version %d\n", major_version);
+ major_version =
+ (val & NIOS_VERSION_MAJOR) >> NIOS_VERSION_MAJOR_SHIFT;
+ dev_info(dev, "A10 NIOS FW version %d\n", major_version);
if (major_version >= 3) {
/* read NIOS_INIT to check if PKVL INIT done or not */
if (spi_reg_read(dev, NIOS_INIT, &val))
return -EIO;
+ dev_debug(dev, "read NIOS_INIT: 0x%x\n", val);
+
/* check if PKVLs are initialized already */
if (val & NIOS_INIT_DONE || val & NIOS_INIT_START)
goto nios_init_done;
/* start to config the default FEC mode */
- val = NIOS_INIT_START;
+ val = fecmode | NIOS_INIT_START;
if (spi_reg_write(dev, NIOS_INIT, val))
return -EIO;
@@ -1010,14 +1014,23 @@ static int nios_spi_wait_init_done(struct
altera_spi_device *dev)
do {
if (spi_reg_read(dev, NIOS_INIT, &val))
return -EIO;
- if (val)
+ if (val & NIOS_INIT_DONE)
break;
ticks = rte_get_timer_cycles();
if (time_after(ticks, timeout))
return -ETIMEDOUT;
msleep(100);
- } while (!val);
+ } while (1);
+
+ /* get the fecmode */
+ if (spi_reg_read(dev, NIOS_INIT, &val))
+ return -EIO;
+ dev_debug(dev, "read NIOS_INIT: 0x%x\n", val);
+ fecmode = (val & REQ_FEC_MODE) >> REQ_FEC_MODE_SHIFT;
+ dev_info(dev, "fecmode: 0x%x, %s\n", fecmode,
+ (fecmode == FEC_MODE_KR) ? "kr" :
+ ((fecmode == FEC_MODE_RS) ? "rs" : "no"));
return 0;
}
diff --git a/drivers/raw/ifpga/base/opae_spi.h
b/drivers/raw/ifpga/base/opae_spi.h
index d20a4c3ed..73a227673 100644
--- a/drivers/raw/ifpga/base/opae_spi.h
+++ b/drivers/raw/ifpga/base/opae_spi.h
@@ -153,6 +153,7 @@ int spi_reg_read(struct altera_spi_device *dev, u32 reg,
u32 *val);
#define NIOS_INIT 0x1000
#define REQ_FEC_MODE GENMASK(23, 8)
+#define REQ_FEC_MODE_SHIFT 8
#define FEC_MODE_NO0x0
#define FEC_MODE_KR0x
#define FEC_MODE_RS0x
--
2.17.1
[dpdk-dev] [PATCH v2 1/2] raw/ifpga/base: fix spi transaction issue
From: Tianfei Zhang
0x4a means idle status on physical layer. when encounter
0x4a on raw data, it need insert a ESCAPE character for
indication.
Fixes: 96ebfcf8 ("raw/ifpga/base: add SPI and MAX10 device driver")
Cc: sta...@dpdk.org
Signed-off-by: Tianfei Zhang
---
drivers/raw/ifpga/base/opae_spi_transaction.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/raw/ifpga/base/opae_spi_transaction.c
b/drivers/raw/ifpga/base/opae_spi_transaction.c
index 013efee3e..d13d2fbc8 100644
--- a/drivers/raw/ifpga/base/opae_spi_transaction.c
+++ b/drivers/raw/ifpga/base/opae_spi_transaction.c
@@ -166,7 +166,7 @@ static int byte_to_core_convert(struct spi_transaction_dev
*dev,
current_byte = send_data[i];
switch (current_byte) {
case SPI_BYTE_IDLE:
- *p++ = SPI_BYTE_IDLE;
+ *p++ = SPI_BYTE_ESC;
*p++ = xor_20(current_byte);
break;
case SPI_BYTE_ESC:
--
2.17.1
Re: [dpdk-dev] [PATCH v1 2/2] raw/ifpga/base: fix NIOS SPI initial
The message include "master", it suggested that replace by " primary ", I will
send the V2.
-Original Message-
From: Zhang, Tianfei
Sent: Friday, July 10, 2020 12:36 AM
To: dev@dpdk.org; Xu, Rosen
Cc: Zhang, Tianfei ; sta...@dpdk.org
Subject: [PATCH v1 2/2] raw/ifpga/base: fix NIOS SPI initial
From: Tianfei Zhang
Add fecmode setting on NIOS SPI master initialization.
this SPI is shared by NIOS core inside FPGA, NIOS will use this SPI master to
do some one time initialization after power up, and then release the control to
DPDK.
Fix the timeout initialization for polling the NIOS_INIT_DONE.
Fixes: bc44402f ("raw/ifpga/base: configure FEC mode")
Cc: sta...@dpdk.org
Signed-off-by: Tianfei Zhang
---
drivers/raw/ifpga/base/ifpga_fme.c | 27 ---
drivers/raw/ifpga/base/opae_spi.h | 1 +
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/drivers/raw/ifpga/base/ifpga_fme.c
b/drivers/raw/ifpga/base/ifpga_fme.c
index c31a94cf8..9057087b5 100644
--- a/drivers/raw/ifpga/base/ifpga_fme.c
+++ b/drivers/raw/ifpga/base/ifpga_fme.c
@@ -979,28 +979,32 @@ struct ifpga_feature_ops fme_spi_master_ops = { static
int nios_spi_wait_init_done(struct altera_spi_device *dev) {
u32 val = 0;
- unsigned long timeout = msecs_to_timer_cycles(1);
+ unsigned long timeout = rte_get_timer_cycles() +
+ msecs_to_timer_cycles(1);
unsigned long ticks;
int major_version;
+ int fecmode = FEC_MODE_NO;
if (spi_reg_read(dev, NIOS_VERSION, &val))
return -EIO;
- major_version = (val >> NIOS_VERSION_MAJOR_SHIFT) &
- NIOS_VERSION_MAJOR;
- dev_debug(dev, "A10 NIOS FW version %d\n", major_version);
+ major_version =
+ (val & NIOS_VERSION_MAJOR) >> NIOS_VERSION_MAJOR_SHIFT;
+ dev_info(dev, "A10 NIOS FW version %d\n", major_version);
if (major_version >= 3) {
/* read NIOS_INIT to check if PKVL INIT done or not */
if (spi_reg_read(dev, NIOS_INIT, &val))
return -EIO;
+ dev_debug(dev, "read NIOS_INIT: 0x%x\n", val);
+
/* check if PKVLs are initialized already */
if (val & NIOS_INIT_DONE || val & NIOS_INIT_START)
goto nios_init_done;
/* start to config the default FEC mode */
- val = NIOS_INIT_START;
+ val = fecmode | NIOS_INIT_START;
if (spi_reg_write(dev, NIOS_INIT, val))
return -EIO;
@@ -1010,14 +1014,23 @@ static int nios_spi_wait_init_done(struct
altera_spi_device *dev)
do {
if (spi_reg_read(dev, NIOS_INIT, &val))
return -EIO;
- if (val)
+ if (val & NIOS_INIT_DONE)
break;
ticks = rte_get_timer_cycles();
if (time_after(ticks, timeout))
return -ETIMEDOUT;
msleep(100);
- } while (!val);
+ } while (1);
+
+ /* get the fecmode */
+ if (spi_reg_read(dev, NIOS_INIT, &val))
+ return -EIO;
+ dev_debug(dev, "read NIOS_INIT: 0x%x\n", val);
+ fecmode = (val & REQ_FEC_MODE) >> REQ_FEC_MODE_SHIFT;
+ dev_info(dev, "fecmode: 0x%x, %s\n", fecmode,
+ (fecmode == FEC_MODE_KR) ? "kr" :
+ ((fecmode == FEC_MODE_RS) ? "rs" : "no"));
return 0;
}
diff --git a/drivers/raw/ifpga/base/opae_spi.h
b/drivers/raw/ifpga/base/opae_spi.h
index d20a4c3ed..73a227673 100644
--- a/drivers/raw/ifpga/base/opae_spi.h
+++ b/drivers/raw/ifpga/base/opae_spi.h
@@ -153,6 +153,7 @@ int spi_reg_read(struct altera_spi_device *dev, u32 reg,
u32 *val);
#define NIOS_INIT 0x1000
#define REQ_FEC_MODE GENMASK(23, 8)
+#define REQ_FEC_MODE_SHIFT 8
#define FEC_MODE_NO0x0
#define FEC_MODE_KR0x
#define FEC_MODE_RS0x
--
2.17.1
Re: [dpdk-dev] [PATCH v6 2/2] ethdev: fix VLAN offloads set if no relative capabilities
09/07/2020 09:39, Wei Hu (Xavier): > On 2020/7/8 18:14, Thomas Monjalon wrote: > > 08/07/2020 05:37, Wei Hu (Xavier): > >> On 2020/7/7 22:11, Thomas Monjalon wrote: > >>> 06/07/2020 09:06, Wei Hu (Xavier): > Currently, there is a potential problem that calling the API function > rte_eth_dev_set_vlan_offload to start VLAN hardware offloads which the > driver does not support. If the PMD driver does not support certain VLAN > hardware offloads and does not check for it, the hardware setting will > not change, but the VLAN offloads in dev->data->dev_conf.rxmode.offloads > will be turned on. > > It is supposed to check the hardware capabilities to decide whether the > relative callback needs to be called just like the behavior in the API > function named rte_eth_dev_configure. And it is also needed to cleanup > duplicated checks which are done in some PMDs. Also, note that it is > behaviour change for some PMDs which simply ignore (with error/warning > log > message) unsupported VLAN offloads, but now it will fail. > > [...] > @@ -3317,6 +3319,25 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, > int offload_mask) > if (mask == 0) > return ret; > > +ret = rte_eth_dev_info_get(port_id, &dev_info); > +if (ret != 0) > +return ret; > + > +/* > + * New added Rx VLAN offloading which are not enabled in > + * rte_eth_dev_configure() must be within its device > capabilities > + */ > >>> What means "New added Rx VLAN offloading"? > >> The parameter offload_mask of rte_eth_dev_set_vlan_offload() function > >> includes some Rx VLAN offload, and some of them maybe are not enabled > >> in rte_eth_dev_configure(). > > OK > > > > I don't understand why checking only new features. > > All enabled features must be within capabilities, right? > Yes，you are right. all enabled features must be within capabilities， > Some features enabled in rte_eth_dev_configure() had been already checked, > So the comment here emphasizes 'new added Rx VLAN offloading'. I feel this precision more confusing than helpful.
[dpdk-dev] [PATCH 0/5] bnxt bug fixes
From: Kalesh AP This patchset contains few bug fixes in bnxt PMD. Please apply. Kalesh AP (5): net/bnxt: fix to avoid unnecessary memory allocation net/bnxt: remove unused enum declaration net/bnxt: fix to not send unnecessary hwrm command net/bnxt: fix to set flow error when filter create fails net/bnxt: fix to free filters when flow create fails drivers/net/bnxt/bnxt.h| 9 -- drivers/net/bnxt/bnxt_ethdev.c | 10 --- drivers/net/bnxt/bnxt_flow.c | 35 +++ drivers/net/bnxt/bnxt_hwrm.c | 63 ++ drivers/net/bnxt/bnxt_hwrm.h | 3 +- 5 files changed, 52 insertions(+), 68 deletions(-) -- 2.10.1
[dpdk-dev] [PATCH 1/5] net/bnxt: fix to avoid unnecessary memory allocation
From: Kalesh AP
VFs are not privileged to issue HWRM_PORT_LED_QCFG/CFG.
There is no need to allocate "bp->leds" memory.
Fixes: 205b74295282 ("net/bnxt: fix allocation of LED config info")
Cc: sta...@dpdk.org
Signed-off-by: Kalesh AP
Reviewed-by: Somnath Kotur
Reviewed-by: Ajit Kumar Khaparde
---
drivers/net/bnxt/bnxt_ethdev.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index d228223..65094a3 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -194,6 +194,9 @@ static void bnxt_free_link_info(struct bnxt *bp)
static void bnxt_free_leds_info(struct bnxt *bp)
{
+ if (BNXT_VF(bp))
+ return;
+
rte_free(bp->leds);
bp->leds = NULL;
}
@@ -263,6 +266,9 @@ static int bnxt_alloc_link_info(struct bnxt *bp)
static int bnxt_alloc_leds_info(struct bnxt *bp)
{
+ if (BNXT_VF(bp))
+ return 0;
+
bp->leds = rte_zmalloc("bnxt_leds",
BNXT_MAX_LED * sizeof(struct bnxt_led_info),
0);
--
2.10.1
[dpdk-dev] [PATCH 5/5] net/bnxt: fix to free filters when flow create fails
From: Kalesh AP
This patch does following things:
1. Added a wrapper function bnxt_clear_one_vnic_filter()
for destroying the filters in hw. This will avoid duplicate
code in many places.
2. When flow creae fails due to an already existing mark id
for the new flow id created, fixed to destroy the hw
filter created.
3. Re-arranged code to move a log and list update to right place.
Fixes: 9db66782bd06 ("net/bnxt: fix supporting zero mark ID with RSS action")
Fixes: 5ef3b79fdfe6 ("net/bnxt: support flow filter ops")
Cc: sta...@dpdk.org
Signed-off-by: Kalesh AP
Reviewed-by: Somnath Kotur
Reviewed-by: Ajit Kumar Khaparde
---
drivers/net/bnxt/bnxt_flow.c | 15 +++
drivers/net/bnxt/bnxt_hwrm.c | 31 +--
drivers/net/bnxt/bnxt_hwrm.h | 2 ++
3 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
index 499dcdf..320b53d 100644
--- a/drivers/net/bnxt/bnxt_flow.c
+++ b/drivers/net/bnxt/bnxt_flow.c
@@ -1816,9 +1816,6 @@ bnxt_flow_create(struct rte_eth_dev *dev,
goto free_flow;
}
- STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
- PMD_DRV_LOG(DEBUG, "Successfully created flow.\n");
- STAILQ_INSERT_TAIL(&vnic->flow_list, flow, next);
if (filter->valid_flags & BNXT_FLOW_MARK_FLAG) {
PMD_DRV_LOG(DEBUG,
"Mark action: mark id 0x%x, flow id 0x%x\n",
@@ -1833,15 +1830,21 @@ bnxt_flow_create(struct rte_eth_dev *dev,
RTE_FLOW_ERROR_TYPE_HANDLE,
NULL,
"Flow with mark id exists");
+ bnxt_clear_one_vnic_filter(bp, filter);
goto free_filter;
}
bp->mark_table[flow_id].valid = true;
bp->mark_table[flow_id].mark_id = filter->mark;
}
+
+ STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
+ STAILQ_INSERT_TAIL(&vnic->flow_list, flow, next);
+
if (BNXT_FLOW_XSTATS_EN(bp))
bp->flow_stat->flow_count++;
bnxt_release_flow_lock(bp);
bnxt_setup_flow_counter(bp);
+ PMD_DRV_LOG(DEBUG, "Successfully created flow.\n");
return flow;
}
@@ -1940,11 +1943,7 @@ _bnxt_flow_destroy(struct bnxt *bp,
filter->flow_id = 0;
}
- if (filter->filter_type == HWRM_CFA_EM_FILTER)
- ret = bnxt_hwrm_clear_em_filter(bp, filter);
- if (filter->filter_type == HWRM_CFA_NTUPLE_FILTER)
- ret = bnxt_hwrm_clear_ntuple_filter(bp, filter);
- ret = bnxt_hwrm_clear_l2_filter(bp, filter);
+ ret = bnxt_clear_one_vnic_filter(bp, filter);
done:
if (!ret) {
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index f9c7461..7ea13a8 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -2613,6 +2613,25 @@ int bnxt_alloc_hwrm_resources(struct bnxt *bp)
return 0;
}
+int
+bnxt_clear_one_vnic_filter(struct bnxt *bp, struct bnxt_filter_info *filter)
+{
+ int rc = 0;
+
+ if (filter->filter_type == HWRM_CFA_EM_FILTER) {
+ rc = bnxt_hwrm_clear_em_filter(bp, filter);
+ if (rc)
+ return rc;
+ } else if (filter->filter_type == HWRM_CFA_NTUPLE_FILTER) {
+ rc = bnxt_hwrm_clear_ntuple_filter(bp, filter);
+ if (rc)
+ return rc;
+ }
+
+ rc = bnxt_hwrm_clear_l2_filter(bp, filter);
+ return rc;
+}
+
static int
bnxt_clear_hwrm_vnic_filters(struct bnxt *bp, struct bnxt_vnic_info *vnic)
{
@@ -2620,11 +2639,7 @@ bnxt_clear_hwrm_vnic_filters(struct bnxt *bp, struct
bnxt_vnic_info *vnic)
int rc = 0;
STAILQ_FOREACH(filter, &vnic->filter, next) {
- if (filter->filter_type == HWRM_CFA_EM_FILTER)
- rc = bnxt_hwrm_clear_em_filter(bp, filter);
- else if (filter->filter_type == HWRM_CFA_NTUPLE_FILTER)
- rc = bnxt_hwrm_clear_ntuple_filter(bp, filter);
- rc = bnxt_hwrm_clear_l2_filter(bp, filter);
+ rc = bnxt_clear_one_vnic_filter(bp, filter);
STAILQ_REMOVE(&vnic->filter, filter, bnxt_filter_info, next);
bnxt_free_filter(bp, filter);
}
@@ -2642,11 +2657,7 @@ bnxt_clear_hwrm_vnic_flows(struct bnxt *bp, struct
bnxt_vnic_info *vnic)
flow = STAILQ_FIRST(&vnic->flow_list);
filter = flow->filter;
PMD_DRV_LOG(DEBUG, "filter type %d\n", filter->filter_type);
- if (filter->filter_type == HWRM_CFA_EM_FILTER)
-
[dpdk-dev] [PATCH 3/5] net/bnxt: fix to not send unnecessary hwrm command
From: Kalesh AP
During probe, driver issues HWRM_CFA_ADV_FLOW_MGNT_QCAPS command.
But it is not using the command response anywhere which makes the
fw call redundant.
Remove the unnecessary HWRM_CFA_ADV_FLOW_MGNT_QCAPS call to fw.
Remove the redundant flow_flags in bnxt struct.
Fixes: afef822b2e1b ("net/bnxt: support creating SMAC and inner DMAC filters")
Cc: sta...@dpdk.org
Signed-off-by: Kalesh AP
Reviewed-by: Somnath Kotur
Reviewed-by: Ajit Kumar Khaparde
---
drivers/net/bnxt/bnxt.h| 2 --
drivers/net/bnxt/bnxt_ethdev.c | 4
drivers/net/bnxt/bnxt_hwrm.c | 32
drivers/net/bnxt/bnxt_hwrm.h | 1 -
4 files changed, 39 deletions(-)
diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 8325e87..50f93ff 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -638,8 +638,6 @@ struct bnxt {
#define BNXT_FW_CAP_ADV_FLOW_COUNTERS BIT(6)
#define BNXT_FW_CAP_HCOMM_FW_STATUSBIT(7)
- uint32_tflow_flags;
-#define BNXT_FLOW_FLAG_L2_HDR_SRC_FILTER_ENBIT(0)
pthread_mutex_t flow_lock;
uint32_tvnic_cap_flags;
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 65094a3..2485a72 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -5472,10 +5472,6 @@ static int bnxt_init_fw(struct bnxt *bp)
bnxt_hwrm_port_phy_qcaps(bp);
- rc = bnxt_hwrm_cfa_adv_flow_mgmt_qcaps(bp);
- if (rc)
- return rc;
-
bnxt_alloc_error_recovery_info(bp);
/* Get the adapter error recovery support info */
rc = bnxt_hwrm_error_recovery_qcfg(bp);
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 6ade32d..f9c7461 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -5320,38 +5320,6 @@ int bnxt_hwrm_port_ts_query(struct bnxt *bp, uint8_t
path, uint64_t *timestamp)
return rc;
}
-int bnxt_hwrm_cfa_adv_flow_mgmt_qcaps(struct bnxt *bp)
-{
- struct hwrm_cfa_adv_flow_mgnt_qcaps_output *resp =
- bp->hwrm_cmd_resp_addr;
- struct hwrm_cfa_adv_flow_mgnt_qcaps_input req = {0};
- uint32_t flags = 0;
- int rc = 0;
-
- if (!(bp->fw_cap & BNXT_FW_CAP_ADV_FLOW_MGMT))
- return rc;
-
- if (!(BNXT_PF(bp) || BNXT_VF_IS_TRUSTED(bp))) {
- PMD_DRV_LOG(DEBUG,
- "Not a PF or trusted VF. Command not supported\n");
- return 0;
- }
-
- HWRM_PREP(&req, HWRM_CFA_ADV_FLOW_MGNT_QCAPS, BNXT_USE_KONG(bp));
- rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_KONG(bp));
-
- HWRM_CHECK_RESULT();
- flags = rte_le_to_cpu_32(resp->flags);
- HWRM_UNLOCK();
-
- if (flags & HWRM_CFA_ADV_FLOW_MGNT_QCAPS_L2_HDR_SRC_FILTER_EN) {
- bp->flow_flags |= BNXT_FLOW_FLAG_L2_HDR_SRC_FILTER_EN;
- PMD_DRV_LOG(INFO, "Source L2 header filtering enabled\n");
- }
-
- return rc;
-}
-
int bnxt_hwrm_cfa_counter_qcaps(struct bnxt *bp, uint16_t *max_fc)
{
int rc = 0;
diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h
index 9e0b799..1704edd 100644
--- a/drivers/net/bnxt/bnxt_hwrm.h
+++ b/drivers/net/bnxt/bnxt_hwrm.h
@@ -259,7 +259,6 @@ int bnxt_hwrm_error_recovery_qcfg(struct bnxt *bp);
int bnxt_hwrm_fw_reset(struct bnxt *bp);
int bnxt_hwrm_port_ts_query(struct bnxt *bp, uint8_t path,
uint64_t *timestamp);
-int bnxt_hwrm_cfa_adv_flow_mgmt_qcaps(struct bnxt *bp);
int bnxt_hwrm_cfa_counter_qcaps(struct bnxt *bp, uint16_t *max_fc);
int bnxt_hwrm_ctx_rgtr(struct bnxt *bp, rte_iova_t dma_addr, uint16_t *ctx_id);
int bnxt_hwrm_ctx_unrgtr(struct bnxt *bp, uint16_t ctx_id);
--
2.10.1
[dpdk-dev] [PATCH 4/5] net/bnxt: fix to set flow error when filter create fails
From: Kalesh AP
If set_em_filter/set_ntuple_filter cmds fails for some reason,
driver is not filling the "rte_flow_error" string buffer.
Same is the case when flow create fails due to an already
existing mark id for the new flow id created.
This leads to a crash in testpmd while trying to print the
error message.
Fixes: 5c1171c97216 ("net/bnxt: refactor filter/flow")
Fixes: 9db66782bd06 ("net/bnxt: fix supporting zero mark ID with RSS action")
Cc: sta...@dpdk.org
Signed-off-by: Kalesh AP
Reviewed-by: Ajit Kumar Khaparde
---
drivers/net/bnxt/bnxt_flow.c | 20
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
index 19bc66a..499dcdf 100644
--- a/drivers/net/bnxt/bnxt_flow.c
+++ b/drivers/net/bnxt/bnxt_flow.c
@@ -1786,12 +1786,24 @@ bnxt_flow_create(struct rte_eth_dev *dev,
filter->enables |=
HWRM_CFA_EM_FLOW_ALLOC_INPUT_ENABLES_L2_FILTER_ID;
ret = bnxt_hwrm_set_em_filter(bp, filter->dst_id, filter);
+ if (ret != 0) {
+ rte_flow_error_set(error, -ret,
+ RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+ "Failed to create EM filter");
+ goto free_filter;
+ }
}
if (filter->filter_type == HWRM_CFA_NTUPLE_FILTER) {
filter->enables |=
HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_L2_FILTER_ID;
ret = bnxt_hwrm_set_ntuple_filter(bp, filter->dst_id, filter);
+ if (ret != 0) {
+ rte_flow_error_set(error, -ret,
+ RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+ "Failed to create ntuple filter");
+ goto free_filter;
+ }
}
vnic = find_matching_vnic(bp, filter);
@@ -1817,10 +1829,10 @@ bnxt_flow_create(struct rte_eth_dev *dev,
*/
flow_id = filter->flow_id & BNXT_FLOW_ID_MASK;
if (bp->mark_table[flow_id].valid) {
- PMD_DRV_LOG(ERR,
- "Entry for Mark id 0x%x occupied"
- " flow id 0x%x\n",
- filter->mark, filter->flow_id);
+ rte_flow_error_set(error, EEXIST,
+ RTE_FLOW_ERROR_TYPE_HANDLE,
+ NULL,
+ "Flow with mark id exists");
goto free_filter;
}
bp->mark_table[flow_id].valid = true;
--
2.10.1
[dpdk-dev] [PATCH 2/5] net/bnxt: remove unused enum declaration
From: Kalesh AP
"enum bnxt_hw_context" is defined in the header file, but is not
used anywhere.
Fixes: 9738793f28ec ("net/bnxt: add VNIC functions and structs")
Cc: sta...@dpdk.org
Signed-off-by: Kalesh AP
Reviewed-by: Ajit Kumar Khaparde
---
drivers/net/bnxt/bnxt.h | 7 ---
1 file changed, 7 deletions(-)
diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index f69ba24..8325e87 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -183,13 +183,6 @@ struct bnxt_led_cfg {
#define BNXT_LED_DFLT_ENABLES(x)\
rte_cpu_to_le_32(BNXT_LED_DFLT_ENA << (BNXT_LED_DFLT_ENA_SHIFT * (x)))
-enum bnxt_hw_context {
- HW_CONTEXT_NONE = 0,
- HW_CONTEXT_IS_RSS = 1,
- HW_CONTEXT_IS_COS = 2,
- HW_CONTEXT_IS_LB= 3,
-};
-
struct bnxt_vlan_table_entry {
uint16_ttpid;
uint16_tvid;
--
2.10.1
[dpdk-dev] [PATCH v3 1/2] Fix build of apps with external dependencies
This fix initializes the dependency object with the external
dependency list. Previously, the external dependencies were
just ignored.
Signed-off-by: Felix Moessbauer
---
app/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/meson.build b/app/meson.build
index 585b90832..a29eba024 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -42,7 +42,7 @@ foreach app:apps
subdir(name)
if build
- dep_objs = []
+ dep_objs = ext_deps
foreach d:deps
dep_objs += get_variable(get_option('default_library')
+ '_rte_' + d)
--
2.20.1
[dpdk-dev] [PATCH v3 0/2] Add l2reflect measurement application
Changes since v2: - add missing internal dependency - improve wording of commit message Changes since v1: - move to app folder, as suggested by maintainer - fix issues reported by checkpatch Felix Moessbauer (2): Fix build of apps with external dependencies Add l2reflect measurement application app/Makefile | 1 + app/l2reflect/Makefile| 14 + app/l2reflect/l2reflect.h | 62 +++ app/l2reflect/main.c | 857 ++ app/l2reflect/meson.build | 22 + app/l2reflect/stats.c | 201 + app/l2reflect/stats.h | 67 +++ app/meson.build | 3 +- 8 files changed, 1226 insertions(+), 1 deletion(-) create mode 100644 app/l2reflect/Makefile create mode 100644 app/l2reflect/l2reflect.h create mode 100644 app/l2reflect/main.c create mode 100644 app/l2reflect/meson.build create mode 100644 app/l2reflect/stats.c create mode 100644 app/l2reflect/stats.h -- 2.20.1
[dpdk-dev] [PATCH v3 2/2] Add l2reflect measurement application
The l2reflect application implements a ping-pong benchmark to
measure the latency between two instances. For communication,
we use raw ethernet and send one packet at a time. The timing data
is collected locally and min/max/avg values are displayed in a TUI.
Finally, a histogram of the latencies is printed which can be
further processed with the jitterdebugger visualization scripts.
To debug latency spikes, a max threshold can be defined.
If it is hit, a trace point is created on both instances.
Signed-off-by: Felix Moessbauer
Signed-off-by: Henning Schild
---
app/Makefile | 1 +
app/l2reflect/Makefile| 14 +
app/l2reflect/l2reflect.h | 62 +++
app/l2reflect/main.c | 857 ++
app/l2reflect/meson.build | 22 +
app/l2reflect/stats.c | 201 +
app/l2reflect/stats.h | 67 +++
app/meson.build | 1 +
8 files changed, 1225 insertions(+)
create mode 100644 app/l2reflect/Makefile
create mode 100644 app/l2reflect/l2reflect.h
create mode 100644 app/l2reflect/main.c
create mode 100644 app/l2reflect/meson.build
create mode 100644 app/l2reflect/stats.c
create mode 100644 app/l2reflect/stats.h
diff --git a/app/Makefile b/app/Makefile
index 0392a7de0..43563ef0e 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -7,6 +7,7 @@ DIRS-$(CONFIG_RTE_APP_TEST) += test
DIRS-$(CONFIG_RTE_TEST_PMD) += test-pmd
DIRS-$(CONFIG_RTE_PROC_INFO) += proc-info
DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += pdump
+DIRS-$(CONFIG_RTE_LIBRTE_L2REFLECT) += l2reflect
DIRS-$(CONFIG_RTE_LIBRTE_ACL) += test-acl
DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test-cmdline
DIRS-$(CONFIG_RTE_LIBRTE_FIB) += test-fib
diff --git a/app/l2reflect/Makefile b/app/l2reflect/Makefile
new file mode 100644
index 0..4e844e35d
--- /dev/null
+++ b/app/l2reflect/Makefile
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2020 Siemens AG
+
+include $(RTE_SDK)/mk/rte.vars.mk
+
+APP = l2reflect
+
+CFLAGS += $(WERROR_FLAGS)
+
+# all source are stored in SRCS-y
+
+SRCS-y := main.c stats.c
+
+include $(RTE_SDK)/mk/rte.app.mk
diff --git a/app/l2reflect/l2reflect.h b/app/l2reflect/l2reflect.h
new file mode 100644
index 0..372dfb1f2
--- /dev/null
+++ b/app/l2reflect/l2reflect.h
@@ -0,0 +1,62 @@
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Siemens AG
+ *
+ * authors:
+ * Felix Moessbauer
+ * Henning Schild
+ */
+#ifndef _L2REFLECT_H_
+#define _L2REFLECT_H_
+#define MAGIC_TRACE_PAYLOAD 0xd00faffeaffed00full
+/* IEEE Std 802 - Local Experimental Ethertype */
+#define ETHER_TYPE_L2REFLECT 0x88B5
+/* Used to compare MAC addresses. */
+#define MAC_ADDR_CMP 0xull
+
+enum {
+ TRACE_TYPE_DATA,
+ TRACE_TYPE_HELO,
+ TRACE_TYPE_EHLO,
+ TRACE_TYPE_RSET,
+ TRACE_TYPE_QUIT,
+};
+
+struct my_magic_packet {
+ struct rte_ether_hdr eth;
+ uint8_t type;
+ uint64_t magic;
+ uint64_t breakval;
+};
+
+enum STATE {
+ /* elect the initial sender */
+ S_ELECT_LEADER = 1,
+ /* reset the counters */
+ S_RESET_TRX = 2,
+ /* measurement S_RUNNING */
+ S_RUNNING = 4,
+ /* terminated by local event */
+ S_LOCAL_TERM = 8,
+ /* terminated by remote event */
+ S_REMOTE_TERM = 16
+};
+
+int l2reflect_hist;
+atomic_int l2reflect_output_hist;
+uint64_t l2reflect_sleep_msec;
+uint16_t l2reflect_port_number;
+atomic_int l2reflect_state;
+struct rte_ether_addr l2reflect_port_eth_addr;
+struct rte_ether_addr l2reflect_remote_eth_addr;
+
+/*
+ * Compares a packet destination MAC address to a device MAC address.
+ */
+static __rte_always_inline int
+ether_addr_cmp(struct rte_ether_addr *ea, struct rte_ether_addr *eb)
+{
+ return ((*(uint64_t *)ea ^ *(uint64_t *)eb) & MAC_ADDR_CMP) == 0;
+}
+
+#endif /* _L2REFLECT_H_ */
diff --git a/app/l2reflect/main.c b/app/l2reflect/main.c
new file mode 100644
index 0..2cf93cdec
--- /dev/null
+++ b/app/l2reflect/main.c
@@ -0,0 +1,857 @@
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Siemens AG
+ *
+ * authors:
+ * Felix Moessbauer
+ * Henning Schild
+ *
+ * launch (non-rt kernel): l2reflect --lcores 0@0,1@6 -n 1
+ * launch (rt kernel): l2reflect --lcores 0@0,1@6 -n 1 -- -P 50 -r -l
+ *
+ * The l2reflect application implements a ping-pong benchmark to
+ * measure the latency between two instances. For communication,
+ * we use raw ethernet and send one packet at a time. The timing data
+ * is collected locally and min/max/avg values are displayed in a TUI.
+ * Finally, a histogram of the latencies is printed which can be
+ * further processed with the jitterdebugger visualization scripts.
+ * To debug latency spikes, a max threshold can be defined.
+ * If it is hit, a trace point is created on both instances.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
Re: [dpdk-dev] [PATCH v2] mbuf: use C11 atomics for refcnt operations
> -Original Message- > From: Olivier Matz > Sent: Wednesday, July 8, 2020 7:43 PM > To: Phil Yang > Cc: Stephen Hemminger ; > david.march...@redhat.com; dev@dpdk.org; d...@linux.vnet.ibm.com; > Honnappa Nagarahalli ; Ruifeng Wang > ; nd > Subject: Re: [dpdk-dev] [PATCH v2] mbuf: use C11 atomics for refcnt > operations > > On Wed, Jul 08, 2020 at 04:48:33AM +, Phil Yang wrote: > > > -Original Message- > > > From: Stephen Hemminger > > > Sent: Wednesday, July 8, 2020 1:13 AM > > > To: Phil Yang > > > Cc: david.march...@redhat.com; dev@dpdk.org; > d...@linux.vnet.ibm.com; > > > Honnappa Nagarahalli ; > > > olivier.m...@6wind.com; Ruifeng Wang ; nd > > > > > > Subject: Re: [dpdk-dev] [PATCH v2] mbuf: use C11 atomics for refcnt > > > operations > > > > > > On Tue, 7 Jul 2020 18:10:33 +0800 > > > Phil Yang wrote: > > > > > > > + return (uint16_t)(__atomic_add_fetch((int16_t *)&shinfo- > > > >refcnt_atomic, > > > > + > > > > > > Why do you need so many casts here? > > > The type of refcnt_atomic is now uint16 after your patch. > > > > In the existing code, the input parameter type for this API is signed > > integer. > For example: > > drivers/net/netvsc/hn_rxtx.c:531 > > lib/librte_mbuf/rte_mbuf.h:1194 > > > > However, the output type of rte_mbuf_ext_refcnt related APIs is not > uniform. We use these typecast to consistent with the current API definition. > > Would it make sense to cast the increment instead? Yes. It is better. Thanks. > > I mean: > > return __atomic_add_fetch(&m->refcnt, (uint16_t)value, > __ATOMIC_ACQ_REL); > > instead of: > > return (uint16_t)(__atomic_add_fetch((int16_t *)&m->refcnt, value, > __ATOMIC_ACQ_REL)); > > > The same could apply to __rte_pktmbuf_pinned_extbuf_decref() I think: > > > - if (likely(rte_atomic16_add_return > > - (&shinfo->refcnt_atomic, -1))) > > + if (likely(__atomic_add_fetch((int *)&shinfo->refcnt_atomic, -1, > > +__ATOMIC_ACQ_REL))) > > By the way, why was the cast was to (int *) in this case? I think > it can overwrite fields beside refcnt. Fixed in the next version. Thanks, Phil
Re: [dpdk-dev] [PATCH v2 4/6] net/i40e: replace restrict with rte restrict
On Wed, Jul 8, 2020 at 5:21 AM Joyce Kong wrote: > > > -Original Message- > > From: David Marchand > > Sent: Tuesday, July 7, 2020 10:00 PM > > To: Joyce Kong > > Cc: Maxime Coquelin ; jer...@marvell.com; > > Zhihong Wang ; Xiaolong Ye > > ; Beilei Xing ; Jeff Guo > > ; Mcnamara, John ; Matan > > Azrad ; Shahaf Shuler ; > > Viacheslav Ovsiienko ; Honnappa Nagarahalli > > ; Phil Yang ; > > Ruifeng Wang ; dev ; nd > > > > Subject: Re: [dpdk-dev] [PATCH v2 4/6] net/i40e: replace restrict with rte > > restrict > > > > On Mon, Jul 6, 2020 at 9:50 AM Joyce Kong wrote: > > > > > > '__rte_restrict' is a common wrapper for restricted pointers which can > > > be supported by all compilers. Use '__rte_restrict' instead of > > > '__restrict' for code consistency. > > > > This patch 4, 5 and 6 are simple replacements and can be squashed into the > > first patch. > > > > Thanks. > > > The first patch is to add a common definition for lib_eal, could we squash > the 4,5 and 6 > into one replacement patch, while separate them from the first one? > This might be more convenient for review? A copy/paste commitlog hints that it did not deserve separate patches. About easing reviews, the changes are mechanical, there is no special case. I am not convinced but, go as you like. Can you provide a new revision wrt patch 1 problem? Thanks. -- David Marchand
Re: [dpdk-dev] [PATCH v2] mbuf: use C11 atomics for refcnt operations
> -Original Message-
> From: Olivier Matz
> Sent: Wednesday, July 8, 2020 7:44 PM
> To: Phil Yang
> Cc: david.march...@redhat.com; dev@dpdk.org; d...@linux.vnet.ibm.com;
> Honnappa Nagarahalli ; Ruifeng Wang
> ; nd
> Subject: Re: [PATCH v2] mbuf: use C11 atomics for refcnt operations
>
> Hi,
>
> On Tue, Jul 07, 2020 at 06:10:33PM +0800, Phil Yang wrote:
> > Use C11 atomics with explicit ordering instead of rte_atomic ops which
> > enforce unnecessary barriers on aarch64.
> >
> > Signed-off-by: Phil Yang
> > Reviewed-by: Ruifeng Wang
> > ---
> > v2:
> > Fix ABI issue: revert the rte_mbuf_ext_shared_info struct refcnt field
> > to refcnt_atomic.
> >
> > lib/librte_mbuf/rte_mbuf.c | 1 -
> > lib/librte_mbuf/rte_mbuf.h | 19 ++-
> > lib/librte_mbuf/rte_mbuf_core.h | 11 +++
> > 3 files changed, 13 insertions(+), 18 deletions(-)
> >
>
> It seems this patch does 2 things:
> - remove refcnt_atomic
> - use C11 atomics
>
> The first change is an API break. I think it should be announced in a
> deprecation
> notice. The one about atomic does not talk about it.
>
> So I suggest to keep refcnt_atomic until next version.
Agreed.
I did a local test, this approach doesn't have any ABI breakage issue.
I will update in the next version.
Thanks,
Phil
>
>
> > uint16_t nb_segs; /**< Number of segments. */
> >
> > /** Input port (16 bits to support more than 256 virtual ports).
> > @@ -679,7 +674,7 @@ typedef void
> (*rte_mbuf_extbuf_free_callback_t)(void *addr, void *opaque);
> > struct rte_mbuf_ext_shared_info {
> > rte_mbuf_extbuf_free_callback_t free_cb; /**< Free callback
> function */
> > void *fcb_opaque;/**< Free callback argument */
> > - rte_atomic16_t refcnt_atomic;/**< Atomically accessed refcnt */
> > + uint16_t refcnt_atomic; /**< Atomically accessed refcnt */
> > };
> >
> > /**< Maximum number of nb_segs allowed. */
> > --
> > 2.7.4
> >
[dpdk-dev] [PATCH v3] mbuf: use C11 atomic built-ins for refcnt operations
Use C11 atomic built-ins with explicit ordering instead of rte_atomic
ops which enforce unnecessary barriers on aarch64.
Signed-off-by: Phil Yang
Reviewed-by: Ruifeng Wang
---
v3:
1.Fix ABI breakage.
2.Simplify data type cast.
v2:
Fix ABI issue: revert the rte_mbuf_ext_shared_info struct refcnt field
to refcnt_atomic.
lib/librte_mbuf/rte_mbuf.c | 1 -
lib/librte_mbuf/rte_mbuf.h | 19 ++-
lib/librte_mbuf/rte_mbuf_core.h | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
index ae91ae2..8a456e5 100644
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -22,7 +22,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index f8e492e..c1c0956 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -37,7 +37,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -365,7 +364,7 @@ rte_pktmbuf_priv_flags(struct rte_mempool *mp)
static inline uint16_t
rte_mbuf_refcnt_read(const struct rte_mbuf *m)
{
- return (uint16_t)(rte_atomic16_read(&m->refcnt_atomic));
+ return __atomic_load_n(&m->refcnt, __ATOMIC_RELAXED);
}
/**
@@ -378,14 +377,15 @@ rte_mbuf_refcnt_read(const struct rte_mbuf *m)
static inline void
rte_mbuf_refcnt_set(struct rte_mbuf *m, uint16_t new_value)
{
- rte_atomic16_set(&m->refcnt_atomic, (int16_t)new_value);
+ __atomic_store_n(&m->refcnt, new_value, __ATOMIC_RELAXED);
}
/* internal */
static inline uint16_t
__rte_mbuf_refcnt_update(struct rte_mbuf *m, int16_t value)
{
- return (uint16_t)(rte_atomic16_add_return(&m->refcnt_atomic, value));
+ return __atomic_add_fetch(&m->refcnt, (uint16_t)value,
+__ATOMIC_ACQ_REL);
}
/**
@@ -466,7 +466,7 @@ rte_mbuf_refcnt_set(struct rte_mbuf *m, uint16_t new_value)
static inline uint16_t
rte_mbuf_ext_refcnt_read(const struct rte_mbuf_ext_shared_info *shinfo)
{
- return (uint16_t)(rte_atomic16_read(&shinfo->refcnt_atomic));
+ return __atomic_load_n(&shinfo->refcnt_atomic, __ATOMIC_RELAXED);
}
/**
@@ -481,7 +481,7 @@ static inline void
rte_mbuf_ext_refcnt_set(struct rte_mbuf_ext_shared_info *shinfo,
uint16_t new_value)
{
- rte_atomic16_set(&shinfo->refcnt_atomic, (int16_t)new_value);
+ __atomic_store_n(&shinfo->refcnt_atomic, new_value, __ATOMIC_RELAXED);
}
/**
@@ -505,7 +505,8 @@ rte_mbuf_ext_refcnt_update(struct rte_mbuf_ext_shared_info
*shinfo,
return (uint16_t)value;
}
- return (uint16_t)rte_atomic16_add_return(&shinfo->refcnt_atomic, value);
+ return __atomic_add_fetch(&shinfo->refcnt_atomic, (uint16_t)value,
+__ATOMIC_ACQ_REL);
}
/** Mbuf prefetch */
@@ -1304,8 +1305,8 @@ static inline int
__rte_pktmbuf_pinned_extbuf_decref(struct rte_mbuf *m)
* Direct usage of add primitive to avoid
* duplication of comparing with one.
*/
- if (likely(rte_atomic16_add_return
- (&shinfo->refcnt_atomic, -1)))
+ if (likely(__atomic_add_fetch(&shinfo->refcnt_atomic, (uint16_t)-1,
+__ATOMIC_ACQ_REL)))
return 1;
/* Reinitialize counter before mbuf freeing. */
diff --git a/lib/librte_mbuf/rte_mbuf_core.h b/lib/librte_mbuf/rte_mbuf_core.h
index 16600f1..d65d1c8 100644
--- a/lib/librte_mbuf/rte_mbuf_core.h
+++ b/lib/librte_mbuf/rte_mbuf_core.h
@@ -679,7 +679,7 @@ typedef void (*rte_mbuf_extbuf_free_callback_t)(void *addr,
void *opaque);
struct rte_mbuf_ext_shared_info {
rte_mbuf_extbuf_free_callback_t free_cb; /**< Free callback function */
void *fcb_opaque;/**< Free callback argument */
- rte_atomic16_t refcnt_atomic;/**< Atomically accessed refcnt */
+ uint16_t refcnt_atomic; /**< Atomically accessed refcnt */
};
/**< Maximum number of nb_segs allowed. */
--
2.7.4
Re: [dpdk-dev] [PATCH v5 4/4] net/qede: add support for get register operation
On Thu, Jul 9, 2020 at 4:22 AM Rasesh Mody wrote:
>
> Add support for .get_reg eth_dev ops which will be used to collect the
> firmware debug data.
>
> PMD on detecting on some HW errors will collect the FW/HW Dump to a
> buffer and then it will save it to a file implemented in
> qede_save_fw_dump().
>
> Dump file location and name:
> Location: or DPDK root
> Name: qede_pmd_dump_mm-dd-yy_hh-mm-ss.bin
>
> DPDK applications can initiate a debug data collection by invoking DPDK
> library’s rte_eth_dev_get_reg_info() API. This API invokes .get_reg()
> interface in the PMD.
>
> PMD implementation of .get_reg() collects the FW/HW Dump, saves it to
> data field of rte_dev_reg_info and passes it to the application. It’s
> the responsibility of the application to save the FW/HW Dump to a file.
> We recommendation using the file name format used by qede_save_fw_dump().
>
> Signed-off-by: Rasesh Mody
> Signed-off-by: Igor Russkikh
Series applied to dpdk-next-net-mrvl/master. Thanks.
> doc/guides/nics/features/qede.ini | 1 +
> drivers/net/qede/Makefile | 1 +
> drivers/net/qede/base/bcm_osal.c | 25 +++
> drivers/net/qede/base/bcm_osal.h | 5 +
> drivers/net/qede/meson.build | 1 +
> drivers/net/qede/qede_ethdev.c| 1 +
> drivers/net/qede/qede_ethdev.h| 25 +++
> drivers/net/qede/qede_regs.c | 271 ++
> 8 files changed, 330 insertions(+)
> create mode 100644 drivers/net/qede/qede_regs.c
>
> diff --git a/doc/guides/nics/features/qede.ini
> b/doc/guides/nics/features/qede.ini
> index 20c90e626..f8716523e 100644
> --- a/doc/guides/nics/features/qede.ini
> +++ b/doc/guides/nics/features/qede.ini
> @@ -31,6 +31,7 @@ Packet type parsing = Y
> Basic stats = Y
> Extended stats = Y
> Stats per queue = Y
> +Registers dump = Y
> Multiprocess aware = Y
> Linux UIO= Y
> Linux VFIO = Y
> diff --git a/drivers/net/qede/Makefile b/drivers/net/qede/Makefile
> index 3b00338ff..0e8a67b0d 100644
> --- a/drivers/net/qede/Makefile
> +++ b/drivers/net/qede/Makefile
> @@ -104,5 +104,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_main.c
> SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_rxtx.c
> SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_filter.c
> SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_debug.c
> +SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_regs.c
>
> include $(RTE_SDK)/mk/rte.lib.mk
> diff --git a/drivers/net/qede/base/bcm_osal.c
> b/drivers/net/qede/base/bcm_osal.c
> index 45557fe3c..65837b53d 100644
> --- a/drivers/net/qede/base/bcm_osal.c
> +++ b/drivers/net/qede/base/bcm_osal.c
> @@ -246,6 +246,28 @@ qede_get_mcp_proto_stats(struct ecore_dev *edev,
> }
> }
>
> +static void qede_hw_err_handler(void *dev, enum ecore_hw_err_type err_type)
> +{
> + struct ecore_dev *edev = dev;
> +
> + switch (err_type) {
> + case ECORE_HW_ERR_FAN_FAIL:
> + break;
> +
> + case ECORE_HW_ERR_MFW_RESP_FAIL:
> + case ECORE_HW_ERR_HW_ATTN:
> + case ECORE_HW_ERR_DMAE_FAIL:
> + case ECORE_HW_ERR_RAMROD_FAIL:
> + case ECORE_HW_ERR_FW_ASSERT:
> + OSAL_SAVE_FW_DUMP(0); /* Using port 0 as default port_id */
> + break;
> +
> + default:
> + DP_NOTICE(edev, false, "Unknown HW error [%d]\n", err_type);
> + return;
> + }
> +}
> +
> void
> qede_hw_err_notify(struct ecore_hwfn *p_hwfn, enum ecore_hw_err_type
> err_type)
> {
> @@ -275,6 +297,9 @@ qede_hw_err_notify(struct ecore_hwfn *p_hwfn, enum
> ecore_hw_err_type err_type)
> }
>
> DP_ERR(p_hwfn, "HW error occurred [%s]\n", err_str);
> +
> + qede_hw_err_handler(p_hwfn->p_dev, err_type);
> +
> ecore_int_attn_clr_enable(p_hwfn->p_dev, true);
> }
>
> diff --git a/drivers/net/qede/base/bcm_osal.h
> b/drivers/net/qede/base/bcm_osal.h
> index b4b94231b..5d4df5907 100644
> --- a/drivers/net/qede/base/bcm_osal.h
> +++ b/drivers/net/qede/base/bcm_osal.h
> @@ -371,6 +371,11 @@ void qede_hw_err_notify(struct ecore_hwfn *p_hwfn,
>
> /* TODO: */
> #define OSAL_SCHEDULE_RECOVERY_HANDLER(hwfn) nothing
> +
> +int qede_save_fw_dump(uint8_t port_id);
> +
> +#define OSAL_SAVE_FW_DUMP(port_id) qede_save_fw_dump(port_id)
> +
> #define OSAL_HW_ERROR_OCCURRED(hwfn, err_type) \
> qede_hw_err_notify(hwfn, err_type)
>
> diff --git a/drivers/net/qede/meson.build b/drivers/net/qede/meson.build
> index 50c9fad7e..05c9bff73 100644
> --- a/drivers/net/qede/meson.build
> +++ b/drivers/net/qede/meson.build
> @@ -10,6 +10,7 @@ sources = files(
> 'qede_main.c',
> 'qede_rxtx.c',
> 'qede_debug.c',
> + 'qede_regs.c',
> )
>
> if cc.has_argument('-Wno-format-nonliteral')
> diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
> index b5d6c7c43..e5a2581dd 100644
> --- a/drivers/net/qede/qede_ethdev.c
> +++ b/drivers/net/qede/qede_ethdev.c
> @@ -2426,6 +2426,7 @@ static const struct eth_dev_op
[dpdk-dev] DPDK Release Status Meeting 9/07/2020
Minutes 9 July 2020 --- Agenda: * Release Dates * Subtrees * LTS * OvS * Opens Participants: * Arm * Debian/Microsoft * Intel * Marvell * Nvidia * NXP * Red Hat Release Dates - * v20.08 dates: * -rc1 pushed to *Sunday, 12 July 2020* * -rc2: Monday, 20 July 2020 * Release:Tuesday, 4 August 2020 * v20.11 proposal dates, please comment: * Proposal/V1:Wednesday, 2 September 2020 * -rc1: Wednesday, 30 September 2020 * -rc2: Friday, 16 October 2020 * Release:Friday, 6 November 2020 * Please remember to send roadmap for 20.11. Subtrees * main * There is priority PCI issue, patch is waiting more review * https://patches.dpdk.org/patch/73521/ * Following are in the backlog * RCU series * Ring cleanup * C11 atomics * FIB / hash change from Vladimir * Thomas will check today * Ethdev patches * If-proxy * Can be considered for -rc2, needs review * It is hard to make big changes as community * Needs more specific review comments to work/fix * There is no time for preparing the spec * The review and time is general problem for generic features * Patches for -rc2 * Regex PMD * ethdev PMD updates * A few patches for crypto * Not much patches planned for -rc2, can keep the -rc2 date for now * next-net * Pulled from vendor sub-trees * virtio, bnxt & nxp patches merged * There are still ethdev patches pending in backlog * Ethdev patches not reviewed/ready end of this week can miss the release * More patches expected after -rc1 from mainly vendor trees * next-crypto * Read for -rc1, pulled yesterday * There can be a few driver patches for -rc2 * next-eventdev * Read for -rc1, pulled * Some doc patches for after -rc1 * next-virtio * Chenbo is managing the virtio patches during Maxime's absence * Ready for -rc1 * One set postponed to next release, rest merged * next-net-intel * Pulled for -rc1 * More patches expected for -rc2 * next-net-mlx * Some more patches expected for -rc1 * Can be ready today but not blocker for -rc1 * next-net-mrvl * pulled for -rc1 * Some qede patches are in the backlog LTS --- * v18.11.9-rc2 is out, please test * https://mails.dpdk.org/archives/dev/2020-June/171690.html * Testing issues resolved * The release is planned for this week OvS --- * 2.14 soft freeze passed, it was 1 July, feature freeze is approaching Opens - * Please check Bugzilla for bugs assigned to you * https://bugs.dpdk.org/ DPDK Release Status Meetings The DPDK Release Status Meeting is intended for DPDK Committers to discuss the status of the master tree and sub-trees, and for project managers to track progress or milestone dates. The meeting occurs on every Thursdays at 8:30 UTC. on https://meet.jit.si/DPDK If you wish to attend just send an email to "John McNamara " for the invite.
Re: [dpdk-dev] [PATCH v3] eal: use c11 atomic built-ins for interrupt status
On Thu, Jul 9, 2020 at 10:35 AM Phil Yang wrote: > > The event status is defined as a volatile variable and shared between > threads. Use c11 atomic built-ins with explicit ordering instead of > rte_atomic ops which enforce unnecessary barriers on aarch64. > > The event status has been cleaned up by the compare-and-swap operation > when we free the event data, so there is no need to set it to invalid > after that. > > Signed-off-by: Phil Yang > Reviewed-by: Ruifeng Wang > Reviewed-by: Honnappa Nagarahalli > Reviewed-by: Harman Kalra > --- > v3: > Fixed typo. > > v2: > 1. Fixed typo. > 2. Updated libabigail.abignore to pass ABI check. > 3. Merged v1 two patches into one patch. > > devtools/libabigail.abignore| 4 +++ > lib/librte_eal/include/rte_eal_interrupts.h | 2 +- > lib/librte_eal/linux/eal_interrupts.c | 48 > - > 3 files changed, 38 insertions(+), 16 deletions(-) > > diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore > index 0133f75..daa4631 100644 > --- a/devtools/libabigail.abignore > +++ b/devtools/libabigail.abignore > @@ -48,6 +48,10 @@ > changed_enumerators = RTE_CRYPTO_AEAD_LIST_END > [suppress_variable] > name = rte_crypto_aead_algorithm_strings > +; Ignore updates of epoll event > +[suppress_type] > +type_kind = struct > +name = rte_epoll_event In general, ignoring all changes on a structure is risky. But the risk is acceptable as long as we remember this for the rest of the 20.08 release (and we will start from scratch for 20.11). Without any comment from others, I'll merge this by the end of (my) day. Thanks. -- David Marchand
[dpdk-dev] [PATCH v2] build: C++ linkage support is added to rte_service_component.h file
From: Levend Sayar
"extern C" define is added to rte_service_component.h file
to be able to use in C++ context
Signed-off-by: Levend Sayar
Acked-by: Harry van Haaren
---
lib/librte_eal/include/rte_service_component.h | 9 +
1 file changed, 9 insertions(+)
diff --git a/lib/librte_eal/include/rte_service_component.h
b/lib/librte_eal/include/rte_service_component.h
index b75aba11b..9e66ee7e2 100644
--- a/lib/librte_eal/include/rte_service_component.h
+++ b/lib/librte_eal/include/rte_service_component.h
@@ -9,6 +9,11 @@
* Include this file if you are writing a component that requires CPU cycles to
* operate, and you wish to run the component using service cores
*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include
#include
@@ -130,4 +135,8 @@ int32_t rte_service_init(void);
*/
void rte_service_finalize(void);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _SERVICE_PRIVATE_H_ */
--
2.27.0
Re: [dpdk-dev] [PATCH] net/bonding: fix socket id check
On 6/16/2020 11:09 AM, Chas Williams wrote:
> On 6/16/20 5:46 AM, David Marchand wrote:
>> Caught by code review, rte_eth_dev_socket_id() returns -1 on error.
>> The code should behave the same, but still, do not use LCORE_ID_ANY for
>> something that is not a lcore id.
>>
>> Fixes: c15c5897340d ("net/bonding: avoid allocating mempool on unknown
>> socket")
>> Cc: sta...@dpdk.org
>>
>> Signed-off-by: David Marchand
>
> Acked-by: Chas Williams
>
Applied to dpdk-next-net/master, thanks.
>> ---
>> drivers/net/bonding/rte_eth_bond_8023ad.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c
>> b/drivers/net/bonding/rte_eth_bond_8023ad.c
>> index b77a37ddb3..b7ffa2f2cf 100644
>> --- a/drivers/net/bonding/rte_eth_bond_8023ad.c
>> +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
>> @@ -1043,7 +1043,7 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev
>> *bond_dev,
>> RTE_ASSERT(port->tx_ring == NULL);
>>
>> socket_id = rte_eth_dev_socket_id(slave_id);
>> -if (socket_id == (int)LCORE_ID_ANY)
>> +if (socket_id == -1)
>
> Testing against < 0 would probably be more future proof. But if someone
> decides to update rte_eth_dev_socket_id they will hopefully update
> callers as well.
>
>> socket_id = rte_socket_id();
>>
>> element_size = sizeof(struct slow_protocol_frame) +
>>
[dpdk-dev] [PATCH 1/1] bus/fslmc: fix memory leak in secondary process
From: Yunjian Wang
In fslmc_process_mcp(), we allocate memory for 'dev_name' but not released
before return in secondary process.
Coverity issue: 268327
Fixes: e55d0494ab98 ("bus/fslmc: support secondary process")
Cc: sta...@dpdk.org
Signed-off-by: Yunjian Wang
---
drivers/bus/fslmc/fslmc_vfio.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index efe2c43d3..247a265c0 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -772,6 +772,7 @@ fslmc_process_mcp(struct rte_dpaa2_device *dev)
*/
if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
rte_mcp_ptr_list[MC_PORTAL_INDEX] = (void *)v_addr;
+ free(dev_name);
return 0;
}
--
2.23.0
[dpdk-dev] [PATCH v3 1/3] drivers/net/softnic: Remove the re-implementation of inet_pton
inet_pton4 and inet_pton6 was reimplemented. Replace implementation of
inet_pton4 and inet_pton6 with libc inet_pton function
Bugzilla ID: 365
Fixes: 31ce8d888625 ("net/softnic: add command interface")
Cc: jasvinder.si...@intel.com
Reported-by: David Marchand
Signed-off-by: Ibtisam Tariq
---
v3:
* None
v2:
* Added fixed commit id in commit body
---
drivers/net/softnic/parser.c | 187 +--
1 file changed, 3 insertions(+), 184 deletions(-)
diff --git a/drivers/net/softnic/parser.c b/drivers/net/softnic/parser.c
index dc15ec8aa..bca78d51c 100644
--- a/drivers/net/softnic/parser.c
+++ b/drivers/net/softnic/parser.c
@@ -4,24 +4,6 @@
* All rights reserved.
*/
-/* For inet_pton4() and inet_pton6() 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
@@ -33,6 +15,7 @@
#include
#include
#include
+#include
#include
@@ -364,170 +347,6 @@ softnic_parse_mpls_labels(char *string, uint32_t *labels,
uint32_t *n_labels)
return 0;
}
-#define INADDRSZ 4
-#define IN6ADDRSZ 16
-
-/* 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;
-
- pch = strchr(digits, ch);
- if (pch != 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 binary form.
- * return:
- * 1 if `src' is a valid [RFC1884 2.2] address, else 0.
- * notice:
- * (1) does not touch `dst' unless it's returning 1.
- * (2) :: in a full address is silently ignored.
- * credit:
- * inspired by Mark Andrews.
- * author:
- * Paul Vixie, 1996.
- */
-static int
-inet_pton6(const char *src, unsigned char *dst)
-{
- static const char xdigits_l[] = "0123456789abcdef",
- xdigits_u[] = "0123456789ABCDEF";
- unsigned char tmp[IN6ADDRSZ], *tp = 0, *endp = 0, *colonp = 0;
- const char *xdigits = 0, *curtok = 0;
- int ch = 0, saw_xdigit = 0, count_xdigit = 0;
- unsigned int val = 0;
- unsigned int dbloct_count = 0;
-
- memset((tp = tmp), '\0', IN6ADDRSZ);
- endp = tp + IN6ADDRSZ;
- colonp = NULL;
- /* Leading :: requires some special handling. */
- if (*src == ':')
- if (*++src != ':')
- return 0;
- curtok = src;
- saw_xdigit = count_xdigit = 0;
- val = 0;
-
- while ((ch = *src++) != '\0') {
- const char *pch;
-
- pch = strchr((xdigits = xdigits_l), ch);
- if (pch == NULL)
- pch = strchr((xdigits = xdigits_u), ch);
- if (pch != NULL) {
- if (count_xdigit >= 4)
- return 0;
- val <<= 4;
- val |= (pch - xdigits);
- if (val > 0x
[dpdk-dev] [PATCH v3 3/3] examples/ipsec-secgw: Remove the re-implementation of inet_pton
inet_pton4 and inet_pton6 was reimplemented. Replace implementation of
inet_pton4 and inet_pton6 with libc inet_pton function
Bugzilla ID: 365
Fixes: 0d547ed03717 ("examples/ipsec-secgw: support configuration file")
Cc: roy.fan.zh...@intel.com
Reported-by: David Marchand
Signed-off-by: Ibtisam Tariq
---
v3:
* Added header file for FreeBSD.
v2:
* Fixed the name of variable, passed as input to inet_pton function.
* Added fixed id in commit body.
---
examples/ipsec-secgw/parser.c | 171 +-
1 file changed, 3 insertions(+), 168 deletions(-)
diff --git a/examples/ipsec-secgw/parser.c b/examples/ipsec-secgw/parser.c
index 65eb7e9e2..58ef3de0a 100644
--- a/examples/ipsec-secgw/parser.c
+++ b/examples/ipsec-secgw/parser.c
@@ -10,6 +10,7 @@
#include
#include
#include
+#include
#include "ipsec.h"
#include "parser.h"
@@ -39,172 +40,6 @@ parse_tokenize_string(char *string, char *tokens[],
uint32_t *n_tokens)
return 0;
}
-#define INADDRSZ 4
-#define IN6ADDRSZ 16
-
-/* 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;
-
- pch = strchr(digits, ch);
- if (pch != 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 binary form.
- * return:
- * 1 if `src' is a valid [RFC1884 2.2] address, else 0.
- * notice:
- * (1) does not touch `dst' unless it's returning 1.
- * (2) :: in a full address is silently ignored.
- * credit:
- * inspired by Mark Andrews.
- * author:
- * Paul Vixie, 1996.
- */
-static int
-inet_pton6(const char *src, unsigned char *dst)
-{
- static const char xdigits_l[] = "0123456789abcdef",
- xdigits_u[] = "0123456789ABCDEF";
- unsigned char tmp[IN6ADDRSZ], *tp = 0, *endp = 0, *colonp = 0;
- const char *xdigits = 0, *curtok = 0;
- int ch = 0, saw_xdigit = 0, count_xdigit = 0;
- unsigned int val = 0;
- unsigned dbloct_count = 0;
-
- memset((tp = tmp), '\0', IN6ADDRSZ);
- endp = tp + IN6ADDRSZ;
- colonp = NULL;
- /* Leading :: requires some special handling. */
- if (*src == ':')
- if (*++src != ':')
- return 0;
- curtok = src;
- saw_xdigit = count_xdigit = 0;
- val = 0;
-
- while ((ch = *src++) != '\0') {
- const char *pch;
-
- pch = strchr((xdigits = xdigits_l), ch);
- if (pch == NULL)
- pch = strchr((xdigits = xdigits_u), ch);
- if (pch != NULL) {
- if (count_xdigit >= 4)
- return 0;
- val <<= 4;
- val |= (pch - xdigits);
- if (val > 0x)
- return 0;
- saw_xdigit = 1;
- count_xdigit++;
- continue;
- }
- if (ch == ':') {
- curtok = src;
- if (!saw_xdigit) {
- if (colonp)
- return 0;
- colonp = tp;
- continue;
- } else if (*src == '\0') {
- return 0;
- }
- if (tp + sizeof(int16_t) > endp)
- return 0;
- *tp++ = (unsigned char) ((val >> 8) & 0xff);
- *tp++ = (unsigned char) (val & 0xff);
- saw_xdigit
[dpdk-dev] [PATCH v3 2/3] examples/ip_pipeline: Remove the re-implementation of inet_pton
inet_pton4 and inet_pton6 was reimplemented. Replacing implementation of
inet_pton4 and inet_pton6 with libc inet_pton function
Bugzilla ID: 365
Fixes: ed7a0490f7e2 ("examples/ip_pipeline: add string parsing helpers")
Cc: piotrx.t.azarew...@intel.com
Reported-by: David Marchand
Signed-off-by: Ibtisam Tariq
---
v3:
* None
v2:
* Added fixed id in commit body
---
examples/ip_pipeline/parser.c | 189 +-
1 file changed, 3 insertions(+), 186 deletions(-)
diff --git a/examples/ip_pipeline/parser.c b/examples/ip_pipeline/parser.c
index fb0769fe3..6ddf0bec4 100644
--- a/examples/ip_pipeline/parser.c
+++ b/examples/ip_pipeline/parser.c
@@ -4,25 +4,6 @@
* All rights reserved.
*/
-/*
- * For inet_pton4() and inet_pton6() 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
@@ -34,6 +15,7 @@
#include
#include
#include
+#include
#include
#include
@@ -348,171 +330,6 @@ parse_mpls_labels(char *string, uint32_t *labels,
uint32_t *n_labels)
return 0;
}
-#define INADDRSZ 4
-#define IN6ADDRSZ 16
-
-/* 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;
-
- pch = strchr(digits, ch);
- if (pch != 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 binary form.
- * return:
- * 1 if `src' is a valid [RFC1884 2.2] address, else 0.
- * notice:
- * (1) does not touch `dst' unless it's returning 1.
- * (2) :: in a full address is silently ignored.
- * credit:
- * inspired by Mark Andrews.
- * author:
- * Paul Vixie, 1996.
- */
-static int
-inet_pton6(const char *src, unsigned char *dst)
-{
- static const char xdigits_l[] = "0123456789abcdef",
- xdigits_u[] = "0123456789ABCDEF";
- unsigned char tmp[IN6ADDRSZ], *tp = 0, *endp = 0, *colonp = 0;
- const char *xdigits = 0, *curtok = 0;
- int ch = 0, saw_xdigit = 0, count_xdigit = 0;
- unsigned int val = 0;
- unsigned dbloct_count = 0;
-
- memset((tp = tmp), '\0', IN6ADDRSZ);
- endp = tp + IN6ADDRSZ;
- colonp = NULL;
- /* Leading :: requires some special handling. */
- if (*src == ':')
- if (*++src != ':')
- return 0;
- curtok = src;
- saw_xdigit = count_xdigit = 0;
- val = 0;
-
- while ((ch = *src++) != '\0') {
- const char *pch;
-
- pch = strchr((xdigits = xdigits_l), ch);
- if (pch == NULL)
- pch = strchr((xdigits = xdigits_u), ch);
- if (pch != NULL) {
- if (count_xdigit >= 4)
- return 0;
- val <<= 4;
- val |= (pch - xdigits);
-
Re: [dpdk-dev] [PATCH v4 0/4] pmdinfogen: rewrite in Python
On Thu, Jul 09, 2020 at 12:23:31AM +0300, Dmitry Kozlyuk wrote: > This patchset implements existing pmdinfogen logic in Python, replaces > and removes the old code. The goals of rewriting are: > > * easier maintenance by using a more high-level language, > * simpler build process without host application and libelf. > > Travis CI script is adjusted to install python3-pyelftools, but other CI > systems may need similar tweaking. Particularly, testing on FreeBSD and > big-endian targets is desired. > > --- > Changes in v4: > > Fix build by removing redundant check. > > Changes in v3: > > 1. Rebase on ToT, add package to CI. > 2. Add copyrights, fixup maintainers file. > 3. Remove C implementation. > > Changes in v2: > > 1. pyelftools is used instead of hand-written ELF parser. > 2. Makefiles are adjusted. > 3. f-strings replaced with % formatting to support Python 3.5. > 4. Wrapper script does not hide stderr from ar and pmdinfogen. > > --- > Dmitry Kozlyuk (4): > pmdinfogen: add Python implementation > build: use Python pmdinfogen > doc/linux_gsg: require pyelftools for pmdinfogen > pmdinfogen: remove C implementation > I'm not currently setup to test with cross compiling, but for direct targets (tested on power and x86), it seems to work well Acked-by: Neil Horman
[dpdk-dev] [PATCH v7 0/2] ethdev: minor bugfixes
This series are minor bugfixes for rte_ethdev.c. Wei Hu (Xavier) (2): ethdev: fix data room size verification in Rx queue setup ethdev: fix VLAN offloads set if no relative capabilities drivers/net/dpaa2/dpaa2_ethdev.c | 12 +++- drivers/net/enic/enic_ethdev.c | 12 drivers/net/fm10k/fm10k_ethdev.c | 23 ++- drivers/net/hinic/hinic_pmd_ethdev.c | 6 -- drivers/net/i40e/i40e_ethdev.c | 5 - drivers/net/nfp/nfp_net.c | 5 - drivers/net/octeontx/octeontx_ethdev_ops.c | 10 -- drivers/net/octeontx2/otx2_vlan.c | 5 - drivers/net/qede/qede_ethdev.c | 3 --- lib/librte_ethdev/rte_ethdev.c | 20 +++- 10 files changed, 24 insertions(+), 77 deletions(-) -- 2.7.4
[dpdk-dev] [PATCH v7 2/2] ethdev: fix VLAN offloads set if no relative capabilities
Currently, there is a potential problem that calling the API function
rte_eth_dev_set_vlan_offload to start VLAN hardware offloads which the
driver does not support. If the PMD driver does not support certain VLAN
hardware offloads and does not check for it, the hardware setting will
not change, but the VLAN offloads in dev->data->dev_conf.rxmode.offloads
will be turned on.
It is supposed to check the hardware capabilities to decide whether the
relative callback needs to be called just like the behavior in the API
function named rte_eth_dev_configure. And it is also needed to cleanup
duplicated checks which are done in some PMDs. Also, note that it is
behaviour change for some PMDs which simply ignore (with error/warning log
message) unsupported VLAN offloads, but now it will fail.
Fixes: a4996bd89c42 ("ethdev: new Rx/Tx offloads API")
Fixes: 0ebce6129bc6 ("net/dpaa2: support new ethdev offload APIs")
Fixes: f9416bbafd98 ("net/enic: remove VLAN filter handler")
Fixes: 4f7d9e383e5c ("fm10k: update vlan offload features")
Fixes: fdba3bf15c7b ("net/hinic: add VLAN filter and offload")
Fixes: b96fb2f0d22b ("net/i40e: handle QinQ strip")
Fixes: d4a27a3b092a ("nfp: add basic features")
Fixes: 56139e85abec ("net/octeontx: support VLAN filter offload")
Fixes: ba1b3b081edf ("net/octeontx2: support VLAN offloads")
Fixes: d87246a43759 ("net/qede: enable and disable VLAN filtering")
Cc: sta...@dpdk.org
Signed-off-by: Chengchang Tang
Signed-off-by: Wei Hu (Xavier)
Acked-by: Andrew Rybchenko
Acked-by: Hyong Youb Kim
Acked-by: Sachin Saxena
Acked-by: Xiaoyun wang
Acked-by: Harman Kalra
Acked-by: Jeff Guo
Acked-by: Viacheslav Ovsiienko
---
v6 -> v7: Update the comment in rte_eth_dev_set_vlan_offload().
v5 -> v6: Add the related history patch into the Fixes commit log.
v4 -> v5: no change.
v3 -> v4: Delete "next_mask" label and modify the function that when the
offload is not supported the function fail.
v2 -> v3: Add __rte_unused to avoid unused parameter 'dev' and 'mask'
warning.
v1 -> v2: Cleanup duplicated checks which are done in some PMDs.
---
drivers/net/dpaa2/dpaa2_ethdev.c | 12 +++-
drivers/net/enic/enic_ethdev.c | 12
drivers/net/fm10k/fm10k_ethdev.c | 23 ++-
drivers/net/hinic/hinic_pmd_ethdev.c | 6 --
drivers/net/i40e/i40e_ethdev.c | 5 -
drivers/net/nfp/nfp_net.c | 5 -
drivers/net/octeontx/octeontx_ethdev_ops.c | 10 --
drivers/net/octeontx2/otx2_vlan.c | 5 -
drivers/net/qede/qede_ethdev.c | 3 ---
lib/librte_ethdev/rte_ethdev.c | 18 ++
10 files changed, 23 insertions(+), 76 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index a1f1919..489d744 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -145,7 +145,7 @@ dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask)
{
struct dpaa2_dev_priv *priv = dev->data->dev_private;
struct fsl_mc_io *dpni = dev->process_private;
- int ret;
+ int ret = 0;
PMD_INIT_FUNC_TRACE();
@@ -153,7 +153,7 @@ dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask)
/* VLAN Filter not avaialble */
if (!priv->max_vlan_filters) {
DPAA2_PMD_INFO("VLAN filter not available");
- goto next_mask;
+ return -ENOTSUP;
}
if (dev->data->dev_conf.rxmode.offloads &
@@ -166,14 +166,8 @@ dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask)
if (ret < 0)
DPAA2_PMD_INFO("Unable to set vlan filter = %d", ret);
}
-next_mask:
- if (mask & ETH_VLAN_EXTEND_MASK) {
- if (dev->data->dev_conf.rxmode.offloads &
- DEV_RX_OFFLOAD_VLAN_EXTEND)
- DPAA2_PMD_INFO("VLAN extend offload not supported");
- }
- return 0;
+ return ret;
}
static int
diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index 6a3580f..30a599d 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -367,18 +367,6 @@ static int enicpmd_vlan_offload_set(struct rte_eth_dev
*eth_dev, int mask)
enic->ig_vlan_strip_en = 0;
}
- if ((mask & ETH_VLAN_FILTER_MASK) &&
- (offloads & DEV_RX_OFFLOAD_VLAN_FILTER)) {
- dev_warning(enic,
- "Configuration of VLAN filter is not supported\n");
- }
-
- if ((mask & ETH_VLAN_EXTEND_MASK) &&
- (offloads & DEV_RX_OFFLOAD_VLAN_EXTEND)) {
- dev_warning(enic,
- "Configuration of extended VLAN is not supported\n");
- }
-
return enic_set_vlan_strip(enic);
}
diff --git a/drivers/net/fm10k/fm10k_ethdev
[dpdk-dev] [PATCH v7 1/2] ethdev: fix data room size verification in Rx queue setup
In the rte_eth_rx_queue_setup API function, the local variable named
mbp_buf_size, which is the data room size of the input parameter mp,
is checked to guarantee that each memory chunck used for net device
in the mbuf is bigger than the min_rx_bufsize. But if mbp_buf_size is
less than RTE_PKTMBUF_HEADROOM, the value of the following statement
will be a large number since the mbp_buf_size is a unsigned value.
mbp_buf_size - RTE_PKTMBUF_HEADROOM
As a result, it will cause a segment fault in this situation.
This patch fixes it by modify the check condition to guarantee that the
local varibale named mbp_buf_size is bigger than RTE_PKTMBUF_HEADROOM.
Fixes: af75078fece3 ("first public release")
Cc: sta...@dpdk.org
Signed-off-by: Chengchang Tang
Signed-off-by: Wei Hu (Xavier)
Reviewed-by: Andrew Rybchenko
Acked-by: Sachin Saxena
Acked-by: Viacheslav Ovsiienko
---
v2 -> v7: No change.
v1 -> v2: Simplify the check condition of mbp_buf_size according to
Andrew Rybchenko's comment.
---
lib/librte_ethdev/rte_ethdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index d06b7f9..50c3f18 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -1820,7 +1820,7 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t
rx_queue_id,
}
mbp_buf_size = rte_pktmbuf_data_room_size(mp);
- if ((mbp_buf_size - RTE_PKTMBUF_HEADROOM) < dev_info.min_rx_bufsize) {
+ if (mbp_buf_size < dev_info.min_rx_bufsize + RTE_PKTMBUF_HEADROOM) {
RTE_ETHDEV_LOG(ERR,
"%s mbuf_data_room_size %d < %d
(RTE_PKTMBUF_HEADROOM=%d + min_rx_bufsize(dev)=%d)\n",
mp->name, (int)mbp_buf_size,
--
2.7.4
Re: [dpdk-dev] [PATCH v3 00/19] update ixgbe base code
> -Original Message-
> From: dev On Behalf Of Guinan Sun
> Sent: Thursday, July 9, 2020 4:00 PM
> To: dev@dpdk.org
> Cc: Guo, Jia ; Zhao1, Wei ; Sun,
> GuinanX
> Subject: [dpdk-dev] [PATCH v3 00/19] update ixgbe base code
>
> source code of ixgbe driver:
> not-released-cid-ixgbe.2020.06.09.tar.gz released by the team which develop
> basic drivers for any ixgbe NIC.
>
> changelog in ND share repo:
> From 66d7da32d8e8 ("ixgbe-shared: Add support to clear VFMBMEM and
> toggle VF's TX queues") To 7f2d73c9742b ("ixgbe-shared: check Host
> Interface Return Status for Shadow RAM Write command for X550")
>
> 66d7da32d8e8 is ignore as no use in this release.
> Reviewed-by: Wei Zhao
> ---
> v3:
> * Modify hardcode.
> * Remove patch "toggle VF's Tx queues"
> * Remove patch "add support to clear VFMBMEM"
> * Split patch into two.
> v2:
> * Remove codes about IXGBE_NVMUPD_SUPPORT.
> * Remove codes about PREBOOT_SUPPORT.
> * Remove codes about IXGBE_SFP_DETECT_RETRIES.
> * Remove codes about IXGBE_EEPROM_GRANT_ATTEMPTS.
> * Remove codes about IXGBE_VFWRITE_REG.
> * Remove some useless defines.
> * Modify commit messages.
> * Split some patch to two patches and Merge some patches to one patch.
> * Update README.
>
> Guinan Sun (19):
> net/ixgbe/base: fix host interface shadow RAM read
> net/ixgbe/base: change flow for "Apply Update" command
> net/ixgbe/base: fix x550em 10G NIC link status report
> net/ixgbe/base: resolve infinite recursion on PCIe link down
> net/ixgbe/base: added register definitions for NVM update
> net/ixgbe/base: cleanup spelling mistakes in comments
> net/ixgbe/base: remove whitespace in function comments
> net/ixgbe/base: move increments after evaluations
> net/ixgbe/base: create dedicated func to restart auto nego
> net/ixgbe/base: add typecast for type mismatch
> net/ixgbe/base: remove unnecessary return value check
> net/ixgbe/base: remove unnecessary log message FC autonego
> net/ixgbe/base: initialize data field in struct buffer
> net/ixgbe/base: improve log about autonego being disabled
> net/ixgbe/base: add ipv6 mask for FDIR feature
> net/ixgbe/base: remove default advertising for x550 2.5G/5G
> net/ixgbe/base: check host interface return status
> net/ixgbe/base: cleanup pre-processor tags
> net/ixgbe/base: update version
>
> drivers/net/ixgbe/base/README|2 +-
> drivers/net/ixgbe/base/ixgbe_82598.c | 238 ++---
> drivers/net/ixgbe/base/ixgbe_82599.c | 397
> drivers/net/ixgbe/base/ixgbe_api.c | 866 +-
> drivers/net/ixgbe/base/ixgbe_common.c| 1055 +++---
> drivers/net/ixgbe/base/ixgbe_common.h|2 +-
> drivers/net/ixgbe/base/ixgbe_dcb.c |6 +-
> drivers/net/ixgbe/base/ixgbe_dcb_82598.c |2 +-
> drivers/net/ixgbe/base/ixgbe_dcb_82599.c |2 +-
> drivers/net/ixgbe/base/ixgbe_hv_vf.c | 20 +-
> drivers/net/ixgbe/base/ixgbe_mbx.c | 242 ++---
> drivers/net/ixgbe/base/ixgbe_phy.c | 488 +-
> drivers/net/ixgbe/base/ixgbe_phy.h |3 +-
> drivers/net/ixgbe/base/ixgbe_type.h | 24 +-
> drivers/net/ixgbe/base/ixgbe_vf.c| 170 ++--
> drivers/net/ixgbe/base/ixgbe_x540.c | 190 ++--
> drivers/net/ixgbe/base/ixgbe_x550.c | 527 ++-
> 17 files changed, 2102 insertions(+), 2132 deletions(-)
>
> --
> 2.17.1
Update v2 to v3 in dpdk-next-net-intel.
Re: [dpdk-dev] [PATCH v3] mbuf: use C11 atomic built-ins for refcnt operations
Hi Phil,
On Thu, Jul 09, 2020 at 06:10:42PM +0800, Phil Yang wrote:
> Use C11 atomic built-ins with explicit ordering instead of rte_atomic
> ops which enforce unnecessary barriers on aarch64.
>
> Signed-off-by: Phil Yang
> Reviewed-by: Ruifeng Wang
> ---
> v3:
> 1.Fix ABI breakage.
> 2.Simplify data type cast.
>
> v2:
> Fix ABI issue: revert the rte_mbuf_ext_shared_info struct refcnt field
> to refcnt_atomic.
>
> lib/librte_mbuf/rte_mbuf.c | 1 -
> lib/librte_mbuf/rte_mbuf.h | 19 ++-
> lib/librte_mbuf/rte_mbuf_core.h | 2 +-
> 3 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
> index ae91ae2..8a456e5 100644
> --- a/lib/librte_mbuf/rte_mbuf.c
> +++ b/lib/librte_mbuf/rte_mbuf.c
> @@ -22,7 +22,6 @@
> #include
> #include
> #include
> -#include
> #include
> #include
> #include
> diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
> index f8e492e..c1c0956 100644
> --- a/lib/librte_mbuf/rte_mbuf.h
> +++ b/lib/librte_mbuf/rte_mbuf.h
> @@ -37,7 +37,6 @@
> #include
> #include
> #include
> -#include
> #include
> #include
> #include
> @@ -365,7 +364,7 @@ rte_pktmbuf_priv_flags(struct rte_mempool *mp)
> static inline uint16_t
> rte_mbuf_refcnt_read(const struct rte_mbuf *m)
> {
> - return (uint16_t)(rte_atomic16_read(&m->refcnt_atomic));
> + return __atomic_load_n(&m->refcnt, __ATOMIC_RELAXED);
> }
>
> /**
> @@ -378,14 +377,15 @@ rte_mbuf_refcnt_read(const struct rte_mbuf *m)
> static inline void
> rte_mbuf_refcnt_set(struct rte_mbuf *m, uint16_t new_value)
> {
> - rte_atomic16_set(&m->refcnt_atomic, (int16_t)new_value);
> + __atomic_store_n(&m->refcnt, new_value, __ATOMIC_RELAXED);
> }
>
> /* internal */
> static inline uint16_t
> __rte_mbuf_refcnt_update(struct rte_mbuf *m, int16_t value)
> {
> - return (uint16_t)(rte_atomic16_add_return(&m->refcnt_atomic, value));
> + return __atomic_add_fetch(&m->refcnt, (uint16_t)value,
> + __ATOMIC_ACQ_REL);
> }
>
> /**
> @@ -466,7 +466,7 @@ rte_mbuf_refcnt_set(struct rte_mbuf *m, uint16_t
> new_value)
> static inline uint16_t
> rte_mbuf_ext_refcnt_read(const struct rte_mbuf_ext_shared_info *shinfo)
> {
> - return (uint16_t)(rte_atomic16_read(&shinfo->refcnt_atomic));
> + return __atomic_load_n(&shinfo->refcnt_atomic, __ATOMIC_RELAXED);
> }
>
> /**
> @@ -481,7 +481,7 @@ static inline void
> rte_mbuf_ext_refcnt_set(struct rte_mbuf_ext_shared_info *shinfo,
> uint16_t new_value)
> {
> - rte_atomic16_set(&shinfo->refcnt_atomic, (int16_t)new_value);
> + __atomic_store_n(&shinfo->refcnt_atomic, new_value, __ATOMIC_RELAXED);
> }
>
> /**
> @@ -505,7 +505,8 @@ rte_mbuf_ext_refcnt_update(struct
> rte_mbuf_ext_shared_info *shinfo,
> return (uint16_t)value;
> }
>
> - return (uint16_t)rte_atomic16_add_return(&shinfo->refcnt_atomic, value);
> + return __atomic_add_fetch(&shinfo->refcnt_atomic, (uint16_t)value,
> + __ATOMIC_ACQ_REL);
> }
>
> /** Mbuf prefetch */
> @@ -1304,8 +1305,8 @@ static inline int
> __rte_pktmbuf_pinned_extbuf_decref(struct rte_mbuf *m)
>* Direct usage of add primitive to avoid
>* duplication of comparing with one.
>*/
> - if (likely(rte_atomic16_add_return
> - (&shinfo->refcnt_atomic, -1)))
> + if (likely(__atomic_add_fetch(&shinfo->refcnt_atomic, (uint16_t)-1,
> + __ATOMIC_ACQ_REL)))
> return 1;
>
> /* Reinitialize counter before mbuf freeing. */
> diff --git a/lib/librte_mbuf/rte_mbuf_core.h b/lib/librte_mbuf/rte_mbuf_core.h
> index 16600f1..d65d1c8 100644
> --- a/lib/librte_mbuf/rte_mbuf_core.h
> +++ b/lib/librte_mbuf/rte_mbuf_core.h
> @@ -679,7 +679,7 @@ typedef void (*rte_mbuf_extbuf_free_callback_t)(void
> *addr, void *opaque);
> struct rte_mbuf_ext_shared_info {
> rte_mbuf_extbuf_free_callback_t free_cb; /**< Free callback function */
> void *fcb_opaque;/**< Free callback argument */
> - rte_atomic16_t refcnt_atomic;/**< Atomically accessed refcnt */
> + uint16_t refcnt_atomic; /**< Atomically accessed refcnt */
> };
To avoid an API breakage (i.e. currently, an application that accesses
to refcnt_atomic expects that its type is rte_atomic16_t), I suggest to
do the same than in the mbuf struct:
union {
rte_atomic16_t refcnt_atomic;
uint16_t refcnt;
};
I hope the ABI checker won't complain.
It will also be better for 20.11 when the deprecated fields will be
renamed: the remaining one will be called 'refcnt' in both mbuf and
mbuf_ext_shared_info.
Olivier
Re: [dpdk-dev] [PATCH] net/ice: fix incomplete protocol header for PPPoE
> -Original Message-
> From: Su, Simei
> Sent: Thursday, July 9, 2020 2:21 PM
> To: Zhang, Qi Z
> Cc: dev@dpdk.org; Guo, Jia ; Su, Simei
>
> Subject: [PATCH] net/ice: fix incomplete protocol header for PPPoE
>
> When adding a RSS rule with pattern MAC_PPPOE_IPV4_UDP and input set
> SRC/DST IPV4, because of incomplete protocol header fields, the rule can't do
> hash with inner src/dst ipv4. PPPOE_IPV4_TCP/SCTP and
> PPPOE_IPV6_UDP/TCP/SCTP also have similar issues. This patch
> complements protocol header fields for PPPOE data packets.
>
> Fixes: dfaedcf20170 ("net/ice: refactor PF hash flow")
>
> Signed-off-by: Simei Su
Acked-by: Qi Zhang
Applied to dpdk-next-net-intel.
Thanks
Qi
Re: [dpdk-dev] [PATCH v8 1/3] lib/lpm: integrate RCU QSBR
Hello Ruifeng,
On Thu, Jul 9, 2020 at 10:03 AM Ruifeng Wang wrote:
> diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c
> index 38ab512a4..4fbf5b6df 100644
> --- a/lib/librte_lpm/rte_lpm.c
> +++ b/lib/librte_lpm/rte_lpm.c
> @@ -1,5 +1,6 @@
> /* SPDX-License-Identifier: BSD-3-Clause
> * Copyright(c) 2010-2014 Intel Corporation
> + * Copyright(c) 2020 Arm Limited
> */
>
> #include
> @@ -39,6 +40,17 @@ enum valid_flag {
> VALID
> };
>
> +/** @internal LPM structure. */
> +struct __rte_lpm {
> + /* LPM metadata. */
> + struct rte_lpm lpm;
> +
> + /* RCU config. */
> + struct rte_rcu_qsbr *v; /* RCU QSBR variable. */
> + enum rte_lpm_qsbr_mode rcu_mode;/* Blocking, defer queue. */
> + struct rte_rcu_qsbr_dq *dq; /* RCU QSBR defer queue. */
> +};
> +
> /* Macro to enable/disable run-time checks. */
> #if defined(RTE_LIBRTE_LPM_DEBUG)
> #include
> @@ -122,6 +134,7 @@ rte_lpm_create(const char *name, int socket_id,
> const struct rte_lpm_config *config)
> {
> char mem_name[RTE_LPM_NAMESIZE];
> + struct __rte_lpm *internal_lpm = NULL;
Nit: internal_lpm does not need to be initialised to NULL.
> struct rte_lpm *lpm = NULL;
> struct rte_tailq_entry *te;
> uint32_t mem_size, rules_size, tbl8s_size;
> @@ -140,12 +153,6 @@ rte_lpm_create(const char *name, int socket_id,
>
> snprintf(mem_name, sizeof(mem_name), "LPM_%s", name);
>
> - /* Determine the amount of memory to allocate. */
> - mem_size = sizeof(*lpm);
> - rules_size = sizeof(struct rte_lpm_rule) * config->max_rules;
> - tbl8s_size = (sizeof(struct rte_lpm_tbl_entry) *
> - RTE_LPM_TBL8_GROUP_NUM_ENTRIES *
> config->number_tbl8s);
> -
> rte_mcfg_tailq_write_lock();
>
> /* guarantee there's no existing */
> @@ -161,6 +168,12 @@ rte_lpm_create(const char *name, int socket_id,
> goto exit;
> }
>
> + /* Determine the amount of memory to allocate. */
> + mem_size = sizeof(*internal_lpm);
> + rules_size = sizeof(struct rte_lpm_rule) * config->max_rules;
> + tbl8s_size = (sizeof(struct rte_lpm_tbl_entry) *
> + RTE_LPM_TBL8_GROUP_NUM_ENTRIES *
> config->number_tbl8s);
> +
> /* allocate tailq entry */
> te = rte_zmalloc("LPM_TAILQ_ENTRY", sizeof(*te), 0);
> if (te == NULL) {
> @@ -170,22 +183,23 @@ rte_lpm_create(const char *name, int socket_id,
> }
>
> /* Allocate memory to store the LPM data structures. */
> - lpm = rte_zmalloc_socket(mem_name, mem_size,
> + internal_lpm = rte_zmalloc_socket(mem_name, mem_size,
> RTE_CACHE_LINE_SIZE, socket_id);
> - if (lpm == NULL) {
> + if (internal_lpm == NULL) {
> RTE_LOG(ERR, LPM, "LPM memory allocation failed\n");
> rte_free(te);
> rte_errno = ENOMEM;
> goto exit;
> }
>
> + lpm = &internal_lpm->lpm;
>From this point...
> lpm->rules_tbl = rte_zmalloc_socket(NULL,
> (size_t)rules_size, RTE_CACHE_LINE_SIZE, socket_id);
>
> if (lpm->rules_tbl == NULL) {
> RTE_LOG(ERR, LPM, "LPM rules_tbl memory allocation failed\n");
> - rte_free(lpm);
> - lpm = NULL;
> + rte_free(internal_lpm);
> + internal_lpm = NULL;
... lpm is set to &internal_lpm->lpm and will be returned by jumping
to the exit label.
So freeing internal_lpm is necessary, but the lpm variable must be set
to NULL too.
> rte_free(te);
> rte_errno = ENOMEM;
> goto exit;
> @@ -197,8 +211,8 @@ rte_lpm_create(const char *name, int socket_id,
> if (lpm->tbl8 == NULL) {
> RTE_LOG(ERR, LPM, "LPM tbl8 memory allocation failed\n");
> rte_free(lpm->rules_tbl);
> - rte_free(lpm);
> - lpm = NULL;
> + rte_free(internal_lpm);
> + internal_lpm = NULL;
Ditto.
> rte_free(te);
> rte_errno = ENOMEM;
> goto exit;
--
David Marchand
Re: [dpdk-dev] [PATCH] net/mlx5: add ConnectX-6 Lx's device ID
Hi,
> -Original Message-
> From: Ali Alnubani
> Sent: Wednesday, July 8, 2020 12:14 PM
> To: dev@dpdk.org
> Cc: Raslan Darawsheh
> Subject: [PATCH] net/mlx5: add ConnectX-6 Lx's device ID
>
> This adds the ConnectX-6 Lx device id to the list of supported
> Mellanox devices that run the MLX5 PMD.
> The device is still in development stage.
>
> Signed-off-by: Ali Alnubani
> Acked-by: Raslan Darawsheh
> ---
> drivers/common/mlx5/mlx5_common.h | 1 +
> drivers/net/mlx5/mlx5.c | 4
> 2 files changed, 5 insertions(+)
>
> diff --git a/drivers/common/mlx5/mlx5_common.h
> b/drivers/common/mlx5/mlx5_common.h
> index da01ffa1c..285150705 100644
> --- a/drivers/common/mlx5/mlx5_common.h
> +++ b/drivers/common/mlx5/mlx5_common.h
> @@ -130,6 +130,7 @@ enum {
> PCI_DEVICE_ID_MELLANOX_CONNECTX6DX = 0x101d,
> PCI_DEVICE_ID_MELLANOX_CONNECTX6DXVF = 0x101e,
> PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF = 0xa2d6,
> + PCI_DEVICE_ID_MELLANOX_CONNECTX6LX = 0x101f,
> };
>
> /* Maximum number of simultaneous unicast MAC addresses. */
> diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
> index 86b7671b4..0c654ed8b 100644
> --- a/drivers/net/mlx5/mlx5.c
> +++ b/drivers/net/mlx5/mlx5.c
> @@ -1885,6 +1885,10 @@ static const struct rte_pci_id mlx5_pci_id_map[] =
> {
> RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
>
> PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF)
> },
> + {
> + RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
> + PCI_DEVICE_ID_MELLANOX_CONNECTX6LX)
> + },
> {
> .vendor_id = 0
> }
> --
> 2.27.0
Patch applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh
Re: [dpdk-dev] [PATCH] common/mlx5: fix physical port name pattern recognition
Hi,
> -Original Message-
> From: Viacheslav Ovsiienko
> Sent: Wednesday, July 8, 2020 11:52 PM
> To: dev@dpdk.org
> Cc: Matan Azrad ; Raslan Darawsheh
> ; sta...@dpdk.org
> Subject: [PATCH] common/mlx5: fix physical port name pattern recognition
>
> This patch makes the Infiniband device physical port name
> recognition more strict. Currently mlx5 PMD might recognize
> the names like "pf0sf0" erroneously as "pf0" and the wrong
> device type (host PF representor) is reported.
>
> The names like "pf0sf0" belong to PCI subfunctions which
> is currently not supported by mlx5 PMD and this false
> recognition must be eliminated.
>
> Fixes: 420bbdae89f2 ("net/mlx5: fix host physical function representor
> naming")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Viacheslav Ovsiienko
> ---
> drivers/common/mlx5/linux/mlx5_common_os.c | 14 +++---
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c
> b/drivers/common/mlx5/linux/mlx5_common_os.c
> index e74aa89..7bb3ba6 100644
> --- a/drivers/common/mlx5/linux/mlx5_common_os.c
> +++ b/drivers/common/mlx5/linux/mlx5_common_os.c
> @@ -89,7 +89,7 @@
> mlx5_translate_port_name(const char *port_name_in,
>struct mlx5_switch_info *port_info_out)
> {
> - char pf_c1, pf_c2, vf_c1, vf_c2;
> + char pf_c1, pf_c2, vf_c1, vf_c2, eol;
> char *end;
> int sc_items;
>
> @@ -97,9 +97,9 @@
>* Check for port-name as a string of the form pf0vf0
>* (support kernel ver >= 5.0 or OFED ver >= 4.6).
>*/
> - sc_items = sscanf(port_name_in, "%c%c%d%c%c%d",
> + sc_items = sscanf(port_name_in, "%c%c%d%c%c%d%c",
> &pf_c1, &pf_c2, &port_info_out->pf_num,
> - &vf_c1, &vf_c2, &port_info_out->port_name);
> + &vf_c1, &vf_c2, &port_info_out->port_name,
> &eol);
> if (sc_items == 6 &&
> pf_c1 == 'p' && pf_c2 == 'f' &&
> vf_c1 == 'v' && vf_c2 == 'f') {
> @@ -110,8 +110,8 @@
>* Check for port-name as a string of the form p0
>* (support kernel ver >= 5.0, or OFED ver >= 4.6).
>*/
> - sc_items = sscanf(port_name_in, "%c%d",
> - &pf_c1, &port_info_out->port_name);
> + sc_items = sscanf(port_name_in, "%c%d%c",
> + &pf_c1, &port_info_out->port_name, &eol);
> if (sc_items == 2 && pf_c1 == 'p') {
> port_info_out->name_type =
> MLX5_PHYS_PORT_NAME_TYPE_UPLINK;
> return;
> @@ -120,8 +120,8 @@
>* Check for port-name as a string of the form pf0
>* (support kernel ver >= 5.7 for HPF representor on BF).
>*/
> - sc_items = sscanf(port_name_in, "%c%c%d",
> - &pf_c1, &pf_c2, &port_info_out->pf_num);
> + sc_items = sscanf(port_name_in, "%c%c%d%c",
> + &pf_c1, &pf_c2, &port_info_out->pf_num, &eol);
> if (sc_items == 3 && pf_c1 == 'p' && pf_c2 == 'f') {
> port_info_out->port_name = -1;
> port_info_out->name_type =
> MLX5_PHYS_PORT_NAME_TYPE_PFHPF;
> --
> 1.8.3.1
Patch applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh
Re: [dpdk-dev] [PATCH] doc: fix a typo in mlx5 guide
Hi,
> -Original Message-
> From: dev On Behalf Of Ali Alnubani
> Sent: Wednesday, July 8, 2020 12:13 PM
> To: dev@dpdk.org
> Cc: Alexander Kozyrev
> Subject: [dpdk-dev] [PATCH] doc: fix a typo in mlx5 guide
>
> Fixes: ecb160456aed ("net/mlx5: add device parameter for MPRQ stride
> size")
> Cc: akozy...@mellanox.com
Added Cc: sta...@dpdk.org
>
> Signed-off-by: Ali Alnubani
> ---
> doc/guides/nics/mlx5.rst | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
> index b51aa67a7..4b6d8fb4d 100644
> --- a/doc/guides/nics/mlx5.rst
> +++ b/doc/guides/nics/mlx5.rst
> @@ -489,7 +489,7 @@ Driver options
>value is not in the range of device capability, the default value will be
> set
>with a warning message. The default value is 11 which is 2048 bytes per a
>stride, valid only if ``mprq_en`` is set. With ``mprq_log_stride_size`` set
> - it is possible for a pcaket to span across multiple strides. This mode
> allows
> + it is possible for a packet to span across multiple strides. This mode
> allows
>support of jumbo frames (9K) with MPRQ. The memcopy of some packets
> (or part
>of a packet if Rx scatter is configured) may be required in case there is
> no
>space left for a head room at the end of a stride which incurs some
> --
> 2.27.0
Patch applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh
Re: [dpdk-dev] [PATCH] net/bnxt: fix build issue
On 7/9/2020 9:15 AM, David Marchand wrote:
> In existing build env, RTE_LIBRTE_BNXT_PMD_SYSTEM is unset.
> Testing against a n value does not work and we end up with a link issue:
>
> /usr/bin/ld: tf_core/tf_em_common.o: in function `tf_em_ext_common_alloc':
> .../dpdk/drivers/net/bnxt/tf_core/tf_em_common.c:1040: undefined reference
> to `tf_em_ext_alloc'
> /usr/bin/ld: tf_core/tf_em_common.o: in function `tf_em_ext_common_free':
> .../dpdk/drivers/net/bnxt/tf_core/tf_em_common.c:1047: undefined reference
> to `tf_em_ext_free'
> collect2: error: ld returned 1 exit status
> gmake[4]: *** [.../dpdk/mk/rte.lib.mk:95: librte_pmd_bnxt.so.20.0.3]
> Error 1
> gmake[3]: *** [.../dpdk/mk/rte.subdir.mk:35: bnxt] Error 2
>
> Fixes: b2da02480cb7 ("net/bnxt: support EEM system memory")
>
> Signed-off-by: David Marchand
> ---
> drivers/net/bnxt/tf_core/Makefile | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/bnxt/tf_core/Makefile
> b/drivers/net/bnxt/tf_core/Makefile
> index b4fbdd00fc..806471427c 100644
> --- a/drivers/net/bnxt/tf_core/Makefile
> +++ b/drivers/net/bnxt/tf_core/Makefile
> @@ -16,10 +16,10 @@ SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_msg.c
> SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tbl.c
> SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_common.c
> SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_internal.c
> -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM), n)
> -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
> +ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM),y)
> +SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_system.c
> else
> -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM) += tf_core/tf_em_system.c
> +SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
> endif
> SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_session.c
> SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device.c
>
Functionally this is same so no objection to the change,
but I wonder why 'RTE_LIBRTE_BNXT_PMD_SYSTEM' is unset.
"CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM=n" is added to 'config/common_base' in the
same patch that updates the Makefile, so it should be set.
Btw, @Ajit, @Peter, how this new flagged managed via meson?
Re: [dpdk-dev] [PATCH 20.08] crypto/scheduler: use ring peek API
> -Original Message- > From: Ananyev, Konstantin > Sent: Friday, May 22, 2020 12:58 PM > To: dev@dpdk.org > Cc: Zhang, Roy Fan ; Ananyev, Konstantin > > Subject: [PATCH 20.08] crypto/scheduler: use ring peek API > > scheduler PMD uses its own hand-made peek functions > that directly access rte_ring internals. > As now rte_ring has an API for that type of functionality - > change scheduler PMD to use API provided by rte_ring. > > Signed-off-by: Konstantin Ananyev Acked-by: Fan Zhang
Re: [dpdk-dev] [PATCH 2/5] net/mlx5: add flow translation of eCPRI header
08/07/2020 16:43, Bing Zhao: > In the translation stage, the eCPRI item should be translated into > the format that lower layer driver could use. All the fields that > need to matched must be in network byte order after translation, as > well as the mask. Since the header in the item belongs to the network > layers stack, and the input parameter of the header is considered to > be in big-endian format already. > > Base on the definition in the PRM, the DW samples will be used for > matching in the FTE/STE. Now, the type field and only the PC ID, RTC > ID, and DLY MSR ID of the payload will be supported. The masks should > be 00 ff 00 00 ff ff(00) 00 00 in the network order. Two DWs are > needed to support such matching. The mask fields could be zeros to > support some wildcard rules. But it makes no sense to support the > rule matching only on the payload but without matching type filed. > > The DW samples should be stored after the flex parser creation for > eCPRI. There is no need to query the sample IDs each time when > creating a flow rule with eCPRI item. It will not introduce > insertion rate degradation significantly. > > Signed-off-by: Bing Zhao > --- > drivers/common/mlx5/mlx5_prm.h | 16 - > drivers/net/mlx5/mlx5.h | 15 + > drivers/net/mlx5/mlx5_flow_dv.c | 130 > > 3 files changed, 160 insertions(+), 1 deletion(-) In this patch, you could add the feature in the release notes, as part of mlx5 section, and probably in the mlx5 guide too.
Re: [dpdk-dev] [PATCH v2 6/6] examples/flow_filtering: utilize shared RSS action
Hi, Jerin and Ferruh
First of all it's decided to postpone this effort to 20.11.
@jer...@marvell.com I sincerely believe we can work out great API for
- shared action, context
- action update / modification / replacement
after 20.08 without time pressure & stress.
I'm fully committed and will continue to work on this PATCH.
I'll resend improved version of this patch once 20.08 is out & we will
continue our discussion from here to make it even better.
Many thanks to all participants of this discussion,
Andrey
-Original Message-
From: Ori Kam
Sent: Thursday, July 9, 2020 9:09 AM
To: Jerin Jacob ; Andrey Vesnovaty
Cc: dpdk-dev ; j...@marvell.com; Thomas Monjalon
; Ferruh Yigit ; Stephen Hemminger
; Richardson, Bruce ;
Slava Ovsiienko ; Andrey Vesnovaty
; Marko Kovacevic ; Radu
Nicolau ; Akhil Goyal ; Tomasz
Kantecki ; Sunil Kumar Kori ;
Pavan Nikhilesh ; John McNamara
Subject: RE: [PATCH v2 6/6] examples/flow_filtering: utilize shared RSS action
Hi Andrey,
> -Original Message-
> From: Jerin Jacob
> Sent: Thursday, July 9, 2020 7:44 AM
> To: Andrey Vesnovaty
> Cc: dpdk-dev ; j...@marvell.com; Thomas Monjalon
> ; Ferruh Yigit ; Stephen
> Hemminger ; Richardson, Bruce
> ; Ori Kam ; Slava
> Ovsiienko ; Andrey Vesnovaty
> ; Marko Kovacevic
> ; Radu Nicolau ; Akhil
> Goyal ; Tomasz Kantecki ;
> Sunil Kumar Kori ; Pavan Nikhilesh
> ; John McNamara
> Subject: Re: [PATCH v2 6/6] examples/flow_filtering: utilize shared RSS action
>
> On Thu, Jul 9, 2020 at 3:09 AM Andrey Vesnovaty
> wrote:
> >
> > This commit gives very first shared RSS action usage example and
> > demonstrates shared action capability for in-place update.
> >
> > First application creates shared action during initialization phase.
>
> What if PMD does not support a shared context, Then this application
> fails to run?
> if so, have a mode or probe the capability(if capability present then
> switches to new mode else fall back to old mode) before changing the
> application behavior.
>
+1 the new action should be added as a new case and should run only if it is
the shared action is supported.
>
> > Later on the flow object created by application uses previously created
> > shared RSS action with 1 queue configured instead of queue action in
> > original application.
> >
> > On each RX queue burst shared RSS action reconfigured via
> > rte_flow_shared_action_update() API to switch queue 0 to 1 & 1 to 0.
> > User supposed to observe consistent queue switches on each packet burst.
> >
> > Signed-off-by: Andrey Vesnovaty
> > ---
> > doc/guides/sample_app_ug/flow_filtering.rst | 62 +
> > examples/flow_filtering/flow_blocks.c | 30 +-
> > examples/flow_filtering/main.c | 41 +-
> > 3 files changed, 105 insertions(+), 28 deletions(-)
> >
> > diff --git a/doc/guides/sample_app_ug/flow_filtering.rst
> b/doc/guides/sample_app_ug/flow_filtering.rst
> > index 5e5a6cd8a0..cfe9334717 100644
> > --- a/doc/guides/sample_app_ug/flow_filtering.rst
> > +++ b/doc/guides/sample_app_ug/flow_filtering.rst
> > @@ -106,7 +106,7 @@ following code:
> > .. code-block:: c
> >
> > /* create flow for send packet with */
> > - flow = generate_ipv4_flow(port_id, selected_queue,
> > + flow = generate_ipv4_flow(port_id, shared_action,
> > SRC_IP, EMPTY_MASK,
> > DEST_IP, FULL_MASK, &error);
> > if (!flow) {
> > @@ -242,7 +242,7 @@ The Ethernet port is configured with default settings
> using the
> > rxq_conf = dev_info.default_rxconf;
> > rxq_conf.offloads = port_conf.rxmode.offloads;
> >
> > -For this example we are configuring number of rx and tx queues that are
> connected
> > +For this example we are configuring 2 rx and 2 tx queues that are connected
> > to a single port.
> >
> > .. code-block:: c
> > @@ -270,13 +270,22 @@ to a single port.
> >}
> > }
> >
> > +Before we create the flow we create shared action in order to send it as
> > +actions argument when creating a flow. The action is single queue RSS
> action
> > +similar to action queue with the only difference that shared RSS action
> > +provides update capability after action creation.
> > +
> > +.. code-block:: c
> > +
> > + shared_action = rte_flow_shared_action_create(port_id, &action, &error);
> > +
> > In the next step we create and apply the flow rule. which is to send
> > packets
> > with destination ip equals to 192.168.1.1 to queue number 1. The detail
> > explanation of the ``generate_ipv4_flow()`` appears later in this document:
> >
> > .. code-block:: c
> >
> > - flow = generate_ipv4_flow(port_id, selected_queue,
> > + flow = generate_ipv4_flow(port_id, shared_action,
> > SRC_IP, EMPTY_MASK,
> > DEST_IP, FULL_MASK, &error);
> >
> > @@ -339,6 +348,21 @@ looks like the following:
> > printf("\
Re: [dpdk-dev] [PATCH v5 1/2] mbuf: introduce accurate packet Tx scheduling
08/07/2020 17:47, Viacheslav Ovsiienko: > There is the requirement on some networks for precise traffic timing > management. The ability to send (and, generally speaking, receive) > the packets at the very precisely specified moment of time provides > the opportunity to support the connections with Time Division > Multiplexing using the contemporary general purpose NIC without involving > an auxiliary hardware. For example, the supporting of O-RAN Fronthaul > interface is one of the promising features for potentially usage of the > precise time management for the egress packets. [...] > lib/librte_ethdev/rte_ethdev.c | 1 + > lib/librte_ethdev/rte_ethdev.h | 4 > lib/librte_mbuf/rte_mbuf_dyn.h | 31 +++ > 3 files changed, 36 insertions(+) I think this feature should be added in the release notes.
[dpdk-dev] [PATCH v3] service: support C++ linkage
From: Levend Sayar
"extern C" define is added to rte_service_component.h file
to be able to use in C++ context
Signed-off-by: Levend Sayar
Acked-by: Harry van Haaren
---
lib/librte_eal/include/rte_service_component.h | 9 +
1 file changed, 9 insertions(+)
diff --git a/lib/librte_eal/include/rte_service_component.h
b/lib/librte_eal/include/rte_service_component.h
index b75aba11b..9e66ee7e2 100644
--- a/lib/librte_eal/include/rte_service_component.h
+++ b/lib/librte_eal/include/rte_service_component.h
@@ -9,6 +9,11 @@
* Include this file if you are writing a component that requires CPU cycles to
* operate, and you wish to run the component using service cores
*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include
#include
@@ -130,4 +135,8 @@ int32_t rte_service_init(void);
*/
void rte_service_finalize(void);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _SERVICE_PRIVATE_H_ */
--
2.27.0
[dpdk-dev] [PATCH v6 2/2] app/testpmd: add send scheduling test capability
This commit adds testpmd capability to provide timestamps on the packets
being sent in the txonly mode. This includes:
- SEND_ON_TIMESTAMP support
new device Tx offload capability support added, example:
testpmd> port config 0 tx_offload send_on_timestamp on
- set txtimes, registers field and flag, example:
testpmd> set txtimes 100,0
This command enables the packet send scheduling on timestamps if
the first parameter is not zero, generic format:
testpmd> set txtimes (inter),(intra)
where:
inter - is the delay between the bursts in the device clock units.
intra - is the delay between the packets within the burst specified
in the device clock units
As the result the bursts of packet will be transmitted with
specific delay between the packets within the burst and specific
delay between the bursts. The rte_eth_get_clock() is supposed to be
engaged to get the current device clock value and provide
the reference for the timestamps.
- show txtimes, displays the timing settings
- txonly burst time pattern
Signed-off-by: Viacheslav Ovsiienko
---
app/test-pmd/cmdline.c | 59 --
app/test-pmd/config.c | 43
app/test-pmd/testpmd.c | 3 ++
app/test-pmd/testpmd.h | 3 ++
app/test-pmd/txonly.c | 77 +++--
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 36 +-
6 files changed, 212 insertions(+), 9 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 39ad938..ec5aad6 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -3930,6 +3930,52 @@ struct cmd_set_txsplit_result {
},
};
+/* *** SET TIMES FOR TXONLY PACKETS SCHEDULING ON TIMESTAMPS *** */
+
+struct cmd_set_txtimes_result {
+ cmdline_fixed_string_t cmd_keyword;
+ cmdline_fixed_string_t txtimes;
+ cmdline_fixed_string_t tx_times;
+};
+
+static void
+cmd_set_txtimes_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_set_txtimes_result *res;
+ unsigned int tx_times[2] = {0, 0};
+ unsigned int n_times;
+
+ res = parsed_result;
+ n_times = parse_item_list(res->tx_times, "tx times",
+ 2, tx_times, 0);
+ if (n_times == 2)
+ set_tx_pkt_times(tx_times);
+}
+
+cmdline_parse_token_string_t cmd_set_txtimes_keyword =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_txtimes_result,
+cmd_keyword, "set");
+cmdline_parse_token_string_t cmd_set_txtimes_name =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_txtimes_result,
+txtimes, "txtimes");
+cmdline_parse_token_string_t cmd_set_txtimes_value =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_txtimes_result,
+tx_times, NULL);
+
+cmdline_parse_inst_t cmd_set_txtimes = {
+ .f = cmd_set_txtimes_parsed,
+ .data = NULL,
+ .help_str = "set txtimes ,",
+ .tokens = {
+ (void *)&cmd_set_txtimes_keyword,
+ (void *)&cmd_set_txtimes_name,
+ (void *)&cmd_set_txtimes_value,
+ NULL,
+ },
+};
+
/* *** ADD/REMOVE ALL VLAN IDENTIFIERS TO/FROM A PORT VLAN RX FILTER *** */
struct cmd_rx_vlan_filter_all_result {
cmdline_fixed_string_t rx_vlan;
@@ -7418,6 +7464,8 @@ static void cmd_showcfg_parsed(void *parsed_result,
pkt_fwd_config_display(&cur_fwd_config);
else if (!strcmp(res->what, "txpkts"))
show_tx_pkt_segments();
+ else if (!strcmp(res->what, "txtimes"))
+ show_tx_pkt_times();
}
cmdline_parse_token_string_t cmd_showcfg_show =
@@ -7426,12 +7474,12 @@ static void cmd_showcfg_parsed(void *parsed_result,
TOKEN_STRING_INITIALIZER(struct cmd_showcfg_result, cfg, "config");
cmdline_parse_token_string_t cmd_showcfg_what =
TOKEN_STRING_INITIALIZER(struct cmd_showcfg_result, what,
-"rxtx#cores#fwd#txpkts");
+"rxtx#cores#fwd#txpkts#txtimes");
cmdline_parse_inst_t cmd_showcfg = {
.f = cmd_showcfg_parsed,
.data = NULL,
- .help_str = "show config rxtx|cores|fwd|txpkts",
+ .help_str = "show config rxtx|cores|fwd|txpkts|txtimes",
.tokens = {
(void *)&cmd_showcfg_show,
(void *)&cmd_showcfg_port,
@@ -18670,7 +18718,8 @@ struct cmd_config_per_port_tx_offload_result {
"sctp_cksum#tcp_tso#udp_tso#outer_ipv4_cksum#"
"qinq_insert#vxlan_tnl_tso#gre_tnl_tso#"
"ipip_tnl_tso#geneve_tnl_tso#macsec_insert#"
- "mt_lockfree#multi_segs#mbuf_fast_free#security");
+
Re: [dpdk-dev] [PATCH v2 6/6] examples/flow_filtering: utilize shared RSS action
09/07/2020 14:25, Andrey Vesnovaty: > Hi, Jerin and Ferruh > > First of all it's decided to postpone this effort to 20.11. > @jer...@marvell.com I sincerely believe we can work out great API for > - shared action, context > - action update / modification / replacement > after 20.08 without time pressure & stress. > > I'm fully committed and will continue to work on this PATCH. > I'll resend improved version of this patch once 20.08 is out & we will > continue our discussion from here to make it even better. I don't think you should wait 20.08 (one month) to progress. Ideally, it should be ready to be merged in the first day of 20.11 cycle. Please add the feature in the release notes (even in 20.08 one in the meantime).
[dpdk-dev] [PATCH v6 1/2] mbuf: introduce accurate packet Tx scheduling
There is the requirement on some networks for precise traffic timing
management. The ability to send (and, generally speaking, receive)
the packets at the very precisely specified moment of time provides
the opportunity to support the connections with Time Division
Multiplexing using the contemporary general purpose NIC without involving
an auxiliary hardware. For example, the supporting of O-RAN Fronthaul
interface is one of the promising features for potentially usage of the
precise time management for the egress packets.
The main objective of this RFC is to specify the way how applications
can provide the moment of time at what the packet transmission must be
started and to describe in preliminary the supporting this feature from
mlx5 PMD side.
The new dynamic timestamp field is proposed, it provides some timing
information, the units and time references (initial phase) are not
explicitly defined but are maintained always the same for a given port.
Some devices allow to query rte_eth_read_clock() that will return
the current device timestamp. The dynamic timestamp flag tells whether
the field contains actual timestamp value. For the packets being sent
this value can be used by PMD to schedule packet sending.
The device clock is opaque entity, the units and frequency are
vendor specific and might depend on hardware capabilities and
configurations. If might (or not) be synchronized with real time
via PTP, might (or not) be synchronous with CPU clock (for example
if NIC and CPU share the same clock source there might be no
any drift between the NIC and CPU clocks), etc.
After PKT_RX_TIMESTAMP flag and fixed timestamp field deprecation
and obsoleting, these dynamic flag and field will be used to manage
the timestamps on receiving datapath as well. Having the dedicated
flags for Rx/Tx timestamps allows applications not to perform explicit
flags reset on forwarding and not to promote received timestamps
to the transmitting datapath by default. The static PKT_RX_TIMESTAMP
is considered as candidate to become the dynamic flag.
When PMD sees the "rte_dynfield_timestamp" set on the packet being sent
it tries to synchronize the time of packet appearing on the wire with
the specified packet timestamp. If the specified one is in the past it
should be ignored, if one is in the distant future it should be capped
with some reasonable value (in range of seconds). These specific cases
("too late" and "distant future") can be optionally reported via
device xstats to assist applications to detect the time-related
problems.
There is no any packet reordering according timestamps is supposed,
neither within packet burst, nor between packets, it is an entirely
application responsibility to generate packets and its timestamps
in desired order. The timestamps can be put only in the first packet
in the burst providing the entire burst scheduling.
PMD reports the ability to synchronize packet sending on timestamp
with new offload flag:
This is palliative and is going to be replaced with new eth_dev API
about reporting/managing the supported dynamic flags and its related
features. This API would break ABI compatibility and can't be introduced
at the moment, so is postponed to 20.11.
For testing purposes it is proposed to update testpmd "txonly"
forwarding mode routine. With this update testpmd application generates
the packets and sets the dynamic timestamps according to specified time
pattern if it sees the "rte_dynfield_timestamp" is registered.
The new testpmd command is proposed to configure sending pattern:
set tx_times ,
- the delay between the packets within the burst
specified in the device clock units. The number
of packets in the burst is defined by txburst parameter
- the delay between the bursts in the device clock units
As the result the bursts of packet will be transmitted with specific
delays between the packets within the burst and specific delay between
the bursts. The rte_eth_get_clock is supposed to be engaged to get the
current device clock value and provide the reference for the timestamps.
Signed-off-by: Viacheslav Ovsiienko
Acked-by: Olivier Matz
---
v1->v4:
- dedicated dynamic Tx timestamp flag instead of shared with Rx
v4->v5:
- elaborated commit message
- more words about device clocks added,
- note about dedicated Rx/Tx timestamp flags added
v5->v6:
- release notes are updated
---
doc/guides/rel_notes/release_20_08.rst | 6 ++
lib/librte_ethdev/rte_ethdev.c | 1 +
lib/librte_ethdev/rte_ethdev.h | 4
lib/librte_mbuf/rte_mbuf_dyn.h | 31 +++
4 files changed, 42 insertions(+)
diff --git a/doc/guides/rel_notes/release_20_08.rst
b/doc/guides/rel_notes/release_20_08.rst
index 988474c..5527bab 100644
--- a/doc/guides/rel_notes/release_20_08.rst
+++ b/doc/guides/rel_notes/release_20_08.rst
@@ -200,6 +200,12 @@ New Features
See the :doc:`../sample_app_ug/l2_forward_re
Re: [dpdk-dev] [PATCH v3] mbuf: use C11 atomic built-ins for refcnt operations
Hi Oliver,
> -Original Message-
> From: Olivier Matz
> Sent: Thursday, July 9, 2020 7:04 PM
> To: Phil Yang
> Cc: dev@dpdk.org; step...@networkplumber.org;
> david.march...@redhat.com; d...@linux.vnet.ibm.com; Honnappa
> Nagarahalli ; Ruifeng Wang
> ; nd
> Subject: Re: [PATCH v3] mbuf: use C11 atomic built-ins for refcnt operations
>
> Hi Phil,
>
> On Thu, Jul 09, 2020 at 06:10:42PM +0800, Phil Yang wrote:
> > Use C11 atomic built-ins with explicit ordering instead of rte_atomic
> > ops which enforce unnecessary barriers on aarch64.
> >
> > Signed-off-by: Phil Yang
> > Reviewed-by: Ruifeng Wang
> > ---
> > v3:
> > 1.Fix ABI breakage.
> > 2.Simplify data type cast.
> >
> > v2:
> > Fix ABI issue: revert the rte_mbuf_ext_shared_info struct refcnt field
> > to refcnt_atomic.
> >
> > lib/librte_mbuf/rte_mbuf.c | 1 -
> > lib/librte_mbuf/rte_mbuf.h | 19 ++-
> > lib/librte_mbuf/rte_mbuf_core.h | 2 +-
> > 3 files changed, 11 insertions(+), 11 deletions(-)
> >
> >
> > /* Reinitialize counter before mbuf freeing. */
> > diff --git a/lib/librte_mbuf/rte_mbuf_core.h
> b/lib/librte_mbuf/rte_mbuf_core.h
> > index 16600f1..d65d1c8 100644
> > --- a/lib/librte_mbuf/rte_mbuf_core.h
> > +++ b/lib/librte_mbuf/rte_mbuf_core.h
> > @@ -679,7 +679,7 @@ typedef void
> (*rte_mbuf_extbuf_free_callback_t)(void *addr, void *opaque);
> > struct rte_mbuf_ext_shared_info {
> > rte_mbuf_extbuf_free_callback_t free_cb; /**< Free callback
> function */
> > void *fcb_opaque;/**< Free callback argument */
> > - rte_atomic16_t refcnt_atomic;/**< Atomically accessed refcnt */
> > + uint16_t refcnt_atomic; /**< Atomically accessed refcnt */
> > };
>
> To avoid an API breakage (i.e. currently, an application that accesses
> to refcnt_atomic expects that its type is rte_atomic16_t), I suggest to
> do the same than in the mbuf struct:
>
> union {
> rte_atomic16_t refcnt_atomic;
> uint16_t refcnt;
> };
>
> I hope the ABI checker won't complain.
>
> It will also be better for 20.11 when the deprecated fields will be
> renamed: the remaining one will be called 'refcnt' in both mbuf and
> mbuf_ext_shared_info.
Got it. I agree with you.
It should work. In my local test machine, the ABI checker happy with this
approach.
Once the test is done, I will upstream the new patch.
Appreciate your comments.
Thanks,
Phil
Re: [dpdk-dev] [EXT] RE: [PATCH 6/6] app/test-eventdev: fix eventdev queues
> -Original Message-
> From: Pavan Nikhilesh Bhagavatula
> Sent: Thursday, July 2, 2020 8:57 AM
> To: Apeksha Gupta ;
> jerin.ja...@caviumnetworks.com
> Cc: dev@dpdk.org; tho...@monjalon.net; Hemant Agrawal
> ; Nipun Gupta ; Akhil
> Goyal ; sta...@dpdk.org
> Subject: [EXT] RE: [dpdk-dev] [PATCH 6/6] app/test-eventdev: fix eventdev
> queues
>
> Caution: EXT Email
>
> >Subject: [dpdk-dev] [PATCH 6/6] app/test-eventdev: fix eventdev
> >queues
> >
> >In pipeline_queue test case, if event queues are greater than the
> >max event queues it will fail.
>
> Nak, it should fail. If sufficient queues are not available how would the
> pipeline work?
>
> /*
> * The pipelines are setup in the following manner:
> *
> * eth_dev_count = 2, nb_stages = 2.
> *
> * queues = 6
> * stride = 3
> *
> * event queue pipelines:
> * eth0 -> q0 -> q1 -> (q2->tx)
> * eth1 -> q3 -> q4 -> (q5->tx)
> *
> * q2, q5 configured as ATOMIC | SINGLE_LINK
> *
> */
>
[Apeksha] Okay.
>
> >To handle this check is added.
> >
> >Fixes: 032a965a8f1 ("app/eventdev: support Tx adapter")
> >Cc: sta...@dpdk.org
> >
> >Signed-off-by: Apeksha Gupta
> >---
> > app/test-eventdev/test_pipeline_queue.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> >diff --git a/app/test-eventdev/test_pipeline_queue.c b/app/test-
> >eventdev/test_pipeline_queue.c
> >index bee4ac0344..b958953bf9 100644
> >--- a/app/test-eventdev/test_pipeline_queue.c
> >+++ b/app/test-eventdev/test_pipeline_queue.c
> >@@ -325,6 +325,9 @@ pipeline_queue_eventdev_setup(struct evt_test
> >*test, struct evt_options *opt)
> > memset(queue_arr, 0, sizeof(uint8_t) *
> >RTE_EVENT_MAX_QUEUES_PER_DEV);
> >
> > rte_event_dev_info_get(opt->dev_id, &info);
> >+ if (nb_queues > info.max_event_queues)
> >+ nb_queues = nb_stages;
> >+
> > ret = evt_configure_eventdev(opt, nb_queues, nb_ports);
> > if (ret) {
> > evt_err("failed to configure eventdev %d", opt-
> >>dev_id);
> >--
> >2.17.1
[dpdk-dev] [PATCH v1 0/1] modify ETIME errors for FreeBSD
Change ETIME to ETIMEDOUT, because ETIME is not defined in FreeBSD which may cause build error. -- v1: - modify ETIME errors for FreeBSD Xiaoyun wang (1): net/hinic/base: modify ETIME errors for FreeBSD drivers/net/hinic/base/hinic_pmd_hwdev.c | 2 +- drivers/net/hinic/base/hinic_pmd_hwif.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 1.8.3.1
[dpdk-dev] [PATCH v1 1/1] net/hinic/base: modify ETIME errors for FreeBSD
Change ETIME errors to ETIMEDOUT, because ETIME is not defined in FreeBSD which may cause build error. Signed-off-by: Xiaoyun wang --- drivers/net/hinic/base/hinic_pmd_hwdev.c | 2 +- drivers/net/hinic/base/hinic_pmd_hwif.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/hinic/base/hinic_pmd_hwdev.c b/drivers/net/hinic/base/hinic_pmd_hwdev.c index 765c47d..ac2a72e 100644 --- a/drivers/net/hinic/base/hinic_pmd_hwdev.c +++ b/drivers/net/hinic/base/hinic_pmd_hwdev.c @@ -475,7 +475,7 @@ static int wait_for_flr_finish(struct hinic_hwif *hwif) rte_delay_ms(10); } while (time_before(jiffies, end)); - return -EFAULT; + return -ETIMEDOUT; } #define HINIC_WAIT_CMDQ_IDLE_TIMEOUT 1000 diff --git a/drivers/net/hinic/base/hinic_pmd_hwif.c b/drivers/net/hinic/base/hinic_pmd_hwif.c index 4578b68..d7fc1af 100644 --- a/drivers/net/hinic/base/hinic_pmd_hwif.c +++ b/drivers/net/hinic/base/hinic_pmd_hwif.c @@ -321,7 +321,7 @@ int wait_until_doorbell_flush_states(struct hinic_hwif *hwif, rte_delay_ms(1); } while (time_before(jiffies, end)); - return -EFAULT; + return -ETIMEDOUT; } static int wait_until_doorbell_and_outbound_enabled(struct hinic_hwif *hwif) @@ -343,7 +343,7 @@ static int wait_until_doorbell_and_outbound_enabled(struct hinic_hwif *hwif) rte_delay_ms(1); } while (time_before(jiffies, end)); - return -EFAULT; + return -ETIMEDOUT; } u16 hinic_global_func_id(void *hwdev) -- 1.8.3.1
Re: [dpdk-dev] [PATCH v3] service: support C++ linkage
09/07/2020 14:32, levendsa...@gmail.com:
> From: Levend Sayar
>
> "extern C" define is added to rte_service_component.h file
> to be able to use in C++ context
It is a bug.
The title should be "service: fix C++ linkage"
And these tags must be added:
Fixes: 21698354c832 ("service: introduce service cores concept")
Cc: sta...@dpdk.org
If you agree, I can do the change while merging.
