From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89D74C00528 for ; Thu, 3 Aug 2023 08:39:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C7C5B28021B; Thu, 3 Aug 2023 04:39:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C04522801EB; Thu, 3 Aug 2023 04:39:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AA57C28021B; Thu, 3 Aug 2023 04:39:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 9655D2801EB for ; Thu, 3 Aug 2023 04:39:06 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 57E9A160662 for ; Thu, 3 Aug 2023 08:39:06 +0000 (UTC) X-FDA: 81082143492.07.8D760B2 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf26.hostedemail.com (Postfix) with ESMTP id 86DA2140007 for ; Thu, 3 Aug 2023 08:39:02 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf26.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691051944; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PCozrqUd5t12Yy5WJ7Xypp37feJaI+sfyQiYDQRxhog=; b=EZauvHo9XsMil+X1mRm0ydBthrFXm66oEnO3y4VYCO81W445Jtifdp8Zusp99TsE+ZSwXS ffxZwBkaw+x9oKw/ev6h6YtSCKCGAE9CcdA0PaW9bgNV0P1gRL3pwSksv4kO+dV+i6cly6 gP3DL8nWemvzlYg+yKbleL5/dqaoVHs= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf26.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691051944; a=rsa-sha256; cv=none; b=7dug3TgjgXGZPzlgHNy4tS6Ebaj/4sZEkmtKtm+cmCtwBsduZxwK95YHa8y39mP9gUur4v hQY6qUm6gN8xQSRA++1QHXgMQ9FF6pO3FbrznwbZNOYEFAH8wpck9TPfTTEcHzSJqxInFe 6P3/emZ6XB0l2iqacgH6NBZsyOVXGkw= Received: from canpemm500002.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4RGhxb1SPmzNmkn; Thu, 3 Aug 2023 16:35:31 +0800 (CST) Received: from [10.174.151.185] (10.174.151.185) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 3 Aug 2023 16:38:56 +0800 Subject: Re: [PATCH -next] mm: zswap: use helper function put_z3fold_locked() To: Ruan Jinjie , , Vitaly Wool , Andrew Morton References: <20230803070820.3775663-1-ruanjinjie@huawei.com> From: Miaohe Lin Message-ID: <12320046-cc1e-17e3-a320-df2a2e677e6e@huawei.com> Date: Thu, 3 Aug 2023 16:38:56 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20230803070820.3775663-1-ruanjinjie@huawei.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.151.185] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 86DA2140007 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: y9yr1jnybucybuosu1a9cp7t4uwykfqs X-HE-Tag: 1691051942-644061 X-HE-Meta: U2FsdGVkX1+XZ8ekLIgHhUWt5/n394uAlFgynr23xaJvgPAQ9b7j5pXAsiImx9sS3uHXM1du09zBRCRpU0p/go6cXhGlpp7m5P2EtiXkZrFX/y5GwF7cEKMa/TqqPvX/Gw5gTlYg7cqZa1G0UvGElGeVK3ebVFAwRV8yrV56TuOGz7mAlvy5oX4pRJGE8ZwNVRJtAxSxUUnLnNKnDQTfK06ibZEzMP1Pkb1mJUBRKKAWM78lqF80w33pomp/o8Ugnnq1ITpSfYfs3B/JnW6zSDAiuTpZd5WaetiWxc9X3qUI76AZm1u1ZBdycQ2JDYxq9b/ao5/j7oguV3WjTfTmvPDJLRaQQRGUPB+dvFvRb0kl/BJhdqWq6Ac/abXM/Vupt4fsihnlgEMJgR1xuvnbJ7yt2VpD4rjFg8fXIiyOA8cjnLIq8QqoAI1NH5Pi6VSQNVgudjhvRpwnpJmwGDZx2+kAeEytbdgrCCwr8aDlioyP+hECxG+vuCx72lwj2azrsWZgUqdW3+Lgic9t+YQx8Ti4N29NpJG869Ea8CzYpMC9LxH5aAaVfwlQC0Rb7rTmz+v10y1LG3Ww4YRwUQf+mEYSHtv6fP6EM5E1C8uvEq33lQkBX2IUE5LX7fM3fqS+qGjVlCxJa7VJxAkeovuN+ijdSkpU6WflyhresS81Z9NL96OiB9BjjIRnEb2bWCakD3OgSjE3rabEkIAzJvoUGHXDKRTCa9MrDfZwk/TRHVmxTnR1MMoOQ8CeNwKHEAXG4m75GWUqn73LCQzJUnH92MNWZiADFRrEwuaL/JNUPpKYBFwfW44gajiHQVwUiMU4EUQ/FBdzyFxJufs/bMXwmH8QOyOr2+5hvaWeJVy7AXzkLd9ohgeLjWz7DdqjD+x0kHVEhqpUgjU/IqXUH0ilk8T/2BAvxTep4EBw/9ZzGewzXo9Ax7xDpfS3SEdWdsE2458B4bKBxXEstu8LNBY Z/9E+Hg6 rfaoue44Ryn5vxlngVNkc/9FsU89fftu1QkrfEXUA0Jbfar/uPYHBao/mQVJObHgurCwiuIdjflrPB7IodDwcGsqmGQn1BVpUZo0vg40O1jcf6XHVWw0N4H5Ds3nZIEoEfEfaNd4ygNyB9DvcWxMdSocafT8c7XTu7vNDsulk4Sbl0ATubQErmG7z/BYck4CSAYe4n4bqGZHyen4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 2023/8/3 15:08, Ruan Jinjie wrote: > This code is already duplicated six times, use helper function > put_z3fold_locked() to release z3fold page instead of open code it > to help improve code readability a bit. No functional change involved. > There is one "if (kref_put(&zhdr->refcount, release_z3fold_page_locked_list))" left in z3fold_free(). It might be better to add another helper for it to make code more consistent? But no preference. Thanks. > Signed-off-by: Ruan Jinjie > --- > mm/z3fold.c | 18 +++++++++++------- > 1 file changed, 11 insertions(+), 7 deletions(-) > > diff --git a/mm/z3fold.c b/mm/z3fold.c > index e84de91ecccb..0b483de83d95 100644 > --- a/mm/z3fold.c > +++ b/mm/z3fold.c > @@ -480,6 +480,11 @@ static void release_z3fold_page_locked_list(struct kref *ref) > __release_z3fold_page(zhdr, true); > } > > +static inline int put_z3fold_locked(struct z3fold_header *zhdr) > +{ > + return kref_put(&zhdr->refcount, release_z3fold_page_locked); > +} > + > static void free_pages_work(struct work_struct *w) > { > struct z3fold_pool *pool = container_of(w, struct z3fold_pool, work); > @@ -666,7 +671,7 @@ static struct z3fold_header *compact_single_buddy(struct z3fold_header *zhdr) > return new_zhdr; > > out_fail: > - if (new_zhdr && !kref_put(&new_zhdr->refcount, release_z3fold_page_locked)) { > + if (new_zhdr && !put_z3fold_locked(new_zhdr)) { > add_to_unbuddied(pool, new_zhdr); > z3fold_page_unlock(new_zhdr); > } > @@ -741,7 +746,7 @@ static void do_compact_page(struct z3fold_header *zhdr, bool locked) > list_del_init(&zhdr->buddy); > spin_unlock(&pool->lock); > > - if (kref_put(&zhdr->refcount, release_z3fold_page_locked)) > + if (put_z3fold_locked(zhdr)) > return; > > if (test_bit(PAGE_STALE, &page->private) || > @@ -752,7 +757,7 @@ static void do_compact_page(struct z3fold_header *zhdr, bool locked) > > if (!zhdr->foreign_handles && buddy_single(zhdr) && > zhdr->mapped_count == 0 && compact_single_buddy(zhdr)) { > - if (!kref_put(&zhdr->refcount, release_z3fold_page_locked)) { > + if (!put_z3fold_locked(zhdr)) { > clear_bit(PAGE_CLAIMED, &page->private); > z3fold_page_unlock(zhdr); > } > @@ -878,7 +883,7 @@ static inline struct z3fold_header *__z3fold_alloc(struct z3fold_pool *pool, > return zhdr; > > out_fail: > - if (!kref_put(&zhdr->refcount, release_z3fold_page_locked)) { > + if (!put_z3fold_locked(zhdr)) { > add_to_unbuddied(pool, zhdr); > z3fold_page_unlock(zhdr); > } > @@ -1012,8 +1017,7 @@ static int z3fold_alloc(struct z3fold_pool *pool, size_t size, gfp_t gfp, > if (zhdr) { > bud = get_free_buddy(zhdr, chunks); > if (bud == HEADLESS) { > - if (!kref_put(&zhdr->refcount, > - release_z3fold_page_locked)) > + if (!put_z3fold_locked(zhdr)) > z3fold_page_unlock(zhdr); > pr_err("No free chunks in unbuddied\n"); > WARN_ON(1); > @@ -1346,7 +1350,7 @@ static void z3fold_page_putback(struct page *page) > if (!list_empty(&zhdr->buddy)) > list_del_init(&zhdr->buddy); > INIT_LIST_HEAD(&page->lru); > - if (kref_put(&zhdr->refcount, release_z3fold_page_locked)) > + if (put_z3fold_locked(zhdr)) > return; > if (list_empty(&zhdr->buddy)) > add_to_unbuddied(pool, zhdr); >