From patchwork Mon Jul 29 11:25:22 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: 13744733 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 82AC3C3DA61 for ; Mon, 29 Jul 2024 11:20:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BB7026B00A3; Mon, 29 Jul 2024 07:20:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AEBBB6B00A4; Mon, 29 Jul 2024 07:20:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 93FCA6B00A5; Mon, 29 Jul 2024 07:20:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 714346B00A3 for ; Mon, 29 Jul 2024 07:20:53 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 269DE80113 for ; Mon, 29 Jul 2024 11:20:53 +0000 (UTC) X-FDA: 82392547986.29.BB3B11C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf05.hostedemail.com (Postfix) with ESMTP id 73B40100002 for ; Mon, 29 Jul 2024 11:20:51 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=E5iyLufh; spf=pass (imf05.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722252024; a=rsa-sha256; cv=none; b=gWPdN7IBOkokHLaYPxY01bSVcT4ZopqsmWNeqdTcpevb+PngCYL1rAGkrtFzvaiOgHQzZ/ ue5lvhFrNXgbsJVdMhoGs6PUCKKqLhls22JQc6q+o8zc/ZAoqiJy3/51M65zyPmPQJ3zsh xlvRNCOCn+SEY5urzdzVKLAbxlG+p5E= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=E5iyLufh; spf=pass (imf05.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=1722252024; 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=/wR/JLWyCBw+98/1Peb9KBstl7/R1dnvU+eYdkVxhdk=; b=e9Ao/ADDPSGYXoBn2ifWlpoFNItDI3RgVzyHS7rHEer0nFkk4K9AdHMMdcoPUmXmurWjph tlaBRb4gaVT+DDmbWD61WkcQC2luS5SOmg8toHK7VcLGmhcNVSCwhRugyWp5AgdStpbJVO c8bdj1H6K96d+WXxVLEcz125rL7DZO4= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id AEBF1617A4; Mon, 29 Jul 2024 11:20:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E330C4AF0E; Mon, 29 Jul 2024 11:20:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722252050; bh=WyPUKBHEIKzHOQMb2khWX8zwblQV8unnw77vQM7bDF8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E5iyLufhwEDkZ+aY5DI547cHfuH0SyU0cZnKUBidJpNkKOkO5+26+kAm6UVZbixNO njVNEpfbytbIXh+8dvyp2agedOkshPsMVpKvAE8d3t5isV/D/XUHFz12c6g17JUgqq JEIr6IMFyMo6wMOYJApbAtqri95Ugy2upf77adlVIFdVbKOypNKYyistCUwc/ndMip ob4vjCmg1y8Ifvm3jCtN9ViV5NE5fHZmq/WCaKwx4mRXgOwGgZ4Xi3sfywdy2c7cwX CACAKi4+a6TxHXlxR9n+RwdFtn44i7Y7Tcaw5m5yjVWIwJ4SAUHNTl+xl7Qt+wr3OB Y7DEGDaoJUl6w== 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, Yosry Ahmed , nphamcs@gmail.com Cc: Alex Shi Subject: [PATCH v4 10/22] mm/zsmalloc: add zpdesc_is_isolated/zpdesc_zone helper for zs_page_migrate Date: Mon, 29 Jul 2024 19:25:22 +0800 Message-ID: <20240729112534.3416707-11-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240729112534.3416707-1-alexs@kernel.org> References: <20240729112534.3416707-1-alexs@kernel.org> MIME-Version: 1.0 X-Stat-Signature: fnhtiz65b3jzr4i1ofucag43anytq4rc X-Rspamd-Queue-Id: 73B40100002 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1722252051-84746 X-HE-Meta: U2FsdGVkX1+SuAhwHtRDdePAtO+iCGQFIlJxKRAdT2NKOfglM6j8gssbAia/nba+yVFOrytvV7NVvWuAHDopDj66U7jm1io4ZK+GJrJbsRgKPOFHtRNKjJ83nVTSpTGQgLBQJoz5cejIEvBDvc1pTWRaF7YBE7qgXO3AuZ3RS9FDYmhDlv1MNBZcZcNKUH/Yg5Xd1O8qqxwYn7zoHhxTpKJh25hCK4BMEN8Cc85+yl6nNi1xW9MuOUMPCHifRzZXyfm7Mz3TlmoGBNVtS7ZLpDTqOLvAWVfiG6bSm+HkE22dW39M/OeKyogCZGUORprGL6N2j/sUYbAZ+6Yo5Rsbpr66gALwdKfBxE9p74lpwleOq1W5Bnh5VTuOlXygQwDCfO93Rnk59xO2SX/F3CsF83sIZRtp1gseng8bk5uhl9WPAoPwaw57jzkG9rJn2bpNEXYN1cimHbcOKHCDf1yC+Xv7QN6+tIHvvxR9N5h7QGMpVncISq2tCR3K5k293apizbxwNAz6rKZZHaC3uqqI81ObOJ5sBY68uH2dnGjr6Ovk9IzkJpqwYIlvhYzNkHgImFMFBK1noz2PF+vJbq/aYJuWY+WcgH50vLvQXNmKu+YrV8nEbxxsR+UC//ftLIrUrGOt4m/XHJ6cPrkIibzQZXJgEWvgNj7Lw7Adljt8vuBz8yFLwsLKcc4yCsz0B9IJlwuCpuMSd/c0KxRFTB5ELdnTLIvPMiGuEPcCTYn3rnm7mkuFVLz/z3qonooN0J4OPCl5/gTkPahxg9tcpvDHab4gyqh5we8B5T54G+qB5ht4OknccuBFSdQRl/XzKTllxixzzBbgORwsDTGy7AzWcFLCFYHAPPd6QRxo05RrdxObeVUbVs29XcmPyOqxkoEBuiHmlGIydZbIFtqzvf2IxVHT7VXJT7dnNwhf6I+OHULPVL3rkiMdh76CcFcN8d6OV2R3ZGPJLs0v2jcZwhw ttoU4MWk V8Y+Q9kc8S06BYV+VYUJA+XRaHPE5woDbVOZjQrsD5jeINZFh0B7HZ2QjwCt86ktfJ86MnwLkwFSkl0GYZZV0yIENHxDOjl1r+/Fw5zeFVLmQJqNKbnD62EqZ1HMLKDSeLsbYbvddQU9eauD2o6RESmDERBgzJrF9ErCPmw5yOWAtlUsZHxBQPZIgmfFjCi6dwsLBIqnrv+REpJ1pDTYtbK9g5BRQjKmmFdgt6y5r3v1+/9BFSLnEgjcr6YZ/VxjV10Oayxs3b2RtsM7ZrIyaDOgVJCZQR7EK/3GXfpYOvlb53LfSf8adcp2w4nY8Rkrzi7y1roqQv4Dx+MXwClqwWdz40YLM0rAXb6En1hoFhOLL++EqCv8hMelBazDqzDikDWyL 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> To convert page to zpdesc in zs_page_migrate(), we added zpdesc_is_isolated/zpdesc_zone helpers. No functional change. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Signed-off-by: Alex Shi --- mm/zpdesc.h | 11 +++++++++++ mm/zsmalloc.c | 30 ++++++++++++++++-------------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/mm/zpdesc.h b/mm/zpdesc.h index 2293453f5d57..ad04c8337cae 100644 --- a/mm/zpdesc.h +++ b/mm/zpdesc.h @@ -108,4 +108,15 @@ static inline void __zpdesc_set_movable(struct zpdesc *zpdesc, { __SetPageMovable(zpdesc_page(zpdesc), mops); } + +static inline bool zpdesc_is_isolated(struct zpdesc *zpdesc) +{ + return PageIsolated(zpdesc_page(zpdesc)); +} + +static inline struct zone *zpdesc_zone(struct zpdesc *zpdesc) +{ + return page_zone(zpdesc_page(zpdesc)); +} + #endif diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 7aa4a4acaec9..9bc9b14187ed 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1830,19 +1830,21 @@ static int zs_page_migrate(struct page *newpage, struct page *page, struct size_class *class; struct zspage *zspage; struct zpdesc *dummy; + struct zpdesc *newzpdesc = page_zpdesc(newpage); + struct zpdesc *zpdesc = page_zpdesc(page); void *s_addr, *d_addr, *addr; unsigned int offset; unsigned long handle; unsigned long old_obj, new_obj; unsigned int obj_idx; - VM_BUG_ON_PAGE(!PageIsolated(page), page); + VM_BUG_ON_PAGE(!zpdesc_is_isolated(zpdesc), zpdesc_page(zpdesc)); /* We're committed, tell the world that this is a Zsmalloc page. */ - __SetPageZsmalloc(newpage); + __SetPageZsmalloc(zpdesc_page(newzpdesc)); /* The page is locked, so this pointer must remain valid */ - zspage = get_zspage(page); + zspage = get_zspage(zpdesc_page(zpdesc)); pool = zspage->pool; /* @@ -1859,30 +1861,30 @@ static int zs_page_migrate(struct page *newpage, struct page *page, /* the migrate_write_lock protects zpage access via zs_map_object */ migrate_write_lock(zspage); - offset = get_first_obj_offset(page); - s_addr = kmap_atomic(page); + offset = get_first_obj_offset(zpdesc_page(zpdesc)); + s_addr = zpdesc_kmap_atomic(zpdesc); /* * Here, any user cannot access all objects in the zspage so let's move. */ - d_addr = kmap_atomic(newpage); + d_addr = zpdesc_kmap_atomic(newzpdesc); copy_page(d_addr, s_addr); kunmap_atomic(d_addr); for (addr = s_addr + offset; addr < s_addr + PAGE_SIZE; addr += class->size) { - if (obj_allocated(page_zpdesc(page), addr, &handle)) { + if (obj_allocated(zpdesc, addr, &handle)) { old_obj = handle_to_obj(handle); obj_to_location(old_obj, &dummy, &obj_idx); - new_obj = (unsigned long)location_to_obj(newpage, + new_obj = (unsigned long)location_to_obj(zpdesc_page(newzpdesc), obj_idx); record_obj(handle, new_obj); } } kunmap_atomic(s_addr); - replace_sub_page(class, zspage, page_zpdesc(newpage), page_zpdesc(page)); + replace_sub_page(class, zspage, newzpdesc, zpdesc); /* * Since we complete the data copy and set up new zspage structure, * it's okay to release migration_lock. @@ -1891,14 +1893,14 @@ static int zs_page_migrate(struct page *newpage, struct page *page, spin_unlock(&class->lock); migrate_write_unlock(zspage); - get_page(newpage); - if (page_zone(newpage) != page_zone(page)) { - dec_zone_page_state(page, NR_ZSPAGES); - inc_zone_page_state(newpage, NR_ZSPAGES); + zpdesc_get(newzpdesc); + if (zpdesc_zone(newzpdesc) != zpdesc_zone(zpdesc)) { + zpdesc_dec_zone_page_state(zpdesc); + zpdesc_inc_zone_page_state(newzpdesc); } reset_page(page); - put_page(page); + zpdesc_put(zpdesc); return MIGRATEPAGE_SUCCESS; }