From patchwork Mon Feb 20 13:22:10 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: 13146445 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 EF3DDC05027 for ; Mon, 20 Feb 2023 13:23:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8E8366B008A; Mon, 20 Feb 2023 08:23:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 898726B008C; Mon, 20 Feb 2023 08:23:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 761576B0092; Mon, 20 Feb 2023 08:23:23 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 621006B008A for ; Mon, 20 Feb 2023 08:23:23 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2A2CE1603F8 for ; Mon, 20 Feb 2023 13:23:23 +0000 (UTC) X-FDA: 80487736686.26.8798CC0 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by imf27.hostedemail.com (Postfix) with ESMTP id C888E40016 for ; Mon, 20 Feb 2023 13:23:20 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=VUYjSIRc; spf=pass (imf27.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676899400; 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=D2Zvt1PWU1etQHhY4xpQEICva/YkZJeRQbp3ItrgXsw=; b=CuwF93rqkkHMPRcz5vx2/KDYqItpsEInwHZR8HcA6sVXqZA0ys+J3CFrRy++gqThiZaaV6 7prCKZcKNDqIlOypliNHLlMSEhtw3RnZ6xw3dzxYDOE7IvidKyl9+0L6Zzp0K/e0h9o1mu 2iJvuOmQmJK8YI32cF4mvKOk8kR+/iA= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=VUYjSIRc; spf=pass (imf27.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676899400; a=rsa-sha256; cv=none; b=0HQB5CIdvtNYVHO1xwBCIfJmC5n8jlBBfyIplvLRL0qOY2eNBqKFt3MrZBQobahUPfEIUX R5X7ACvRwv5VgaHwAdfBcIwjWkB/+p9inwhy5BnHDAdFzi91efKslyZXIel9wFAJ164amV ZHT9zr4MIbqc8pQz55hv4FCl/hM9LHo= Received: by mail-pj1-f45.google.com with SMTP id o16so1402478pjp.3 for ; Mon, 20 Feb 2023 05:23:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=D2Zvt1PWU1etQHhY4xpQEICva/YkZJeRQbp3ItrgXsw=; b=VUYjSIRcVixbLe3xPQCr6MSzJqAvX7wJfsRyt/sZn8h0pRqA0Ic2RETEHOe368HamJ zmD4koHeNNiNThQWWh5wX8xYaCuQuUHPAaoZoLZdRcSZFTGnpqwAkRVDnABfyEmzqk2V a8v3PTE3u33d7+dBLbmFANNe0zU0O85zE1VI7jVBOrd65zOI9tp+sDyum/gZUvkRa9RF PPAE449HsFFt0eYrqPFCPN8Px+Xbt6/vXmTIzpig8Y9R+2Ws2WSgzSpRAUeGJeUqhc4d yXDJ7OPLFoG0ICx1Xz4KowRn+rzz0+tFxikvSkij5fuvfcSWfgY+IiDoTSVKBzytNCHj sIvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=D2Zvt1PWU1etQHhY4xpQEICva/YkZJeRQbp3ItrgXsw=; b=X9Lv70sN1om3PekEh2Ix12I80CT68LaH0j+YpaFw+DGXYGpigpmy0oMEBmjpYwRckP OCRCPwXY6ryOGZy7N1VL0o4kCTmk8oQgibfzUSDH2iHfM14MCS+mYxKae96++hZcOKoP UjyEZOU79KcBMdNSp6NneqX0hq8AiuJaJ4IKiJVqP7sO9cO5BNyiaM54TT2X0t7AJ2QC kf7hRNOb7htXa++v/kgj7v1c5LRvj9TmwZsmMlO81PYTYoQmbqlrK8fzc8J3Tg6nLq3s efGBL9Xv7p3wSJZY7Y2U80XmPi5QE9o8RJqXmzrnQCmaE36YF8VreW+1dPKNdSJTfjka vMOg== X-Gm-Message-State: AO0yUKVQ5XHGIQCWGqqVF00Kt8/H7hxCloaM2rFO5/us2BSU/nY8C17/ 75Pz1oavOAZnjOJ1wFnr1Mc= X-Google-Smtp-Source: AK7set9kBY2tKAUlp8fzqSE48cXlGlqRLv9ge6rH9m4t8faWGHmmq2w6yWmlI1z0SmynJL/CTmDFyA== X-Received: by 2002:a17:902:ecc4:b0:196:8292:e879 with SMTP id a4-20020a170902ecc400b001968292e879mr2948386plh.1.1676899399699; Mon, 20 Feb 2023 05:23:19 -0800 (PST) Received: from test-ha.kr-central-1.c.kakaoi.io ([210.109.63.229]) by smtp.gmail.com with ESMTPSA id x2-20020a170902fe8200b0019c13d032d8sm6125436plm.253.2023.02.20.05.23.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 05:23:18 -0800 (PST) From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Minchan Kim , Sergey Senozhatsky , Matthew Wilcox Cc: Andrew Morton , linux-mm@kvack.org, Hyeonggon Yoo <42.hyeyoo@gmail.com> Subject: [RFC PATCH 17/25] mm/zsmalloc: convert location_to_obj() to use zsdesc Date: Mon, 20 Feb 2023 13:22:10 +0000 Message-Id: <20230220132218.546369-18-42.hyeyoo@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230220132218.546369-1-42.hyeyoo@gmail.com> References: <20230220132218.546369-1-42.hyeyoo@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: C888E40016 X-Stat-Signature: zfabszp5hhrj5fpjod6gg3abju5gxya5 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1676899400-596875 X-HE-Meta: U2FsdGVkX1/DYvBtP9ou13hEEzy0trjHTW2gOZQNE/++gJHOCy5lwgQDyPfqisJHgrEseddZ+ylQ7yRatuTWAG3YUsvzD0+fTqUH6ZosNWU/UTVm75uFEAvlecMAavhionzBAPfAgHTD0RxOzsIrKbryax3dMNMul1DoCRpliIoeMxiK1EvcacomhtuVaxBi52uWUwBYypkpfmvV08FKXkHwcfJxm+kpQz5N64OJd8aNKgebs3FYoAwlaPk4QMBv4eimLSO5kLs559mXOSDLK/CjEhNyy4YsaadJUg2KD0Ao9iERcO3frjqacsHT6tNsLZomhb/aLCHtRuytq0OvDdIji7k1SvUThcYGWwN1qqTNyuAc9/8yYk4SoG8W60Ru7qnczIkOni97Q4R4CBlLmq/ZPYUSsVWt0PMvuB43lTQ7FI+KKccK3gwAtOFdc81gVLm7S2zdbBSm6Kvypi7x0GcG0jK5f3uy6n2DbOp9CPhtW5VcFf5Bf8qh18lfKwpYW1hMFCtJUuWMsvH3eXKGu2tm0TVyguvddBAxV7DlJ0nqin24oXM/ipnqUMSQ/8Oq3GJqAjcfgIgQ8Qjd7T7TqvyoZDhOHQ2oAJV3tYr63UlHyJ5ETzc7Tzl0p7FgsLqooGqYS0QqQXo3cIc1bBMYBGkjaMZyBvruQRz5SuU4Xkezea02CHh5y9TDlvquY7y+7Aq/g18WJpmGTpa+4jC04rq5FHCQTtk/iitbR/vW38gW7+EuspFrlwo1MR85OKswzYjPeuY8WL43+T+ko+ooTMjowIlTpmcDHFPvk0TY7tzIlUg38OmoFxMShtKHAOAlMp/sDnNLZ8n6YFuHvkcCU96PTlt257sQxBwyku/N9/wCpNfFF6H7ZLmVMY0mL1VuTsytc8AovzDeszselB8ouzW6bKitv9AYXDQQM100qWlJXxgTuT4Z5x9B/nb75gdK5L2tcVZcrZptchlQvnx DcInVkhm w1B85UCbbRRY/e/iUC0KFoPPEzuLw/Vd0rWxY6QidtVrV9MhNlxtF4sdL4eEoPc69Gg23vmxI/stJdX/rws42fAqVCbHAIydyOT4OsxwfMnVxsiWUEJRSjMwyGqN685xhhjG/EaP7H13874yELTR4g9KMCEcnItvm1ifyhgjcB6XDrOtgESoe2TlBmovWX0q5J9uQFsU0Fgx0KyUjBGPm5xqUq+MH3NKtktgmhxy7W8uaxQDbMirQbPpK3Wpjfy3DFNWCdqZFdeFgqxP1riRLwdGYf43uNOz42aEQj3nb5oLVyd6ld43Ga+3RA+6W3PyYmB8g+iwnCJ3TYrh5W/KJIJmuj0ABka6p0okezSY6HOkHsDjC82lhpLfegdolfVPi8yvFGiG9moe780OkRA4WnlxQo6bqDLr7yPkrqoO/YP9P+sRc5uiF3oDbTeUpH/rXBW0x0ojGoAnoga7g2PR6VbKKQs3pdAQkw7I852W+T09CYim6oDJ8WO3zajcDzKujD8UL8gU4FedeUxaFgLAlWacJ+Q8oofJKR7Fr90trBvqFnm7Jf7ybaks0Zr0v4CryfSeazO9fbjzmcg2JAMfD+AkZEBS13BEMuhED 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: 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 affb2755d9d7..dbc404045487 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1038,15 +1038,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 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; @@ -1671,7 +1671,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; } @@ -2252,7 +2252,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); }