[dpdk-dev] table: hash: fix entry size of configurable key size ext and lru

Message ID

1407728582-19637-1-git-send-email-takayuki@midokura.com (mailing list archive)

State

Superseded, archived

Headers

From: Takayuki Usui <takayuki@midokura.com>
To: dev@dpdk.org
Date: Mon, 11 Aug 2014 12:43:02 +0900
Message-Id: <1407728582-19637-1-git-send-email-takayuki@midokura.com>
Subject: [dpdk-dev] [PATCH] table: hash: fix entry size of configurable key
	size ext and lru
Precedence: list

Commit Message

Takayuki Usui Aug. 11, 2014, 3:43 a.m. UTC

  Signed-off-by: Takayuki Usui <takayuki@midokura.com>
---
 lib/librte_table/rte_table_hash_ext.c | 2 +-
 lib/librte_table/rte_table_hash_lru.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Thomas Monjalon Nov. 26, 2014, 9:18 p.m. UTC | #1

Hi,

2014-08-11 12:43, Takayuki Usui:
> Signed-off-by: Takayuki Usui <takayuki@midokura.com>
> ---
>  lib/librte_table/rte_table_hash_ext.c | 2 +-
>  lib/librte_table/rte_table_hash_lru.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/librte_table/rte_table_hash_ext.c b/lib/librte_table/rte_table_hash_ext.c
> index 6e26d98..8b86fab 100644
> --- a/lib/librte_table/rte_table_hash_ext.c
> +++ b/lib/librte_table/rte_table_hash_ext.c
> @@ -221,7 +221,7 @@ rte_table_hash_ext_create(void *params, int socket_id, uint32_t entry_size)
>  	/* Internal */
>  	t->bucket_mask = t->n_buckets - 1;
>  	t->key_size_shl = __builtin_ctzl(p->key_size);
> -	t->data_size_shl = __builtin_ctzl(p->key_size);
> +	t->data_size_shl = __builtin_ctzl(entry_size);
>  
>  	/* Tables */
>  	table_meta_offset = 0;
> diff --git a/lib/librte_table/rte_table_hash_lru.c b/lib/librte_table/rte_table_hash_lru.c
> index d1a4984..bf92e81 100644
> --- a/lib/librte_table/rte_table_hash_lru.c
> +++ b/lib/librte_table/rte_table_hash_lru.c
> @@ -192,7 +192,7 @@ rte_table_hash_lru_create(void *params, int socket_id, uint32_t entry_size)
>  	/* Internal */
>  	t->bucket_mask = t->n_buckets - 1;
>  	t->key_size_shl = __builtin_ctzl(p->key_size);
> -	t->data_size_shl = __builtin_ctzl(p->key_size);
> +	t->data_size_shl = __builtin_ctzl(entry_size);
>  
>  	/* Tables */
>  	table_meta_offset = 0;

A similar patch has been recently applied:
	http://dpdk.org/browse/dpdk/commit/?id=8595428e50

Cristian, as the author of this library, it would be appreciated that you
review and ack such patch. It's important to accept contributions and give
credit to the first author of a patch.

Thanks

Cristian Dumitrescu Nov. 27, 2014, 10:34 a.m. UTC | #2

Hi Thomas,

Yes, we can confirm that this patch is identical to one of the fixes provided by Balazs with his set of patches which were already applied.

Sorry for not seeing this patch earlier.

Thank you, Takayuki San for doing this work and sending us the patch!

Regards,
Cristian


-----Original Message-----
From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com] 
Sent: Wednesday, November 26, 2014 9:18 PM
To: Takayuki Usui; Dumitrescu, Cristian
Cc: dev@dpdk.org; Nemeth, Balazs
Subject: Re: [dpdk-dev] [PATCH] table: hash: fix entry size of configurable key size ext and lru

Hi,

2014-08-11 12:43, Takayuki Usui:
> Signed-off-by: Takayuki Usui <takayuki@midokura.com>
> ---
>  lib/librte_table/rte_table_hash_ext.c | 2 +-
>  lib/librte_table/rte_table_hash_lru.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/librte_table/rte_table_hash_ext.c b/lib/librte_table/rte_table_hash_ext.c
> index 6e26d98..8b86fab 100644
> --- a/lib/librte_table/rte_table_hash_ext.c
> +++ b/lib/librte_table/rte_table_hash_ext.c
> @@ -221,7 +221,7 @@ rte_table_hash_ext_create(void *params, int socket_id, uint32_t entry_size)
>  	/* Internal */
>  	t->bucket_mask = t->n_buckets - 1;
>  	t->key_size_shl = __builtin_ctzl(p->key_size);
> -	t->data_size_shl = __builtin_ctzl(p->key_size);
> +	t->data_size_shl = __builtin_ctzl(entry_size);
>  
>  	/* Tables */
>  	table_meta_offset = 0;
> diff --git a/lib/librte_table/rte_table_hash_lru.c b/lib/librte_table/rte_table_hash_lru.c
> index d1a4984..bf92e81 100644
> --- a/lib/librte_table/rte_table_hash_lru.c
> +++ b/lib/librte_table/rte_table_hash_lru.c
> @@ -192,7 +192,7 @@ rte_table_hash_lru_create(void *params, int socket_id, uint32_t entry_size)
>  	/* Internal */
>  	t->bucket_mask = t->n_buckets - 1;
>  	t->key_size_shl = __builtin_ctzl(p->key_size);
> -	t->data_size_shl = __builtin_ctzl(p->key_size);
> +	t->data_size_shl = __builtin_ctzl(entry_size);
>  
>  	/* Tables */
>  	table_meta_offset = 0;

A similar patch has been recently applied:
	http://dpdk.org/browse/dpdk/commit/?id=8595428e50

Cristian, as the author of this library, it would be appreciated that you
review and ack such patch. It's important to accept contributions and give
credit to the first author of a patch.

Thanks

Cristian Dumitrescu Nov. 27, 2014, 10:38 a.m. UTC | #3

Acked by: Cristian Dumitrescu <Cristian.Dumitrescu at intel.com>

-----Original Message-----
From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com] 
Sent: Wednesday, November 26, 2014 9:18 PM
To: Takayuki Usui; Dumitrescu, Cristian
Cc: dev@dpdk.org; Nemeth, Balazs
Subject: Re: [dpdk-dev] [PATCH] table: hash: fix entry size of configurable key size ext and lru

Hi,

2014-08-11 12:43, Takayuki Usui:
> Signed-off-by: Takayuki Usui <takayuki@midokura.com>
> ---
>  lib/librte_table/rte_table_hash_ext.c | 2 +-
>  lib/librte_table/rte_table_hash_lru.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/librte_table/rte_table_hash_ext.c b/lib/librte_table/rte_table_hash_ext.c
> index 6e26d98..8b86fab 100644
> --- a/lib/librte_table/rte_table_hash_ext.c
> +++ b/lib/librte_table/rte_table_hash_ext.c
> @@ -221,7 +221,7 @@ rte_table_hash_ext_create(void *params, int socket_id, uint32_t entry_size)
>  	/* Internal */
>  	t->bucket_mask = t->n_buckets - 1;
>  	t->key_size_shl = __builtin_ctzl(p->key_size);
> -	t->data_size_shl = __builtin_ctzl(p->key_size);
> +	t->data_size_shl = __builtin_ctzl(entry_size);
>  
>  	/* Tables */
>  	table_meta_offset = 0;
> diff --git a/lib/librte_table/rte_table_hash_lru.c b/lib/librte_table/rte_table_hash_lru.c
> index d1a4984..bf92e81 100644
> --- a/lib/librte_table/rte_table_hash_lru.c
> +++ b/lib/librte_table/rte_table_hash_lru.c
> @@ -192,7 +192,7 @@ rte_table_hash_lru_create(void *params, int socket_id, uint32_t entry_size)
>  	/* Internal */
>  	t->bucket_mask = t->n_buckets - 1;
>  	t->key_size_shl = __builtin_ctzl(p->key_size);
> -	t->data_size_shl = __builtin_ctzl(p->key_size);
> +	t->data_size_shl = __builtin_ctzl(entry_size);
>  
>  	/* Tables */
>  	table_meta_offset = 0;

A similar patch has been recently applied:
	http://dpdk.org/browse/dpdk/commit/?id=8595428e50

Cristian, as the author of this library, it would be appreciated that you
review and ack such patch. It's important to accept contributions and give
credit to the first author of a patch.

Thanks

Patch

diff --git a/lib/librte_table/rte_table_hash_ext.c b/lib/librte_table/rte_table_hash_ext.c
index 6e26d98..8b86fab 100644
--- a/lib/librte_table/rte_table_hash_ext.c
+++ b/lib/librte_table/rte_table_hash_ext.c
@@ -221,7 +221,7 @@  rte_table_hash_ext_create(void *params, int socket_id, uint32_t entry_size)
 	/* Internal */
 	t->bucket_mask = t->n_buckets - 1;
 	t->key_size_shl = __builtin_ctzl(p->key_size);
-	t->data_size_shl = __builtin_ctzl(p->key_size);
+	t->data_size_shl = __builtin_ctzl(entry_size);
 
 	/* Tables */
 	table_meta_offset = 0;
diff --git a/lib/librte_table/rte_table_hash_lru.c b/lib/librte_table/rte_table_hash_lru.c
index d1a4984..bf92e81 100644
--- a/lib/librte_table/rte_table_hash_lru.c
+++ b/lib/librte_table/rte_table_hash_lru.c
@@ -192,7 +192,7 @@  rte_table_hash_lru_create(void *params, int socket_id, uint32_t entry_size)
 	/* Internal */
 	t->bucket_mask = t->n_buckets - 1;
 	t->key_size_shl = __builtin_ctzl(p->key_size);
-	t->data_size_shl = __builtin_ctzl(p->key_size);
+	t->data_size_shl = __builtin_ctzl(entry_size);
 
 	/* Tables */
 	table_meta_offset = 0;