From patchwork Sat Feb 22 16:08:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13986545 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 52B62C021B2 for ; Sat, 22 Feb 2025 07:12:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ADD376B007B; Sat, 22 Feb 2025 02:12:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A8D356B0083; Sat, 22 Feb 2025 02:12:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 955526B0085; Sat, 22 Feb 2025 02:12:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 76A5F6B007B for ; Sat, 22 Feb 2025 02:12:37 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 20579160828 for ; Sat, 22 Feb 2025 07:12:37 +0000 (UTC) X-FDA: 83146712754.06.AA82E03 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf15.hostedemail.com (Postfix) with ESMTP id 178A3A0002 for ; Sat, 22 Feb 2025 07:12:33 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; dmarc=none; spf=none (imf15.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740208355; a=rsa-sha256; cv=none; b=bVgSBo0BDZPeOkxyX+hML00uXYMzJ3yFEyQ+9rwHPHMdADcOrZUkVRcbRpu87cGqU2nkf3 T4IoVhINAEQeK5oS3zwU5FwP9h2nhBSYAoC0QJNeyLSr9YANEgh7w+jlf09lUE9PWp3jxv BW0vRpxXonUb6ZQnxmqyal2nfJzD6PQ= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; dmarc=none; spf=none (imf15.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740208355; 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=l9txf+NYsCaSrQKoRjpIgJI3NjIqLhKROzPof8VBybU=; b=mnsepwGpRUF5I+GYdk3GJY78+xRQVtW4kDEbbM+Yqneq1TzOmhX3F64c4ROTV3wKvTE4Nc +QbLsVkSewn9pwXiz+l7YFKJoN6F6WGG9AztZNZjKjksaviuRspoTLCtEC8s/O3BG4gOFt PYDBL8P+VW9PGFNSc+oIP1Wwu6BtPaA= Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Z0J8r3ZS9z4f3jt9 for ; Sat, 22 Feb 2025 15:12:12 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id DE18E1A0E98 for ; Sat, 22 Feb 2025 15:12:28 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgBHBWjaeLlnrTsjEg--.26688S4; Sat, 22 Feb 2025 15:12:28 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org, kasong@tencent.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] mm: swap: use correct step in loop to wait all clusters in wait_for_allocation() Date: Sun, 23 Feb 2025 00:08:46 +0800 Message-Id: <20250222160850.505274-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250222160850.505274-1-shikemeng@huaweicloud.com> References: <20250222160850.505274-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBHBWjaeLlnrTsjEg--.26688S4 X-Coremail-Antispam: 1UD129KBjvJXoW7Zr1DAFy3trW8tw4DtrWrKrg_yoW8GF4kpF n8t3ZYkFs3XrykJF4DA3ZYkry8Kw1vgFWxXFy5ur1fZwnxXrWakF1Dtr90qFyjkr1kJr90 qFZ7K34xurn0yaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB0b4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK 8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I 0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUsmiiDUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 178A3A0002 X-Stat-Signature: age8mo6yr5c1xjss66i7jq61j7n7d3gy X-Rspam-User: X-HE-Tag: 1740208353-785455 X-HE-Meta: U2FsdGVkX183w4QVUkI0EhFn6sCpqz3amI6VC0F+o7antmnIvACnpHrFYeyk/z9Q2jnLaR58BHDoo+hV68+D6SLiRedV1PwnwQndEGWfWnb83fHQ1U9vXfDe5LCyjZEd+czJpWoEcSJRzCi4nihLhQFPy/195r4rSQ1F6+qe8OymSdwrS8H8zjuynn4eqLdkjn4TDkLTW4eo/1PZzMzuyYjeC7ktfvZJqkbyoSNildwUSAwESoAsQ+6kXTrmCz9ZEOKXzWwqki9ZvlKmHu9qRCLuq3fWDRCZzebO7Vg71n+1Txl2ZWNo0rBrfR8jz7nRg0vAvMXbdqsXLx1v1t+o0fGQjTn7ayKQvM6uBLol4Ia2vGGXjKP1F/M4n55YtCR16ToJ7rVc4seNP/g01BqhPUwgCNrnN1BQNnJa0USzc7paH8Qvf9u37EnFNqJ7Qrf+IJ0p63/+GA8i78oGVROX2GOveiUmjrUa3FxFXIpVpGxFe44/Zki7IQxZm8/u6qODD4ZdcZrLBlwKrvV9g9G4wRxpKwqIapylzunYvMq2+renur4R+hSlZO0f2CnVjpT9z8KfothcqU8pBfS41Tw4NIRrYwQFyW56eSbPspMQC0SvNJCcX5VpuubTGZtjSat6UJ4sfeN4lDcIe2VSMYNCYUT8/JhQQ9jQAQRBuZyhqsA4s8+RxkSuQLQXr2t7knNjSfzl1RwtU5Zn5BflnQ6H8hKAUAsajwjuEDsMjT2MMIn7b6+9kStQooD2kIcH6IlZilwRLVvU9QYwzlbJfL8Ly1mvgjZDGgrhP1QdocvKIXMxP9uO9MCmJKoCs1MGZko4LHPBNxvWvfg0XeC5hvtFM9ftZBJIjTx0j3VDAlzMZgZQmEZKdk/7qbozMmk5WuToKvj5ItaLuJ+PZ2UTWAcDjy+N/J33+vQXG7Cw/sKIZmXktYt6461fIBFzkgm7AyywzPLxUbyGKezMo8BolqA WDKOYEEw MIC8vFHFUjhTXj4KSgxjzoJMY32SoqoPkqQQr7Pth1mElEBmG+EfLwGKLiNYs4I4J5Zc8SvRHp3lgWJ5a1ZiqKKXVYoybzprEM4SOZh2dqGpNI7p3i/mkaukJm3epaNtefFZ8dpkEaooMiQGO2njO4Q9/OK4RaKxi6pirX42mGtEadmmI47t72YaF4ONi34/8K9T1qhT25CPWZXr0/GmVVpN4QmEM5UhqgQvgPkgqAVu+x18si0Fk8HExygPAVCsuwbQx 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: Use correct step in loop to wait all clusters in wait_for_allocation(). If we miss some cluster in wait_for_allocation(), use after free may occurs as following: shmem_writepage swapoff folio_alloc_swap get_swap_pages scan_swap_map_slots cluster_alloc_swap_entry alloc_swap_scan_cluster cluster_alloc_range /* SWP_WRITEOK is valid */ if (!(si->flags & SWP_WRITEOK)) ... del_from_avail_list(p, true); ... /* miss the cluster in shmem_writepage */ wait_for_allocation() ... try_to_unuse() memset(si->swap_map + start, usage, nr_pages); swap_range_alloc(si, nr_pages); ci->count += nr_pages; /* return a valid entry */ ... exit_swap_address_space(p->type); ... ... add_to_swap_cache /* dereference swap_address_space(entry) which is NULL */ xas_lock_irq(&xas); Fixes: e47bd46eab97e ("mm, swap: hold a reference during scan and cleanup flag usage") Signed-off-by: Kemeng Shi Reviewed-by: Kairui Song --- mm/swapfile.c | 1 - 1 file changed, 1 deletion(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index e5f58ab86329..425126c0a07d 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -2627,7 +2627,6 @@ static void wait_for_allocation(struct swap_info_struct *si) for (offset = 0; offset < end; offset += SWAPFILE_CLUSTER) { ci = lock_cluster(si, offset); unlock_cluster(ci); - offset += SWAPFILE_CLUSTER; } }