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 9D97CC369DC for ; Wed, 30 Apr 2025 00:56:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6FC7E6B00CC; Tue, 29 Apr 2025 20:56:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 682CF6B00CF; Tue, 29 Apr 2025 20:56:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4D7586B00D0; Tue, 29 Apr 2025 20:56:23 -0400 (EDT) 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 2BBCB6B00CC for ; Tue, 29 Apr 2025 20:56:23 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 921CB5F8B7 for ; Tue, 29 Apr 2025 23:39:07 +0000 (UTC) X-FDA: 83388699534.07.4ED7762 Received: from mail-yb1-f176.google.com (mail-yb1-f176.google.com [209.85.219.176]) by imf28.hostedemail.com (Postfix) with ESMTP id C3B49C0005 for ; Tue, 29 Apr 2025 23:39:05 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Xel+C6V2; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf28.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.219.176 as permitted sender) smtp.mailfrom=nphamcs@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745969945; a=rsa-sha256; cv=none; b=dALJF0pltqHT2ZuTfI2YbQNoGG1xKuus6voh9jMxpqp3GAc3UNp6s5PWCbGShyXob+SFoa sjKnAtqAw6SNo1BUUEQjowoVJ1LMxGtORcT1DG6+fvnbOrmgoIt35e7h1sXlh8DJRXDHdx HYe8BPZweG9xXKj/jK+PZ5HH2/o8YJ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745969945; 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:dkim-signature; bh=2OXJh49ro0Is08VU7l706A8kleEYBYNLH5HPqY/XJZw=; b=tbDCnrKo83dl9a3Ve1XZeP8KFkjQ+Cm98y/nk92EIyEGMhkNpuLjSAMDo11WwnpQY9rQqJ JcW/XQZ8Ul1lIKm5gfiHUINU4LMlEtdiyddZUVwp0akWqhxuGNNybFmkQ/Y1RFdsnBt4wO 2HUOMfDKgILu4fqujd+g+XDtx8XjDw4= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Xel+C6V2; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf28.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.219.176 as permitted sender) smtp.mailfrom=nphamcs@gmail.com Received: by mail-yb1-f176.google.com with SMTP id 3f1490d57ef6-e6582542952so5728165276.3 for ; Tue, 29 Apr 2025 16:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745969945; x=1746574745; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2OXJh49ro0Is08VU7l706A8kleEYBYNLH5HPqY/XJZw=; b=Xel+C6V2MD1/fAjYATwzW85kfkLPzsWWluMnNp/IuXVocbgxcKhQXWMN32/LTnfliT vTSxXZmiRmryYG5YAlVNY8VT2p1IPbt2dObcYhtUNRK0cz6Djo0KkSL9gwMl7W1ulJxe bAr34a6vway4qhXvwffBpIXUmGLJM5yQ2opxMaiRsXuVHvVr8GJAla6R5bZoj1yvwN2s JM4NcnfBNKZeGdbHLvnf6/21yk8WUS5xTHmtL9aJ3hWaC8ir8xyW9nDUxLIW1ztPCOd1 5/RBlkbXvH8SB7wA0UuKJkY/bZ6UblP+EHvjtypIJSJafzseknsfOPuFNDy0wlE9mOYX ue8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745969945; x=1746574745; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2OXJh49ro0Is08VU7l706A8kleEYBYNLH5HPqY/XJZw=; b=d2cZW0r20G4heFFzXrK6yY/9bKGHARre5OiDblEWRXHF31sO37CsCacRDaHIAflasg SwZ3cL/jl84ar7qV5kGyZRHEDnGeK3AUwGxjsbFtD7Ifx7DJi0ki2qEVh6HEDvjLKyU3 ual7I+FvQ6uNCFapMYy+Wpc7A0DNHt+HzCxEDBuTccurRyLs+v2fvMxm0lb4W6qRa58D BttNLJrBrkREhPqzsraUlM7LjCNtj8+9WttyR3awgAlP37of8neHl+3XcfW9bQsk2va7 eCyCNTjTi1niY3gW4x/W8GRbxrabfTS0qa10O90xQjeq6z89nmcsLlstPohWRVDdCiuC gChA== X-Gm-Message-State: AOJu0Yyt1n2v40nQbJQon6XrYKB2qH0LbTRfSlgDuBRwnW5JpkOcRnLL SdLyQo2iRy/uMPgE8W1BEj5lDPqdpXlDWzwTXV2A/YLoFS3E5lNvx41dhw== X-Gm-Gg: ASbGncv1XMqptyea26IW9LDgKqhz1Qa9Xemr4lOCnrIBFWWaPSeugPfFEK/vPWye+P8 uZjOtCe5M7AFY8Eo32Grr3/9gHwHTgFNeYx9hhFxmuV5zATzSn1N+7Yw3B0MjmLC8B74yVjtVHD IC2wdhTE2rxFy7BTr1VYPNTtNDpnN3dYAegz8roEnMfPn5Zx1QLHVHHtX6JpFH3uE2dvXzePeDV AUiFAJkMA0KmlIze1DAccVhFiOrAXKybk/jF0LlLn4eKu+fM0WXb+3ZcbkQQu2piE+Gq/mqAhc+ 5XFXdY7A968OF7ySVN3x+EboP0spifk= X-Google-Smtp-Source: AGHT+IFvGhhWkQ9UGzTtXcjIsy+O9RRs3eS+N4X6pVmlww1mm3JHu8MPhztRLEkVipdj5eMNP+HjVw== X-Received: by 2002:a05:6902:1692:b0:e73:176b:fc28 with SMTP id 3f1490d57ef6-e73ecb8dd29mr1543475276.49.1745969944799; Tue, 29 Apr 2025 16:39:04 -0700 (PDT) Received: from localhost ([2a03:2880:25ff:4::]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e7412f1428fsm63359276.24.2025.04.29.16.39.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 16:39:04 -0700 (PDT) From: Nhat Pham To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, hannes@cmpxchg.org, hughd@google.com, yosry.ahmed@linux.dev, mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, len.brown@intel.com, chengming.zhou@linux.dev, kasong@tencent.com, chrisl@kernel.org, huang.ying.caritas@gmail.com, ryan.roberts@arm.com, viro@zeniv.linux.org.uk, baohua@kernel.org, osalvador@suse.de, lorenzo.stoakes@oracle.com, christophe.leroy@csgroup.eu, pavel@kernel.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-pm@vger.kernel.org, peterx@redhat.com Subject: [RFC PATCH v2 17/18] swapfile: move zeromap setup out of enable_swap_info Date: Tue, 29 Apr 2025 16:38:45 -0700 Message-ID: <20250429233848.3093350-18-nphamcs@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429233848.3093350-1-nphamcs@gmail.com> References: <20250429233848.3093350-1-nphamcs@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: C3B49C0005 X-Stat-Signature: 67d6mf37jmi1yj4zi8mnr6bsd5fxejra X-Rspam-User: X-HE-Tag: 1745969945-172222 X-HE-Meta: U2FsdGVkX199AOgBaHi8C6ATGgmLOHR8DaRKXfkptYc3nabWEF/nQzeo7yJ+61OiTqRGaqJL1IMxdcvdBqh1hyKQ4qyJR9Vvyove08JMKcqqVm2peYg3xAvCMcxvwrVUTK3Mqax5wBTA9aa2u7z3qHVtelNpKut94RckX9k+l+fBbxjGbW2jjG7c1W/v9n5zRQo1kGe1QcPdV3u5339Lx9b9AoMSECInwRRzcHExo9eUgzuoD0APeSZL/RGITN8KP1oMF4VeXR7jK4DxBF8rYB07+YsFi5iN8G91vfww7gUW4t3a/0jdCC180gswg3NcXqC3Bbybo/totoa3Z1Mh15FOR3FqAULZF7OFhouv8LWBHniQ9CGNuqmdhh6Jk25qEmTQx/yIs461VPo4+Fxr9lFCPMbWBe4ffkcLVP1dTF/YdJfEOCCQqjcG4ZLDie4au+ws2JK8679kdrxJKzeOBgnTwwtI8xvw6OkVsI5bypO4OQNljUTRAArgi5P/sXgJLsJbRbPtvnNzkMItrlUY7vfL8WO2ABHL6lsYfzxOEcslAvFNQvdR9Q/vWTVjU/NMMYXrO1UwOEj0fElqqmEiHeFntoUBrIyJqrVIk8J0i71UwULL8ldlPcBYRMvHZflLvZHQC04bolMwsESpcku6LPVAs/OIPTtE11uLohkeFH53EINeo1pSoPiVQ6QwW3Q8eCsARlN0I9yV7+47qZFtw68ghh/Ad0cwwF1sQgXj/Fr+/c+gl1NZyE3PHkC4HdRERsGaMpBJjOaFBLwBQxHReBIPvVqmGLxuRRNF5MoU0+fXXzKP7gDoVAhWN3j1eYhn4MKI4qacEIJZR7Qnq3+3p56yKDv19vqQo7+A/e1c4k+yqlT8zAM9YkqCVv/PmxmkRUiSx+yBWv4Mk6XI/RhcKG85EO+FLoiNG55LbqNemERYbAkrxmbay/6oBXMZA49aH/E5JeguZMpBk3IrcZz SrjYQTpF 07MONtybih6Cu/mn1ySxNaTPpljYqTfrnkPu5P35pMSHolsPH68FRkYyTBgDrekxAVwf7b9Vi+6t4i1d9JjPEntZEJR7tUs5cN+kzycsd+CRL5Tkpan+yXbV4s9EKWLfAnfI6uGx1ecsemHOgjHoNSWFvInZVIRBGaySeftA+NtnClYkXUFcrbUAoEz5zczd4B/y0EgI52VGRVJfHbNMIl3msPV0eTq2+uZ5DpkFmZ84JOQ/KSVoZ+at4DEJDCa6l/7jGQb2INLGOU3hY6L9f2NTo6qMRx9963eS9RfrD6m2PHR7Uizm8QAvxx9pp0ZIZW1IDH1UxCLQ2Pmap7OAJc1zivr0VYif0VKa30fN0Z7QBOMyXaA2QLV9Zk0GJvK9UgBzugLVgqfoSugskkKw0CZh1SVb2KcsVuMhp3mNPRH89M8A9Ln4iEZgLfpedE5gDw1N7LWnyGkjwFhsrvjbWNDOP0+v4Pe3d5lWASsZeyfcNQIf8Cw8DSb2NLXm3ofjl9/7BjLtwcH2DJow2loe28TkVu0fq82wH32yimELqP4976gY= 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: In preparation for zeromap removal in virtual swap implementation, move zeromap setup step out of enable_swap_info to its callers, where necessary. Signed-off-by: Nhat Pham --- mm/swapfile.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 3aa3df10c3be..3ed7edc800fe 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -2767,8 +2767,7 @@ static int swap_node(struct swap_info_struct *si) static void setup_swap_info(struct swap_info_struct *si, int prio, unsigned char *swap_map, - struct swap_cluster_info *cluster_info, - unsigned long *zeromap) + struct swap_cluster_info *cluster_info) { int i; @@ -2793,7 +2792,6 @@ static void setup_swap_info(struct swap_info_struct *si, int prio, } si->swap_map = swap_map; si->cluster_info = cluster_info; - si->zeromap = zeromap; } static void _enable_swap_info(struct swap_info_struct *si) @@ -2825,7 +2823,8 @@ static void enable_swap_info(struct swap_info_struct *si, int prio, { spin_lock(&swap_lock); spin_lock(&si->lock); - setup_swap_info(si, prio, swap_map, cluster_info, zeromap); + setup_swap_info(si, prio, swap_map, cluster_info); + si->zeromap = zeromap; spin_unlock(&si->lock); spin_unlock(&swap_lock); /* @@ -2843,7 +2842,7 @@ static void reinsert_swap_info(struct swap_info_struct *si) { spin_lock(&swap_lock); spin_lock(&si->lock); - setup_swap_info(si, si->prio, si->swap_map, si->cluster_info, si->zeromap); + setup_swap_info(si, si->prio, si->swap_map, si->cluster_info); _enable_swap_info(si); spin_unlock(&si->lock); spin_unlock(&swap_lock); -- 2.47.1