From patchwork Fri Jun 28 03:11:18 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: 13715389 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 C2CAFC2BD09 for ; Fri, 28 Jun 2024 03:07:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0C6ED6B0089; Thu, 27 Jun 2024 23:07:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 04BDA6B0095; Thu, 27 Jun 2024 23:07:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DE13C6B009C; Thu, 27 Jun 2024 23:07:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B740F6B0089 for ; Thu, 27 Jun 2024 23:07:03 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3271416148B for ; Fri, 28 Jun 2024 03:07:03 +0000 (UTC) X-FDA: 82278810726.11.81663D2 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf23.hostedemail.com (Postfix) with ESMTP id 84F63140009 for ; Fri, 28 Jun 2024 03:07:01 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="kePCV/TI"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf23.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=1719544001; 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=g7cGUq+URoNvvexaaMQLwI3OYNEW0J8WQAWgi8R3hs0=; b=YYqKen1j2o4L65mLWVeR9t3PjPNL2kr/ppWi2wyV/YvBMOKp2tPxIoJjpq9BMhHvHpHYok E/XYVKWP+QScIo4a4s8aDTP5ZhhzYpVbS6NovdhUsJaQK5T3hVLNOurnNMSFIoFUkTTJd1 rxOW/sCDxE68dsVMqLXwUeVwRwquQwM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719544001; a=rsa-sha256; cv=none; b=T9tQqpZpYTv0Oa5Cc51sNcrHM8HPgG/L9JHCRBlY2Ay8FYLoxBTC89gZK6Mn5ElpuPrz9/ e2+AdO3lqo/QY68PLk9Kq/+Il/7U0TtwQS76zknCq8k5y7raWsN0DT9JJMYIOvqfW0+Mm4 gKv4pmpQj+ylFqtW2IdhXnRYAz1YRb8= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="kePCV/TI"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf23.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 A1C3762055; Fri, 28 Jun 2024 03:07:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47CB1C2BBFC; Fri, 28 Jun 2024 03:06:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719544020; bh=la1BOuF9dyPKXa6VzFValIggtH+1hQli1SJEv8vNjvY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kePCV/TI59oEiDU6RiCVWdhIVIIKK6xMrJRCLPWy/EAVyv+bgOGbbgE/wlA1MOr7d rQzOIbgaBwAOnvtUtf19hEHYCrJ4dovLCdTK8438MXdWmSM58iKRvGF9DbM3lXfOYp rKGIs0YnIzt4nnDUsyin6MVfxZaBbsF+kCD+jDs9TxrG+UIVVJ7vYbIlnowNDwFzVO 3js5naNvOwhjn7Am/WMKBsjRm83kLOsGAJuAjxrSQQiy+GQDMucwfZSIA9QICY4h8P 0uTp0tQREmNquy0fJ0kNTYxSLm+8YiI3moo28X2+FqrPCZLhgupx7dSpIyxsczlkRE 349W7Hg/LeVMA== 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 03/20] mm/zsmalloc: convert __zs_map_object/__zs_unmap_object to use zpdesc Date: Fri, 28 Jun 2024 11:11:18 +0800 Message-ID: <20240628031138.429622-4-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-Server: rspam07 X-Rspamd-Queue-Id: 84F63140009 X-Stat-Signature: wn6quqowpq9jdxoaaqere1z9ozxhbjxs X-Rspam-User: X-HE-Tag: 1719544021-998137 X-HE-Meta: U2FsdGVkX18ctT1fHEv+vVda99X5aRu4lSQMEBZaRT4Pp0SvKnOtnt31xOvJCSQfXL+p3vUfNupccwKKD9L5Nbj/37ZJok1qAXYuYyG23XzDDo3X/c8uKoP6MjB5Fh7+YZCImOVKZf6SHzMMd0UPlRA+b+mkSjbKUtvQhfRqe6hTLNjJFzD0/3p6/imQmSHHhsTSzUFGaf/BpTsY8JunhkFyfPq8AwHXwy5k7K1cdmzwV+wlfbYLjrhgFNhu/c5g8fLGHNXku+TeHe6XQyqjCWKDBJpJlT2jag/zeoKa+pckWOfDYBAfgoiN9SDnj7biP0OAbNfOi5aP62e2CWmnIK9UqiebUMcY/7qjPO/tP2p7esp8zCNA+pAvJMXyxHjfgZFFvldZcJV7b15dxnMJjwYalXCYVk306ixHst3NsALLhIn5JoLPEcxCsKPZ7oYtjqJYcqUDUMix4A9ZoL3rVjvTHenVXCmq6Lu4mzE+ynjXy65vJXn5HODdXNxSD1fIrN7BWlY2KhHRb0pC7buwisr9LF3RYHNoLBJrvwkH92EQ+/O4Ye2MRuLiRU5G8NyDhXnnOnBq0theL20H1HDFdMYwypgzZPHQNfnOXS+fITNj/qBnjraJwuSInBElLkKJNJJ4aKIyhjX9qMJaE/oqeyHRcwf+tc+ZrrtO911I2Grmm2D1DiKiCRKPtZACOYfuTod4p+rJMknYqTUQXkmN+nHk7U7slzLUsvmW30jmwKQKu7nHXgFF/QGoR8CGyM2yPBjuNU05y9YChaX3WlyltZ2f/+845jB90xgYp0qLTJbUAchpewzqPVoFDE4jn7DTQQKJQdvBluBEHaeBOqDfrzDM/OgSF0kvg8GnpOWAV2IlbFRw/cLGrhqIAdXQjmd8KELXdHUpqLb+q3NObEA+xJPN/YXX8XbpB69ba/lPMMX5s7SQIC0Sflms9MyFQ0FOI0N6Zl1CyCkA1A+AwMq poHIuP2y mQ4IdZMORstpwvFFL2IEILOxJhvAzWZl/zPonDbJJcsXIN9fHFSZa7Oe6/p04fSJXQ99Th9mOaEQ/tAmumK+d/QnW9HpARQkNnCAdI+Z10O1Dlg34qUATn1FN9fK0UyFLleBkggLXVL8mQBg+dbcbjhu8jgYEBb9j9QAe6ILC3xPBWQVP53HmfBv2Ft3j3SOhE+LuPycqMXHyjMyI+NpWxuF37jpmtraQ2jbCietssCaTz2q6zoFV5wLlklmid3YBr9iCvQfa5ttW9yg8A9RagQLuMEfPgkWMjZ2i4q2LC6qMtc53eTTD326BvAJOkvwbJKW8MUwc61s1SEFKIK4bl0LG7WcfqhuVXD1TyQHr/re3yCYPmDfPEUMqTzmZqc4ak2AO 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 9835121109d1..cedd3dfb9124 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -245,6 +245,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; @@ -1063,7 +1068,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; @@ -1080,10 +1085,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: @@ -1091,7 +1096,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; @@ -1110,10 +1115,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); @@ -1254,7 +1259,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; @@ -1289,7 +1294,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);