From patchwork Mon Feb 20 13:22:05 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: 13146440 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 DD784C64EC4 for ; Mon, 20 Feb 2023 13:23:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7AF886B0083; Mon, 20 Feb 2023 08:23:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 760286B0085; Mon, 20 Feb 2023 08:23:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 600FC6B0087; Mon, 20 Feb 2023 08:23:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 53C286B0083 for ; Mon, 20 Feb 2023 08:23:09 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 255DFA5955 for ; Mon, 20 Feb 2023 13:23:09 +0000 (UTC) X-FDA: 80487736098.22.C1D82C4 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf23.hostedemail.com (Postfix) with ESMTP id 5B5EE14001D for ; Mon, 20 Feb 2023 13:23:07 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=mmSODkO4; spf=pass (imf23.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.173 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=1676899387; 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=qwmkL2pzDsXM3Ihm2yCy21CwbNvNB3TX+HCzSAtLeMM=; b=PHdFsjkxaEdD9oTRaGcpj2xZzbP3Ms3wFWdwKZSqA91yGn+wh9ee3SaLfnR3pcHhdQknZD mCbJbes73YLXgYeoG1EIZ0bkpT7EJW9Qg9cGtD6gK99h5LjdJ2y0JzEAGdlh3irOGToYjK ky4+3/7wXyQtxOWuOebovF9gXOKSvoU= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=mmSODkO4; spf=pass (imf23.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.173 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=1676899387; a=rsa-sha256; cv=none; b=Gb1eAJ9Ftwgf6KeQUcxQ66pfk9xmyZaJsfgAQNpdJieTKObKshr+HOX9YpoDKqY0lJo1ok dPApspiQ2RC6QdVVkknzavJ98R4+5HSOutNjd7Q1umRpblOImf8yjNt8Wn7IZQpFhE0XCy Umhm2W67LCVsZQ4OcMHzdeP31T6Lo58= Received: by mail-pl1-f173.google.com with SMTP id bh1so1341014plb.11 for ; Mon, 20 Feb 2023 05:23:07 -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=qwmkL2pzDsXM3Ihm2yCy21CwbNvNB3TX+HCzSAtLeMM=; b=mmSODkO4nioadyk77ojoBU0SjJV2GwqPUB9uN/ss/8dhmkzE2wSuesClNfKEyQeAS3 JJKRQAswJSCe2QijPqCZb0AqqHUnrqG3+dQ+AIuJLWuKJSNeerGFx4p85tNfP99Y2wRX rO93kbE0FMiAGbDJSIKV0Iw2vW7AFvD6y7K1rTOhVyf6WCvTyH+1Z2NBiyKXI0QVjJF3 wemBd8AbAgZtmZLRqxmFU/TOw5DJCTSYC/wgQHKaqdVkA7OJgCQ/JyALGdGKEs5xtkX9 U5nQtEzIVIWEXQ1+0xWrV9yYn1bupdO0S6IWFlzVpv4SlM7vfo8beanAdLgDN+QkT3N4 7OBA== 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=qwmkL2pzDsXM3Ihm2yCy21CwbNvNB3TX+HCzSAtLeMM=; b=v1mNrCWLBvqI63LCwvkEm9A9rjm4rUNEiQ+QDwsx+Cdc+NculQ0vomLH7McO+7NZjc 40tTKgOzASZsTLgt9HU6d/FRJmXAfxXsyAjcNGiGOuyZl0jxBEKdw49kF6lL/exHWBqT WhFolJ2dXA6g/FT12d2d7XcNebQKx5mAFEHRbNTnG/GK8Q+RWnMamRHYJJ3uZIAdOk6x nnUY2GmYd76plU8MlWlfxOnKKXikx40zzqNDuqSDmpstH8oMvxWDNBh7+Y7R4v42C/P3 khuEkBMoV/fc8d0cUde0KDPFR9PwhJtVVoBiIMJ4ArZO3iIvA3jX/2KMTdd8FIQOi/oq JnPQ== X-Gm-Message-State: AO0yUKU7naPISomhS8fJmXq0VgIUjbOyiL3VxiyMjlB18grTmB1/5BjJ EgeroUzGAb8fbg3hHYVVtF0= X-Google-Smtp-Source: AK7set/IfL+H6TKNgpkeZFQVUrD9xP46FxPLwU/e08tgIlxgDjtVWawflPDn9xVJXPEK3Te8AJ8/TA== X-Received: by 2002:a17:902:da91:b0:19a:f02c:a05b with SMTP id j17-20020a170902da9100b0019af02ca05bmr1956504plx.3.1676899386249; Mon, 20 Feb 2023 05:23:06 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 05:23:05 -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 12/25] mm/zsmalloc: convert obj_to_page() and zs_free() to use zsdesc Date: Mon, 20 Feb 2023 13:22:05 +0000 Message-Id: <20230220132218.546369-13-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-Server: rspam07 X-Rspamd-Queue-Id: 5B5EE14001D X-Rspam-User: X-Stat-Signature: oicb4n67gc3nrhbpmouh9x8kerixojnj X-HE-Tag: 1676899387-519184 X-HE-Meta: U2FsdGVkX1/ffQvEEuedIbw9qNt9crT/jVChLP8FJkBGaZ/pQQaJnhwGxg0BqaEW334qZyOwm8VGByuzEfJvL76wJfxOe4UfHMpYY4n77qGdCaPiaKN8lTvw7ztEHJj/PjeY7puo6RRbvyYBPM8awc09rWx+BPnM5T4S3m8LcG9hcz3324wRUAs4Izh2Blbg9eXB/YeJT492euBdP+a6zR2zIM80Rn7c1DVIavi6r/vmicyusc++1iMUoK/5uBKbHIzkB3TSyGR6K3lAb5vH6ao62FSODT4In8KIXyb4m5oQunXRIBqidvwuvODLPwQArTE8pp4HhFZryN0UYuTZbyy1s10N+sGOysrDltmUQknSEpbgMZAs2QaSKyCQ+JGF7lOIYhkeA8pClLUpcyaUsZBNUP1Nw/QqGXIf4UyGniEPGI4lT3kmSvs0XozVm9k5BiefeZ7LjbaOPDNXyP0iNdXbwNvJj1UTFl0g17uBLrA1PXnkivtxT3ydis1uWVTkw1E2GNS/wyqXq4117QPsp4xA9AclBrOmp33vuPLd6nfI9kFmrwwFan56dFNAsWoSamgJ8JF6gmjlSESiKZork0PXhu9uOWSe2pnftNbA7XSjwBebUgE32cYayTDCaaNqAwE4CImCJnGaRMQpwCbqnKk+MB6OIc6IlbKfkTEdQrnSslHvx3nOOdX+SIOkAQCRipMKNhlo4+W34mCdMigxLpx3pZI/Gt6/ZTBKZFAB801fCaJ4I2cGra2Hp8z/ykHIj+sE8UhiUvUWoVDCT4DAa5gM6qNb4hd3+1bhPuWZPZknMLYrPGMOqjOOMjfXkVFRVCgrC1fJ7b19xs4oexxyxWb/N19XnuI5RGEMFkLtGiSg8nBhWcJ2+qUAKyzSieSsYOpPooZSW1reren60TP6J22CSUooZkBGYvb6mk4TS/ELawb+7XycGfhCXCmenaBtXmVHaTcaqNkdYB+hWj0 Bn6ssTR5 NsvFe2WHtlcGb9nsGlSXwcFRfU11I+Cu6PEXc84oohwsx3enF87NcdEyc+2pbRfUJDhEWOvsIQYOiZVtoQ6ntb96ARyk+c3uSxULQKzZ0eieD6eKdPdsZrIysG5q9F9MQg2q6IC4u/e8Vtb03nIMdpA3gHSxu65abDeg1jk2otgT+3PJStXP30xYVLKXyndDwO4Vnh61O7v8d+kkR5SghTCbTpVUqq+CaBVrjbyG29YBqlWkA/8/7RPZ2R/JbzkX5cWHfvffUZvFoy1H7ZGhC5ra+TLKny7KDJa1oz0ZssL05ywKpEbVXVZ7S94pGBXC922RtMF/cev96DzJOj/L8q5bCW27A0ocxKOxRNKNBPjhmJmNDJ/mhi9BaaDH0jB5zPBvoLRqwAMASAlboMRxudUbTte7cRAVJS4nYwidnoGtLLznVi1oM70Kq45G9nlOYL88aZN8TH+EfL0JuVzhmQs0tqoD8r3rEuKZQpriPeIS0+d7AaJmuwjT/z8ctVJf9AZr6eEtV+JBhanxbai6axik3yE2owat8pAmDHOz0C9ZF7ttBv90flHelSP3D9I9CKctah/jbDYezhf7X4fNXlIBkVEND0BUhxSaajyzu7gldSoM= 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: Convert obj_to_page() to obj_to_zsdesc() and also convert its user zs_free() to use zsdesc. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- mm/zsmalloc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index cfcd63c50c36..bbb65fb8749a 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1020,10 +1020,10 @@ static void obj_to_location(unsigned long obj, struct zsdesc **zsdesc, *obj_idx = (obj & OBJ_INDEX_MASK); } -static void obj_to_page(unsigned long obj, struct page **page) +static void obj_to_zsdesc(unsigned long obj, struct zsdesc **zsdesc) { obj >>= OBJ_TAG_BITS; - *page = pfn_to_page(obj >> OBJ_INDEX_BITS); + *zsdesc = pfn_zsdesc(obj >> OBJ_INDEX_BITS); } /** @@ -1787,7 +1787,7 @@ static void obj_free(int class_size, unsigned long obj, unsigned long *handle) void zs_free(struct zs_pool *pool, unsigned long handle) { struct zspage *zspage; - struct page *f_page; + struct zsdesc *f_zsdesc; unsigned long obj; struct size_class *class; enum fullness_group fullness; @@ -1801,8 +1801,8 @@ void zs_free(struct zs_pool *pool, unsigned long handle) */ spin_lock(&pool->lock); obj = handle_to_obj(handle); - obj_to_page(obj, &f_page); - zspage = get_zspage(f_page); + obj_to_zsdesc(obj, &f_zsdesc); + zspage = get_zspage(zsdesc_page(f_zsdesc)); class = zspage_class(pool, zspage); class_stat_dec(class, OBJ_USED, 1);