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 80092C67861 for ; Wed, 10 Apr 2024 02:30:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F2AD46B0089; Tue, 9 Apr 2024 22:30:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EDB676B008A; Tue, 9 Apr 2024 22:30:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D7C4C6B008C; Tue, 9 Apr 2024 22:30:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id B7FEB6B0089 for ; Tue, 9 Apr 2024 22:30:37 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 79383805FE for ; Wed, 10 Apr 2024 02:30:37 +0000 (UTC) X-FDA: 81992043714.02.8D36C2F Received: from out-170.mta0.migadu.com (out-170.mta0.migadu.com [91.218.175.170]) by imf19.hostedemail.com (Postfix) with ESMTP id 9284F1A0011 for ; Wed, 10 Apr 2024 02:30:34 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=JkRcMD7u; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf19.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.170 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712716235; 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=Ep0yCE3LosNaiXPWKGlbOziHWDlxqD6vB41Roc/ZFwc=; b=sAnjlZi6Db9ylNUPkHscegvRgtaxTa0Yk/zxnXH8293HoD2R/LgvYWlgHm6SfFQzqcX9r6 f/t0C/WH+BlKQ8HVybtlUXSO3WwE8qeeT1rGG2TiUHimMTUhOMsVQs16NSD3G3/gbpG2wT JX+gTBXqEhVWlmIAcuocQB3rZixPjV8= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=JkRcMD7u; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf19.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.170 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712716235; a=rsa-sha256; cv=none; b=FM+ZKXhmAmBSHsXaMLeLmV58+N0g0T+8J6xWsaZ50FygfCdgcHvX85QmfLo+GxCHcv8j/m bHcHA7RjWLw9QRaESKrNZ57e9sZrXjQ+e1fUELSl3q2e7bKhvYoNm3sXat06XYpYxrgdje 1SbPKt1jGjyQScSwL90UaA8K3p7jD9I= Message-ID: <84eccd09-6434-4abc-97c4-99e8c13a7271@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1712716232; 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=Ep0yCE3LosNaiXPWKGlbOziHWDlxqD6vB41Roc/ZFwc=; b=JkRcMD7u5CmxOMIXQCHIPWwy1VWLnNlzCfb/6lHpL+e0H4xH67ZRZhA80LtX+zok0UpbbY uICAdNIkvaMAoJNstaf1NFN+LUckdSjhCH/HH+QtVzJpPOaZupn1Qc1TbMudLOewKY5zo3 ZjCJGko/8fSuOd2n4orlBa0ksLrBGvY= Date: Wed, 10 Apr 2024 10:30:21 +0800 MIME-Version: 1.0 Subject: Re: [PATCH v2 3/5] 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: <20240405053510.1948982-1-yosryahmed@google.com> <20240405053510.1948982-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: <20240405053510.1948982-4-yosryahmed@google.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 9284F1A0011 X-Stat-Signature: pbtjzuibhtd41qrrgfhidgb9wshpwwuq X-Rspam-User: X-HE-Tag: 1712716234-956090 X-HE-Meta: U2FsdGVkX1/dwAhBBcOkgh9Tx5zblKSe+nwhaZaI+OlDS407sE0xIqHR70l0HVLYRnLc6s9hkHJuHy5YPFiXA0p2DDEVF5xBQEibsYa22AaJF7RlVoexoUQkQCkH+33936yWk/Te3I1zLo3Vwm0yX1iA76wZ/JmFiMKrtICjwCOuBLwzioI74fOMj64KAP+9CJ1RH8c66VyVEoqm4gjcx7QT1dzldtKJROOA9CpRwLUHfDww7FB/4TF8FHXRR33kTzLhW6pVx+w2Ydk2eJ7aDoa2OIkueEGu1kwXuDZldPbaCAqDKl2zg9ueUiCG5kaZnqMfXC0woDlBN2UlZv6la7b5wOHQgG0B9pU/t4rSITzHfSN/RVIU8UpxacCzl/cO2c+7KIPAmv2mulz4E2ZHyRrrWgxK2PDnaUR7r0m89zcs0OobKphpGO0Jij9L0TztBz2A5k0NgSX1B4RblPTHVoUMexku1tF1nw1UlTFBF9L1y0tmj26ARWMGx6r4t9KGx60FuFGypNJAW7B9Lp8QmfLDVnGqI8innYWMLubOnIUj8uAaI0oQhWaUmDecBD6i5ilM5U+X4GeLk1/RUd3SVCohbk4CWK4cLhYGurwWZx5R8n5hMs/Cu6hpBySeKx2hgjpwfwnG15ne3uVcGQWYhjUKmR/3XiB1b/8ub+pKAT5xQogZcBtjd/ENsEyBpnoF0XEjUPIgv496vkJJ+oaOTS7Fb2CQCKGgX9CfhntPLhFkLMRcPzX53LjanudjEjWINakovG8D/UjKc/oT1L8M55J+l/aC2VAFywCxz+YbyFgCf/0b/hkaVaDKmcZ2lc1n22/RSMjneJGzwkwjxpRLyjhH2jEptv5XKJU6PLGtzbN7aF7IYFN9q8ah61YzA/slcYu55776wT2OlVkgIZHA2xv9DtjVYP/N+74lHK5y0SOjHQ4oTXMoMiQP3lDD2yyQmLohaOJHhz91sI+gX7S H3PBTm4X o8fawe0mF86ngFXlqygTC96Lwf8NqbS1MemY6faLX0Oz1d/2BOYFCkVNXx97OLoq7sU3bXvtXdMH1TsXrrsNYWTRfzG4gFZ+qApuWa9EeH27Y4xKaNmQRUBkkDLZLAFx8S+DkqpJEA8TfC24X/ZP7mIxItQwGxPifJ+PCY/HnU7fEKHECuhKpMFpDxVL95avBvXoG 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/4/5 13:35, 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 LGTM. Reviewed-by: Chengming Zhou Thanks. > --- > mm/zswap.c | 29 +++++++++++++++-------------- > 1 file changed, 15 insertions(+), 14 deletions(-) > > diff --git a/mm/zswap.c b/mm/zswap.c > index 832e3f56232f0..ab3cd43cdfc9d 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -1444,6 +1444,20 @@ static void zswap_fill_page(void *ptr, unsigned long value) > memset_l(page, value, PAGE_SIZE / sizeof(unsigned long)); > } > > +static bool zswap_check_full(void) > +{ > + unsigned long cur_pages = zswap_total_pages(); > + > + if (cur_pages >= READ_ONCE(zswap_max_pages)) { > + zswap_pool_limit_hit++; > + zswap_pool_reached_full = true; > + } else if (zswap_pool_reached_full && > + cur_pages <= READ_ONCE(zswap_accept_thr_pages)) { > + zswap_pool_reached_full = false; > + } > + return zswap_pool_reached_full; > +} > + > bool zswap_store(struct folio *folio) > { > swp_entry_t swp = folio->swap; > @@ -1452,7 +1466,6 @@ bool zswap_store(struct folio *folio) > struct zswap_entry *entry, *old; > struct obj_cgroup *objcg = NULL; > struct mem_cgroup *memcg = NULL; > - unsigned long max_pages, cur_pages; > > VM_WARN_ON_ONCE(!folio_test_locked(folio)); > VM_WARN_ON_ONCE(!folio_test_swapcache(folio)); > @@ -1475,20 +1488,8 @@ bool zswap_store(struct folio *folio) > mem_cgroup_put(memcg); > } > > - /* Check global limits */ > - cur_pages = zswap_total_pages(); > - if (cur_pages >= READ_ONCE(zswap_max_pages)) { > - zswap_pool_limit_hit++; > - zswap_pool_reached_full = true; > + if (zswap_check_full()) > goto reject; > - } > - > - if (zswap_pool_reached_full) { > - if (cur_pages > READ_ONCE(zswap_accept_thr_pages)) > - goto reject; > - else > - zswap_pool_reached_full = false; > - } > > /* allocate entry */ > entry = zswap_entry_cache_alloc(GFP_KERNEL, folio_nid(folio));