From patchwork Fri Jun 28 03:11:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexs@kernel.org X-Patchwork-Id: 13715398 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 8171FC2BD09 for ; Fri, 28 Jun 2024 03:07:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D968B6B00AE; Thu, 27 Jun 2024 23:07:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CA7F46B00AF; Thu, 27 Jun 2024 23:07:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A5F476B00B0; Thu, 27 Jun 2024 23:07:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 837656B00AE for ; Thu, 27 Jun 2024 23:07:36 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 47433A1445 for ; Fri, 28 Jun 2024 03:07:36 +0000 (UTC) X-FDA: 82278812112.07.742C2B1 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf25.hostedemail.com (Postfix) with ESMTP id 8905CA0013 for ; Fri, 28 Jun 2024 03:07:34 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="mLYMc/7u"; spf=pass (imf25.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719544037; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=bAhIIaqab/APipgO1TGwSy9N4CpIWlezM1hq6ZRi7hI=; b=CIsMKdrdoGVEMnVR9Pc7/IGlWTewnZjB8N2hT7pBIHKjZJ13eTNCLQygzKAIta743UtbZj 1OfA7LeY7Hwm1oZMdbx/djqkasKLPRH7fdcNEV08xNrL50YUUGcpv5bFWp16gYkD3qdJLH aZipexa6o9qX5P/v5RVsJdToiaXjxRM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719544037; a=rsa-sha256; cv=none; b=ipSSfLxmhBWMtPfv3Q1NvTSYHm4V7GSsD985WQ+oWGwbfPP54dpBD80mJCY0gm8rr2RO9X IKEkBVZtTBNFfuRLkjerKlKWO9hO6iuViu/ftY8bdm+9pzL2Hq1lykbUT/hEV8ltArBIhl Yluqjv6TfBhK2V9lS03R2bQV+zOPqms= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="mLYMc/7u"; spf=pass (imf25.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id B1F376204C; Fri, 28 Jun 2024 03:07:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 812C8C32789; Fri, 28 Jun 2024 03:07:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719544053; bh=rDBA9PQhfrX2sld8/x0O9UG/mVNkTt8p9w0g00Zl/Is=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mLYMc/7u901OlvwzejVebGRJEyPAEygoLhV89brKlhhYjxZ0icIH+7gy5VLMEhstY nC7sgqj0XdoqBL5QlBfnBN+qP+BIpEJN0PjpCOSOS2WuR74IrOaEn/iLirkfQxTzS+ UkAx8p2uK7Z8em0W7vDigSNNjGWkjfZxdeqM90qox2/0MhzJ8EBVvPhWtBO936eT5i AnutNkwsiJvqnDczkg2qwn5VxLl1uIwZDool0UvbpMRsJO7a5R6tn9KT0sHs1oQWWC 7L62XReP/pejWZpdCCQx8KXAehDgaiohDLewX5nNd2thVBKgKwWv6LbGWHl/ZVXaNP WDThjKrP9FPBg== From: alexs@kernel.org To: Vitaly Wool , Miaohe Lin , Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, minchan@kernel.org, willy@infradead.org, senozhatsky@chromium.org, david@redhat.com, 42.hyeyoo@gmail.com Cc: Alex Shi Subject: [PATCH 12/20] mm/zsmalloc: convert __free_zspage() to use zdsesc Date: Fri, 28 Jun 2024 11:11:27 +0800 Message-ID: <20240628031138.429622-13-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240628031138.429622-1-alexs@kernel.org> References: <20240628031138.429622-1-alexs@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 8905CA0013 X-Stat-Signature: akp96eh5mpxr31pq8sd1fxdbjfhuf6pw X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1719544054-533878 X-HE-Meta: U2FsdGVkX19Fd901C3U0I9sMZJGup8NYS3YIAgtQMjCBlg3AC51IIsBf5TaWsO5ZFy2FwD5MAYqtb8zc42V0bQQ2ll2khag006OocdSgg5SxydZzibtIlxOdHKW/O+aslnPVFN3Tka7SG+HlnNEC3EPoVP/f0UB1OOThgdCE3/aVhFFvQ71JwWb06mQk8goRovX93eqZSriAT89pEaWxGpBb1fWyTQbsHcxBqJswEqqQCTp41QV9DfSeCqi4mKasSLT5WkEZZIBeCooSSoXUaEIQ/JZan6g5vLrA82gU1L1XeDh7u77Os77+0Jk/p+LZUo6JwRTRUQIzBrm+CXiFISwEydQ1tE15uV6I4BDs96fltdh7EWoLpRbipqafrEb5CNEmgkPr3IYv8e8knlVFb+dgNRNLPIQaVXfi0qbKEs9G3DN8QzyY6ZAEUVPq+siY7Y8GDAx5ogCQOwRUbZuWYTVBwNh/KxvzKMs7cqg8v+lIBVbARzbA/Z2RTP+QKCzoTGdwAMTWq2+DTI6z+u0Cg3WMeP/LLYPbSrlo2PRYbhwZ5qevOViWORn9ZzkwzS9cYIogSbu4D/+VMZ5qoBcIG9q5DspQvHxdG1TxbLAQqxNKfqqrKBvvJEcj/WT1EZ2phinyycVaf3YGxn+9F/XVLGTV91+uzTc5dQ5lV464X+tG9Nb2KtpTYCQO1EpfhXfPhkxCyTRTCzgv6N67CjfpzUxQlv3Xw1eGufYXZOXN+JLXlwkhuOpJwTMk4XhCKrxh8fDXpZtiu4Fd1huoqvTl+AABePk7hFzi/fPG4gFnpKa6xrxrL6jl3vciAleb+GmB+U4XCNEyrohDuTHD7pzgR29Gp384NHrDAjXWXAAvoZzHjexIntLKXriyjynL5ITGqQioER4l5jXyoH0dAJKpyvZTY2qaNDMapOGebS9gtERQrqTFSYSwUFfV2iIOEiATCnM7MnkUktB633kPaVZ w6vEmT1l ZaUpHIRU713tGqxTUny8dVS+6OffKA6q+dncCJHPp4V2ggAkRdqR26miSZCVltbykf6iMeNubBDNlMywq+wCbMm5OHZ3MTEfKHuUZFAfEYrE+tOFGElKR+HukyeeyH1i13DnR9EfaZIIsl93uhj9wtfh8s0KxNrb6AvRIcKXxZCOsr2ABfW5DNkXCgEYdzKgchWSsUxHXsEkGCXVGC3XUInH68OqTiPlMar2RPev8h4TaEWVISQ98XzHasleXoBxbcfE1fMTF3508l4qdWya1SLPUTuDEcJYrhVA6b8PIV/Fvb6q1Nd5gxZiJc6REZ+BGhxqo9Guod0l75+4dTF/OUgjq0jAQYmQGrdsaW0cgg57HB+g+5yYjzNKrVA== 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: List-Subscribe: List-Unsubscribe: From: Hyeonggon Yoo <42.hyeyoo@gmail.com> Introduce zpdesc_is_locked() and convert __free_zspage() to use zpdesc. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Signed-off-by: Alex Shi --- mm/zpdesc.h | 4 ++++ mm/zsmalloc.c | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/mm/zpdesc.h b/mm/zpdesc.h index 2e35b8220e05..186ff9711ffb 100644 --- a/mm/zpdesc.h +++ b/mm/zpdesc.h @@ -109,4 +109,8 @@ static inline struct zone *zpdesc_zone(struct zpdesc *zpdesc) return page_zone(zpdesc_page(zpdesc)); } +static inline bool zpdesc_is_locked(struct zpdesc *zpdesc) +{ + return PageLocked(zpdesc_page(zpdesc)); +} #endif diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 216f8e6950ef..bf5a1b63bb17 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -903,23 +903,23 @@ static int trylock_zspage(struct zspage *zspage) static void __free_zspage(struct zs_pool *pool, struct size_class *class, struct zspage *zspage) { - struct page *page, *next; + struct zpdesc *zpdesc, *next; assert_spin_locked(&class->lock); VM_BUG_ON(get_zspage_inuse(zspage)); VM_BUG_ON(zspage->fullness != ZS_INUSE_RATIO_0); - next = page = get_first_page(zspage); + next = zpdesc = get_first_zpdesc(zspage); do { - VM_BUG_ON_PAGE(!PageLocked(page), page); - next = get_next_page(page); - reset_zpdesc(page_zpdesc(page)); - unlock_page(page); - dec_zone_page_state(page, NR_ZSPAGES); - put_page(page); - page = next; - } while (page != NULL); + VM_BUG_ON_PAGE(!zpdesc_is_locked(zpdesc), zpdesc_page(zpdesc)); + next = get_next_zpdesc(zpdesc); + reset_zpdesc(zpdesc); + zpdesc_unlock(zpdesc); + zpdesc_dec_zone_page_state(zpdesc); + zpdesc_put(zpdesc); + zpdesc = next; + } while (zpdesc != NULL); cache_free_zspage(pool, zspage);