Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   NeilBrown <neilb@suse.com>
To:     Tom Herbert <tom@herbertland.com>
Date:   Thu, 07 Jun 2018 12:46:30 +1000
Cc:     Herbert Xu <herbert@gondor.apana.org.au>,
        Thomas Graf <tgraf@suug.ch>,
        Linux Kernel Network Developers <netdev@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        Tom Herbert <tom@quantonium.net>
Subject: [PATCH - RFC] rhashtable: implement rhashtable_walk_peek() using
 rhashtable_walk_last_seen()
In-Reply-To: <871sdjnwkr.fsf@notabene.neil.brown.name>
References: <152782754287.30340.4395718227884933670.stgit@noble> <152782824964.30340.6329146982899668633.stgit@noble> <20180602154851.pfy4wryezuhxp76v@gondor.apana.org.au> <87y3fvpf40.fsf@notabene.neil.brown.name> <CALx6S37AYrFoJNrdToRc84J=B4f57jaHS077UsxdEoQ-xwyCeg@mail.gmail.com> <87sh63pakb.fsf@notabene.neil.brown.name> <CALx6S35sf4oj=x73SfhUxi1e9-u4Stxgr9BAj5E7KKmbufntwg@mail.gmail.com> <87r2lmnj2c.fsf@notabene.neil.brown.name> <CALx6S36Ce-rXQMzmFYZVPGD10Bo6udvRAHiZ5gWwnzVwoTVv0w@mail.gmail.com> <87in6wo636.fsf@notabene.neil.brown.name> <871sdjnwkr.fsf@notabene.neil.brown.name>
Message-ID: <87y3frmhyx.fsf@notabene.neil.brown.name>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
        micalg=pgp-sha256; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable


rhashtable_walk_last_seen() does most of the work that
rhashtable_walk_peek() needs done, so use it.
Also update the documentation for rhashtable_walk_peek() to clarify
the expected use case.

Signed-off-by: NeilBrown <neilb@suse.com>
=2D--
 lib/rhashtable.c | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index 45f2554399a5..30bb9ead15f4 100644
=2D-- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -916,36 +916,34 @@ void *rhashtable_walk_next(struct rhashtable_iter *it=
er)
 EXPORT_SYMBOL_GPL(rhashtable_walk_next);
=20
 /**
=2D * rhashtable_walk_peek - Return the next object but don't advance the i=
terator
+ * rhashtable_walk_peek - Return the next object to use in an interrupted =
walk
  * @iter:	Hash table iterator
  *
=2D * Returns the next object or NULL when the end of the table is reached.
+ * Returns the "current" object or NULL when the end of the table is reach=
ed.
+ * When an rhashtable_walk is interrupted with rhashtable_walk_stop(),
+ * it is often because an object was found that could not be processed
+ * immediately, possible because there is no more space to encode details
+ * of the object (e.g. when producing a seq_file from the table).
+ * When the walk is restarted, the same object needs to be processed again,
+ * if possible.  The object might have been removed from the table while
+ * the walk was paused, so it might not be available.  In that case, the
+ * normal "next" object should be treated as "current".
  *
=2D * Returns -EAGAIN if resize event occurred.  Note that the iterator
+ * To support this common case, rhashtable_walk_peek() returns the
+ * appropriate object to process after an interrupted walk, either the
+ * one that was most recently returned, or if that doesn't exist - the
+ * next one.
+ *
+ * Returns -EAGAIN if resize event occurred.  In that case the iterator
  * will rewind back to the beginning and you may continue to use it.
  */
 void *rhashtable_walk_peek(struct rhashtable_iter *iter)
 {
=2D	struct rhlist_head *list =3D iter->list;
=2D	struct rhashtable *ht =3D iter->ht;
=2D	struct rhash_head *p =3D iter->p;
+	void *ret =3D rhashtable_walk_last_seen(iter);
=20
=2D	if (p)
=2D		return rht_obj(ht, ht->rhlist ? &list->rhead : p);
=2D
=2D	/* No object found in current iter, find next one in the table. */
=2D
=2D	if (iter->skip) {
=2D		/* A nonzero skip value points to the next entry in the table
=2D		 * beyond that last one that was found. Decrement skip so
=2D		 * we find the current value. __rhashtable_walk_find_next
=2D		 * will restore the original value of skip assuming that
=2D		 * the table hasn't changed.
=2D		 */
=2D		iter->skip--;
=2D	}
=2D
=2D	return __rhashtable_walk_find_next(iter);
+	if (!ret)
+		ret =3D rhashtable_walk_next(iter);
+	return ret;
 }
 EXPORT_SYMBOL_GPL(rhashtable_walk_peek);
=20
=2D-=20
2.14.0.rc0.dirty


--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEG8Yp69OQ2HB7X0l6Oeye3VZigbkFAlsYnIcACgkQOeye3VZi
gbl6PBAAp9ntBGKzD9pALbngdpTBLv+eK9ukpkhqJYlfZ6kwQsl272NQYzzUYHsv
4OHkieUMt+8odh+eP8ucymUDCo3wad4dazhXih4qI4bwjn0UQyKxtWZxjJaVGAZX
ojgXevPqsFnohOteLwbDbZiW+8DlRO/DDUZFVCKOn9SoCUjFjbLblrTklV+hlcWn
PuuEsBdHEYVOZYvsp9pAlPu8Yh9+ZLx7vhWEZJbMpoubHp4Y0OoLmWVZEooEKVr1
Ot6ABTxze3zwJKr8QrWHvsiKTfgZzPxmbK/Ux8X29DR9tyUFh3i4i5oSUQ26h9o4
uWiTNERIFV/uR89XDw7MvtRyvTFdkux4IkZkf0NX3KUijADVED4DywfbOuz/03ul
8aL/v8UrZvb8zzLubucGA2Kod2HEGy9UgWN6V5ylRLc5yRGLEND+Pkto6psHWW6q
2UlE1/WnPYbRSVtry3sAxtAAb2VsRuAZHYPkT6aXWAoY/FfEVnL0GoloifY3RXKd
/YBeXLTSkDeTbYBMhn/4TjM17pxLFbdWPD6Xui7nou6lY/mEzu7hsUFgEOks7IxB
PGsdDDjp3nGhoPvkjMOGz8vjMhkxZ4E9K+mc3CyBgURm6e1KhQ9DKpKr33mxHOgW
g7k0K4KzDXaIEV+wYS8YsbqRuRQO37nDwwPEsFDfg0U4OgWt6fM=
=90TW
-----END PGP SIGNATURE-----
--=-=-=--