From: Eric Dumazet <edumazet@google.com>
To: "David S . Miller" <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>, Florian Westphal <fw@strlen.de>,
Herbert Xu <herbert@gondor.apana.org.au>,
Thomas Graf <tgraf@suug.ch>,
Jesper Dangaard Brouer <brouer@redhat.com>,
Alexander Aring <alex.aring@gmail.com>,
Stefan Schmidt <stefan@osg.samsung.com>,
Kirill Tkhai <ktkhai@virtuozzo.com>,
Eric Dumazet <edumazet@google.com>,
Eric Dumazet <eric.dumazet@gmail.com>
Subject: [PATCH v3 net-next 07/12] rhashtable: add schedule points
Date: Fri, 30 Mar 2018 17:53:04 -0700 [thread overview]
Message-ID: <20180331005309.179376-8-edumazet@google.com> (raw)
In-Reply-To: <20180331005309.179376-1-edumazet@google.com>
Rehashing and destroying large hash table takes a lot of time,
and happens in process context. It is safe to add cond_resched()
in rhashtable_rehash_table() and rhashtable_free_and_destroy()
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
lib/rhashtable.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index 47de025b624520f75e521bef46dc9b28baa6a1a0..2b2b79974b614a94e5325e8c2271804cb27069aa 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -333,6 +333,7 @@ static int rhashtable_rehash_table(struct rhashtable *ht)
err = rhashtable_rehash_chain(ht, old_hash);
if (err)
return err;
+ cond_resched();
}
/* Publish the new table pointer. */
@@ -1112,6 +1113,7 @@ void rhashtable_free_and_destroy(struct rhashtable *ht,
for (i = 0; i < tbl->size; i++) {
struct rhash_head *pos, *next;
+ cond_resched();
for (pos = rht_dereference(*rht_bucket(tbl, i), ht),
next = !rht_is_a_nulls(pos) ?
rht_dereference(pos->next, ht) : NULL;
--
2.17.0.rc1.321.gba9d0f2565-goog
next prev parent reply other threads:[~2018-03-31 0:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-31 0:52 [PATCH v3 net-next 00/12] inet: frags: bring rhashtables to IP defrag Eric Dumazet
2018-03-31 0:52 ` [PATCH v3 net-next 01/12] ipv6: frag: remove unused field Eric Dumazet
2018-03-31 0:52 ` [PATCH v3 net-next 02/12] inet: frags: change inet_frags_init_net() return value Eric Dumazet
2018-03-31 0:53 ` [PATCH v3 net-next 03/12] inet: frags: add a pointer to struct netns_frags Eric Dumazet
2018-03-31 0:53 ` [PATCH v3 net-next 04/12] inet: frags: refactor ipv6_frag_init() Eric Dumazet
2018-03-31 0:53 ` [PATCH v3 net-next 05/12] inet: frags: refactor lowpan_net_frag_init() Eric Dumazet
2018-03-31 0:53 ` [PATCH v3 net-next 06/12] inet: frags: refactor ipfrag_init() Eric Dumazet
2018-03-31 0:53 ` Eric Dumazet [this message]
2018-03-31 4:21 ` [PATCH v3 net-next 07/12] rhashtable: add schedule points Herbert Xu
2018-03-31 0:53 ` [PATCH v3 net-next 08/12] inet: frags: use rhashtables for reassembly units Eric Dumazet
2018-03-31 7:47 ` kbuild test robot
2018-03-31 7:47 ` [RFC PATCH] inet: frags: lowpan_rhash_params can be static kbuild test robot
2018-03-31 13:46 ` Eric Dumazet
2018-03-31 0:53 ` [PATCH v3 net-next 09/12] inet: frags: remove some helpers Eric Dumazet
2018-03-31 0:53 ` [PATCH v3 net-next 10/12] inet: frags: get rif of inet_frag_evicting() Eric Dumazet
2018-03-31 0:53 ` [PATCH v3 net-next 11/12] inet: frags: remove inet_frag_maybe_warn_overflow() Eric Dumazet
2018-03-31 0:53 ` [PATCH v3 net-next 12/12] inet: frags: break the 2GB limit for frags storage Eric Dumazet
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=20180331005309.179376-8-edumazet@google.com \
--to=edumazet@google.com \
--cc=alex.aring@gmail.com \
--cc=brouer@redhat.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=fw@strlen.de \
--cc=herbert@gondor.apana.org.au \
--cc=ktkhai@virtuozzo.com \
--cc=netdev@vger.kernel.org \
--cc=stefan@osg.samsung.com \
--cc=tgraf@suug.ch \
/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).