Received: by 10.192.165.148 with SMTP id m20csp305260imm; Thu, 3 May 2018 20:55:59 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrXsRDxNLkv4CloQeRIU7S9ZMBYd3jS0pIuOFOZvNJmOYHNezzA+YQk7BucbHulvz4w+jhV X-Received: by 10.98.150.150 with SMTP id s22mr24857696pfk.191.1525406159367; Thu, 03 May 2018 20:55:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525406159; cv=none; d=google.com; s=arc-20160816; b=AybmxdU0DjMjiRv9udXW7UXO8E+exn3WFctM7TNLMV4LmrJ+nrgJIIBkMAbw9SOYCO WC/vTLZgf9U6ro4UoY0z5NsoUmjPlhq8i+Bpe94ITBGfnslTCN9EXmAkON+dyKhUUnPN kd2fLKh9N+zOkpi7eQmr2uPx09/2WQ/E1STR3fi74ovZoZwsib4iyRGHDwkgEE1tbvdV lqdjvDWTNGFutGSKmavEKoSm+kcbYgNZjNs3DJeYUnB/YblSALvyiW6HcRu7ekq+Tzoy NM2M+PBGzucVslwnbfffx0I1EsZ7wC/cN8jiEVlAOf3HH4MoxInyT5zfIYYwwPWro85O RvOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:cc:subject:date:to :from:arc-authentication-results; bh=dq1721mHdYSAFPlqgdzI/S2BuOVWsSItkG/5R/tiYwM=; b=zb2a9li0QxxOaafjzVVJuKWp/D07Tn8lWPGqbFzMNYUgLr1iTJzrOUNlkQgiBu1ir1 Ge7GAvZR+xsLaVHUX3KbsnpzANnUiDWrr+gse7DRpXe2cB60R/fXpvyqnw/pm6jza3TS 45fdSXLlKitlwD27xQ0ubYqf3wN0kuSBrDRQt0Z/in9o6CHwQ4+hw8Z04PrBvtEswp7N u2NfPuCM3k96KU1m31NGZa0lmVe6u6unTZ/1dB58AXmPdINS2/nqv5DTzHgNdUBKIcVq VrQY1wr1MRELBYfTZJ4kWbG2x7MtjukcyQ6urm/oG0exmBOEeSMx9GnqmHqnQRlmH6kK CVpQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l7-v6si15583510plt.197.2018.05.03.20.55.45; Thu, 03 May 2018 20:55:59 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751673AbeEDDz0 (ORCPT + 99 others); Thu, 3 May 2018 23:55:26 -0400 Received: from mx2.suse.de ([195.135.220.15]:45020 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751586AbeEDDzY (ORCPT ); Thu, 3 May 2018 23:55:24 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 2C943ABB2; Fri, 4 May 2018 03:55:23 +0000 (UTC) From: NeilBrown To: Thomas Graf , Herbert Xu Date: Fri, 04 May 2018 13:54:14 +1000 Subject: [PATCH 7/8] rhashtable: add rhashtable_walk_prev() Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Message-ID: <152540605441.18473.4087381584733882012.stgit@noble> In-Reply-To: <152540595840.18473.11298241115621799037.stgit@noble> References: <152540595840.18473.11298241115621799037.stgit@noble> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org rhashtable_walk_prev() returns the object returned by the previous rhashtable_walk_next(), providing it is still in the table (or was during this grace period). This works even if rhashtable_walk_stop() and rhashtable_talk_start() have been called since the last rhashtable_walk_next(). If there have been no calls to rhashtable_walk_next(), or if the object is gone from the table, then NULL is returned. This can usefully be used in a seq_file ->start() function. If the pos is the same as was returned by the last ->next() call, then rhashtable_walk_prev() can be used to re-establish the current location in the table. If it returns NULL, then rhashtable_walk_next() should be used. Signed-off-by: NeilBrown --- include/linux/rhashtable.h | 1 + lib/rhashtable.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h index 20684a451cb0..82d061ff96d6 100644 --- a/include/linux/rhashtable.h +++ b/include/linux/rhashtable.h @@ -367,6 +367,7 @@ static inline void rhashtable_walk_start(struct rhashtable_iter *iter) } void *rhashtable_walk_next(struct rhashtable_iter *iter); +void *rhashtable_walk_prev(struct rhashtable_iter *iter); void rhashtable_walk_stop(struct rhashtable_iter *iter) __releases(RCU); void rhashtable_free_and_destroy(struct rhashtable *ht, diff --git a/lib/rhashtable.c b/lib/rhashtable.c index 038c4156b66a..d0267e37e7e1 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -921,6 +921,37 @@ void *rhashtable_walk_next(struct rhashtable_iter *iter) } EXPORT_SYMBOL_GPL(rhashtable_walk_next); +/** + * rhashtable_walk_prev - Return the previously returned object, if available + * @iter: Hash table iterator + * + * If rhashtable_walk_next() has previously been called and the object + * it returned is still in the hash table, that object is returned again, + * otherwise %NULL is returned. + * + * If the recent rhashtable_walk_next() call was since the most recent + * rhashtable_walk_start() call then the returned object may not, strictly + * speaking, still be in the table. It will be safe to dereference. + * + * Note that the iterator is not changed and in particular it does not + * step backwards. + */ +void *rhashtable_walk_prev(struct rhashtable_iter *iter) +{ + struct rhashtable *ht = iter->ht; + struct rhash_head *p = iter->p; + + if (!p) + return NULL; + if (!iter->p_is_unsafe || ht->rhlist) + return p; + rht_for_each_rcu(p, iter->walker.tbl, iter->slot) + if (p == iter->p) + return p; + return NULL; +} +EXPORT_SYMBOL_GPL(rhashtable_walk_prev); + /** * rhashtable_walk_stop - Finish a hash table walk * @iter: Hash table iterator