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 A5F2EC54ED0 for ; Thu, 22 May 2025 03:32:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9FF666B0082; Wed, 21 May 2025 23:32:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 95F256B0095; Wed, 21 May 2025 23:32:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 62AAF6B0083; Wed, 21 May 2025 23:32:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 345CB6B0089 for ; Wed, 21 May 2025 23:32:01 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id DB8181620A1 for ; Thu, 22 May 2025 03:32:00 +0000 (UTC) X-FDA: 83469120000.26.5FF0BAC Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf01.hostedemail.com (Postfix) with ESMTP id E4AEA40010 for ; Thu, 22 May 2025 03:31:56 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; spf=pass (imf01.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747884719; 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; bh=upD09hni2dcgX/dCCKbCueE1oKwMExMA0TjXO2yJF6c=; b=bfc0Jawy39ul16ZgsqS1pnjW92fTl07eC6qwKQfUor6b3xZTIroVKATnNYdii0V1q++NVY agghYyEgBzImo0Lqda9TWfxLnyhkO6a0HJBZfoqwxEROZsvOldCb4bxvBvHCXPkczMuURu MIdtazzGEpNgdjzuHMtRZfOQ7nyLrF0= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; spf=pass (imf01.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747884719; a=rsa-sha256; cv=none; b=jwzzIalivQIjHWnGjLNvjxKzuANTatDJUCpfuc/bIQwmOT3Cys9ekuocX5slzMjW/uEUlH q5X0Mu3ITmYWIJIX7aTLPX2q5/gSmhRZsyaqz8ZATyC3O1Jlj+6aqOM9/Okg/J/BIXybNr HBM3yqFHMHrVWO2w5r9UvxwUd3xVgnc= Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4b2v314ZcLz4f3lVM for ; Thu, 22 May 2025 11:31:25 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 338A71A15BD for ; Thu, 22 May 2025 11:31:52 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP1 (Coremail) with SMTP id cCh0CgC3Z3immi5okKq2Mw--.19487S3; Thu, 22 May 2025 11:31:52 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org Cc: kasong@tencent.com, bhe@redhat.com, hannes@cmpxchg.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] mm: swap: move nr_swap_pages counter decrement from folio_alloc_swap() to swap_range_alloc() Date: Thu, 22 May 2025 20:25:51 +0800 Message-Id: <20250522122554.12209-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250522122554.12209-1-shikemeng@huaweicloud.com> References: <20250522122554.12209-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:cCh0CgC3Z3immi5okKq2Mw--.19487S3 X-Coremail-Antispam: 1UD129KBjvJXoW7Zr15uF1DGF4kCF1kWFWDCFg_yoW8JF4kpF Z8Wr1qkr4kXryxKFyava1DGry7A39a9FWfGF47Ww13Z3WfJrnFga4IkayUZry5Cr1vyaya grWDtFy3CFyjyaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUmlb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxVAaw2AFwI 0_JF0_Jw1l42xK82IYc2Ij64vIr41l4c8EcI0Ec7CjxVAaw2AFwI0_JF0_Jw1l4I8I3I0E 4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGV WUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_ Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rV WUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4U JbIYCTnIWIevJa73UjIFyTuYvjxUVF1vDUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: E4AEA40010 X-Stat-Signature: h5qmjujwmib1shtetmykk93qcb5smgn4 X-Rspam-User: X-HE-Tag: 1747884716-491891 X-HE-Meta: U2FsdGVkX1/hGAyvy7LloFcRGOoh/sfMZ3pA9DFPJmSc5r4GOaeMm7NKMbQBbXHAUvD17SImiKzqJ7Ah1KIvNxrFqB/JBoX1S7r98ctGPuWM4wMmyvOSKiCQz4+IL41RxahM/8PrsRBckSwkl/Ptk1F62El59SX5tyn+TwDPej41gtahXY4qjEEdk1Z5j3YCi2cnpfWn+B6PFXOf+70XWGHoxDGUWwL6Mec3pVeTL3nRoHujkM7rIzXVBluETQ4O+F87dEYbKPR09Z5+apflTEfU6hJ2MNs4C44YM7aLPcCJK8cyIvqXz78qU3tS72Bjv1D+e1ON2KixRZRKbX4XPk8EWd4ApNhZ0eK/Bvfp8o5fsPfboj6gC6UAGdSbH2rqq6FlRYh5+SSaOCXUs6uLc+TKlEFCHbUg3X7vW41dXjvlHrQs+RxBekZdtf4Dc5zunLUeA5mge8WOjX+/2LdGr/Yp4k6lHZvPwwf2bNrdBkFEiOhWt8X3fUyrBTD5dIb2C7qrZJr65b26DBGJnifxnEemc+UlVO6ElIchAnZ88PFICEwQySNkP9zdHSP4+rxYEwXjUaeQSA3wXUHAgkyRBUJ3ULNscmQRb9N/tUwF8wCirtPj0FJCXkikXY7aLJuUouePHQHGldreycTRKSA7cglAtUuXw60tH4NwJTC4UUgvfHSBn86eWLSsVvPKcOBEvmWRv8h9r6t51/iRWRFO1B5BLlgB3spckTydnJfwMo6ADxykhtNkprnz4jkX7F0zX8xaqlhIhvMWLwLotTmRsYrnGNxMErJ1r6c+T83eTN0zaokMGQpImH65MQ9EoFmKWzcxOopQ7qtsGKrAmvo3tFh8e92eiQLyr6VB2Hy2jGwE5oN9hiXvPAORlpXkQ291wJJdayblYdYq5Do2TAvz7QE4xP4/0A1Ybw6BhKKUATzufUiBDoXLIobMpeIvGEA5kSL3bYHdDFk5u/to4Il oj3JkiCt 35ebLXk9lGjStXoIEi1YXZ68VASoezz5WX0n92cVhRRmau0q6OpAw5yfnE8a6MSovEmAv2dlpR7k7NhloowXSBVexmleB7CgQxKBrZZka13+/4V69Lz+GR4ojhexsqREi+3LoPE35ADC/qkYHZUjQ6bITZB40inzo7vOxkLGMYW38YxL3jtg4lDpfUsB2FaZYik2nZZjjReaY85vO2bNWb8uXQw== 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: When folio_alloc_swap() encounters a failure in either mem_cgroup_try_charge_swap() or add_to_swap_cache(), nr_swap_pages counter is not decremented for allocated entry. However, the following put_swap_folio() will increase nr_swap_pages counter unpairly and lead to an imbalance. Move nr_swap_pages decrement from folio_alloc_swap() to swap_range_alloc() to pair the nr_swap_pages counting. Fixes: 0ff67f990bd45 ("mm, swap: remove swap slot cache") Signed-off-by: Kemeng Shi --- mm/swapfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 026090bf3efe..75b69213c2e7 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1115,6 +1115,7 @@ static void swap_range_alloc(struct swap_info_struct *si, if (vm_swap_full()) schedule_work(&si->reclaim_work); } + atomic_long_sub(nr_entries, &nr_swap_pages); } static void swap_range_free(struct swap_info_struct *si, unsigned long offset, @@ -1313,7 +1314,6 @@ int folio_alloc_swap(struct folio *folio, gfp_t gfp) if (add_to_swap_cache(folio, entry, gfp | __GFP_NOMEMALLOC, NULL)) goto out_free; - atomic_long_sub(size, &nr_swap_pages); return 0; out_free: -- 2.30.0