| Message ID | 20240130014208.565554-10-hannes@cmpxchg.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mm: zswap: cleanups | expand |
On 2024/1/30 09:36, Johannes Weiner wrote: > The branching is awkward and duplicates code. The comment about > writeback is also misleading: yes, the entry might have been written > back. Or it might have never been stored in zswap to begin with due to > a rejection - zswap_invalidate() is called on all exiting swap entries. > > Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Reviewed-by: Chengming Zhou <zhouchengming@bytedance.com> > --- > mm/zswap.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/mm/zswap.c b/mm/zswap.c > index cde309c539b3..082d076a758d 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -1739,15 +1739,10 @@ void zswap_invalidate(int type, pgoff_t offset) > struct zswap_tree *tree = swap_zswap_tree(swp_entry(type, offset)); > struct zswap_entry *entry; > > - /* find */ > spin_lock(&tree->lock); > entry = zswap_rb_search(&tree->rbroot, offset); > - if (!entry) { > - /* entry was written back */ > - spin_unlock(&tree->lock); > - return; > - } > - zswap_invalidate_entry(tree, entry); > + if (entry) > + zswap_invalidate_entry(tree, entry); > spin_unlock(&tree->lock); > } >
On Mon, Jan 29, 2024 at 08:36:45PM -0500, Johannes Weiner wrote: > The branching is awkward and duplicates code. The comment about > writeback is also misleading: yes, the entry might have been written > back. Or it might have never been stored in zswap to begin with due to > a rejection - zswap_invalidate() is called on all exiting swap entries. > > Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Yosry Ahmed <yosryahmed@google.com>
On Mon, Jan 29, 2024 at 5:42 PM Johannes Weiner <hannes@cmpxchg.org> wrote: > > The branching is awkward and duplicates code. The comment about > writeback is also misleading: yes, the entry might have been written > back. Or it might have never been stored in zswap to begin with due to > a rejection - zswap_invalidate() is called on all exiting swap entries. > > Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Reviewed-by: Nhat Pham <nphamcs@gmail.com>
diff --git a/mm/zswap.c b/mm/zswap.c index cde309c539b3..082d076a758d 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1739,15 +1739,10 @@ void zswap_invalidate(int type, pgoff_t offset) struct zswap_tree *tree = swap_zswap_tree(swp_entry(type, offset)); struct zswap_entry *entry; - /* find */ spin_lock(&tree->lock); entry = zswap_rb_search(&tree->rbroot, offset); - if (!entry) { - /* entry was written back */ - spin_unlock(&tree->lock); - return; - } - zswap_invalidate_entry(tree, entry); + if (entry) + zswap_invalidate_entry(tree, entry); spin_unlock(&tree->lock); }
The branching is awkward and duplicates code. The comment about writeback is also misleading: yes, the entry might have been written back. Or it might have never been stored in zswap to begin with due to a rejection - zswap_invalidate() is called on all exiting swap entries. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> --- mm/zswap.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)