* [PATCH 20.11 1/2] Revert "regexdev: fix section attribute of symbols"
@ 2022-03-29 12:09 luca.boccassi
2022-03-29 12:09 ` [PATCH 20.11 2/2] dpaa2: fix build with RTE_LIBRTE_IEEE1588 luca.boccassi
2022-03-29 14:07 ` [PATCH 20.11 1/2] Revert "regexdev: fix section attribute of symbols" Christian Ehrhardt
0 siblings, 2 replies; 9+ messages in thread
From: luca.boccassi @ 2022-03-29 12:09 UTC (permalink / raw)
To: stable; +Cc: christian.ehrhardt, ktraynor, Luca Boccassi
From: Luca Boccassi <bluca@debian.org>
Causes symbols changes, so it's not appropriate for 20.11.
This reverts commit 64452c878f225c147dfb7156e605f5b55da9f7c0.
Signed-off-by: Luca Boccassi <bluca@debian.org>
---
devtools/libabigail.abignore | 4 ----
lib/librte_regexdev/rte_regexdev.h | 4 ----
lib/librte_regexdev/rte_regexdev_driver.h | 3 ---
lib/librte_regexdev/version.map | 9 ---------
4 files changed, 20 deletions(-)
diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore
index 1414cdfba9..025f2c01bc 100644
--- a/devtools/libabigail.abignore
+++ b/devtools/libabigail.abignore
@@ -7,7 +7,3 @@
symbol_version = INTERNAL
[suppress_variable]
symbol_version = INTERNAL
-
-; Ignore section attribute fixes in experimental regexdev library
-[suppress_file]
- soname_regexp = ^librte_regexdev\.
diff --git a/lib/librte_regexdev/rte_regexdev.h b/lib/librte_regexdev/rte_regexdev.h
index 09d1718da9..df2312678c 100644
--- a/lib/librte_regexdev/rte_regexdev.h
+++ b/lib/librte_regexdev/rte_regexdev.h
@@ -228,9 +228,6 @@ extern int rte_regexdev_logtype;
} while (0)
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Check if dev_id is ready.
*
* @param dev_id
@@ -240,7 +237,6 @@ extern int rte_regexdev_logtype;
* - 0 if device state is not in ready state.
* - 1 if device state is ready state.
*/
-__rte_experimental
int rte_regexdev_is_valid_dev(uint16_t dev_id);
/**
diff --git a/lib/librte_regexdev/rte_regexdev_driver.h b/lib/librte_regexdev/rte_regexdev_driver.h
index 6246b144a6..64742016c0 100644
--- a/lib/librte_regexdev/rte_regexdev_driver.h
+++ b/lib/librte_regexdev/rte_regexdev_driver.h
@@ -32,7 +32,6 @@ extern "C" {
* A pointer to the RegEx device slot case of success,
* NULL otherwise.
*/
-__rte_internal
struct rte_regexdev *rte_regexdev_register(const char *name);
/**
@@ -42,7 +41,6 @@ struct rte_regexdev *rte_regexdev_register(const char *name);
* @param dev
* Device to be released.
*/
-__rte_internal
void rte_regexdev_unregister(struct rte_regexdev *dev);
/**
@@ -52,7 +50,6 @@ void rte_regexdev_unregister(struct rte_regexdev *dev);
* @param name
* The device name.
*/
-__rte_internal
struct rte_regexdev *rte_regexdev_get_device_by_name(const char *name);
#ifdef __cplusplus
diff --git a/lib/librte_regexdev/version.map b/lib/librte_regexdev/version.map
index 988b909638..8db9b17018 100644
--- a/lib/librte_regexdev/version.map
+++ b/lib/librte_regexdev/version.map
@@ -1,7 +1,6 @@
EXPERIMENTAL {
global:
- rte_regex_devices;
rte_regexdev_attr_get;
rte_regexdev_attr_set;
rte_regexdev_close;
@@ -12,8 +11,6 @@ EXPERIMENTAL {
rte_regexdev_enqueue_burst;
rte_regexdev_get_dev_id;
rte_regexdev_info_get;
- rte_regexdev_is_valid_dev;
- rte_regexdev_logtype;
rte_regexdev_queue_pair_setup;
rte_regexdev_rule_db_compile_activate;
rte_regexdev_rule_db_export;
@@ -27,9 +24,3 @@ EXPERIMENTAL {
rte_regexdev_xstats_names_get;
rte_regexdev_xstats_reset;
};
-
-INTERNAL {
- rte_regexdev_get_device_by_name;
- rte_regexdev_register;
- rte_regexdev_unregister;
-};
--
2.34.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 20.11 2/2] dpaa2: fix build with RTE_LIBRTE_IEEE1588
2022-03-29 12:09 [PATCH 20.11 1/2] Revert "regexdev: fix section attribute of symbols" luca.boccassi
@ 2022-03-29 12:09 ` luca.boccassi
2022-03-29 14:11 ` Luca Boccassi
2022-03-29 14:20 ` Christian Ehrhardt
2022-03-29 14:07 ` [PATCH 20.11 1/2] Revert "regexdev: fix section attribute of symbols" Christian Ehrhardt
1 sibling, 2 replies; 9+ messages in thread
From: luca.boccassi @ 2022-03-29 12:09 UTC (permalink / raw)
To: stable; +Cc: christian.ehrhardt, ktraynor, Luca Boccassi
From: Luca Boccassi <bluca@debian.org>
../drivers/net/dpaa2/dpaa2_rxtx.c: In function ‘dpaa2_dev_rx’:
../drivers/net/dpaa2/dpaa2_rxtx.c:863:4: error: ‘priv’ undeclared (first use in this function); did you mean ‘ldiv’?
priv->rx_timestamp =
^~~~
ldiv
Bugzilla ID: 982
Fixes: 1d10966a22ca ("net/dpaa2: fix timestamping for IEEE1588")
Signed-off-by: Luca Boccassi <bluca@debian.org>
---
drivers/net/dpaa2/dpaa2_rxtx.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
index ecd004f9fa..23e193f86c 100644
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -772,6 +772,9 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
const struct qbman_fd *fd;
struct qbman_pull_desc pulldesc;
struct rte_eth_dev_data *eth_data = dpaa2_q->eth_data;
+#if defined(RTE_LIBRTE_IEEE1588)
+ struct dpaa2_dev_priv *priv = eth_data->dev_private;
+#endif
if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
ret = dpaa2_affine_qbman_swp();
--
2.34.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 20.11 2/2] dpaa2: fix build with RTE_LIBRTE_IEEE1588
2022-03-29 12:09 ` [PATCH 20.11 2/2] dpaa2: fix build with RTE_LIBRTE_IEEE1588 luca.boccassi
@ 2022-03-29 14:11 ` Luca Boccassi
2022-03-31 12:25 ` Luca Boccassi
2022-03-31 15:19 ` Hemant Agrawal
2022-03-29 14:20 ` Christian Ehrhardt
1 sibling, 2 replies; 9+ messages in thread
From: Luca Boccassi @ 2022-03-29 14:11 UTC (permalink / raw)
To: stable; +Cc: vanshika.shukla, Lingli Chen, Hemant Agrawal
On Tue, 2022-03-29 at 13:09 +0100, luca.boccassi@gmail.com wrote:
> From: Luca Boccassi <bluca@debian.org>
>
> ../drivers/net/dpaa2/dpaa2_rxtx.c: In function ‘dpaa2_dev_rx’:
> ../drivers/net/dpaa2/dpaa2_rxtx.c:863:4: error: ‘priv’ undeclared (first use in this function); did you mean ‘ldiv’?
> priv->rx_timestamp =
> ^~~~
> ldiv
>
> Bugzilla ID: 982
>
> Fixes: 1d10966a22ca ("net/dpaa2: fix timestamping for IEEE1588")
>
> Signed-off-by: Luca Boccassi <bluca@debian.org>
> ---
> drivers/net/dpaa2/dpaa2_rxtx.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
> index ecd004f9fa..23e193f86c 100644
> --- a/drivers/net/dpaa2/dpaa2_rxtx.c
> +++ b/drivers/net/dpaa2/dpaa2_rxtx.c
> @@ -772,6 +772,9 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
> const struct qbman_fd *fd;
> struct qbman_pull_desc pulldesc;
> struct rte_eth_dev_data *eth_data = dpaa2_q->eth_data;
> +#if defined(RTE_LIBRTE_IEEE1588)
> + struct dpaa2_dev_priv *priv = eth_data->dev_private;
> +#endif
>
>
> if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
> ret = dpaa2_affine_qbman_swp();
FYI Vanshika, Hemant and Lingli
--
Kind regards,
Luca Boccassi
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 20.11 2/2] dpaa2: fix build with RTE_LIBRTE_IEEE1588
2022-03-29 14:11 ` Luca Boccassi
@ 2022-03-31 12:25 ` Luca Boccassi
2022-04-01 5:29 ` [EXT] " Vanshika Shukla
2022-03-31 15:19 ` Hemant Agrawal
1 sibling, 1 reply; 9+ messages in thread
From: Luca Boccassi @ 2022-03-31 12:25 UTC (permalink / raw)
To: dpdk stable; +Cc: Vanshika Shukla, Lingli Chen, Hemant Agrawal
On Tue, 29 Mar 2022 at 15:11, Luca Boccassi <bluca@debian.org> wrote:
>
> On Tue, 2022-03-29 at 13:09 +0100, luca.boccassi@gmail.com wrote:
> > From: Luca Boccassi <bluca@debian.org>
> >
> > ../drivers/net/dpaa2/dpaa2_rxtx.c: In function ‘dpaa2_dev_rx’:
> > ../drivers/net/dpaa2/dpaa2_rxtx.c:863:4: error: ‘priv’ undeclared (first use in this function); did you mean ‘ldiv’?
> > priv->rx_timestamp =
> > ^~~~
> > ldiv
> >
> > Bugzilla ID: 982
> >
> > Fixes: 1d10966a22ca ("net/dpaa2: fix timestamping for IEEE1588")
> >
> > Signed-off-by: Luca Boccassi <bluca@debian.org>
> > ---
> > drivers/net/dpaa2/dpaa2_rxtx.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
> > index ecd004f9fa..23e193f86c 100644
> > --- a/drivers/net/dpaa2/dpaa2_rxtx.c
> > +++ b/drivers/net/dpaa2/dpaa2_rxtx.c
> > @@ -772,6 +772,9 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
> > const struct qbman_fd *fd;
> > struct qbman_pull_desc pulldesc;
> > struct rte_eth_dev_data *eth_data = dpaa2_q->eth_data;
> > +#if defined(RTE_LIBRTE_IEEE1588)
> > + struct dpaa2_dev_priv *priv = eth_data->dev_private;
> > +#endif
> >
> >
> > if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
> > ret = dpaa2_affine_qbman_swp();
>
> FYI Vanshika, Hemant and Lingli
Ping - this is a blocker for the 20.11.5 LTS release, would it be
possible to have a quick review from NXP?
Thanks!
^ permalink raw reply [flat|nested] 9+ messages in thread
* RE: [EXT] Re: [PATCH 20.11 2/2] dpaa2: fix build with RTE_LIBRTE_IEEE1588
2022-03-31 12:25 ` Luca Boccassi
@ 2022-04-01 5:29 ` Vanshika Shukla
2022-04-01 7:19 ` Christian Ehrhardt
0 siblings, 1 reply; 9+ messages in thread
From: Vanshika Shukla @ 2022-04-01 5:29 UTC (permalink / raw)
To: Luca Boccassi, dpdk stable
Cc: Lingli Chen, Hemant Agrawal, Rajan Gupta, Nipun Gupta
Hi,
I have reviewed the issue. 4690a6114ff6993afc5c005fc340af0b1e4dbe94 commit (https://github.com/DPDK/dpdk/commit/4690a6114ff6993afc5c005fc340af0b1e4dbe94) which is a new feature that is not required to be backported on the stable branch declares the variable that is causing issue here. I have a patch ready to fix this issue. Please confirm if I can submit the patch on stable@dpdk.org mailing list?
Regards,
Vanshika
-----Original Message-----
From: Luca Boccassi <bluca@debian.org>
Sent: Thursday, 31 March 2022 5:56 pm
To: dpdk stable <stable@dpdk.org>
Cc: Vanshika Shukla <vanshika.shukla@nxp.com>; Lingli Chen <linglix.chen@intel.com>; Hemant Agrawal <hemant.agrawal@nxp.com>
Subject: [EXT] Re: [PATCH 20.11 2/2] dpaa2: fix build with RTE_LIBRTE_IEEE1588
Caution: EXT Email
On Tue, 29 Mar 2022 at 15:11, Luca Boccassi <bluca@debian.org> wrote:
>
> On Tue, 2022-03-29 at 13:09 +0100, luca.boccassi@gmail.com wrote:
> > From: Luca Boccassi <bluca@debian.org>
> >
> > ../drivers/net/dpaa2/dpaa2_rxtx.c: In function ‘dpaa2_dev_rx’:
> > ../drivers/net/dpaa2/dpaa2_rxtx.c:863:4: error: ‘priv’ undeclared (first use in this function); did you mean ‘ldiv’?
> > priv->rx_timestamp =
> > ^~~~
> > ldiv
> >
> > Bugzilla ID: 982
> >
> > Fixes: 1d10966a22ca ("net/dpaa2: fix timestamping for IEEE1588")
> >
> > Signed-off-by: Luca Boccassi <bluca@debian.org>
> > ---
> > drivers/net/dpaa2/dpaa2_rxtx.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c
> > b/drivers/net/dpaa2/dpaa2_rxtx.c index ecd004f9fa..23e193f86c 100644
> > --- a/drivers/net/dpaa2/dpaa2_rxtx.c
> > +++ b/drivers/net/dpaa2/dpaa2_rxtx.c
> > @@ -772,6 +772,9 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
> > const struct qbman_fd *fd;
> > struct qbman_pull_desc pulldesc;
> > struct rte_eth_dev_data *eth_data = dpaa2_q->eth_data;
> > +#if defined(RTE_LIBRTE_IEEE1588)
> > + struct dpaa2_dev_priv *priv = eth_data->dev_private; #endif
> >
> >
> > if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
> > ret = dpaa2_affine_qbman_swp();
>
> FYI Vanshika, Hemant and Lingli
Ping - this is a blocker for the 20.11.5 LTS release, would it be possible to have a quick review from NXP?
Thanks!
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [EXT] Re: [PATCH 20.11 2/2] dpaa2: fix build with RTE_LIBRTE_IEEE1588
2022-04-01 5:29 ` [EXT] " Vanshika Shukla
@ 2022-04-01 7:19 ` Christian Ehrhardt
0 siblings, 0 replies; 9+ messages in thread
From: Christian Ehrhardt @ 2022-04-01 7:19 UTC (permalink / raw)
To: Vanshika Shukla
Cc: Luca Boccassi, dpdk stable, Lingli Chen, Hemant Agrawal,
Rajan Gupta, Nipun Gupta
[-- Attachment #1: Type: text/plain, Size: 3424 bytes --]
On Fri, Apr 1, 2022 at 7:29 AM Vanshika Shukla <vanshika.shukla@nxp.com>
wrote:
> Hi,
> I have reviewed the issue. 4690a6114ff6993afc5c005fc340af0b1e4dbe94 commit
> (
> https://github.com/DPDK/dpdk/commit/4690a6114ff6993afc5c005fc340af0b1e4dbe94)
> which is a new feature that is not required to be backported on the stable
> branch declares the variable that is causing issue here. I have a patch
> ready to fix this issue. Please confirm if I can submit the patch on
> stable@dpdk.org mailing list?
>
Yes you can send it there, here a copy&paste from our call for backports
about the preferred style.
A backport should contain a reference to the DPDK main branch commit
in it's commit message in the following fashion:
[ upstream commit <commit's dpdk main branch SHA-1 checksum> ]
For example:
https://git.dpdk.org/dpdk-stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3811ff9f26aec7f3c06eb
When sending the backported patch, please indicate the target branch in
the
subject line, as we have multiple branches, for example:
[PATCH 20.11] foo/bar: fix baz
With git format-patch, this can be achieved by appending the parameter:
--subject-prefix='PATCH 20.11'
Keeping Luca on CC when submitting the patch will also help.
Regards,
> Vanshika
>
> -----Original Message-----
> From: Luca Boccassi <bluca@debian.org>
> Sent: Thursday, 31 March 2022 5:56 pm
> To: dpdk stable <stable@dpdk.org>
> Cc: Vanshika Shukla <vanshika.shukla@nxp.com>; Lingli Chen <
> linglix.chen@intel.com>; Hemant Agrawal <hemant.agrawal@nxp.com>
> Subject: [EXT] Re: [PATCH 20.11 2/2] dpaa2: fix build with
> RTE_LIBRTE_IEEE1588
>
> Caution: EXT Email
>
> On Tue, 29 Mar 2022 at 15:11, Luca Boccassi <bluca@debian.org> wrote:
> >
> > On Tue, 2022-03-29 at 13:09 +0100, luca.boccassi@gmail.com wrote:
> > > From: Luca Boccassi <bluca@debian.org>
> > >
> > > ../drivers/net/dpaa2/dpaa2_rxtx.c: In function ‘dpaa2_dev_rx’:
> > > ../drivers/net/dpaa2/dpaa2_rxtx.c:863:4: error: ‘priv’ undeclared
> (first use in this function); did you mean ‘ldiv’?
> > > priv->rx_timestamp =
> > > ^~~~
> > > ldiv
> > >
> > > Bugzilla ID: 982
> > >
> > > Fixes: 1d10966a22ca ("net/dpaa2: fix timestamping for IEEE1588")
> > >
> > > Signed-off-by: Luca Boccassi <bluca@debian.org>
> > > ---
> > > drivers/net/dpaa2/dpaa2_rxtx.c | 3 +++
> > > 1 file changed, 3 insertions(+)
> > >
> > > diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c
> > > b/drivers/net/dpaa2/dpaa2_rxtx.c index ecd004f9fa..23e193f86c 100644
> > > --- a/drivers/net/dpaa2/dpaa2_rxtx.c
> > > +++ b/drivers/net/dpaa2/dpaa2_rxtx.c
> > > @@ -772,6 +772,9 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs,
> uint16_t nb_pkts)
> > > const struct qbman_fd *fd;
> > > struct qbman_pull_desc pulldesc;
> > > struct rte_eth_dev_data *eth_data = dpaa2_q->eth_data;
> > > +#if defined(RTE_LIBRTE_IEEE1588)
> > > + struct dpaa2_dev_priv *priv = eth_data->dev_private; #endif
> > >
> > >
> > > if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
> > > ret = dpaa2_affine_qbman_swp();
> >
> > FYI Vanshika, Hemant and Lingli
>
> Ping - this is a blocker for the 20.11.5 LTS release, would it be possible
> to have a quick review from NXP?
>
> Thanks!
>
--
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd
[-- Attachment #2: Type: text/html, Size: 5961 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* RE: [PATCH 20.11 2/2] dpaa2: fix build with RTE_LIBRTE_IEEE1588
2022-03-29 14:11 ` Luca Boccassi
2022-03-31 12:25 ` Luca Boccassi
@ 2022-03-31 15:19 ` Hemant Agrawal
1 sibling, 0 replies; 9+ messages in thread
From: Hemant Agrawal @ 2022-03-31 15:19 UTC (permalink / raw)
To: Luca Boccassi, stable; +Cc: Vanshika Shukla, Lingli Chen
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> -----Original Message-----
> From: Luca Boccassi <bluca@debian.org>
> Sent: Tuesday, March 29, 2022 7:42 PM
> To: stable@dpdk.org
> Cc: Vanshika Shukla <vanshika.shukla@nxp.com>; Lingli Chen
> <linglix.chen@intel.com>; Hemant Agrawal <hemant.agrawal@nxp.com>
> Subject: Re: [PATCH 20.11 2/2] dpaa2: fix build with RTE_LIBRTE_IEEE1588
>
> On Tue, 2022-03-29 at 13:09 +0100, luca.boccassi@gmail.com wrote:
> > From: Luca Boccassi <bluca@debian.org>
> >
> > ../drivers/net/dpaa2/dpaa2_rxtx.c: In function ‘dpaa2_dev_rx’:
> > ../drivers/net/dpaa2/dpaa2_rxtx.c:863:4: error: ‘priv’ undeclared (first use
> in this function); did you mean ‘ldiv’?
> > priv->rx_timestamp =
> > ^~~~
> > ldiv
> >
> > Bugzilla ID: 982
> >
> > Fixes: 1d10966a22ca ("net/dpaa2: fix timestamping for IEEE1588")
> >
> > Signed-off-by: Luca Boccassi <bluca@debian.org>
> > ---
> > drivers/net/dpaa2/dpaa2_rxtx.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c
> > b/drivers/net/dpaa2/dpaa2_rxtx.c index ecd004f9fa..23e193f86c 100644
> > --- a/drivers/net/dpaa2/dpaa2_rxtx.c
> > +++ b/drivers/net/dpaa2/dpaa2_rxtx.c
> > @@ -772,6 +772,9 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs,
> uint16_t nb_pkts)
> > const struct qbman_fd *fd;
> > struct qbman_pull_desc pulldesc;
> > struct rte_eth_dev_data *eth_data = dpaa2_q->eth_data;
> > +#if defined(RTE_LIBRTE_IEEE1588)
> > + struct dpaa2_dev_priv *priv = eth_data->dev_private; #endif
> >
> >
> > if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
> > ret = dpaa2_affine_qbman_swp();
>
> FYI Vanshika, Hemant and Lingli
>
> --
> Kind regards,
> Luca Boccassi
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 20.11 2/2] dpaa2: fix build with RTE_LIBRTE_IEEE1588
2022-03-29 12:09 ` [PATCH 20.11 2/2] dpaa2: fix build with RTE_LIBRTE_IEEE1588 luca.boccassi
2022-03-29 14:11 ` Luca Boccassi
@ 2022-03-29 14:20 ` Christian Ehrhardt
1 sibling, 0 replies; 9+ messages in thread
From: Christian Ehrhardt @ 2022-03-29 14:20 UTC (permalink / raw)
To: luca.boccassi; +Cc: stable, ktraynor, Luca Boccassi
On Tue, Mar 29, 2022 at 2:10 PM <luca.boccassi@gmail.com> wrote:
>
> From: Luca Boccassi <bluca@debian.org>
>
> ../drivers/net/dpaa2/dpaa2_rxtx.c: In function ‘dpaa2_dev_rx’:
> ../drivers/net/dpaa2/dpaa2_rxtx.c:863:4: error: ‘priv’ undeclared (first use in this function); did you mean ‘ldiv’?
> priv->rx_timestamp =
> ^~~~
> ldiv
>
> Bugzilla ID: 982
>
> Fixes: 1d10966a22ca ("net/dpaa2: fix timestamping for IEEE1588")
>
> Signed-off-by: Luca Boccassi <bluca@debian.org>
It was unclear at first why it needs the if defined, thanks for the
IRC discussion.
While not nice I think it makes sense as a build-fix.
+1, but since I'm not a subject matter expert I'm holding back an
official signed-off for this.
> ---
> drivers/net/dpaa2/dpaa2_rxtx.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
> index ecd004f9fa..23e193f86c 100644
> --- a/drivers/net/dpaa2/dpaa2_rxtx.c
> +++ b/drivers/net/dpaa2/dpaa2_rxtx.c
> @@ -772,6 +772,9 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
> const struct qbman_fd *fd;
> struct qbman_pull_desc pulldesc;
> struct rte_eth_dev_data *eth_data = dpaa2_q->eth_data;
> +#if defined(RTE_LIBRTE_IEEE1588)
> + struct dpaa2_dev_priv *priv = eth_data->dev_private;
> +#endif
>
> if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
> ret = dpaa2_affine_qbman_swp();
> --
> 2.34.1
>
--
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 20.11 1/2] Revert "regexdev: fix section attribute of symbols"
2022-03-29 12:09 [PATCH 20.11 1/2] Revert "regexdev: fix section attribute of symbols" luca.boccassi
2022-03-29 12:09 ` [PATCH 20.11 2/2] dpaa2: fix build with RTE_LIBRTE_IEEE1588 luca.boccassi
@ 2022-03-29 14:07 ` Christian Ehrhardt
1 sibling, 0 replies; 9+ messages in thread
From: Christian Ehrhardt @ 2022-03-29 14:07 UTC (permalink / raw)
To: luca.boccassi; +Cc: stable, ktraynor, Luca Boccassi
On Tue, Mar 29, 2022 at 2:10 PM <luca.boccassi@gmail.com> wrote:
>
> From: Luca Boccassi <bluca@debian.org>
>
> Causes symbols changes, so it's not appropriate for 20.11.
>
> This reverts commit 64452c878f225c147dfb7156e605f5b55da9f7c0.
Yeah this is what i suggested.
I already test with that, working.
+1
Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> Signed-off-by: Luca Boccassi <bluca@debian.org>
> ---
> devtools/libabigail.abignore | 4 ----
> lib/librte_regexdev/rte_regexdev.h | 4 ----
> lib/librte_regexdev/rte_regexdev_driver.h | 3 ---
> lib/librte_regexdev/version.map | 9 ---------
> 4 files changed, 20 deletions(-)
>
> diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore
> index 1414cdfba9..025f2c01bc 100644
> --- a/devtools/libabigail.abignore
> +++ b/devtools/libabigail.abignore
> @@ -7,7 +7,3 @@
> symbol_version = INTERNAL
> [suppress_variable]
> symbol_version = INTERNAL
> -
> -; Ignore section attribute fixes in experimental regexdev library
> -[suppress_file]
> - soname_regexp = ^librte_regexdev\.
> diff --git a/lib/librte_regexdev/rte_regexdev.h b/lib/librte_regexdev/rte_regexdev.h
> index 09d1718da9..df2312678c 100644
> --- a/lib/librte_regexdev/rte_regexdev.h
> +++ b/lib/librte_regexdev/rte_regexdev.h
> @@ -228,9 +228,6 @@ extern int rte_regexdev_logtype;
> } while (0)
>
> /**
> - * @warning
> - * @b EXPERIMENTAL: this API may change without prior notice.
> - *
> * Check if dev_id is ready.
> *
> * @param dev_id
> @@ -240,7 +237,6 @@ extern int rte_regexdev_logtype;
> * - 0 if device state is not in ready state.
> * - 1 if device state is ready state.
> */
> -__rte_experimental
> int rte_regexdev_is_valid_dev(uint16_t dev_id);
>
> /**
> diff --git a/lib/librte_regexdev/rte_regexdev_driver.h b/lib/librte_regexdev/rte_regexdev_driver.h
> index 6246b144a6..64742016c0 100644
> --- a/lib/librte_regexdev/rte_regexdev_driver.h
> +++ b/lib/librte_regexdev/rte_regexdev_driver.h
> @@ -32,7 +32,6 @@ extern "C" {
> * A pointer to the RegEx device slot case of success,
> * NULL otherwise.
> */
> -__rte_internal
> struct rte_regexdev *rte_regexdev_register(const char *name);
>
> /**
> @@ -42,7 +41,6 @@ struct rte_regexdev *rte_regexdev_register(const char *name);
> * @param dev
> * Device to be released.
> */
> -__rte_internal
> void rte_regexdev_unregister(struct rte_regexdev *dev);
>
> /**
> @@ -52,7 +50,6 @@ void rte_regexdev_unregister(struct rte_regexdev *dev);
> * @param name
> * The device name.
> */
> -__rte_internal
> struct rte_regexdev *rte_regexdev_get_device_by_name(const char *name);
>
> #ifdef __cplusplus
> diff --git a/lib/librte_regexdev/version.map b/lib/librte_regexdev/version.map
> index 988b909638..8db9b17018 100644
> --- a/lib/librte_regexdev/version.map
> +++ b/lib/librte_regexdev/version.map
> @@ -1,7 +1,6 @@
> EXPERIMENTAL {
> global:
>
> - rte_regex_devices;
> rte_regexdev_attr_get;
> rte_regexdev_attr_set;
> rte_regexdev_close;
> @@ -12,8 +11,6 @@ EXPERIMENTAL {
> rte_regexdev_enqueue_burst;
> rte_regexdev_get_dev_id;
> rte_regexdev_info_get;
> - rte_regexdev_is_valid_dev;
> - rte_regexdev_logtype;
> rte_regexdev_queue_pair_setup;
> rte_regexdev_rule_db_compile_activate;
> rte_regexdev_rule_db_export;
> @@ -27,9 +24,3 @@ EXPERIMENTAL {
> rte_regexdev_xstats_names_get;
> rte_regexdev_xstats_reset;
> };
> -
> -INTERNAL {
> - rte_regexdev_get_device_by_name;
> - rte_regexdev_register;
> - rte_regexdev_unregister;
> -};
> --
> 2.34.1
>
--
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-04-01 7:20 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-29 12:09 [PATCH 20.11 1/2] Revert "regexdev: fix section attribute of symbols" luca.boccassi
2022-03-29 12:09 ` [PATCH 20.11 2/2] dpaa2: fix build with RTE_LIBRTE_IEEE1588 luca.boccassi
2022-03-29 14:11 ` Luca Boccassi
2022-03-31 12:25 ` Luca Boccassi
2022-04-01 5:29 ` [EXT] " Vanshika Shukla
2022-04-01 7:19 ` Christian Ehrhardt
2022-03-31 15:19 ` Hemant Agrawal
2022-03-29 14:20 ` Christian Ehrhardt
2022-03-29 14:07 ` [PATCH 20.11 1/2] Revert "regexdev: fix section attribute of symbols" Christian Ehrhardt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).