From patchwork Thu Nov 30 10:12:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hyeonggon Yoo <42.hyeyoo@gmail.com> X-Patchwork-Id: 13474213 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 22A84C4167B for ; Thu, 30 Nov 2023 10:13:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A769F8D0037; Thu, 30 Nov 2023 05:13:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9DB548D0001; Thu, 30 Nov 2023 05:13:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 85E0D8D0037; Thu, 30 Nov 2023 05:13:49 -0500 (EST) 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 707E88D0001 for ; Thu, 30 Nov 2023 05:13:49 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 456B280179 for ; Thu, 30 Nov 2023 10:13:49 +0000 (UTC) X-FDA: 81514209378.15.8335B2B Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) by imf17.hostedemail.com (Postfix) with ESMTP id 3A0B340020 for ; Thu, 30 Nov 2023 10:13:47 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=P+byPcYL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.210.45 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701339227; 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=ZL22QKK4nXxVYgGVD7neKWpp8x2kVRHfKcr5jDKusDg=; b=4z8O9c7rumlcFvUE7reDx4eLcAXIdWDJjX/SEZ1YdIgcHIcpcEVS/4dh3QEXKdcV0RMGKW Kspd0xe31RhMIQvM4tlaGB2CjnFL1n24WuQ3NTtvJstXh/k/SQp2TGn/zrCSc5phOVrG2y PxsXEg9bkR+5n0uXyuTlb/sqHTBziik= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=P+byPcYL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.210.45 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701339227; a=rsa-sha256; cv=none; b=AZF9/9Ze85qcRaGo9iGJsVNTZp6yHmgVERzajBeofHryBb7grtJKHVajWBVyNm723DCZQv o16Ul9e0hQTLuCud+k8XXJnrDhzXwpEMnT00IO1fpw8dZsWLGfeQBYVFEAkIWouFs18MbP 7qOO/QyGFahzkiDWauFOz5Q1TQQpoD4= Received: by mail-ot1-f45.google.com with SMTP id 46e09a7af769-6d7fc4661faso440717a34.3 for ; Thu, 30 Nov 2023 02:13:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701339226; x=1701944026; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZL22QKK4nXxVYgGVD7neKWpp8x2kVRHfKcr5jDKusDg=; b=P+byPcYLWw/TYPQuCMt1PWQ5ASFazjMEptCQbWFIkqO9neJw+lqh+abX/QJIipKyzS W1DWxhfRel66PcrNM5uN2aQceTT+jLCJImzKpyviH9qgwER1UNmvaNI5RP8h6yG94SKh ivOXh3gQlAglT1LlClJ6aV7FZVu4LFS29y2OGztA91io04W6hqPiFen2Hz+lXMmZTjL+ hK5GxALhixBWLj86oK2DxJSxfCa6wChG67USEL6NfGaxIUsJtkvdyv6j2Iza/xij5vSg 9PKjBwj4zVapT/rBkjkrTp2z5kMsAnkQ7YBqIfVSf7DNoD/G/f7lOT5M4x9K5J5aS+6F qlnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701339226; x=1701944026; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZL22QKK4nXxVYgGVD7neKWpp8x2kVRHfKcr5jDKusDg=; b=cV8rsnZvB1sERX1070d7SjVxQd/zyzqv3Dq2/cjB0krWEDn72bAeS7hp5X8R3mvAdg r9hw4aEhI9xUImqAveE7hH3Cpi+Gh2YO3UIx40vVT4/oSg7J4xlZyPHmH7FahDs8iZGO QczuBzle+robT2k9ToDqlfQziZMdrWNLhF4/U/6Z6Hm1SGM6/+YWpdauHEpqJf5i3Fh4 fLUmifnrkh2BfIY4I+//4AQ64Ab1tVculne6IB8VO5wcTnMnydr2IG27u8zxQY1r8hnh AJYmIIImaJUWIpJtajQN8bYtZINrgaty5wDWr03NGyQy3zsFHwh8dvtc0OREqduNaW0T ZArw== X-Gm-Message-State: AOJu0Ywhzb238rJjHaBJK59mpTCDQRRJ//3/HeVn/aVXPqVwfwpljBCr gKnuhIYsg7ahBuMpeVSC1tY= X-Google-Smtp-Source: AGHT+IH5M77JymonPDY3XhsdbxOK2PjjaHZPKLSVAv5L1xsSrPqO0yeVzHbJ2hgDEgEm3O7rKd0f5g== X-Received: by 2002:a05:6870:75c9:b0:1f9:9003:4164 with SMTP id de9-20020a05687075c900b001f990034164mr27306992oab.35.1701339226256; Thu, 30 Nov 2023 02:13:46 -0800 (PST) Received: from localhost.localdomain ([1.245.180.67]) by smtp.gmail.com with ESMTPSA id r27-20020aa78b9b000000b006900cb919b8sm841402pfd.53.2023.11.30.02.13.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 02:13:45 -0800 (PST) From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Minchan Kim , Sergey Senozhatsky Cc: Matthew Wilcox , Mike Rapoport , Yosry Ahmed , linux-mm@kvack.org, Hyeonggon Yoo <42.hyeyoo@gmail.com> Subject: [RFC PATCH v3 16/21] mm/zsmalloc: convert location_to_obj() to use zsdesc Date: Thu, 30 Nov 2023 19:12:37 +0900 Message-Id: <20231130101242.2590384-17-42.hyeyoo@gmail.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231130101242.2590384-1-42.hyeyoo@gmail.com> References: <20231130101242.2590384-1-42.hyeyoo@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 3A0B340020 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: gitfn3yxw3hp4pf4gc6qx1kayb3gao9x X-HE-Tag: 1701339227-795279 X-HE-Meta: U2FsdGVkX196z3T10V2+3kQ8qe4krE8L2l2+UU7mIPx7TEw2/HjVYdYAPGZ79UQvni+UVH+j1J41n3Xz+tpNTM2Tqh1eqVNxh1cuMSPUqSogoDyulQt98I6U15udkQ1DjZEQmIw8FIVxb6TFmyU82AQOq6qYOZO5xY/wRvq0HKXeW60gOhbnsQYPu51uu00gvL63vru2mHFC6Mo6HVLq5BOHUvMgTlQ7b0foiuxb6pHrSS31rqt1BLgk5geejhIb/jkJ8O5AZu9bmB74V5rwsgPzoJbylpEXzjAdKCfALg7jgaYPou4C7Z14nzNqdJ+AVpdBbJrx/AvFh7cFuSuHW32SB1Khc60GtycdabvvIukiTo4jMeBDlftB8w8Nmggkiqtk5GGhUyvoX2oIDqRSfl8NRYXAXM8qZuT5eeK8EnIy7K7upU+ZUfFUe46EhXrdCWnCnBzfcxyFzVUylGGls8tmCqvsIIJk+y32uvtFPZvzRA5HN3skqoHoeT6lf3m/ZV6wP4j+1+OZmFyzn0VBWOY9qBImiuWH1f52xlSZa/s3I3xjYHzyCo7bkYy/w1GtrU0xOrkwJgvzYWEp4QCsMyYtGCEIULU7kIXoB4GQVJESln8eAS34I4febwPoThaTZsAW3OYuMSbMdgd+hTR+3IQkujwOdezKH3eOv7kFUQRyQjOJHuMlWAmnht3cHbR6D4FMxHJQTomNnJLVVR1GQJ1VJDGTXMAcabaOvU0We0Q8beqacg+WQSMFPsUWwlrI1l6htuOXRTvcPorwJdMyhJEPOXm9EQFLPaOxKKOdtr32QUi4czxkgAnjnhMIiD0TSWa9dy9WBL9zzdOQJB6qWIHz2Clw8KOWZL89yp4YWd6XpXIeKolLwNnzMMijoKb1qN5SbV4A8s5fnjL7P99ArgqNJ9ArPoAfi2kN6Ize/ziorpC1XVH5JdAS3NAXnFwXHb8C5FyOTHdgB77N6cE zZg8DF2H qRq+qPiisKY9fT/p+udQpckof7sGZ3pTtSQElJe57n56MMMmwkoC5LO3aip9JIQIyrPAnZSDr5/nrRJamLe3xuCCGQrtlNz9xhkVYVR5Td7BenaQyseceqEjjAiGEiw0BLuclerhRrzirSpfc3SPsn5V/Z4rxDKici7/QnFDjasclgIRED9kwyk0iH1ySD3v/6IUZOkeksboXz6R3YA8mPr7b2ssk+VNgqffhUYKas1a+XRyJPAykQKJciejI03XRAFldF5MGo8tuy0eE+rwfmQKy63qaf3J2DHMSBEPwqBjKOHViNmSVzVKNeicFl0W91m4R/8FxOgn0p9csSnOI9ZdFh0qWIFurv3RynpuSPgwc6gfMJ5LiIfpiXPkIjIibVCwxzDQ7I4F+ooRgm4ubBibmCwzhTd19JFc9aKqHJ1WgAw1jNQ4nxibKsXO5vkePPh8RMGESQFr4ChJTp3KznVxPRlYuLsdOIJPvgIgUzqFwBK9SjJa4y44xYaq8c7S3hcRxHneSKv1/4jxDW3yXRKXIlNfik5bM+9xpBnNUNrgeGUBDk6sghvLJqEM88dChcKkUhYIhBiJM3AwcLcq18KyTyQ== 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: As all users of location_to_obj() now use zsdesc, convert location_to_obj() to use zsdesc. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- mm/zsmalloc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index fdcc47569644..317bb0e8939a 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -952,15 +952,15 @@ static void obj_to_zsdesc(unsigned long obj, struct zsdesc **zsdesc) } /** - * location_to_obj - get obj value encoded from (, ) - * @page: page object resides in zspage + * location_to_obj - get obj value encoded from (, ) + * @zsdesc: zsdesc object resides in zspage * @obj_idx: object index */ -static unsigned long location_to_obj(struct page *page, unsigned int obj_idx) +static unsigned long location_to_obj(struct zsdesc *zsdesc, unsigned int obj_idx) { unsigned long obj; - obj = page_to_pfn(page) << OBJ_INDEX_BITS; + obj = zsdesc_pfn(zsdesc) << OBJ_INDEX_BITS; obj |= obj_idx & OBJ_INDEX_MASK; obj <<= OBJ_TAG_BITS; @@ -1509,7 +1509,7 @@ static unsigned long obj_malloc(struct zs_pool *pool, kunmap_atomic(vaddr); mod_zspage_inuse(zspage, 1); - obj = location_to_obj(zsdesc_page(m_zsdesc), obj); + obj = location_to_obj(m_zsdesc, obj); return obj; } @@ -2020,7 +2020,7 @@ static int zs_page_migrate(struct page *newpage, struct page *page, old_obj = handle_to_obj(handle); obj_to_location(old_obj, &dummy, &obj_idx); - new_obj = (unsigned long)location_to_obj(zsdesc_page(new_zsdesc), + new_obj = (unsigned long)location_to_obj(new_zsdesc, obj_idx); record_obj(handle, new_obj); }