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;