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 B5A46C4345F for ; Fri, 3 May 2024 00:51:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4EC5E6B0096; Thu, 2 May 2024 20:51:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 475CB6B0099; Thu, 2 May 2024 20:51:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 33D3D6B009A; Thu, 2 May 2024 20:51:16 -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 13D996B0096 for ; Thu, 2 May 2024 20:51:16 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id BCDC2405D1 for ; Fri, 3 May 2024 00:51:15 +0000 (UTC) X-FDA: 82075255710.15.F1C0B9A Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf21.hostedemail.com (Postfix) with ESMTP id EAC251C0004 for ; Fri, 3 May 2024 00:51:13 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=bH1Lm60O; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf21.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714697474; 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=iTZWC4mSVwFMl/e34a7NVZCzCVLqGdUKErQlq6SYz3Y=; b=X5KY7ViVV6xnCKlJbdO2GtpQr9dpIwr/8frubz2T9Xwe4ax7WmQYeGMmDSJT3cJZe4P5n7 7IzInH4eCZ8yNWQoP50UtIGj33L9kOlIIC1ivlYVHYsNqvR9ymFFUNmYZhXONcbVVW+78s capDts0f+MzSQZFTzJgKu8O+V0KtVzQ= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=bH1Lm60O; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf21.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714697474; a=rsa-sha256; cv=none; b=XIKLMOHa4I5Bn0qdAEyhXKGl0yYWfOeRuqFUaEb9ypmjr24bcTHRUfpp+skwO/Sm/hjRKk +I3NHaUBmhxZyodd2zQqOJPlNaPC7inRsAfurTf4qPurzyMewzQOCoef7w94TC3qyHopQ7 5tiONWx6WwldB88IW5U0AVMfYkjGp1Q= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1ecd9dab183so12675905ad.1 for ; Thu, 02 May 2024 17:51:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714697473; x=1715302273; 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=iTZWC4mSVwFMl/e34a7NVZCzCVLqGdUKErQlq6SYz3Y=; b=bH1Lm60O0Lr+9Wacspg9Hw9bKV9d2HwVLFoQapN+DN2PVDPO/QKFjiPthJcY0Pyqd7 t2O2Gc68/ZhMKe2ukrFtXN4bfFyBd2aHP4IGnndKVVLF18TlOayP2xQVPW168SvEMG0D 3aq7Fm/2Wbprq2zoc0tikFFCfGaLAOND4XoJq67AhCqoexbwMPvXcaHWJwF1A26xPjvm DUwK/xNtQIEU9dPsnjGev9lyq/qYgdHlgAqnHscJcaUx2r+fmZMKUJ9sQ/uNyBQSqg9f zDutEw49coRBC0Yfo/z6biZttFbA/NsUUm86xOzORtTHmHajdDeSzFP4+eezxwcTownD adUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714697473; x=1715302273; 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=iTZWC4mSVwFMl/e34a7NVZCzCVLqGdUKErQlq6SYz3Y=; b=xEuADAqon9xdL9d4BuyNqXa1ctlOjd/M3B/xrs8VqMTDKpf6WfUXSfMsARcLTLcHFf Qq6x4b6Nk0BN4XEcC59AReHwb3fxZBgWZ5kfJO8uzLgME1NAOx1e8GFcnkqMQeePV+ub V2zjb5+pIzEnmW5tYhb7z/DUPy4X7GrYtf5sw0z8za/Y63pHFDM3OpLJJm1xLaeNvVfS 2SdwxuTpZeTl52ruRDCzws4MZz+e97qFOo/hNvKBi8rtRFIxDofg0gh8+aFoVxyEufuC tgs74VpWGWQwGqz/OoA3a4o3XW6c1dlcvNGJ2Q0N0j6ex6MFKyhUjpEVa6tnyjLfDqP0 PcFg== X-Forwarded-Encrypted: i=1; AJvYcCUTD4jDM0QbSVqe4DkW1QoxoxGR9dL+TgvMFlQYiBHjgha67Qo0SRdte2a7ITYkAyOnI06zsMJ5+x3hc85xxtvA0GE= X-Gm-Message-State: AOJu0YxghYUVxckgOSyaWSWpwR11kG5rVujJTU0Q2yFhuQa5QHasj8yW U2jn7zFf9UIoBfIMH7sRU5GAxypvZQ0zxwBE1Yoh1ZivI2u/Coza X-Google-Smtp-Source: AGHT+IF6KPbkDG4oPcXF3nnGu2vkHcu3vUbx1MmrFOaaiRUAVvVI/eyC0SeYLYYd7YsLphvtZmA6tw== X-Received: by 2002:a17:902:ecc4:b0:1e4:59a2:d7c1 with SMTP id a4-20020a170902ecc400b001e459a2d7c1mr6562669plh.33.1714697472877; Thu, 02 May 2024 17:51:12 -0700 (PDT) Received: from localhost.localdomain ([2407:7000:8942:5500:aaa1:59ff:fe57:eb97]) by smtp.gmail.com with ESMTPSA id d14-20020a170903230e00b001ec48e41d2esm1969175plh.212.2024.05.02.17.51.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 May 2024 17:51:12 -0700 (PDT) From: Barry Song <21cnbao@gmail.com> To: akpm@linux-foundation.org, linux-mm@kvack.org Cc: baolin.wang@linux.alibaba.com, chrisl@kernel.org, david@redhat.com, hanchuanhua@oppo.com, hannes@cmpxchg.org, hughd@google.com, kasong@tencent.com, linux-kernel@vger.kernel.org, ryan.roberts@arm.com, surenb@google.com, v-songbaohua@oppo.com, willy@infradead.org, xiang@kernel.org, ying.huang@intel.com, yosryahmed@google.com, yuzhao@google.com, ziy@nvidia.com, Khalid Aziz , "David S. Miller" , Andreas Larsson Subject: [PATCH v3 4/6] mm: introduce arch_do_swap_page_nr() which allows restore metadata for nr pages Date: Fri, 3 May 2024 12:50:21 +1200 Message-Id: <20240503005023.174597-5-21cnbao@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240503005023.174597-1-21cnbao@gmail.com> References: <20240503005023.174597-1-21cnbao@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: x987oxecgoerqwajsbn9wcrzejb3urqr X-Rspamd-Queue-Id: EAC251C0004 X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1714697473-726275 X-HE-Meta: U2FsdGVkX1+d38qhjMU2xcCTnWQd5709B4YjpaiTpKMgdk8YfDmvoaXlxhlFeXkNsBKZR1pdV6fprYvkfnXD9Hli0d9jeIajxnVNeV+LQzmNkvxzVMIVNQP7yKmzb7HjGhO4ZBLv9uQX/xhEyulqno2AQRArQNC/VKV9cIXBecfEm9V4D+yQn0HR9g2ndh8NDrd6C30KQIQwJo0M8fpwXmNJxGIzo6e0bGXnSHhrBYCYuMxxjhUkKPiqSPi4mZ2KuhsiT6sNqLhVpDUQWT5bzv6Fop+hFKhF161XlEVXe1XbNuhiXJ57A8NKRHuXW1UQkUrvfcdXVBX7KYnC2ex4D/Il27xbRVIsWFfgpYidKCTcMa1hmZcsjxk2PZjZz3hg7/I2pAX1czk1DVKuzZ9UGgxbTxaBOykBEth59SflTi/CpqVMU/Z/muCMeGps7IE+SRu5CrUI8/eohH0XX4CdTwr57oatkbLAgw2NURbM6TpxAlK1LaSudxA8aXj1vZEvxsuM+2iasPsR8zqAlly7zdigXQX/ksnYN818cpk/27xNyWpaXIePgb8D2IhC3pdlylgSQ3h15ff44rHY+HBJQhp5ouW0K/mvjIXdpAk1BJqXH6S/+mj+hNQLH7fyBh9Y31d/WqF7F1vlBPEQSlOIb0j0bwJOWCuWrOKLVMcpPqrWM8InjXPy4F83bx/jHMN3A2+8ZoAG6OCNurPFQolLEm2ovbfEyMnJtpmQE+DYQ/Hfi2ADn6JYNpEqPC+v5j3nVYNoMKMTPEAi5ZrXvA2sYk3Vs3AEcq/cdcpOPHBNTDWzC7Dvx2LzdN1xHoakdm1qvTkh/J5XwmRDZYacVdx0RqZ8XxSzvwsYVAQ5n3w94uL92tHazX1w6G93mIaxWtPFc6BW2OCr2+/2uiS+X3w3xVCj2DqDCwxDIIYwzgEv3seaNpp3Ce6YBY1gCUJt4bNgSWRjWDnaNerjTxQFhoH cRehxUP1 Io24k/7eQUPKpW0AVLJCxQanD1VQ8U3V0GOOOj00rCzSkuMuJIIgiPYYaTsJ80lxeNdj+VyjXOSlE5vQY/o/GP6c9p1NTctCwe+bbpYNJc6ynRkOjNxTYwsFlC+r7qqrLT4vo/jaEsjnL3Kila0DabRP7mgvK7EvzVNQV+fskFBMweY7CoHj1H5c+ZzfnBxg5i1Yb6mmUMNJE33qH2DS85wZXcY8KvodOVvFuayC/bWr5DKRRXC3VGpahHf2SlI80DS6KBvuG5tWHIiJNSbGJy5mumCMYVYOpOyVU0co1CUlfrr4dpUJDk7Klqh0giqYYjtqIlZWgZntekJOtzN3K++Pc/uLOtR4jgRQ053jeMiwccZ3A6HrTUoz2SaSJQbhSmWpL8jvS1jZWd333VQsooGPyCgkPF80wifV5A+qjQ0fqzoOHC7NEVZDxocxFE9RMZZYGFHQMDQdKbUDY1wDQSXlRP9DMWVKeOkEIS/28HXtRwMFB+sm1vH9gdYoA2uUW2uhK/95DpeC5Go0RE0WpO/fj3mdy6BfxLid/ljsRxbx4TFMRg6Q4StwEED6X8b6JYHF+WpMnYM0Q899K42y8JJl2i0oXrFBZ5wJ3KqcoALDd50yq9klDn65t5IFnSoUjmDwgtAKY05tj7asWjndzv0W5wlPGDOg7DdFjXl6aHoBqdXJxlMKm2kqPVvEzppatnmZoTIX6PZHhdTgHzlOuWu1uIw== 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: From: Barry Song Should do_swap_page() have the capability to directly map a large folio, metadata restoration becomes necessary for a specified number of pages denoted as nr. It's important to highlight that metadata restoration is solely required by the SPARC platform, which, however, does not enable THP_SWAP. Consequently, in the present kernel configuration, there exists no practical scenario where users necessitate the restoration of nr metadata. Platforms implementing THP_SWAP might invoke this function with nr values exceeding 1, subsequent to do_swap_page() successfully mapping an entire large folio. Nonetheless, their arch_do_swap_page_nr() functions remain empty. Cc: Khalid Aziz Cc: "David S. Miller" Cc: Andreas Larsson Signed-off-by: Barry Song --- include/linux/pgtable.h | 26 ++++++++++++++++++++------ mm/memory.c | 3 ++- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 18019f037bae..463e84c3de26 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -1084,6 +1084,15 @@ static inline int pgd_same(pgd_t pgd_a, pgd_t pgd_b) }) #ifndef __HAVE_ARCH_DO_SWAP_PAGE +static inline void arch_do_swap_page_nr(struct mm_struct *mm, + struct vm_area_struct *vma, + unsigned long addr, + pte_t pte, pte_t oldpte, + int nr) +{ + +} +#else /* * Some architectures support metadata associated with a page. When a * page is being swapped out, this metadata must be saved so it can be @@ -1092,12 +1101,17 @@ static inline int pgd_same(pgd_t pgd_a, pgd_t pgd_b) * page as metadata for the page. arch_do_swap_page() can restore this * metadata when a page is swapped back in. */ -static inline void arch_do_swap_page(struct mm_struct *mm, - struct vm_area_struct *vma, - unsigned long addr, - pte_t pte, pte_t oldpte) -{ - +static inline void arch_do_swap_page_nr(struct mm_struct *mm, + struct vm_area_struct *vma, + unsigned long addr, + pte_t pte, pte_t oldpte, + int nr) +{ + for (int i = 0; i < nr; i++) { + arch_do_swap_page(vma->vm_mm, vma, addr + i * PAGE_SIZE, + pte_advance_pfn(pte, i), + pte_advance_pfn(oldpte, i)); + } } #endif diff --git a/mm/memory.c b/mm/memory.c index f033eb3528ba..74cdefd58f5f 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4266,7 +4266,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) VM_BUG_ON(!folio_test_anon(folio) || (pte_write(pte) && !PageAnonExclusive(page))); set_pte_at(vma->vm_mm, vmf->address, vmf->pte, pte); - arch_do_swap_page(vma->vm_mm, vma, vmf->address, pte, vmf->orig_pte); + arch_do_swap_page_nr(vma->vm_mm, vma, vmf->address, + pte, vmf->orig_pte, 1); folio_unlock(folio); if (folio != swapcache && swapcache) { -- 2.34.1