* [dpdk-dev] [PATCH] bpf: rename bpf_validate() to rte_bpf_validate() to avoid collisions
@ 2019-04-10 19:23 David Christensen
2019-04-10 19:23 ` David Christensen
2019-04-10 21:43 ` Ananyev, Konstantin
0 siblings, 2 replies; 4+ messages in thread
From: David Christensen @ 2019-04-10 19:23 UTC (permalink / raw)
To: konstantin.ananyev; +Cc: dev, radhika.chirra, David Christensen, stable
When using libpcap libraries the error "multiple definition of
'bpf_validate'" is observed. Rename the DPDK version to rte_bpf_validate
to be more consistenet with other DPDK defined functions.
Cc: stable@dpdk.org
Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
Tested-by: Radhika Chirra <radhika.chirra@ibm.com>
---
lib/librte_bpf/bpf_impl.h | 2 +-
lib/librte_bpf/bpf_load.c | 2 +-
lib/librte_bpf/bpf_validate.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/librte_bpf/bpf_impl.h b/lib/librte_bpf/bpf_impl.h
index b577e2c..f1d6f9a 100644
--- a/lib/librte_bpf/bpf_impl.h
+++ b/lib/librte_bpf/bpf_impl.h
@@ -21,7 +21,7 @@ struct rte_bpf {
uint32_t stack_sz;
};
-extern int bpf_validate(struct rte_bpf *bpf);
+extern int rte_bpf_validate(struct rte_bpf *bpf);
extern int bpf_jit(struct rte_bpf *bpf);
diff --git a/lib/librte_bpf/bpf_load.c b/lib/librte_bpf/bpf_load.c
index d9d163b..bd9eebf 100644
--- a/lib/librte_bpf/bpf_load.c
+++ b/lib/librte_bpf/bpf_load.c
@@ -115,7 +115,7 @@
return NULL;
}
- rc = bpf_validate(bpf);
+ rc = rte_bpf_validate(bpf);
if (rc == 0) {
bpf_jit(bpf);
if (mprotect(bpf, bpf->sz, PROT_READ) != 0)
diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c
index 83983ef..12c34f0 100644
--- a/lib/librte_bpf/bpf_validate.c
+++ b/lib/librte_bpf/bpf_validate.c
@@ -2209,7 +2209,7 @@ struct bpf_ins_check {
}
int
-bpf_validate(struct rte_bpf *bpf)
+rte_bpf_validate(struct rte_bpf *bpf)
{
int32_t rc;
struct bpf_verifier bvf;
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [dpdk-dev] [PATCH] bpf: rename bpf_validate() to rte_bpf_validate() to avoid collisions
2019-04-10 19:23 [dpdk-dev] [PATCH] bpf: rename bpf_validate() to rte_bpf_validate() to avoid collisions David Christensen
@ 2019-04-10 19:23 ` David Christensen
2019-04-10 21:43 ` Ananyev, Konstantin
1 sibling, 0 replies; 4+ messages in thread
From: David Christensen @ 2019-04-10 19:23 UTC (permalink / raw)
To: konstantin.ananyev; +Cc: dev, radhika.chirra, David Christensen, stable
When using libpcap libraries the error "multiple definition of
'bpf_validate'" is observed. Rename the DPDK version to rte_bpf_validate
to be more consistenet with other DPDK defined functions.
Cc: stable@dpdk.org
Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
Tested-by: Radhika Chirra <radhika.chirra@ibm.com>
---
lib/librte_bpf/bpf_impl.h | 2 +-
lib/librte_bpf/bpf_load.c | 2 +-
lib/librte_bpf/bpf_validate.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/librte_bpf/bpf_impl.h b/lib/librte_bpf/bpf_impl.h
index b577e2c..f1d6f9a 100644
--- a/lib/librte_bpf/bpf_impl.h
+++ b/lib/librte_bpf/bpf_impl.h
@@ -21,7 +21,7 @@ struct rte_bpf {
uint32_t stack_sz;
};
-extern int bpf_validate(struct rte_bpf *bpf);
+extern int rte_bpf_validate(struct rte_bpf *bpf);
extern int bpf_jit(struct rte_bpf *bpf);
diff --git a/lib/librte_bpf/bpf_load.c b/lib/librte_bpf/bpf_load.c
index d9d163b..bd9eebf 100644
--- a/lib/librte_bpf/bpf_load.c
+++ b/lib/librte_bpf/bpf_load.c
@@ -115,7 +115,7 @@
return NULL;
}
- rc = bpf_validate(bpf);
+ rc = rte_bpf_validate(bpf);
if (rc == 0) {
bpf_jit(bpf);
if (mprotect(bpf, bpf->sz, PROT_READ) != 0)
diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c
index 83983ef..12c34f0 100644
--- a/lib/librte_bpf/bpf_validate.c
+++ b/lib/librte_bpf/bpf_validate.c
@@ -2209,7 +2209,7 @@ struct bpf_ins_check {
}
int
-bpf_validate(struct rte_bpf *bpf)
+rte_bpf_validate(struct rte_bpf *bpf)
{
int32_t rc;
struct bpf_verifier bvf;
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [dpdk-dev] [PATCH] bpf: rename bpf_validate() to rte_bpf_validate() to avoid collisions
2019-04-10 19:23 [dpdk-dev] [PATCH] bpf: rename bpf_validate() to rte_bpf_validate() to avoid collisions David Christensen
2019-04-10 19:23 ` David Christensen
@ 2019-04-10 21:43 ` Ananyev, Konstantin
2019-04-10 21:43 ` Ananyev, Konstantin
1 sibling, 1 reply; 4+ messages in thread
From: Ananyev, Konstantin @ 2019-04-10 21:43 UTC (permalink / raw)
To: David Christensen; +Cc: dev, radhika.chirra, stable
>
> When using libpcap libraries the error "multiple definition of
> 'bpf_validate'" is observed. Rename the DPDK version to rte_bpf_validate
> to be more consistenet with other DPDK defined functions.
As I already ask Vivian, before we proceed any further with that patch
could you provide some simple test-case to reproduce the problem?
bpf_validate() function is not exposed as external API,
so no need for rte_ prefix in general.
Konstantin
>
> Cc: stable@dpdk.org
>
> Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
> Tested-by: Radhika Chirra <radhika.chirra@ibm.com>
> ---
> lib/librte_bpf/bpf_impl.h | 2 +-
> lib/librte_bpf/bpf_load.c | 2 +-
> lib/librte_bpf/bpf_validate.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/lib/librte_bpf/bpf_impl.h b/lib/librte_bpf/bpf_impl.h
> index b577e2c..f1d6f9a 100644
> --- a/lib/librte_bpf/bpf_impl.h
> +++ b/lib/librte_bpf/bpf_impl.h
> @@ -21,7 +21,7 @@ struct rte_bpf {
> uint32_t stack_sz;
> };
>
> -extern int bpf_validate(struct rte_bpf *bpf);
> +extern int rte_bpf_validate(struct rte_bpf *bpf);
>
> extern int bpf_jit(struct rte_bpf *bpf);
>
> diff --git a/lib/librte_bpf/bpf_load.c b/lib/librte_bpf/bpf_load.c
> index d9d163b..bd9eebf 100644
> --- a/lib/librte_bpf/bpf_load.c
> +++ b/lib/librte_bpf/bpf_load.c
> @@ -115,7 +115,7 @@
> return NULL;
> }
>
> - rc = bpf_validate(bpf);
> + rc = rte_bpf_validate(bpf);
> if (rc == 0) {
> bpf_jit(bpf);
> if (mprotect(bpf, bpf->sz, PROT_READ) != 0)
> diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c
> index 83983ef..12c34f0 100644
> --- a/lib/librte_bpf/bpf_validate.c
> +++ b/lib/librte_bpf/bpf_validate.c
> @@ -2209,7 +2209,7 @@ struct bpf_ins_check {
> }
>
> int
> -bpf_validate(struct rte_bpf *bpf)
> +rte_bpf_validate(struct rte_bpf *bpf)
> {
> int32_t rc;
> struct bpf_verifier bvf;
> --
> 1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [dpdk-dev] [PATCH] bpf: rename bpf_validate() to rte_bpf_validate() to avoid collisions
2019-04-10 21:43 ` Ananyev, Konstantin
@ 2019-04-10 21:43 ` Ananyev, Konstantin
0 siblings, 0 replies; 4+ messages in thread
From: Ananyev, Konstantin @ 2019-04-10 21:43 UTC (permalink / raw)
To: David Christensen; +Cc: dev, radhika.chirra, stable
>
> When using libpcap libraries the error "multiple definition of
> 'bpf_validate'" is observed. Rename the DPDK version to rte_bpf_validate
> to be more consistenet with other DPDK defined functions.
As I already ask Vivian, before we proceed any further with that patch
could you provide some simple test-case to reproduce the problem?
bpf_validate() function is not exposed as external API,
so no need for rte_ prefix in general.
Konstantin
>
> Cc: stable@dpdk.org
>
> Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
> Tested-by: Radhika Chirra <radhika.chirra@ibm.com>
> ---
> lib/librte_bpf/bpf_impl.h | 2 +-
> lib/librte_bpf/bpf_load.c | 2 +-
> lib/librte_bpf/bpf_validate.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/lib/librte_bpf/bpf_impl.h b/lib/librte_bpf/bpf_impl.h
> index b577e2c..f1d6f9a 100644
> --- a/lib/librte_bpf/bpf_impl.h
> +++ b/lib/librte_bpf/bpf_impl.h
> @@ -21,7 +21,7 @@ struct rte_bpf {
> uint32_t stack_sz;
> };
>
> -extern int bpf_validate(struct rte_bpf *bpf);
> +extern int rte_bpf_validate(struct rte_bpf *bpf);
>
> extern int bpf_jit(struct rte_bpf *bpf);
>
> diff --git a/lib/librte_bpf/bpf_load.c b/lib/librte_bpf/bpf_load.c
> index d9d163b..bd9eebf 100644
> --- a/lib/librte_bpf/bpf_load.c
> +++ b/lib/librte_bpf/bpf_load.c
> @@ -115,7 +115,7 @@
> return NULL;
> }
>
> - rc = bpf_validate(bpf);
> + rc = rte_bpf_validate(bpf);
> if (rc == 0) {
> bpf_jit(bpf);
> if (mprotect(bpf, bpf->sz, PROT_READ) != 0)
> diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c
> index 83983ef..12c34f0 100644
> --- a/lib/librte_bpf/bpf_validate.c
> +++ b/lib/librte_bpf/bpf_validate.c
> @@ -2209,7 +2209,7 @@ struct bpf_ins_check {
> }
>
> int
> -bpf_validate(struct rte_bpf *bpf)
> +rte_bpf_validate(struct rte_bpf *bpf)
> {
> int32_t rc;
> struct bpf_verifier bvf;
> --
> 1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-04-10 21:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-10 19:23 [dpdk-dev] [PATCH] bpf: rename bpf_validate() to rte_bpf_validate() to avoid collisions David Christensen
2019-04-10 19:23 ` David Christensen
2019-04-10 21:43 ` Ananyev, Konstantin
2019-04-10 21:43 ` Ananyev, Konstantin
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).