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 57347CD11DD for ; Wed, 27 Mar 2024 02:42:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DA1C96B0095; Tue, 26 Mar 2024 22:42:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D52326B0096; Tue, 26 Mar 2024 22:42:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C40C16B0098; Tue, 26 Mar 2024 22:42:10 -0400 (EDT) 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 B4D136B0095 for ; Tue, 26 Mar 2024 22:42:10 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 82584A053B for ; Wed, 27 Mar 2024 02:42:10 +0000 (UTC) X-FDA: 81941269620.10.21D6091 Received: from out-173.mta0.migadu.com (out-173.mta0.migadu.com [91.218.175.173]) by imf21.hostedemail.com (Postfix) with ESMTP id B8A9C1C0013 for ; Wed, 27 Mar 2024 02:42:08 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=IHWzK86R; spf=pass (imf21.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.173 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711507328; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xzy+RwRkpomfrV5aU//CFi1vdBrORFrQTeVF8dJnbRg=; b=7d3FSQEHE16HpKykk5jp47Jj5/buR+/dy6tkukU4p6rGYfutDTdSE/pB1ZaM1jASF7KGGX VzA6+Xg96fOBu7k8caDNxBmDHAyLZrGBXXK9jViiweeI0uxCd5ZH4ZyCLIFSywVx6XtLT2 4Tz6I9oqMFsD/L+aX13zDwvzb2y7dvc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711507328; a=rsa-sha256; cv=none; b=LAh3Tl4uTUBKbVSsIa/oYX8rT/QgHtxpn1FNs43BFlcWlMm5BsbNDD/e4NaGHWbeUwGgcm t8WesQZPlAzC4hpg0ulZShxGOSRA99ba1o9KeewgKl6+UnwYw0n4K/btoQ0vCSHB+FIBQ0 Du/YPNN3UaJ+5JT8XFopMt7ZsSqQyyY= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=IHWzK86R; spf=pass (imf21.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.173 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev Message-ID: <88957a87-fe4c-448c-a22a-9052d65ab643@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1711507327; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xzy+RwRkpomfrV5aU//CFi1vdBrORFrQTeVF8dJnbRg=; b=IHWzK86Rc8aGvWMdfBsPeiBdcXEyN+ObKgTyiAPNS9k1d1R2hnlh1OLogjiRG4Fkc5gyyP PpsqNMh+SzxTNwjCg6mHBCEClNtuazCc8lnlJzC1t1ezUEue1DwHCkGm86UUvaLuS9HCja W5rYuPaOWIpeCnKvZy9T4MujQn907Os= Date: Wed, 27 Mar 2024 10:42:01 +0800 MIME-Version: 1.0 Subject: Re: [RFC PATCH 3/9] mm: zswap: refactor limit checking from zswap_store() Content-Language: en-US To: Yosry Ahmed , Andrew Morton Cc: Johannes Weiner , Nhat Pham , linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20240325235018.2028408-1-yosryahmed@google.com> <20240325235018.2028408-4-yosryahmed@google.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chengming Zhou In-Reply-To: <20240325235018.2028408-4-yosryahmed@google.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT X-Stat-Signature: iszwrtfumbnp3ehtfsn9eqhef65yoa3p X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: B8A9C1C0013 X-Rspam-User: X-HE-Tag: 1711507328-546148 X-HE-Meta: U2FsdGVkX19UfowxrxEOmIE6yh32Sq1CnziXJmk603TqjpSmmZobLoZdz+67fWhj8xQUoIFXemMUORQe18npS8bIlwOjcuWFiWTXp7FwAzC22hOXQY2r+fx0d7kxejXNfb1vNPTZMcq+NiuoMC95ZNOirZl/1YwYh60JlA7oKs1Av2HvcJa9xhcF1DxpDVpkTRXEw/UtOtth63VoYzCE+o5DUbht5keUURM6OisPu9c+HaLS3Od9fm0x6wwh7dHQRPv2oIqQCQJtAPG1Iw4qPod7gSCksqLxJh6HUZDmK/+t1vfGkYjdnCDMMf3Po0POaER2eVTVB+pceHU3yQ7J/8u1nKoQ+e8nvbQllvZv+lD77YxSaxhxUWAwmR1vJhguyfenohaMeplRsNp11QUeW6GjU0C5YHsc2qqNaS+iTOTB3BklaDoejy0iIMLhcWSURpkiN/BAGMQfXoWNePiojGrulXBJ7qlIBW+SQ01hW1c2vitVnp555AI3bGb/jpC5Z40dtpd3vE2sWoT7/hlRU3hTi+YFAXX4tWstDy15Pm8hpifuvUgd28YQyz+bLM9G/CL0iw+srgYeiu51zfkJUTtn5WVI65uqoO4mdnhIvaaGSOkbrDP9cSFmkXU8981njeOw6Wqta2E709++gRuVQBEFDfcEEHdJfZVezXqK+lx6g7Vr6DuL/qWdqRD2AxnXDVMuXMvuF5Cd/aDWa7/hdOhbVoQORrG9nw5l3EE9b+g7wqIb+nKdFz+JbFzlqAzxdBc+szGoOqtEVS3Z0Kz/pemJBaEzK5mazOFncL4CUox2JIx8Uu5Rv/XPiSqNDQ790H4v7jGQmfMvvXoNQLegfVE6B/Oe4nO37Aawvt8DT5AshVnbsVvpV2lG+iXMXSnXz27m+b3loGijYmvB1NrZFeJxdGGGtQjXDmrWiAS4s+naOkkl23cayBOyBaqfCsRTjk//o/hbm5ZGGI1ZIC0 Wr233r7L B6kh2J8JtnLWt3Cm9ovVgZg7HGKycohlKf+LfFG+/oIBWdkrzNWx0E+6DrGTZD5flMmjPzacZsjZ3uHCwhoWNLVqJv3VIqNbPO/Y3wi8BxHPhlf0m3nXLMT3LMnpcVu8xq3HHfhIBklz7fYoKOtsJQSngtciBTEB1xy1iRfq5XKgRM1dlKbmQbKjQuFpypb2dh3Zl 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: On 2024/3/26 07:50, Yosry Ahmed wrote: > Refactor limit and acceptance threshold checking outside of > zswap_store(). This code will be moved around in a following patch, so > it would be cleaner to move a function call around. > > Signed-off-by: Yosry Ahmed > --- > mm/zswap.c | 32 ++++++++++++++++---------------- > 1 file changed, 16 insertions(+), 16 deletions(-) > > diff --git a/mm/zswap.c b/mm/zswap.c > index ff1975afb7e3d..6b890c8590ef7 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -1415,6 +1415,21 @@ static void zswap_fill_page(void *ptr, unsigned long value) > memset_l(page, value, PAGE_SIZE / sizeof(unsigned long)); > } > > +static bool zswap_check_limit(void) > +{ > + unsigned long cur_pages = zswap_total_pages(); > + unsigned long thr = zswap_accept_thr_pages(); > + unsigned long max_pages = zswap_max_pages(); > + > + if (cur_pages >= max_pages) { > + zswap_pool_limit_hit++; > + zswap_pool_reached_full = true; > + } else if (zswap_pool_reached_full && cur_pages <= thr) { > + zswap_pool_reached_full = false; > + } > + return !zswap_pool_reached_full; nit: Then we use "!zswap_check_limit()" below, double negation looks complex, should we change to zswap_should_reject() or something? > +} > + > bool zswap_store(struct folio *folio) > { > swp_entry_t swp = folio->swap; > @@ -1422,7 +1437,6 @@ bool zswap_store(struct folio *folio) > struct xarray *tree = swap_zswap_tree(swp); > struct obj_cgroup *objcg = NULL; > struct mem_cgroup *memcg = NULL; > - unsigned long max_pages, cur_pages; > struct zswap_entry *entry; > > VM_WARN_ON_ONCE(!folio_test_locked(folio)); > @@ -1446,22 +1460,8 @@ bool zswap_store(struct folio *folio) > mem_cgroup_put(memcg); > } > > - /* Check global limits */ > - cur_pages = zswap_total_pages(); > - max_pages = zswap_max_pages(); > - > - if (cur_pages >= max_pages) { > - zswap_pool_limit_hit++; > - zswap_pool_reached_full = true; > + if (!zswap_check_limit()) > goto reject; > - } > - > - if (zswap_pool_reached_full) { > - if (cur_pages > zswap_accept_thr_pages()) > - goto reject; > - else > - zswap_pool_reached_full = false; > - } > > /* allocate entry */ > entry = zswap_entry_cache_alloc(GFP_KERNEL, folio_nid(folio));