From patchwork Sat Feb 22 16:08:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13986547 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 D31C9C021B2 for ; Sat, 22 Feb 2025 07:12:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E1D186B0083; Sat, 22 Feb 2025 02:12:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C81056B0089; Sat, 22 Feb 2025 02:12:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8BD296B008A; Sat, 22 Feb 2025 02:12:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 6813D6B0085 for ; Sat, 22 Feb 2025 02:12:38 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id EE2A81C8250 for ; Sat, 22 Feb 2025 07:12:37 +0000 (UTC) X-FDA: 83146712754.28.2EA0735 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf04.hostedemail.com (Postfix) with ESMTP id DE9AE40006 for ; Sat, 22 Feb 2025 07:12:33 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; spf=pass (imf04.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=1740208356; 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=l40Nd+qI8Vvprc42br0mc9djnmJrS5l15N20I3XNAQM=; b=dUmVhDBdHIkWtE+1y19QNc87Sr8Wej88n+9iku2S0XTLYY9UTvSV17elw+i4EaMDFG8Czc 3Z+PiN4IPz6xk4Y2s2snmYh1miUCmBs72hyepDDcjsiOZtvoy5bSxY5KIR0UnD9e4UKSR7 MCqkNb89i7HAa3AjFT0FYwUtYvRxwnE= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; spf=pass (imf04.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=1740208356; a=rsa-sha256; cv=none; b=0oI3+r4wuz9FvJG0QhiV71X35PGhHVbNf7yZt0E53WeGa5jE/aC6rEgNze4pv6U1Li5viY oyzXyGK+uErdE9ykw6pDLgQSXt1od9DGa8np5bZBDPM8Y0VAf3xjTnhWz/NBiKwaweIMkk nkNxDhilmuq47JpEqijuArjAPRkMNfc= Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Z0J8r1s2Xz4f3jt4 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 A295E1A0E98 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--.26688S3; 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 1/6] mm: swap: avoid losting cluster in swap_reclaim_full_clusters() Date: Sun, 23 Feb 2025 00:08:45 +0800 Message-Id: <20250222160850.505274-2-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--.26688S3 X-Coremail-Antispam: 1UD129KBjvdXoW7GFy5Kr4fXF43Aw1fJF4xWFg_yoW3CFc_Aa 4vy348GrZ5Jw1kGr12y3yrXrZ7Krs7ZFyjgry3tFWxA34fXFs7tan7Gay2gw1rJa1DCa4r J3Z8trn3X39FkjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbf8YFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r18M28IrcIa0xkI8VCY1x0267AKxVWUXVWUCwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwI xGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480 Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7 IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k2 6cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxV AFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU0a0PDUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: DE9AE40006 X-Stat-Signature: jzs43usf9duagh53me6p7exhj6zbmw3h X-HE-Tag: 1740208353-298267 X-HE-Meta: U2FsdGVkX18Om++g+uwhkH7ggm6h4DzN3s8aIiTytgyjBgZILGqw345nUbfmmC8g+vJn5EJaJyYMP+Cq+rDbIQopd9eCYhCczHAS3FJW8BNn4KgBG26MEgnG5KJ6VevDe4RRvMLqIUN+g6PC39AJ5niB+APB2/VRL8VCrXOxuZ+8zqWdaarFPg9MFWwGQvOPoV1S/EdJDYyKTQBpqWWGo5gOF4ePz6OOPaWoojIMh3JSpGC6khuqkKseJKdiPmmYws72H9EJNERgg9ruhRlM6+iKWHm0XuFoflEP4zQ70IhW4zqfCiQskBcsuBmOQ1zyR4trpVi095ExDiWlEZDWLaHTSkA5N/yqosOo8CL/Mx7s3ZsuXWPd0VD5esQZgQRno3W+4FywPpO5X93jzLxgh9MFCZBXm5QJ7/JFgpSrGoEdbS+/9QUQxOvEoR6N2sTQmVOKX4FpwOCrBRwZswbYwcYGEqHYIqbuj6U2uB/pIeq773sr7qKVkSmXJ4AxfVHlcEEdS3uAUWH2G4UhmIFB0mH4LW/VRMhDv5xCS4IL8wJgsBZzkZ5M79VcR7qP7Ziy950U6ErUewCkR6l2w0AlSNxcRQtPNCvcov5foOtTucPMV5bDuG059EU/znAKD5K3jow36JhqkInjrknmPwwdB0wcsi3FyUJe7KdtbzecbKn3vNzcsiLOGocp1/XDv0H+8cMBB1Ao9ddWQl53EERX+38XGy4yJQa8dUpxrcF5EkgRaNQZjqM9pS4TeybO/rbPBgVcDKlQ8jZJeta/O6AcSkd/oOFCz8H0XU2Mi1dNLKgcAMAc3f9nJKqNOZH4umBOL9OQn1nNi1jz7B+9kyVWudv/NdzUSmTiSdEEQ+8C91ojnvFJ+Hf7rlWEHgDUpGmWbxLeFPzWmdTgQlFEiKRYyjOiz/E0FQrX7Pt7rmThRxnDn2p4+DOtrnLqu8Ih+fwFAXvbW0xu/noWEZGUMcy oWzgNDBo Ui3JXZUfnEDoOiNn6BjSLfdxdHmGuu6eY8aylNacksp1diqhzGTl1F/d+WA6FEc1FkgwCFC+d6y3AnObvVF1+szCatW/t+S4RAy7jA3leo/gWdIo+Hr0Dr9BKRQMCUyAMN3B3PX40cNOiYyyura5iWfHj0rxtTnXPMtTWgTWR6HXNMCSurRbzuYX5tO0hVCCeklwkJX8gH17lynCEz/xUeS6tjQ== 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: If no swap cache is reclaimed, cluster taken off from full_clusters list will not be put in any list and may not be reused. Do relocate_cluster for such cluster to fix the issue. Fixes: 3b644773eefda ("mm, swap: reduce contention on device lock") Signed-off-by: Kemeng Shi Reviewed-by: Kairui Song --- mm/swapfile.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mm/swapfile.c b/mm/swapfile.c index 34baefb000b5..e5f58ab86329 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -861,6 +861,10 @@ static void swap_reclaim_full_clusters(struct swap_info_struct *si, bool force) offset++; } + /* in case no swap cache is reclaimed */ + if (ci->flags == CLUSTER_FLAG_NONE) + relocate_cluster(si, ci); + unlock_cluster(ci); if (to_scan <= 0) break; 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; } } From patchwork Sat Feb 22 16:08:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13986549 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 50E01C021B5 for ; Sat, 22 Feb 2025 07:12:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 43AC56B0089; Sat, 22 Feb 2025 02:12:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 058106B0092; Sat, 22 Feb 2025 02:12:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF9B86B0085; Sat, 22 Feb 2025 02:12:38 -0500 (EST) 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 780946B0089 for ; Sat, 22 Feb 2025 02:12:38 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 220B11A082C for ; Sat, 22 Feb 2025 07:12:38 +0000 (UTC) X-FDA: 83146712796.21.49F5FC7 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf22.hostedemail.com (Postfix) with ESMTP id 1AB48C0007 for ; Sat, 22 Feb 2025 07:12:33 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf22.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 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=1740208356; 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=rX4/pCbzu6P9xmEoDSdy+9bsmGQtLEgH11a3wQJfyIk=; b=R0pbvUMsMBNTx4EweYG1sP3+J7GPPZ7indxTOLC3HUEnccQ9NHCwouiK/w1GqRHEAPIQEK Q3w6FQXgrWF/YrNIfesHkKtkU9jzVTaYlCFAHEUWxYmWz7GTQZPmwJG7OUpOIEOxIdZMmZ hJtDPUTiue50Iyn42PczHNhTVAQkog8= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf22.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740208356; a=rsa-sha256; cv=none; b=xisXubFzw+ash3A+RFy7z4XpNvfSby5QnRChBF3wi5HE9HbjjJcWxyf6UcJpC6h4mpj3nH /HnsA1CPIMbb8V8cyDXY9a+N0BN6VHI8lSFEUKKLzCcCAkgd0guM7DZ40m+8BuhEsY+BN0 jmNjYlA8jVTv6F28MEeu9KmvBUnRUos= Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Z0J8r5WGjz4f3jtD 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 271C31A0E98 for ; Sat, 22 Feb 2025 15:12:29 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgBHBWjaeLlnrTsjEg--.26688S5; Sat, 22 Feb 2025 15:12:29 +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 3/6] mm, swap: avoid BUG_ON in relocate_cluster() Date: Sun, 23 Feb 2025 00:08:47 +0800 Message-Id: <20250222160850.505274-4-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--.26688S5 X-Coremail-Antispam: 1UD129KBjvJXoW7Ar17GFW7JF45GrW5Cr1xZrb_yoW8XFW3pr 1fKF98tF4xtr4kGw45A3Z3JayrGw40gry5Gay3Xr1fCasxZr4xKFyvyr9avr98GF4kCa4D ZF1DKa4xuFn8A3JanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB0b4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK 8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I 0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU3G-eDUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspam-User: X-Stat-Signature: zy39a1ezaigxjnrm3k9jdqxn7xkzfgi6 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 1AB48C0007 X-HE-Tag: 1740208353-580998 X-HE-Meta: U2FsdGVkX19ph9D4J7yTyv49hp9smUCtrK8n3Xy2KSe9dici7Ttpl9XG499opYwzH8PS+3eMQc9rsUvlSaYpFr4Ect5TrkfeA6dMC4ct3hhjynS4oHi848Rqer9uqQfu1wyhyk0yEsiKcbWhk/801EDMeOOGP3qCeBc+G4ykPo+UY+Tlbq/MyU8srl/pPHjiMxjLNhDfjq+odeX4guSK1+r3R4JrQgynS/ryIFeC6oMw2v1V9DPeQDK0app+g2L9ZefFBaRfaKvNZlRmb/nS4swcdK2jI8lgbJCX0Xgkru1M+nq6gvIegulhfdKrMIUnkRuMXOpvLy9KT4Hh9Gyi0NZ83AzgB1wd5IR5TYUlY6kjYw9bQIkml5Z+5NDy6LFYlDc1Cdlu+sR5rwW7wW1awb/G4NW9vaVvvQM5hcnuIkRvbEn2DlFx2CXDMePCJExJO89aKwAlsU3lpnOZL+Slx+xjgmUgRyT8y8yEjHpCQYrUrLsnhBSp4UFs+RK3BfQvHmpEbS3OZtvVuOfFR3yPHGRpHwoWokWuJdbFygMz1a/l9qixbTePD3sS0vvZVPxlh+zSlRXymw8MM8jAPMk4TnY07sUcvygueRan756hRNSeG32LiFY3JdTiSV/ytl5Acd0tnq+c3CznZ/uUTVcAYYja/TKRWfKdT5zP8yL6Ub+wedd+hbHWWZljNIrS1qv28axXqC99JAIGURB6+/Ujot25E5TvnBthstgMv8aApYTPla7I/MSewuUeHoLnPiyyyzC2okAaxsxDBK9p8nYgT5xi98BtYpuqIXufI1AkRKe2Th1kz3kfzQ/Pa/P0AkeoFi00ti8XajnPSqPJu6HSKYmc6ucOw6pBydqmZ4Guh58YFkKF5dfsQ++apAxqeWeCVr91ALznQ9xmJhBmMS3TwDW+9kIXmHTTtRb7bwiyoljWvMjPjv07+Ut4+CeahiIkOPsb4LX6AX3dOYU1x00 R+hJmpZ2 KlfG+vHvxGB8TnkXtuGIP9Ob7M5Q13B4Qu5zpE/HFpn00k9YXOr/1u73qZvFWdWTDiHMN0/vXPqCVkR55BLaPi8Nw1kOI8wJhwkf3PifhMe1B7Jc7GEwwDmn8Wn8AXl0mGimD6QhPCC941vFbh2D/REEfziNtMPVKNwlZP6nxJ2AD1GKV7pFzb5xL0gCYoFSwcYQGMLlDgz9R6jHM7hrZAPNyGw== 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: If allocation is racy with swapoff, we may call free_cluster for cluster already in free list and trigger bug on as following: Allocation Swapoff cluster_alloc_swap_entry ... /* may get a free cluster with offset */ offset = xxx; if (offset) ci = lock_cluster(si, offset); ... del_from_avail_list(p, true); si->flags &= ~SWP_WRITEOK; alloc_swap_scan_cluster(si, ci, ...) ... /* failed to alloc entry from free entry */ if (!cluster_alloc_range(...)) break; ... /* add back a free cluster */ relocate_cluster(si, ci); if (!ci->count) free_cluster(si, ci); VM_BUG_ON(ci->flags == CLUSTER_FLAG_FREE); Despite bug_on could be triggered, call free_cluster() for free cluster only move cluster to tail of list and should be fine. Check cluster is not free before calling free_cluster() in relocate_cluster() to avoid bug_on. Fixes: 3b644773eefda ("mm, swap: reduce contention on device lock") Signed-off-by: Kemeng Shi Reviewed-by: Kairui Song --- mm/swapfile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 425126c0a07d..fc45b9d56639 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -653,7 +653,8 @@ static void relocate_cluster(struct swap_info_struct *si, return; if (!ci->count) { - free_cluster(si, ci); + if (ci->flags != CLUSTER_FLAG_FREE) + free_cluster(si, ci); } else if (ci->count != SWAPFILE_CLUSTER) { if (ci->flags != CLUSTER_FLAG_FRAG) move_cluster(si, ci, &si->frag_clusters[ci->order], From patchwork Sat Feb 22 16:08:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13986548 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 EEBFCC021B5 for ; Sat, 22 Feb 2025 07:12:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A6DD6B0085; Sat, 22 Feb 2025 02:12:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D52E96B008C; Sat, 22 Feb 2025 02:12:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A19106B0083; Sat, 22 Feb 2025 02:12:38 -0500 (EST) 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 68F446B0088 for ; Sat, 22 Feb 2025 02:12:38 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 31024B1A85 for ; Sat, 22 Feb 2025 07:12:38 +0000 (UTC) X-FDA: 83146712796.16.2F69724 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf01.hostedemail.com (Postfix) with ESMTP id E8D9340009 for ; Sat, 22 Feb 2025 07:12:33 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf01.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740208356; a=rsa-sha256; cv=none; b=iwLfFdgcUEU1HgRJNgiHtnitMsb8BZkdb66TqfheyeLl9EGait01+M9LfjxonwFEYrMOwc F2iB3NQKjkBSqKbeRYfo3tSUCow8I/+gdDAuV2lUkVIfYZiCvgeGZL55mA+dPMMKVnisRX dBE2XSeC9MuGQHaZrERr6O1kjZvfBt0= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf01.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 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=1740208356; 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=A81NhqZ8zcUzvEQSaHhqnSuykPtAqNCI1fUawACP2yQ=; b=BLDVn1IAFpTy20+GRzyrgy760aeK1pkVUsyAyF1DPJYDolbeHXf8YgENJ1E8Z8ekwDr3of Klex92+z+IIQ4Q4mhif03SUhgGGZBNFT8AcJbypNohZVgWSMq8lmv4TkYBvhSOPHMzU0Ni b5rir09L1Hr+TwqR0b/+QRpZTVcge0U= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Z0J8s0F1lz4f3jt0 for ; Sat, 22 Feb 2025 15:12:13 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 670DD1A058E for ; Sat, 22 Feb 2025 15:12:29 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgBHBWjaeLlnrTsjEg--.26688S6; Sat, 22 Feb 2025 15:12:29 +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 4/6] mm, swap: remove setting SWAP_MAP_BAD for discard cluster Date: Sun, 23 Feb 2025 00:08:48 +0800 Message-Id: <20250222160850.505274-5-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--.26688S6 X-Coremail-Antispam: 1UD129KBjvJXoW7CF4ktr4rZr4kJrW5Wr47twb_yoW8XF43pF y2q3Z8KF4UJF1q9F4UZws0yry3KrW8Kr9rXa1Sqw1fC3Z8tr1fJr90ya9ayrW5GrZ5Cr9r uw4jg3y7u398tFUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB2b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3w A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU3XTQUUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspamd-Queue-Id: E8D9340009 X-Stat-Signature: dg8ibm3cf9q8mdficb9t7odtfsownk45 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1740208353-131444 X-HE-Meta: U2FsdGVkX19UYs2H/9HcAWoHS/5iDGznnGHEwW3SnALy8GZJRnQBPWyl9BhnIE1VG12a0GD4cZTvD1iimpRa5YMJtPXzMrAP8B1gQ+wwaw4fmbTWTwHXQft6H/1VIgm87PU2x3o/AaU5ok0TmKFy5IraAxkel/UDFwsBpzVcUMYgYRiT0sOAMsRFCsPpKBnYJ31esDqyBVjRUw6zZRVnptMEKVhejyWAl9Ows+5+vBZBGUgQAqg677U/1TVclDJZV1K0fqYhn+vjD36Xzb/fAm+H829YludMGurXmif+XATQfGldrMNVANa41wajfi9TC6C9F6MiE/WWqnwQOAqsfnJA2mtj3Fmx/IP0fNMUtT7TAHkOw4Wo++/gcQeSAyesI7xcSLtGpDJGYbNawYQWWrbqIWHYR0vBCfzO4T2u//TP3DIQ+yEDSAbDSO9jhRFpTUUG7UGw1snFlH7ek5GZEVHre3SdBJqaNKT5q7DaKz/gWg2Lv6mb9AYyx7OfjAbY4fbpu0z43VyoSFzxKOYNDmHJktW5B0vvqIt1xcxwb3FROQ7eaU3IXC2mTQQzqkJfhW3vWsUWZwnAXBtG4GhG77U7Q9zJY1qF2qCQauYOyESSWGL9cla8jBXZM0eElKqPcNpgdOSfSec4vPXhCJzK1NjnutG9FgGLZ/EZCSr245Z+fgHNYewJqw2f5OZBGSuTZWofj3ZcsGTxl1g1Xa5F+jVIbSLmMcAtgjYemzrCCQV77iMfngyUa2KK1kViU3rETDeqPI3iDgnefL+u6GZ0ILlLRadwWFntOOf8oSva/7hS+O6F3vZ1ZmKScbIgj1SCw2IDQj7wNlx16hfLh/0zdQV7rX63CvH9l0Du/G4nBG8twAs8e0Na9Mr9DRgqcoipfj6U6cagoNqp3kLUUTCTq8yWwYzE7UJGynZazKCiVVttM6Cu4TPfMWy3Mzwk0taRQFZkB4lno+vKxSVRGn0 JfXhBgmH QLcv1nNqoJfAQJs/7y8Zp1eMMkYqBVbVinf//Iwm8CajDBHIEfXkCEmqvUFkU1Zk/It0OoNWeZaX0r7DjtFkNjYC6qVSufXWwYqU3YxUrwCOMdDomzaU8YX46YkHxLVhwAHYKqO4AoFVIY6KAHKVbhd1gUX2bAP7VWsgES6YSv99rj5cUx+W07eo+DZ+kyeeMLI9toF1hGwi5+KWi+G/YH8gpaQ== 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: Before alloc from a cluster, we will aqcuire cluster's lock and make sure it is usable by cluster_is_usable(), so there is no need to set SWAP_MAP_BAD for cluster to be discarded. Signed-off-by: Kemeng Shi --- mm/swapfile.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index fc45b9d56639..c640f77a464a 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -479,15 +479,6 @@ static void move_cluster(struct swap_info_struct *si, static void swap_cluster_schedule_discard(struct swap_info_struct *si, struct swap_cluster_info *ci) { - unsigned int idx = cluster_index(si, ci); - /* - * If scan_swap_map_slots() can't find a free cluster, it will check - * si->swap_map directly. To make sure the discarding cluster isn't - * taken by scan_swap_map_slots(), mark the swap entries bad (occupied). - * It will be cleared after discard - */ - memset(si->swap_map + idx * SWAPFILE_CLUSTER, - SWAP_MAP_BAD, SWAPFILE_CLUSTER); VM_BUG_ON(ci->flags == CLUSTER_FLAG_FREE); move_cluster(si, ci, &si->discard_clusters, CLUSTER_FLAG_DISCARD); schedule_work(&si->discard_work); @@ -571,8 +562,6 @@ static bool swap_do_scheduled_discard(struct swap_info_struct *si) * return the cluster to allocation list. */ ci->flags = CLUSTER_FLAG_NONE; - memset(si->swap_map + idx * SWAPFILE_CLUSTER, - 0, SWAPFILE_CLUSTER); __free_cluster(si, ci); spin_unlock(&ci->lock); ret = true; From patchwork Sat Feb 22 16:08:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13986551 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 B14B4C021B5 for ; Sat, 22 Feb 2025 07:12:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E61E46B008C; Sat, 22 Feb 2025 02:12:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E10D1280001; Sat, 22 Feb 2025 02:12:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D05716B0093; Sat, 22 Feb 2025 02:12:42 -0500 (EST) 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 A82296B008C for ; Sat, 22 Feb 2025 02:12:42 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 5E5FAA17CB for ; Sat, 22 Feb 2025 07:12:42 +0000 (UTC) X-FDA: 83146712964.25.419E262 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf16.hostedemail.com (Postfix) with ESMTP id 2B4E8180006 for ; Sat, 22 Feb 2025 07:12:39 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf16.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740208360; a=rsa-sha256; cv=none; b=PBaJYw2Xukw2dKalF/1wqbAQjgY65ihsgPgQFUHAUVwxic9z8o4PS6wLqUNYZAxo29TpjL XfNRBJpRyxUaf3Ggx/q/+Dd7rvjC5M11GRVwQTiURzq8txu2gLp/pVQ+g/2beVJVZR5PYh t9v7sQ22LoyYNfxMp4qzgzSQt6nczJw= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf16.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 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=1740208360; 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=lzcNnkrPpslGmo8ASWREmJm7gnsQb3unMVdFJo+d0V4=; b=KWhp4akTM4CY7yk9xoCtw+DC7bKrGPwngJdzsRoAdlT21tlMAKjmeuiwjxqUOekVTnn3re TtknfoN2DViL0JikM0VayuCqgYNbXZfx/SYQS81EKS2AjIp3ONPvaxrqdjg967+N7k79D0 BPe5ONDZTnTlEX5pFS0hYRundRR8R8Y= Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Z0J8s2B1Gz4f3jt4 for ; Sat, 22 Feb 2025 15:12:13 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id AC9971A0E98 for ; Sat, 22 Feb 2025 15:12:29 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgBHBWjaeLlnrTsjEg--.26688S7; Sat, 22 Feb 2025 15:12:29 +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 5/6] mm, swap: correct comment in swap_usage_sub() Date: Sun, 23 Feb 2025 00:08:49 +0800 Message-Id: <20250222160850.505274-6-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--.26688S7 X-Coremail-Antispam: 1UD129KBjvdXoWrtw1DWF1rtr4UtF4kGw15Jwb_yoW3Jrc_ua 9Yqa18Gw48J3Wvyr17ur97urnrWws8AF1fWay3JFy7Gry5JF18Zr1vg39xWa4DA3Z0vrn5 Xw1vqF1qkw4kujkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbS8YFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jyYLPUUUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspamd-Queue-Id: 2B4E8180006 X-Stat-Signature: 8bwhzom83m5h38ren4g6sjhjmeh9h5cy X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1740208359-915060 X-HE-Meta: U2FsdGVkX195EcgwMNFP9gcP6M/RaEsgvxhiv6lLRsqo6si0Aplk+A+bAWwsvjZywRPpIWItuhREEtdZmlhifcWLYZGdNbiAOVdVctjqVDPKob6jG3lciYsCjkWl8NeW88jbbs/HklSLIvt2zlpmMmNGinZX4qJrOxuj1RdvnmvGmeGvs85Ch/Jt9EVLHmhoPHdw9XPvSSYo+0gvSdJV6zWKsuk9qNU3y2yIXrRxCRbENO1hGjuHDpQaY+YqsMkH74OtqmaHI+j8QfPYFBy2kNECedRvecJKqJFsF8iVqDS6Jix65cg0BY5TqyVJqs54U1es7AdtQMYJaC13xuvSNkhf1VEeC0MTXkmi3j5W6Y7YDuJ/y7SFpT47NKtLPo4oB2fjwLVLGyxxlUrypyEWChcqpfplIsjYlX/FunI8lllCZ0h30zRxdUyyroSGSperF8tX9hP2vjbaGANZL/8WtKVWhUcw80OhBJu1w2h9IS5N0S9P2JgbVXVhvFzgPb9nql3hOjT2OAwVlQBpoVxkG3aENaqWoNzvqZGiCGplUB3VsdcFY114GSkfui2flszhPg7MLoXFd0Ir5xz83xX65sbIflMH+qaKHY0yAmJFhc6A9/DIJIVPdwO20no9iQxWJhyc1MZatzKyP7bFLYAyZNLlS+3JS5gWN0/Ri+73VYbNQ5MniUQwOLvJgNORkHIkYJ2PlYgIOCoKr20cOXpVca9wYKdxTzibU04xqhJsivzBavl6hVh+6bofA2GEwoyEUkJhGB+iR1gZzcQg/jPVvHKlAH+/41MFe8rDCeUKMpW3UJGElMRWBV4p8ReEZ5+QPQBACQe+qfu0wB+nTbN7zRZHuci4jsnnezngfiTDViPJi3WvEVPpN+oBqx1f0FF7ufqMusY7E6KXVoKiH9l7eutzOSmGu1yAply+uxyI8lnEU+CEkybT2/KSOXfnM/gYazC+Sl3HrKeuxzhxiRn aJpvK6v7 puurtl00pifhwiaHFj9IVW8b4cWhpFWLL/XlF45yz0EAF9VbSG6BDvyzaKzjdCt8J7VvLeDrVBon0XCRVX/rRMp/KkXGtb/ilwJSQQ7NrdqCpFvP/OHbOlWX3v0nQR5jlwaOX1yrSl8ye0meaVJimGva7OROnEbqoKCjBAJ/N0bKV+F8QjdwEG6kXr/bWGJosLJ4m93iJ5uPYmH7ukB26UdvGAQ== 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 will add si back to plist in swap_usage_sub(), just correct the wrong comment which says we will remove si from plist in swap_usage_sub(). 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 c640f77a464a..6ff57ed23e27 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1098,7 +1098,7 @@ static void swap_usage_sub(struct swap_info_struct *si, unsigned int nr_entries) /* * If device is not full, and SWAP_USAGE_OFFLIST_BIT is set, - * remove it from the plist. + * add it to the plist. */ if (unlikely(val & SWAP_USAGE_OFFLIST_BIT)) add_to_avail_list(si, false); From patchwork Sat Feb 22 16:08:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13986550 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 77D00C021B6 for ; Sat, 22 Feb 2025 07:12:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E61D86B008A; Sat, 22 Feb 2025 02:12:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E12316B008C; Sat, 22 Feb 2025 02:12:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C143E6B0092; Sat, 22 Feb 2025 02:12:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 9B8A66B008A for ; Sat, 22 Feb 2025 02:12:39 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 4CE93C0851 for ; Sat, 22 Feb 2025 07:12:39 +0000 (UTC) X-FDA: 83146712838.22.BA12A30 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf29.hostedemail.com (Postfix) with ESMTP id 10333120002 for ; Sat, 22 Feb 2025 07:12:36 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf29.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740208357; a=rsa-sha256; cv=none; b=elIzLMK3l0cxpLkAIQWI4AzKJUVUboxRtqjucwcqzb+invhK2vSjIf/C8wkcRKJRd5hPTj J6sx8HrXa4grBBMhNPxtQADdGc9YGetJkG52i7/7xHJeZSLkfhZ/2jmyuThWDah/Fr/Pr0 e5fBZa35nydvmWQiM+NJOeCKVRVCGTU= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf29.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 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=1740208357; 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=WpJEgZltBPdozrH3df9NgVEC/8Ucz0ASvBxL6tMKjZY=; b=ACP0a16HMsKiflHOKUUXa6vmtRKz9s+/F9g95D9OzyjUDqTD10n+WNIOcWUoeM+NyPTFoL rtiFj7wcGZT7GY46/aVBQMJBy5tlCSxx/Q/spYMt0vybJENDiOZ2jgmFRMNtpemlpVYTc0 1cZRO6NZfjkxwyp/Bc5nIamuoedWeug= Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Z0J8k6P53z4f3lDK for ; Sat, 22 Feb 2025 15:12:06 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 0853F1A0E98 for ; Sat, 22 Feb 2025 15:12:30 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgBHBWjaeLlnrTsjEg--.26688S8; Sat, 22 Feb 2025 15:12:29 +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 6/6] mm: swap: remove stale comment of swap_reclaim_full_clusters() Date: Sun, 23 Feb 2025 00:08:50 +0800 Message-Id: <20250222160850.505274-7-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--.26688S8 X-Coremail-Antispam: 1UD129KBjvdXoW7Jr1kKrWfAF4fAr4kuw4rKrg_yoWxZFX_ua 9Yy34kGrWrG3W8Ca43C34rXrZ7Wan3Za48Ary3KFW7A343GF1xZ3WkX343W343Xw4DX34r AwsYvrn3AwnrKjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbS8YFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jstxDUUUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspam-User: X-Rspamd-Queue-Id: 10333120002 X-Rspamd-Server: rspam12 X-Stat-Signature: 4omxkrmz3rraznm8q4bgxgfabyewqoh8 X-HE-Tag: 1740208356-751305 X-HE-Meta: U2FsdGVkX1+Q9TqnpOtspMN6O8Sb7JPoMtpzaC5VN8AgczS/8LFFiPnsVaO/wjcPazTp4GzPAuLT3U+L1ORKd+HRoOJIEMHQn6XMOQHWm+aTqWc0mGWbpUxJ6KKQtVECpC06qzyX367pRujBDkEeiFaZraji9iLrZ7yw4gbhHAvDSmUWhCnXCv3xtcDMRcfVH67Q4JyBnRDX1tVozhA7lExOEZ87WksnMexxUnMvpu76uOXsQ9nEmPAJBBW6mrgKU9iY8D9YTwmO/Us2l9Mr5fFKB8gB1iJUMs1KDpNtYYiwL/VeEkuUkten1noNYg8d8o4ezfYpu0jXuzeaMnc3U8+b19DT2EBkR6bSBsLh9QXA0OYfqMNq6hI0MJRaXX8PjswA7U5TUWCQ8+SYFigUeQTZLRkL9S/DDy4YOwRxgE796YaKDXw3FbViiGPLbOsLTcfCs4bIJCWl3BcZqZh6uvBqOQUSfYt+BwDV0xrb+SX8UvEpam9BX/ZkaPNV+NtU2JJmd9saxA5Kebi22FRVTqXbaKKUcAvooakZWYddHYlke5cdH3ehtJfWnFbHjeJFMbvAocgO3wBKUxCmjG0u/qSVGku5vBrRsjr9rp/LLznnkDFgRk5dsXItF3b6QYGCLjkJZru8iMNpFasV9FMW9w/h1T4l5jY1wQaBqAB7QWVX1+QZmzzQ5D8XXNturyj8PtQA4MJVdu9oTGNmEl8m8EymJk6L2wwPDoRgo6GHQEFtaJxfN/TMspLhKVCTZLQWdPVdcIIo9kmTgRdBahgTEMD9yjuHwdvgcgeD2IXMhXNR9qEm6NAVLbEjgszur8oHFO9LPj6Lq2Zifrt7OZlZmYXLqmVR+nN5xmhFj1zEZTc9I+tbJ+VoPlubN75v+7uqb412hCVD+kvzl89xWgj4PZYp/4/i+eI93BmBBo914D2zfAajemwAlrl6oMRbt9MU/EyBPGvLLx9p7IyKAT5 bnW7i4GS I1UJWhPtJvjBnxqnDok2QcRk9b/BwEEzLzRSQzZ+AyCHcojsIyQ5W2HA0gyzhL8GIGo1VeYqsspmpGjZpLaK0FZFZvTePlZQTcMwrIOSz0mxZzo7cVL/yfQNjU7NU/wzBGm5PcuHnNQ09RuFECrQfCWjOYTJ6i/xI5TJh6BY2ZefXGm4tNmPRQ39zNvBx2D1FseVvqh3JpJ9x/UCE9EFv7faFng== 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: swap_reclaim_full_clusters() has no return value now, just remove the stale comment which says swap_reclaim_full_clusters() wil return a bool value. Signed-off-by: Kemeng Shi --- mm/swapfile.c | 1 - 1 file changed, 1 deletion(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 6ff57ed23e27..dc0dc5a26a88 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -820,7 +820,6 @@ static unsigned int alloc_swap_scan_cluster(struct swap_info_struct *si, return found; } -/* Return true if reclaimed a whole cluster */ static void swap_reclaim_full_clusters(struct swap_info_struct *si, bool force) { long to_scan = 1;