From patchwork Mon Jul 29 11:25:15 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: 13744726 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 941D1C3DA61 for ; Mon, 29 Jul 2024 11:20:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 239C86B0099; Mon, 29 Jul 2024 07:20:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1EAB26B0098; Mon, 29 Jul 2024 07:20:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 08BA26B0099; Mon, 29 Jul 2024 07:20:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id DB9066B0096 for ; Mon, 29 Jul 2024 07:20:30 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 4BA541602BB for ; Mon, 29 Jul 2024 11:20:30 +0000 (UTC) X-FDA: 82392547020.17.98039E8 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf02.hostedemail.com (Postfix) with ESMTP id A216B80004 for ; Mon, 29 Jul 2024 11:20:28 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=mPBuc1PI; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf02.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722251969; 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=61ZUT7gO5pix+Syfo3H6V1v5+PP3SiTNV2KMQCafkgk=; b=KzD/Sm+aOJ4R11KlnZZnAmUYuZNGqiL32DTHJQrirmomLc8SMiGmixy5woSfJ6A51/1C9p bRnJ+XQURv7R3mXSJ3ne17d+1djKywzP5WZCuLi6n97emxUbXmaEa+0AnrTHZRq+UDZX5B iVihfR3dT9D8seQUO9OFsZsiXMEtQCo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722251969; a=rsa-sha256; cv=none; b=ZkPjMkYHtkAc+W2KIqZ3kYtLn0bNtW1QK9fcK1zSodtdasSFLWJxQGY2LiNrBuy3ePFNNd vwIzQ/swzsBaQCR67RZWhl9hEoLTz+9LbHvzG08Dcg9OOfRnYRxyOj0ivYKSBPVgNgxhGJ 6o1TGVS+CSvdcs3sMqRWs97A17WAsSk= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=mPBuc1PI; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf02.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id CF361617BD; Mon, 29 Jul 2024 11:20:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D32CFC4AF0A; Mon, 29 Jul 2024 11:20:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722252027; bh=ezRZsoVNxvO9p/Es1oKbiCO8zRXU9uaLAm4pSSvGkg4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mPBuc1PIJz8zxeEieUPstihcjHXEabomtxQv0t1FNmEjidfXx8YbWGSAUWn5iN7D7 DEyiE44MryR2s94k9jM8AXG6j1u5h/1k3RSSZAOfk3Y/EF+LxFI07oscV3CGh0J6ed B6cj5rJspAo6bNylOz4erxIr8aBwqP+bNW919IGYX/RCEGVxm5tx2i77vy+ZpHd3eT gGh2JRbA9G2mi9iKh2gmOKthWRciie29ZHJjBEseRwcP+hIxFTykM9M4wYVvG1xTBs r6o/CobB/cF4rZDnpSBwcspMXsRequ6xuCHD3GU91Cq49XYzsMeyHEKs66Twok2ApT mJcO8nA17CJeQ== 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 03/22] mm/zsmalloc: convert __zs_map_object/__zs_unmap_object to use zpdesc Date: Mon, 29 Jul 2024 19:25:15 +0800 Message-ID: <20240729112534.3416707-4-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-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: A216B80004 X-Stat-Signature: hmd7bpoteasuqiu76b9pdhyphhwxtfgk X-Rspam-User: X-HE-Tag: 1722252028-711374 X-HE-Meta: U2FsdGVkX1/uzYVf+BDHWzmkqzhKzRje5VwqNjvRp4UmzQu/dDyS04sE5VYkLiD6ILQxjtrDleNLZOmDNVH2UXbl53qfjFEvSGc/PN0PsiG4Lf6i/6UDFkfxlZdfmBrsdVIuD60l3w0Pvus0ETzf6EStePIJei5rLaENElJIfgvTDu4contX6bJ1kFQE1/vmiyS7bal1+VnB6hJO/r05UHOgOkaNAkqwywSKRA15REP5WdIkoYqESvD2Sq/tXf1Rjf+PdNRBkdV8jP5Y92pNmaHu+sC4FzRGcDWVgnP7B1L3SrW8GMOcFdOfN/jXKfPRV9V6y6rOgrl3SXI1SnWX7rBXaUgZKXfZnswkX38vBPQgccqDDIuMOBOuE3TI2Terojv4Z/xehHZSP9YGeG78nYhU+8ExLtoDSTquCbi/cgOI0PgebTwnWjIeAjjj+SKjAoNVinRSsYfS0pba1yiC8OcytLKn+7uKpBPdrbbg1f1WohkKxDPgn9Afj0Djbec8hrPLiD3mzv0lIpkGWbrd0TYsCvWDQvuXnd2A6JUCvW7PfMh+DEfLn3AP1u/+ZM7P7OiWACAjSIi5Aj5UlMk1nkFhR9tpj1FOMaUfUwfDnq/nWo0hSKn2tT8xI3yrmoEcH90xu8zUPgEbJBws2am8IVrbLaq71ujxwZsNtWoNvaVXdiI5cPiD82xOv7nN5F9IZV5WuYMPB6UA86NcGXn/lYowFY5JEG+brazBrETaTILRRo3J9gcdyZ5f9GHPfvYiQsiFdbvAcmT0wbnAoquwiGwPEoREhet95JMcApqgoERRRxYTwGxavVjyhZKR9dVdUlU+9alTJJp+hSqw3lbuckXtBANtziOmpQbb4s1nD0bPXEcz8UKiYKHCoTyvfp6h9dHXI5qQFo4juoZi/XMb7pCUabugQzhynNbASBpCyUV41PMkGV2aIrVUmJES/K6M+LBLbRhpkBvQQ5AhNc5 tNYcXF94 5UhDivdgRdBdOq//qmMUv56WHfpbgt7nu96XrxSevnUEUeZkajm5x/+LAIOOQsKfbJVMm5lsfPIRCADTix9InMZGztELEglyj7dzdUi8o4Y45WUGbSSogWycHbKI5dyilwBlmFbMAjiYRTfVbeu/VNrKUBpgy+gs+lNiatHbcOeB2k9XNtuDVsG3XxEuzCf/m4x7Z7k8BtummbGUoyWop0/nmVGzJ4kJlEJWHwpMWcqFOTv6FOx1FNcOv1nTafozJ/E5xnjFcLmIzCERz+gLhHYZ9iexp4R/PPEMGQ9vFIveAdvqYYtnO8Rx94Ft6jwLd2RaSPCwHgd6ULqLEKIdRjZeockdbnz+5l7rIudX074g0vkao0QF2xSpZNc1yU2ahkfE5 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> These two functions take pointer to an array of struct page. Introduce zpdesc_kmap_atomic() and make __zs_{map,unmap}_object() take pointer to an array of zpdesc instead of page. Add silly type casting when calling them. Casting will be removed late. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Signed-off-by: Alex Shi --- mm/zsmalloc.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 243677a9c6d2..68a39c233d34 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -243,6 +243,11 @@ struct zs_pool { atomic_t compaction_in_progress; }; +static inline void *zpdesc_kmap_atomic(struct zpdesc *zpdesc) +{ + return kmap_atomic(zpdesc_page(zpdesc)); +} + struct zspage { struct { unsigned int huge:HUGE_BITS; @@ -1061,7 +1066,7 @@ static inline void __zs_cpu_down(struct mapping_area *area) } static void *__zs_map_object(struct mapping_area *area, - struct page *pages[2], int off, int size) + struct zpdesc *zpdescs[2], int off, int size) { int sizes[2]; void *addr; @@ -1078,10 +1083,10 @@ static void *__zs_map_object(struct mapping_area *area, sizes[1] = size - sizes[0]; /* copy object to per-cpu buffer */ - addr = kmap_atomic(pages[0]); + addr = zpdesc_kmap_atomic(zpdescs[0]); memcpy(buf, addr + off, sizes[0]); kunmap_atomic(addr); - addr = kmap_atomic(pages[1]); + addr = zpdesc_kmap_atomic(zpdescs[1]); memcpy(buf + sizes[0], addr, sizes[1]); kunmap_atomic(addr); out: @@ -1089,7 +1094,7 @@ static void *__zs_map_object(struct mapping_area *area, } static void __zs_unmap_object(struct mapping_area *area, - struct page *pages[2], int off, int size) + struct zpdesc *zpdescs[2], int off, int size) { int sizes[2]; void *addr; @@ -1108,10 +1113,10 @@ static void __zs_unmap_object(struct mapping_area *area, sizes[1] = size - sizes[0]; /* copy per-cpu buffer to object */ - addr = kmap_atomic(pages[0]); + addr = zpdesc_kmap_atomic(zpdescs[0]); memcpy(addr + off, buf, sizes[0]); kunmap_atomic(addr); - addr = kmap_atomic(pages[1]); + addr = zpdesc_kmap_atomic(zpdescs[1]); memcpy(addr, buf + sizes[0], sizes[1]); kunmap_atomic(addr); @@ -1252,7 +1257,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle, pages[1] = get_next_page(page); BUG_ON(!pages[1]); - ret = __zs_map_object(area, pages, off, class->size); + ret = __zs_map_object(area, (struct zpdesc **)pages, off, class->size); out: if (likely(!ZsHugePage(zspage))) ret += ZS_HANDLE_SIZE; @@ -1287,7 +1292,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle) pages[1] = get_next_page(page); BUG_ON(!pages[1]); - __zs_unmap_object(area, pages, off, class->size); + __zs_unmap_object(area, (struct zpdesc **)pages, off, class->size); } local_unlock(&zs_map_area.lock);