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 618D1C54756 for ; Thu, 22 May 2025 03:32:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C004C6B008A; Wed, 21 May 2025 23:32:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ABE816B0083; 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 9AC9C6B0092; Wed, 21 May 2025 23:32:01 -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 4E4BB6B0093 for ; Wed, 21 May 2025 23:32:01 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id E32C8E5160 for ; Thu, 22 May 2025 03:32:00 +0000 (UTC) X-FDA: 83469120000.24.EAD4817 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf24.hostedemail.com (Postfix) with ESMTP id D6B26180003 for ; Thu, 22 May 2025 03:31:57 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf24.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com 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=Hz1hnl0S74R7iX4OS200RTr4rzBIJvN3FlsOsHGBVNg=; b=bvIvCMSPnmLwgLFgGKqooAuWDCxuxRzWZwuNacE36fdsAOcIbWny7rayc+PcA54bEFwLGC EPG50AWCG46zjUrXAg3BWCgzq1EHfOTUrcGtsXwR6yYVuR2F9zeCwZCTcIf7wGi2EIkBaP J7XyYz9IAg5r/HSGMd56ovlAcxEhOQk= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf24.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747884719; a=rsa-sha256; cv=none; b=WavgnfeFJP2EfV7hREPPgcRFferGKktjXWA58E9nKah1pnCYVyiUPt1R4iDmVDFRE6rSnP Vq3szPz5sKspPIqTCqxfsVf/S+9FvExiwlMF44o7HdMTGdjvhMTQ+hI1qBADR1mWbDxb5A hGFIox4EK1nKuNLzlcfyipsFecRJeR0= Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4b2v3338Mbz4f3l7k for ; Thu, 22 May 2025 11:31:27 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 7FC2A1A018D 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--.19487S4; 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 2/4] mm: swap: correctly use maxpages in swapon syscall to avoid potensial deadloop Date: Thu, 22 May 2025 20:25:52 +0800 Message-Id: <20250522122554.12209-3-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--.19487S4 X-Coremail-Antispam: 1UD129KBjvJXoWxGrWkAF17XryUWFWrGw4kWFg_yoWrCry7pF W3WF90kr4kJryftw17A3WDCry3Gr1fCa17tF43Ja4Sv3WDJrySgFy8tFnYkryfKFykJFyD trs7t343uFs0va7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUmlb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxVAaw2AFwI 0_JF0_Jw1l42xK82IYc2Ij64vIr41l4c8EcI0Ec7CjxVAaw2AFwI0_JF0_Jw1l4I8I3I0E 4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGV WUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_ Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rV WUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4U JbIYCTnIWIevJa73UjIFyTuYvjxUaknYDUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspam-User: X-Rspamd-Queue-Id: D6B26180003 X-Rspamd-Server: rspam09 X-Stat-Signature: fy717j1obff5moni4scw8ot7s3yrbaf1 X-HE-Tag: 1747884717-544504 X-HE-Meta: U2FsdGVkX1+VzwHlNnYwJzqTbZ9SVfpjMoUFQjDuigBCfiNvEvvCraIiyuhNj9zQJNNhA6o0I5evNwlPDskNfICHbK07G2AcfR8NzAsdPJ8YKgV/MpLAcIUnbcLydA8/0JxkoWx2iIuyRk2IPBUqnHILNF37cADbC1e29rlVimcJHCvj3sR019HOIvZzYCaWa//2dQC0JRQZ6D5dsZKxcLDLgEXQsDo71iGlaEIRtETbrDlQi5ThcRVfTxHE1Jg7usKZWcDNmyyKaHbwCHOsJ38+TyztSI+quAahsXrULgjavPlPK33k6gkKkzvV8Iwv5c6xbsIhefxMI0QzdXyZpfStoUEOvITeR+PxZtGY1JUn5ce7OM9SHw/bz8my/8EykRNrzGDQF5XwI70nXh9H4dCl+Ko/rh01+LcmbN2C0LwAnQnR6D5gBibhohYf13A7GYEEmxgel23MpvLqo8LwnFT2gb1UvFXU8H8CMKXEA5q3B0WdKtzxVwLBZokAOGtk67rhF+jY0eBrde/gQZJ9J56G18rL9gU9N3AfFzZiuTWI1/3KpIaqXQUhY050jguQxKoWRZS1a2EdKM7UQI+SNiJ4le4I05U2G+QImQqRkqeTHi+XyTK9BXklSbTD12AZn8S/e+9IcbbHHvDUiOIFOrtIesVy+b7thKfpkf/TDqaJLnugDSy20wRiSGqeW5Vghat03zxFD08u9ML1VkvIftzW/hhnG+rPlBOR1oa2xml0mZvydkqOGcBnorf4NVcnfrbwe3L6nVTaPhA9KPcXAdsgAWomP7UmeXKsKqhvBhx39Q5w/bZUYLg0h8rVN6tSby8tZVYjv8/DaSmSBLUtVSqTCmXCsIyBd7HjHCLG6xR2RHEg5WMbBzOnqxXMj3J50R2BBes53rIqpM5xRLt82wJTDFEfv5urMmZWBiQnJABMWHc0L5GG4ML9th2ZS+PBMBqVqKrmr2A5Dj+a78L s3HgxZ4y YnNbPXZkC0UefDZYe/V4lnMA8fU7OmGJUDZE3MTaf0aMceGGi7h2zGCOHbLGbEJNPP3+8cWx9DevIukXhwWBPVx07xj0GsO0FiBrd0aY34rB9rmP1guBRQbgXGv6WnbpPkbHRJs68ZSdzdiUAu/ZKEmSlOWTFg0lbFUzj 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: We use maxpages from read_swap_header() to initialize swap_info_struct, however the maxpages might be reduced in setup_swap_extents() and the si->max is assigned with the reduced maxpages from the setup_swap_extents(). Obviously, this could lead to memory waste as we allocated memory based on larger maxpages, besides, this could lead to a potensial deadloop as following: 1) When calling setup_clusters() with larger maxpages, unavailable pages within range [si->max, larger maxpages) are not accounted with inc_cluster_info_page(). As a result, these pages are assumed available but can not be allocated. The cluster contains these pages can be moved to frag_clusters list after it's all available pages were allocated. 2) When the cluster mentioned in 1) is the only cluster in frag_clusters list, cluster_alloc_swap_entry() assume order 0 allocation will never failed and will enter a deadloop by keep trying to allocate page from the only cluster in frag_clusters which contains no actually available page. Call setup_swap_extents() to get the final maxpages before swap_info_struct initialization to fix the issue. Fixes: 661383c6111a3 ("mm: swap: relaim the cached parts that got scanned") Signed-off-by: Kemeng Shi --- mm/swapfile.c | 47 ++++++++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 75b69213c2e7..a82f4ebefca3 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3141,43 +3141,30 @@ static unsigned long read_swap_header(struct swap_info_struct *si, return maxpages; } -static int setup_swap_map_and_extents(struct swap_info_struct *si, - union swap_header *swap_header, - unsigned char *swap_map, - unsigned long maxpages, - sector_t *span) +static int setup_swap_map(struct swap_info_struct *si, + union swap_header *swap_header, + unsigned char *swap_map, + unsigned long maxpages) { - unsigned int nr_good_pages; unsigned long i; - int nr_extents; - - nr_good_pages = maxpages - 1; /* omit header page */ + swap_map[0] = SWAP_MAP_BAD; /* omit header page */ for (i = 0; i < swap_header->info.nr_badpages; i++) { unsigned int page_nr = swap_header->info.badpages[i]; if (page_nr == 0 || page_nr > swap_header->info.last_page) return -EINVAL; if (page_nr < maxpages) { swap_map[page_nr] = SWAP_MAP_BAD; - nr_good_pages--; + si->pages--; } } - if (nr_good_pages) { - swap_map[0] = SWAP_MAP_BAD; - si->max = maxpages; - si->pages = nr_good_pages; - nr_extents = setup_swap_extents(si, span); - if (nr_extents < 0) - return nr_extents; - nr_good_pages = si->pages; - } - if (!nr_good_pages) { + if (!si->pages) { pr_warn("Empty swap-file\n"); return -EINVAL; } - return nr_extents; + return 0; } #define SWAP_CLUSTER_INFO_COLS \ @@ -3217,7 +3204,7 @@ static struct swap_cluster_info *setup_clusters(struct swap_info_struct *si, * Mark unusable pages as unavailable. The clusters aren't * marked free yet, so no list operations are involved yet. * - * See setup_swap_map_and_extents(): header page, bad pages, + * See setup_swap_map(): header page, bad pages, * and the EOF part of the last cluster. */ inc_cluster_info_page(si, cluster_info, 0); @@ -3354,6 +3341,15 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) goto bad_swap_unlock_inode; } + si->max = maxpages; + si->pages = maxpages - 1; + nr_extents = setup_swap_extents(si, &span); + if (nr_extents < 0) { + error = nr_extents; + goto bad_swap_unlock_inode; + } + maxpages = si->max; + /* OK, set up the swap map and apply the bad block list */ swap_map = vzalloc(maxpages); if (!swap_map) { @@ -3365,12 +3361,9 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) if (error) goto bad_swap_unlock_inode; - nr_extents = setup_swap_map_and_extents(si, swap_header, swap_map, - maxpages, &span); - if (unlikely(nr_extents < 0)) { - error = nr_extents; + error = setup_swap_map(si, swap_header, swap_map, maxpages); + if (error) goto bad_swap_unlock_inode; - } /* * Use kvmalloc_array instead of bitmap_zalloc as the allocation order might -- 2.30.0