From mboxrd@z Thu Jan 1 00:00:00 1970 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 E54FCC7EE25 for ; Wed, 7 Jun 2023 17:45:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7EF1F8E0003; Wed, 7 Jun 2023 13:45:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 79F908E0001; Wed, 7 Jun 2023 13:45:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6403F8E0003; Wed, 7 Jun 2023 13:45:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 515DD8E0001 for ; Wed, 7 Jun 2023 13:45:38 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0AF16120421 for ; Wed, 7 Jun 2023 17:45:37 +0000 (UTC) X-FDA: 80876679156.23.81EE2FD Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf26.hostedemail.com (Postfix) with ESMTP id 1AE0B140008 for ; Wed, 7 Jun 2023 17:45:35 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="rFwImea/"; spf=pass (imf26.hostedemail.com: domain of minchan.kim@gmail.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=minchan.kim@gmail.com; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686159936; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LEHz2ZoKgSyxNB1AeUKqmQu+HCPGQ2ML++3OH4j+o7Y=; b=R2OliQbCnbf9CH7+mZRqqVPzwTyGMkneMjOGqcfGy1vMUSGxQFRZc95lF6BIFCtSb97yHp LyMo+0/fsPnagRkeExDvX4qi+f946RoYSMhbTv4sdzjcDP5PpWe62rhDXCDC3vohacmKOc +LNcPiwQUx5/Cd0O0tithL725YZxKn4= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="rFwImea/"; spf=pass (imf26.hostedemail.com: domain of minchan.kim@gmail.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=minchan.kim@gmail.com; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686159936; a=rsa-sha256; cv=none; b=CBJDhJmi6MFNIYg3yPKoaBw9PLOz4vn4v/y8xj9nOk9o/eMsOUMlcJU8hbD57u4Q3LA/xE IaphgKoKIv2JxxcvxPT1r2GkgSGIJKQToEKW8R+xMpjBdmKnrWhLhjCZG6WTst7eID7/Zj M35xRqP6Gyve4Z4cXkI0zSRB3DONrk4= Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1b021cddb74so35842685ad.0 for ; Wed, 07 Jun 2023 10:45:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686159934; x=1688751934; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=LEHz2ZoKgSyxNB1AeUKqmQu+HCPGQ2ML++3OH4j+o7Y=; b=rFwImea/OOEo/0t4Q+mAr1zCkoA8LoFl8bbw94y42DLLnSvH1pSjKAgRF3GooBY/c0 pNtCc8NjjwqhV4+14Xtl0Z7zh28EzajitRvHvBYbxTDwi21L/J4XROhMYzEIk0D5oI0S IxcgQN0OBJKbP0wT3JFRo6g3ZMrWBPCOA0tm0nIiab0NatPd/iYtMDctRO5yf1Q+PSfb uVifLBThQVvXfA7WwnYizYdVhhovoTCAUi0ETxlbs1b7eK03yIU5hGxONHJTc0QqjypP KNRqdjpILdxqX5hqOtz4ECxBpRgFkC9ubtpUAUNw5xLaUOiIo+6fS82Fc9vYqevKGFsn EY7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686159934; x=1688751934; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LEHz2ZoKgSyxNB1AeUKqmQu+HCPGQ2ML++3OH4j+o7Y=; b=S2/SwcJ4oxH+Yx3ultDzpCyWm0PWQTB95e7KnNvpjlGvwwoBgXlclX+npeubkgrXDG 7VFRzbtyBS+zvQoq1NJfgk1ujNouSv2QzXUTRR1djbMorXt6YQO4D0DjfjjT0G2zMhe4 LTIRwKbXhfaQE3ekVHk16DSQV7FRnJ3a5lhrd9iSR4Gy5NTNvuqzrZu7J5ZFQOXKpM2R y4QVQcRSi0XZGtEsB6mt74yFNfo93zj3v4eNxuO54oQBzqIEglfd/L8IokRdIFh4PD8j Op6qbFNepr0mssm5+ycRuNDoPfJRoz7qh4utZTqFm6mQF6Al7c0L+EibiPllL2M6FW9G 0MQg== X-Gm-Message-State: AC+VfDyktsXPf+7PSPHd4UMSic8oZAzAemW/ljUJjZyX2c/6ooyYu8JC zBxXp9aTWjCaF5eUz/FjDvs= X-Google-Smtp-Source: ACHHUZ58Y6XNgIIhNBrPN7yClCVvnBcR7oCRQ9QnbUohlQCTzrZ0qLJvr2/Br7MnQjJVX9r/zW6T5g== X-Received: by 2002:a17:902:dacc:b0:1ac:8837:de9 with SMTP id q12-20020a170902dacc00b001ac88370de9mr3030728plx.3.1686159934539; Wed, 07 Jun 2023 10:45:34 -0700 (PDT) Received: from google.com ([2620:15c:211:201:b727:cbb8:689a:5510]) by smtp.gmail.com with ESMTPSA id l12-20020a170902f68c00b001afd821c057sm10697262plg.58.2023.06.07.10.45.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 10:45:33 -0700 (PDT) Date: Wed, 7 Jun 2023 10:45:31 -0700 From: Minchan Kim To: Domenico Cerasuolo Cc: vitaly.wool@konsulko.com, senozhatsky@chromium.org, yosryahmed@google.com, linux-mm@kvack.org, ddstreet@ieee.org, sjenning@redhat.com, nphamcs@gmail.com, hannes@cmpxchg.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, kernel-team@meta.com Subject: Re: [RFC PATCH v2 4/7] mm: zswap: remove page reclaim logic from zsmalloc Message-ID: References: <20230606145611.704392-1-cerasuolodomenico@gmail.com> <20230606145611.704392-5-cerasuolodomenico@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230606145611.704392-5-cerasuolodomenico@gmail.com> X-Rspamd-Queue-Id: 1AE0B140008 X-Rspam-User: X-Stat-Signature: iere364dg6yp5zpz34qoyawqi41z8jfx X-Rspamd-Server: rspam01 X-HE-Tag: 1686159935-42032 X-HE-Meta: U2FsdGVkX1+X+q668Hdd+drr4aB6nt1E9MVUE6h2+MOvgyUo6pEUwJGnJsZgYlW7lP7qsZr9Ko9IWEnkDgDsLIXFsDxILgw1c0WoeRPDUD4u0sVhvft+PUhDwWntdyzozQvouTLj6DNiXq6IJNIidf+3npYvWFrdsffsIKIQWawiQPj4EiUc3Cl0FK8N/tS/RUYYr14EPXrOZAuNA5KoCubCa3RVQRzVmv+te194NTfQaqJyVH3QtNjgGRgUVUDxencxCOe1P7SowhpxZbaQh6Ysk5b2IkEtO68kXnlM1wxzATOMyz/j4fD4E6QQiEARYNtj7fffMcXYv8lcYyRqe7uH4J/7EFLqTL0e1oj+rKEY+MYTc0uJVFL5hmXANZro2l/WREP9b+lLvj6IMthZNxTPvio+2GsFWTQlnf8/YyhZfmnKfuYyRgzYUMEQsLX5QC+qsBIdN6r5x5iFdvjzkuOflJnx9uwlal5xEu3jePF+EGifQuZAOjr12JRKhDii0hP3sztTuyKzFrlTQ/+gtSUtWKsKiS/LcfXpUEmQPELmUtznmsAExoN7BIf0V2DYNAVu90JXdYpwPVd+wiU+RAQ8+YkdlRM5JPlNAUG84Tzi4ofQvbuxuyE2Jf+1ElbjyARzE4LQduS1X6kH1U7nOFUx37/y1qDewFCPWgIv62tb7pKNE+OBNPS8lPCPi4UNrw+C3loeMdIWSscXgJjFU2UhKvTKCvObzot66LUH+HAXKG8n1cqwvw+rUW8VgmfgaDobO0HlpuKwan4OLStauZve3ty7BisyZ3+jLx+aPohC5xUhlRU5cKXNePyswA6WKiU/TE99uXdFKFTC+RKRo++RP4Ylh35P62XV1T4R7iiTp6LT2IACyhgrxFQEeZBJgZAAbl+KJW2i0jhqt2HO5+khxKiFQ8p/38z2ddwTwj54YSQWWJjPs//oyREmYp2ULa0RGgNTGSy2zNvcHso 8/lC3UgS jFlBWLWOAKfe/N8Bypj0RNx/ZYZyzGf9lFfiRvpzRBqsSDKtVG4gk58Y2Rd2d3xPPIcqnzz8wGWTTGReWEL849vwl6lm7otbsktw4X34asj7fYgHQVF8x2mGILOn3oWh0lNiFivpnFtTRvaEGL0ZGEJWONPsPzwjjlEa3xcgtYRvbuYIv6b8P1W3Ujo//dJqZxIEMXtOLo/f9Vf3Zhf/8+w9XwwcpmbL6G261f8E170lZHmLbqpdiaHI+0hDrVegyRKlmpb+mFr2YodeSkoVCjBu0gxnCCn81lN9VuVoFD89R5uywv2uqzojQeoqj/bdOywJ0iqFG1t2f6hPuDmF5fiDZARg1ZQjXos195l/ObePqhZZK+aTgYpllmC7IOI8Qjrnt7p2KwNM2ehJGD0OOPBdhDRktaEKBMNAbqRguhA2naapVY45LKyB4tANRuF6asLgDuCzPa/jE9AuY+eXcdKByXFKUcF0rOqkjOW5xir5P4ikiXX6x3wp9t4P9gNSM5iu+kptohg4rllPK27QLE+c418dMchU8r2D3CosGD8Tk0/lGN+E78a/CtFlrPhzqvQzfFCQMB1Ly0jOVOzThuTtatkofmXoQ8zxk/QA5omno75VyAtJTYczsk6huOqvTNwv3kstRWlgiHOg= 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: On Tue, Jun 06, 2023 at 04:56:08PM +0200, Domenico Cerasuolo wrote: > With the recent enhancement to zswap enabling direct page writeback, the > need for the shrink code in zsmalloc has become obsolete. As a result, > this commit removes the page reclaim logic from zsmalloc entirely. > > Signed-off-by: Domenico Cerasuolo > --- > mm/zsmalloc.c | 393 ++------------------------------------------------ > 1 file changed, 13 insertions(+), 380 deletions(-) > > diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c > index 02f7f414aade..75386283dba0 100644 > --- a/mm/zsmalloc.c > +++ b/mm/zsmalloc.c > @@ -107,21 +107,8 @@ > */ > #define OBJ_ALLOCATED_TAG 1 > > -#ifdef CONFIG_ZPOOL > -/* > - * The second least-significant bit in the object's header identifies if the > - * value stored at the header is a deferred handle from the last reclaim > - * attempt. > - * > - * As noted above, this is valid because we have room for two bits. > - */ > -#define OBJ_DEFERRED_HANDLE_TAG 2 > -#define OBJ_TAG_BITS 2 > -#define OBJ_TAG_MASK (OBJ_ALLOCATED_TAG | OBJ_DEFERRED_HANDLE_TAG) > -#else > #define OBJ_TAG_BITS 1 > #define OBJ_TAG_MASK OBJ_ALLOCATED_TAG > -#endif /* CONFIG_ZPOOL */ > > #define OBJ_INDEX_BITS (BITS_PER_LONG - _PFN_BITS - OBJ_TAG_BITS) > #define OBJ_INDEX_MASK ((_AC(1, UL) << OBJ_INDEX_BITS) - 1) > @@ -227,12 +214,6 @@ struct link_free { > * Handle of allocated object. > */ > unsigned long handle; > -#ifdef CONFIG_ZPOOL > - /* > - * Deferred handle of a reclaimed object. > - */ > - unsigned long deferred_handle; > -#endif > }; > }; > > @@ -250,13 +231,6 @@ struct zs_pool { > /* Compact classes */ > struct shrinker shrinker; > > -#ifdef CONFIG_ZPOOL > - /* List tracking the zspages in LRU order by most recently added object */ > - struct list_head lru; > - struct zpool *zpool; > - const struct zpool_ops *zpool_ops; > -#endif > - > #ifdef CONFIG_ZSMALLOC_STAT > struct dentry *stat_dentry; > #endif > @@ -279,13 +253,6 @@ struct zspage { > unsigned int freeobj; > struct page *first_page; > struct list_head list; /* fullness list */ > - > -#ifdef CONFIG_ZPOOL > - /* links the zspage to the lru list in the pool */ > - struct list_head lru; > - bool under_reclaim; > -#endif > - > struct zs_pool *pool; > rwlock_t lock; > }; > @@ -393,14 +360,7 @@ static void *zs_zpool_create(const char *name, gfp_t gfp, > * different contexts and its caller must provide a valid > * gfp mask. > */ > - struct zs_pool *pool = zs_create_pool(name); > - > - if (pool) { > - pool->zpool = zpool; > - pool->zpool_ops = zpool_ops; > - } > - > - return pool; > + return zs_create_pool(name); > } > > static void zs_zpool_destroy(void *pool) > @@ -422,27 +382,6 @@ static void zs_zpool_free(void *pool, unsigned long handle) > zs_free(pool, handle); > } > > -static int zs_reclaim_page(struct zs_pool *pool, unsigned int retries); > - > -static int zs_zpool_shrink(void *pool, unsigned int pages, > - unsigned int *reclaimed) > -{ > - unsigned int total = 0; > - int ret = -EINVAL; > - > - while (total < pages) { > - ret = zs_reclaim_page(pool, 8); > - if (ret < 0) > - break; > - total++; > - } > - > - if (reclaimed) > - *reclaimed = total; > - > - return ret; > -} > - > static void *zs_zpool_map(void *pool, unsigned long handle, > enum zpool_mapmode mm) > { > @@ -481,7 +420,7 @@ static struct zpool_driver zs_zpool_driver = { > .malloc_support_movable = true, > .malloc = zs_zpool_malloc, > .free = zs_zpool_free, > - .shrink = zs_zpool_shrink, > + .shrink = NULL, You can simply delete the line instead since the NULL is default behavior. Other than that, Super nice. Thanks, Domenico! Acked-by: Minchan Kim