[v8,05/13] net/dpaa: move internal symbols into INTERNAL section

Message ID 20200515094752.28490-6-hemant.agrawal@nxp.com
State New
Headers show
Series
  • NXP DPAAx: move internal symbols to INTERNAL
Related show

Commit Message

Hemant Agrawal May 15, 2020, 9:47 a.m.
This patch moves the internal symbols to INTERNAL sections
so that any change in them is not reported as ABI breakage.

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>

---
 devtools/libabigail.abignore              | 2 ++
 drivers/net/dpaa/dpaa_ethdev.h            | 2 ++
 drivers/net/dpaa/rte_pmd_dpaa_version.map | 9 +++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

-- 
2.17.1

Comments

Ray Kinsella May 19, 2020, 11:14 a.m. | #1
On 15/05/2020 10:47, Hemant Agrawal wrote:
> This patch moves the internal symbols to INTERNAL sections

> so that any change in them is not reported as ABI breakage.

> 

> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>

> ---

>  devtools/libabigail.abignore              | 2 ++

>  drivers/net/dpaa/dpaa_ethdev.h            | 2 ++

>  drivers/net/dpaa/rte_pmd_dpaa_version.map | 9 +++++++--

>  3 files changed, 11 insertions(+), 2 deletions(-)

> 

> diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore

> index 42f9469221..7b6358c394 100644

> --- a/devtools/libabigail.abignore

> +++ b/devtools/libabigail.abignore

> @@ -63,3 +63,5 @@

>  	name_regexp = ^rte_dpaa_bpid_info

>  [suppress_variable]

>  	name_regexp = ^rte_dpaa2_bpid_info

> +[suppress_function]

> +        name_regexp = ^dpaa


This rule ends up being very general 
Could we do something more specific like ... 

^dpaa_\.attach

it should catch

dpaa_eth_eventq_attach;
dpaa_eth_eventq_detach;
dpaa2_eth_eventq_attach;
dpaa2_eth_eventq_detach;

which is I think, what you are after.

> diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h

> index af9fc2105d..7393a9df05 100644

> --- a/drivers/net/dpaa/dpaa_ethdev.h

> +++ b/drivers/net/dpaa/dpaa_ethdev.h

> @@ -160,12 +160,14 @@ struct dpaa_if_stats {

>  	uint64_t tund;		/**<Tx Undersized */

>  };

>  

> +__rte_internal

>  int

>  dpaa_eth_eventq_attach(const struct rte_eth_dev *dev,

>  		int eth_rx_queue_id,

>  		u16 ch_id,

>  		const struct rte_event_eth_rx_adapter_queue_conf *queue_conf);

>  

> +__rte_internal

>  int

>  dpaa_eth_eventq_detach(const struct rte_eth_dev *dev,

>  			   int eth_rx_queue_id);

> diff --git a/drivers/net/dpaa/rte_pmd_dpaa_version.map b/drivers/net/dpaa/rte_pmd_dpaa_version.map

> index f403a1526d..774aa0de45 100644

> --- a/drivers/net/dpaa/rte_pmd_dpaa_version.map

> +++ b/drivers/net/dpaa/rte_pmd_dpaa_version.map

> @@ -1,9 +1,14 @@

>  DPDK_20.0 {

>  	global:

>  

> -	dpaa_eth_eventq_attach;

> -	dpaa_eth_eventq_detach;

>  	rte_pmd_dpaa_set_tx_loopback;

>  

>  	local: *;

>  };

> +

> +INTERNAL {

> +	global:

> +

> +	dpaa_eth_eventq_attach;

> +	dpaa_eth_eventq_detach;

> +};

>
Hemant Agrawal May 19, 2020, 11:39 a.m. | #2
Hi Ray,

> On 15/05/2020 10:47, Hemant Agrawal wrote:

> > This patch moves the internal symbols to INTERNAL sections so that any

> > change in them is not reported as ABI breakage.

> >

> > Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>

> > ---

> >  devtools/libabigail.abignore              | 2 ++

> >  drivers/net/dpaa/dpaa_ethdev.h            | 2 ++

> >  drivers/net/dpaa/rte_pmd_dpaa_version.map | 9 +++++++--

> >  3 files changed, 11 insertions(+), 2 deletions(-)

> >

> > diff --git a/devtools/libabigail.abignore

> > b/devtools/libabigail.abignore index 42f9469221..7b6358c394 100644

> > --- a/devtools/libabigail.abignore

> > +++ b/devtools/libabigail.abignore

> > @@ -63,3 +63,5 @@

> >  	name_regexp = ^rte_dpaa_bpid_info

> >  [suppress_variable]

> >  	name_regexp = ^rte_dpaa2_bpid_info

> > +[suppress_function]

> > +        name_regexp = ^dpaa

> 

> This rule ends up being very general

> Could we do something more specific like ...

> 

> ^dpaa_\.attach


[Hemant]  I am not sure, how much time I have to check and test again before David closes RC3
- while I am working on experimenting these.
These are not serious issues. dpaa is always internal for the libraries. No symbol with starting with dpaa name is exposed to libraries.
This change will anyway go away in 20.11. 


> 

> it should catch

> 

> dpaa_eth_eventq_attach;

> dpaa_eth_eventq_detach;

> dpaa2_eth_eventq_attach;

> dpaa2_eth_eventq_detach;

> 

> which is I think, what you are after.

> 

> > diff --git a/drivers/net/dpaa/dpaa_ethdev.h

> > b/drivers/net/dpaa/dpaa_ethdev.h index af9fc2105d..7393a9df05 100644

> > --- a/drivers/net/dpaa/dpaa_ethdev.h

> > +++ b/drivers/net/dpaa/dpaa_ethdev.h

> > @@ -160,12 +160,14 @@ struct dpaa_if_stats {

> >  	uint64_t tund;		/**<Tx Undersized */

> >  };

> >

> > +__rte_internal

> >  int

> >  dpaa_eth_eventq_attach(const struct rte_eth_dev *dev,

> >  		int eth_rx_queue_id,

> >  		u16 ch_id,

> >  		const struct rte_event_eth_rx_adapter_queue_conf

> *queue_conf);

> >

> > +__rte_internal

> >  int

> >  dpaa_eth_eventq_detach(const struct rte_eth_dev *dev,

> >  			   int eth_rx_queue_id);

> > diff --git a/drivers/net/dpaa/rte_pmd_dpaa_version.map

> > b/drivers/net/dpaa/rte_pmd_dpaa_version.map

> > index f403a1526d..774aa0de45 100644

> > --- a/drivers/net/dpaa/rte_pmd_dpaa_version.map

> > +++ b/drivers/net/dpaa/rte_pmd_dpaa_version.map

> > @@ -1,9 +1,14 @@

> >  DPDK_20.0 {

> >  	global:

> >

> > -	dpaa_eth_eventq_attach;

> > -	dpaa_eth_eventq_detach;

> >  	rte_pmd_dpaa_set_tx_loopback;

> >

> >  	local: *;

> >  };

> > +

> > +INTERNAL {

> > +	global:

> > +

> > +	dpaa_eth_eventq_attach;

> > +	dpaa_eth_eventq_detach;

> > +};

> >
Ray Kinsella May 19, 2020, 11:41 a.m. | #3
On 19/05/2020 12:39, Hemant Agrawal wrote:
> Hi Ray,

> 

>> On 15/05/2020 10:47, Hemant Agrawal wrote:

>>> This patch moves the internal symbols to INTERNAL sections so that any

>>> change in them is not reported as ABI breakage.

>>>

>>> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>

>>> ---

>>>  devtools/libabigail.abignore              | 2 ++

>>>  drivers/net/dpaa/dpaa_ethdev.h            | 2 ++

>>>  drivers/net/dpaa/rte_pmd_dpaa_version.map | 9 +++++++--

>>>  3 files changed, 11 insertions(+), 2 deletions(-)

>>>

>>> diff --git a/devtools/libabigail.abignore

>>> b/devtools/libabigail.abignore index 42f9469221..7b6358c394 100644

>>> --- a/devtools/libabigail.abignore

>>> +++ b/devtools/libabigail.abignore

>>> @@ -63,3 +63,5 @@

>>>  	name_regexp = ^rte_dpaa_bpid_info

>>>  [suppress_variable]

>>>  	name_regexp = ^rte_dpaa2_bpid_info

>>> +[suppress_function]

>>> +        name_regexp = ^dpaa

>>

>> This rule ends up being very general

>> Could we do something more specific like ...

>>

>> ^dpaa_\.attach

> 

> [Hemant]  I am not sure, how much time I have to check and test again before David closes RC3

> - while I am working on experimenting these.

> These are not serious issues. dpaa is always internal for the libraries. No symbol with starting with dpaa name is exposed to libraries.

> This change will anyway go away in 20.11. 

>


if dpaa is always general - I can live with a general rule.

> 

>>

>> it should catch

>>

>> dpaa_eth_eventq_attach;

>> dpaa_eth_eventq_detach;

>> dpaa2_eth_eventq_attach;

>> dpaa2_eth_eventq_detach;

>>

>> which is I think, what you are after.

>>

>>> diff --git a/drivers/net/dpaa/dpaa_ethdev.h

>>> b/drivers/net/dpaa/dpaa_ethdev.h index af9fc2105d..7393a9df05 100644

>>> --- a/drivers/net/dpaa/dpaa_ethdev.h

>>> +++ b/drivers/net/dpaa/dpaa_ethdev.h

>>> @@ -160,12 +160,14 @@ struct dpaa_if_stats {

>>>  	uint64_t tund;		/**<Tx Undersized */

>>>  };

>>>

>>> +__rte_internal

>>>  int

>>>  dpaa_eth_eventq_attach(const struct rte_eth_dev *dev,

>>>  		int eth_rx_queue_id,

>>>  		u16 ch_id,

>>>  		const struct rte_event_eth_rx_adapter_queue_conf

>> *queue_conf);

>>>

>>> +__rte_internal

>>>  int

>>>  dpaa_eth_eventq_detach(const struct rte_eth_dev *dev,

>>>  			   int eth_rx_queue_id);

>>> diff --git a/drivers/net/dpaa/rte_pmd_dpaa_version.map

>>> b/drivers/net/dpaa/rte_pmd_dpaa_version.map

>>> index f403a1526d..774aa0de45 100644

>>> --- a/drivers/net/dpaa/rte_pmd_dpaa_version.map

>>> +++ b/drivers/net/dpaa/rte_pmd_dpaa_version.map

>>> @@ -1,9 +1,14 @@

>>>  DPDK_20.0 {

>>>  	global:

>>>

>>> -	dpaa_eth_eventq_attach;

>>> -	dpaa_eth_eventq_detach;

>>>  	rte_pmd_dpaa_set_tx_loopback;

>>>

>>>  	local: *;

>>>  };

>>> +

>>> +INTERNAL {

>>> +	global:

>>> +

>>> +	dpaa_eth_eventq_attach;

>>> +	dpaa_eth_eventq_detach;

>>> +};

>>>

Patch

diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore
index 42f9469221..7b6358c394 100644
--- a/devtools/libabigail.abignore
+++ b/devtools/libabigail.abignore
@@ -63,3 +63,5 @@ 
 	name_regexp = ^rte_dpaa_bpid_info
 [suppress_variable]
 	name_regexp = ^rte_dpaa2_bpid_info
+[suppress_function]
+        name_regexp = ^dpaa
diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h
index af9fc2105d..7393a9df05 100644
--- a/drivers/net/dpaa/dpaa_ethdev.h
+++ b/drivers/net/dpaa/dpaa_ethdev.h
@@ -160,12 +160,14 @@  struct dpaa_if_stats {
 	uint64_t tund;		/**<Tx Undersized */
 };
 
+__rte_internal
 int
 dpaa_eth_eventq_attach(const struct rte_eth_dev *dev,
 		int eth_rx_queue_id,
 		u16 ch_id,
 		const struct rte_event_eth_rx_adapter_queue_conf *queue_conf);
 
+__rte_internal
 int
 dpaa_eth_eventq_detach(const struct rte_eth_dev *dev,
 			   int eth_rx_queue_id);
diff --git a/drivers/net/dpaa/rte_pmd_dpaa_version.map b/drivers/net/dpaa/rte_pmd_dpaa_version.map
index f403a1526d..774aa0de45 100644
--- a/drivers/net/dpaa/rte_pmd_dpaa_version.map
+++ b/drivers/net/dpaa/rte_pmd_dpaa_version.map
@@ -1,9 +1,14 @@ 
 DPDK_20.0 {
 	global:
 
-	dpaa_eth_eventq_attach;
-	dpaa_eth_eventq_detach;
 	rte_pmd_dpaa_set_tx_loopback;
 
 	local: *;
 };
+
+INTERNAL {
+	global:
+
+	dpaa_eth_eventq_attach;
+	dpaa_eth_eventq_detach;
+};