From patchwork Wed May 8 22:40:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Barry Song <21cnbao@gmail.com> X-Patchwork-Id: 13659214 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 89A0BC04FFE for ; Wed, 8 May 2024 22:42:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1E96E6B009A; Wed, 8 May 2024 18:42:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 19A626B009B; Wed, 8 May 2024 18:42:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 01FC16B009C; Wed, 8 May 2024 18:42:15 -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 DE5906B009A for ; Wed, 8 May 2024 18:42:15 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A04391C165D for ; Wed, 8 May 2024 22:42:15 +0000 (UTC) X-FDA: 82096703430.22.A6F54A4 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by imf17.hostedemail.com (Postfix) with ESMTP id C89E240011 for ; Wed, 8 May 2024 22:42:13 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=FfrVoinK; spf=pass (imf17.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.216.49 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715208133; 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=7DcpNxuaHKQ2XGPRcrgwYPClc6OYNtCFnxYQ34hBDF0=; b=pEjaI5PdV7V4CFRBKVGnFmXJmdVaE3kxOV3awAqE4cAckkaFRkoIEIQx1p0Ygvfyh5syvT ZwzUI/4hC4AuN6Fkkbs1gDCNdw73GvyhI1TWPANI9BoqXWcgb4bLZhiaWhjdgeUez+T8rd o25WfoTeLvuYDmVcfUYoIqq3V3myhAE= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=FfrVoinK; spf=pass (imf17.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.216.49 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715208133; a=rsa-sha256; cv=none; b=kbWR7FYkhAJPWSbsTeDoEUJhf1iaCfn170VVz3OIvhPkC5DGrz/VLg2vXMnE85pUHzdpxV E4s5ceK5m/hQwnjo69EuqPGokB07ENnrBHl3DuJIKpY9NGpj+AunjMXbzoHnMrhW+sBzg2 iya4KAei3ybBZmsJCst8er2WqjM8+rA= Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2b5f3e20615so276145a91.1 for ; Wed, 08 May 2024 15:42:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715208132; x=1715812932; 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=7DcpNxuaHKQ2XGPRcrgwYPClc6OYNtCFnxYQ34hBDF0=; b=FfrVoinK6z7/0GLtD5B2z7yb7UMEyAkM/2yKa8NE5IphASI5mfB85d/Zj7P0bi8xVr 1aCBfPQYYKPmcJF0yxcvs5qEB0tiuzeAP98LKfGKRa+fxwSQQDDLOlLxfFIcDyxFYkzb OCptXJzwsNiCydU27dLyE+c/nCrm+9etOdN4ZFqUZWEQz1j3itlXI7lB9QOgPvT5Ever +1MqQ/IpTz4rRR3T/+o/UstH1SOb2qLnqA30dhTR08F6PMvNJCn3Bcuqg/4cBdKTNq1+ 3+qHhlZS6nb1fnORiBDjimLeRdLaI46IYyjSmGaJQ+pT1sD56FHUnB9/DDrCpGYXcent LWdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715208132; x=1715812932; 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=7DcpNxuaHKQ2XGPRcrgwYPClc6OYNtCFnxYQ34hBDF0=; b=wZ+/QcpQxr0/4PnUGmzajKWUtExtvskMPVrbVh7mYupvQwyDaJSA05dhFS8NGuwf2a 835PzRVoLiOoWSeczY5kABNtdQmFKJ6/IK7/G7+h2R7APWAkHRLKSL//bK1Q766UX/kr 2GY649p623Gk0T0AOXsmLZuJ6JZmu+6W0UutldZ9jC4Ap17xVFOrEtTwN3xa7S9tb+qf Z16NaMBz6ANV6DUl0sonLYSl/QxtBshzgsYCiRSwqNohz4EMeln2MHR/QP2lfabNHOA8 LWUd+A1zkgFgVn3olistCPJiBx5kwUi3i7sNiGki5EPfBBJGqfw6hQvKiuaKtkl/3dWi Z5Kg== X-Forwarded-Encrypted: i=1; AJvYcCVms1uUnGk+ZXvYy9O4FG8Dg3q8w+G8LhKS6kml2bPIsLHy8ReAyUIojzg7pE0Y2C5V3U2mVeWuNyjoLHRE+Flf6Rw= X-Gm-Message-State: AOJu0YyE5IFyF5ubbPJa5U/4pIECGgzKKjvhO5kF9mkQWmSEde8+pETN N7AmpsxumSm4aDx1j94OCnwMVattjWvKHuiJ81pD5AfnX9dbeA+r X-Google-Smtp-Source: AGHT+IGkFdAUAzrMlbUlBhREM/CEvwatOEIMRBL45vN2bg1LTAUKPSPifp6IeAAwfIL/STXKxZU/xg== X-Received: by 2002:a17:90a:8b06:b0:2a2:981b:2c9e with SMTP id 98e67ed59e1d1-2b6169e1a86mr4021869a91.36.1715208132570; Wed, 08 May 2024 15:42:12 -0700 (PDT) Received: from localhost.localdomain ([2407:7000:8942:5500:aaa1:59ff:fe57:eb97]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2b67126b666sm102082a91.34.2024.05.08.15.42.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 15:42: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 v4 4/6] mm: introduce arch_do_swap_page_nr() which allows restore metadata for nr pages Date: Thu, 9 May 2024 10:40:38 +1200 Message-Id: <20240508224040.190469-5-21cnbao@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240508224040.190469-1-21cnbao@gmail.com> References: <20240508224040.190469-1-21cnbao@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: C89E240011 X-Rspamd-Server: rspam06 X-Stat-Signature: q83ao8y758pwybwgcx8q34hswa8nemhj X-HE-Tag: 1715208133-970747 X-HE-Meta: U2FsdGVkX1/Wnbtnp2GrJlQH0CWX6haCZ3SWcKN8iHhhI9PtxQiOYJixEJGIMYGw6lgu6afFtjIfQwm0IHplg38SQSdqts+T/AT42hcyUMz8umKZ3iWJGugDo07hf6ctsJlikq2RwnpVtbUDAi0xcC9kJ2jjRHPSFiCdC1lO6X4QjL8atWOKStwZAyjbCEig64bLTqujEQQRgi13KmV4Ynmo/r9V+p5zLqxNWLzxSu6wjc04q9BtlZE1gMiIr8WJwGacCqDFn3MtA+Ux16ImApORUn5uV/6nFO41P+nNy738yHsfqzR2oOkgfpdCEDbDfyNyvp+enI4OXTF2JZ0Nl4r+fu1m7ADjNks2jt3Ug2/zDcQmaY70cJUYn9C4gp1cij+nZWsRMuBswny05IIh0SVBMpGEwt+todZOgCDSvEaNZX85YY9+zkyLrsLT34ly/ObcA3u3xAiakXmEZMoSxzd4IqiMYinRAbHD+1BrbnO36sbSxKI3pqImqEFWGyp73i+BLXlCy1u2kTdHzXLh5QNh+xD+7PdFtaoIOyw6aZ3k8u4pvpK9qH46FgVwfDbmlNVlgfoiOb+YvOCoamGbIPyBeFWqL6SFREkeVGNGIuu9aewFDbFEhT1eK7NZZfTXp/Qo3gnJZSod2si1q0pmQl3Cd+ygOtHYBj+mrAr15pRj3F+3uUestbtETV0HRIhmtYOCFivAvXWjeCKMLKLnwlQAF5D5UABTOaaBafFGVjvPPiQFRLO5vzUkMR6ovjBO8V3rgIMGYXej3dXG1IB6lABzGLkilEFc+gROf+tYHlIbXFtzVAdCRQ/BCR8Bz7xvH4GBKE9ZrImrCN0tH76tyGKI5Dycf65nscKh8IrDmHoL3SJQ6STTE5T2HC0AYduBI5cpryFn2AI9nMHJg+kBkTVG2cRcMZbYfDKCynDOGCAB6xq34ebNGHqgiS1O7wQZpKDGrFx35cXxrh4Zt+S GlgKSclD PAb6Put9gVXKTfM8ArbA8qGtnUiZuyWXp4aWKU8m/hOMgelpEsfo+auAhslk2rwulKZSzenX9wld7RzvOG4mrEhuAxLL7t9WyZ8XA72brjBvMW2f2DfezRLfRpUGB5odjfU52/fs/typIoXuJxGtm2MPJt4MZTos60OwF7LLmTVJ9i/4Ter6pTSnadRQ2WVsbOHZ4KJupQnTc6pTwGxHHZi+nKmGUAHPZsFB7GqUMdIsBSkPj7ScDCCZm6X0qEMP/LBtLiwBrYWtV0Jm8aRfJ4RMsE/cL4k/81gJXsTn/+SGWYYuF3QRlN3qG/Gox39ZZYXrgg34E7ixnnAH3TeZZrceISe8+E+zm7drG+HZuUzRb3JkkCB/sFkQ1KNwUQ6rZLH+b0zEZUTI98bGARDkgrpmH0YNtOOfpjhpjzPiSbMcBwwKBFGsqKCSHz5j5tMrxwhdHxbqeuD6eP3bS4hYXV49gKbJm8f9MDWbZ8i58ua4y+TVDrM/4fiDRMV7BFib/fUQdq/UQuSvF5Xy4LxL1Y7WJbtlEmq9gaeHKdMh65XveefCdSKMSVMrwTfU4a6WXs0fftZ+wGF6tpSEy9qPq4edoyorNWpPC5elqNy5m4XrsU0pLmS0QWYh6WrJa9dvfAc8TF7T3RuwtOlMik0ZQWxJK7TIrbuHTSt//ljPrS8pROfsNu00XvmbyHLyoELpgeTQHyL5yJfs4Uzy9S1cjke5nYedii4FczRKzRnj6VsUx29/dycrrtujOuFB9Bl1bUXD2hnfvo3w7Uy0= 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. Signed-off-by: Barry Song Reviewed-by: Ryan Roberts Reviewed-by: Khalid Aziz Cc: "David S. Miller" Cc: Andreas Larsson --- 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 eea6e4984eae..b51c059af0b0 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) {