From: Yuanhan Liu <yuanhan.liu@linux.intel.com>
To: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Cc: stable@dpdk.org
Subject: Re: [dpdk-stable] [PATCH 1/2] hash: fix unlimited cuckoo path
Date: Tue, 15 Nov 2016 16:55:09 +0800 [thread overview]
Message-ID: <20161115085509.GB5048@yliu-dev.sh.intel.com> (raw)
In-Reply-To: <1478712124-14090-1-git-send-email-pablo.de.lara.guarch@intel.com>
Both are applied to dpdk stable branch 16.07.
Thanks.
--yliu
On Wed, Nov 09, 2016 at 05:22:03PM +0000, Pablo de Lara wrote:
> When trying to insert a new entry, if its target bucket is full,
> the alternative location (bucket) of one of the entries is checked,
> to try to find an empty slot, with make_space_bucket.
> This function is called every time a new bucket is checked, recursively.
> To avoid having a very long insert operation (and to avoid filling up
> the stack), a limit in the number of pushes is introduced.
>
> Fixes: 48a399119619 ("hash: replace with cuckoo hash implementation")
>
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> ---
> lib/librte_hash/rte_cuckoo_hash.c | 6 +++++-
> lib/librte_hash/rte_cuckoo_hash.h | 2 ++
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
> index 26e54f6..53363ed 100644
> --- a/lib/librte_hash/rte_cuckoo_hash.c
> +++ b/lib/librte_hash/rte_cuckoo_hash.c
> @@ -408,6 +408,7 @@ rte_hash_reset(struct rte_hash *h)
> static inline int
> make_space_bucket(const struct rte_hash *h, struct rte_hash_bucket *bkt)
> {
> + static unsigned int nr_pushes;
> unsigned i, j;
> int ret;
> uint32_t next_bucket_idx;
> @@ -444,11 +445,13 @@ make_space_bucket(const struct rte_hash *h, struct rte_hash_bucket *bkt)
> break;
>
> /* All entries have been pushed, so entry cannot be added */
> - if (i == RTE_HASH_BUCKET_ENTRIES)
> + if (i == RTE_HASH_BUCKET_ENTRIES || nr_pushes > RTE_HASH_MAX_PUSHES)
> return -ENOSPC;
>
> /* Set flag to indicate that this entry is going to be pushed */
> bkt->flag[i] = 1;
> +
> + nr_pushes++;
> /* Need room in alternative bucket to insert the pushed entry */
> ret = make_space_bucket(h, next_bkt[i]);
> /*
> @@ -458,6 +461,7 @@ make_space_bucket(const struct rte_hash *h, struct rte_hash_bucket *bkt)
> * or return error
> */
> bkt->flag[i] = 0;
> + nr_pushes = 0;
> if (ret >= 0) {
> next_bkt[i]->signatures[ret].alt = bkt->signatures[i].current;
> next_bkt[i]->signatures[ret].current = bkt->signatures[i].alt;
> diff --git a/lib/librte_hash/rte_cuckoo_hash.h b/lib/librte_hash/rte_cuckoo_hash.h
> index 6c76700..9625fff 100644
> --- a/lib/librte_hash/rte_cuckoo_hash.h
> +++ b/lib/librte_hash/rte_cuckoo_hash.h
> @@ -138,6 +138,8 @@ enum add_key_case {
>
> #define LCORE_CACHE_SIZE 64
>
> +#define RTE_HASH_MAX_PUSHES 100
> +
> #define RTE_HASH_BFS_QUEUE_MAX_LEN 1000
>
> #define RTE_XABORT_CUCKOO_PATH_INVALIDED 0x4
> --
> 2.7.4
prev parent reply other threads:[~2016-11-15 8:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-09 17:22 Pablo de Lara
2016-11-09 17:22 ` [dpdk-stable] [PATCH 2/2] hash: fix bucket size usage Pablo de Lara
2016-11-15 8:55 ` Yuanhan Liu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161115085509.GB5048@yliu-dev.sh.intel.com \
--to=yuanhan.liu@linux.intel.com \
--cc=pablo.de.lara.guarch@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).