Received-SPF: pass (google.com: domain of linux-kernel+bounces-170195-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <ce916e16-7512-4c6a-a0e3-415bdc906afb@oracle.com>
Date: Mon, 6 May 2024 10:51:16 -0600
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v3 4/6] mm: introduce arch_do_swap_page_nr() which allows
 restore metadata for nr pages
To: Barry Song <21cnbao@gmail.com>, 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,
        "David S. Miller" <davem@davemloft.net>,
        Andreas Larsson <andreas@gaisler.com>
References: <20240503005023.174597-1-21cnbao@gmail.com>
 <20240503005023.174597-5-21cnbao@gmail.com>
Content-Language: en-US
From: Khalid Aziz <khalid.aziz@oracle.com>
In-Reply-To: <20240503005023.174597-5-21cnbao@gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?utf-8?B?OStMQjh6SDZ6dTNaMGlCNDVkcXFCS0w5d0locWpJdisva2FzaUMwTGM3aWtS?=
 =?utf-8?B?aHY2dTQ2WVFCSktEay9Rb1NmWTA1Qit0amtvU0t0d2hYVmR6bm1hTUw1MVVy?=
 =?utf-8?B?MlZtWGZVUEozNXFLbU5jQU1vaDR0S3hMRUFMbjFhckhOMy9KaElsTWFRaUdj?=
 =?utf-8?B?NTZUS2VkcG1KeDVKcE9MMjNsR2hpSnhKK2t4VFEzbW5xTE1XdTRITXRNZTJn?=
 =?utf-8?B?M0MwSlVEaUVoUHcwaWlnWVkxbkpEL2FVb1dJSEFBS0tGaFdCek0xckpCdU0w?=
 =?utf-8?B?M0d6SjBObThadHA4c0tSaGp4SEp6Rko1a3NydEZRRmM5V0tzQjNDekh0L29D?=
 =?utf-8?B?eDRJbzdnNHNhWDF1TU5EWS81SEplYVNkY045N2hmQXdSdXArOW9GWk9uN29U?=
 =?utf-8?B?QUlQcGRoUHpsOWxTQ3gvcjVTUmtCYUZLNTN6bE5uVGtTMFk2UE5hRzZZRm0w?=
 =?utf-8?B?V2lUMkJjSzFHUGUxa0NhZmIrTHJTbGVxOFUzdU5xQkVLZ1d5SjdtellXdkho?=
 =?utf-8?B?RzhHSGZ6bjF1V0JkR2dETy8wV2o0RnpXYldPSnRQUlRsa3pDQnUvcy9hUUUr?=
 =?utf-8?B?SnNZSlRRMkd4WHJVMTdnOVZsTVh1RjEzL0UrWGxxRVNBWWlCYWJMUm9tTGpY?=
 =?utf-8?B?WHdXQVpScktPcUNpUkFqK2U3WDBGMHVLZ0t4SElyMXBOZnhMZU16SVlpampp?=
 =?utf-8?B?T3JuQ0NQQkphUlpEODk1RlRUQnR6ZEhyVU1vcmtsWTVISVlRZjEvWVZkdklq?=
 =?utf-8?B?TlVXeENNckk5MHZQejRiRDF0WXZaUjVOdERMUGo5b01KSlhkVForOWd4VzAv?=
 =?utf-8?B?KzNsbGxtaWNlanZBSEptQWRmQWFoTjZWcEJDclN4SW1zNkIrNlJ0bjV2K2tu?=
 =?utf-8?B?ZGxhcVF0dktGd29wbU1oSm1xUm5ua1oyczNsa3piQmRjNXp3bE9FK1VpWGVq?=
 =?utf-8?B?TmlRYWtaQXVNS2VKNmY4SUoyVlp3cW44ZDh3dDNtcWx2bGZhcFIweHVDeHlV?=
 =?utf-8?B?dmZpSHZFMThnRUJ0QWlRdHlkYmFYVWMzVzI4S2dCYmcrRGlMVjd3UGY4M0Q2?=
 =?utf-8?B?OTdJa2ptTlVUY1RpV3hkWS9Nb3gvUlltNkRIaVhBMEhDWjZtK25IVjVNVXdI?=
 =?utf-8?B?MWdsa0ZUUGFERkVBZk1tektmWG5ranMrUkdtOWVoYzZ3WktzWi9QeVlkamtX?=
 =?utf-8?B?dnc0bjgrOU5FVGc0dVQ1TXRrTW83MklPVHQ1MmRqbWZDejlIbDUwTXBpQWQv?=
 =?utf-8?B?cURkc1VzSW9KOXNmZHJCYTZGSHhxS2J3amxFVU5BQmlFRVF6bE11Snh3Q09i?=
 =?utf-8?B?M1BSdzg3eVVjUjB2S2pISnNma1JOYWJPbjIveGExa2Y2NWxxM3VmVlVrSWV0?=
 =?utf-8?B?Q0w5REorR29LaE95SmdmZXluU0luZUhQcm5CVnc5Ry92QWE3OGxIUWlGN2NF?=
 =?utf-8?B?R3lHNytpcko2WDl3aDAyNEwvQmZZMms5Smd4TGRIUVF1cGdONXlqSzlkTHJW?=
 =?utf-8?B?SE1PRXNPL3lkamVxRUFwbWpCcTd0UTNnYjVyZ0hxZTlteUNNWjZMeFVFaEJQ?=
 =?utf-8?B?cDJ0eFBjdTR4MFpiSFRmUE1mRmljQW1CRU11Q3RjbWRRUkFGeDdwcGQzOE91?=
 =?utf-8?B?T0p6ektmSEwzSTRMQ2JkakxKNWFteWVOeHZVaS9YWEgrYlFwNGFJS1h6c0hF?=
 =?utf-8?B?ZDFCZFNueEFJMFIwcnJVUjRKaEU5RzVteG5PbXdQeENZWElQM1cwQ1hIbGVj?=
 =?utf-8?B?U0czbjF1elpiUVNkVUgzakVQZmN2WkUwUkRvc1VNWG95cEErQy9IMllkSDRj?=
 =?utf-8?B?emJnOUtRN21nQ00wRVRGMndMaFpjT2J6d3l5OTF6Z0FyeWVScXkvb2REYjBL?=
 =?utf-8?B?WTNuc0RiUUJFOURQS1lHMGJXUXRzMUZQenFiSC9qcDRnWGl0cXYvTnpFNHRo?=
 =?utf-8?B?WnZ3c1pMUWFXNTdvL3ZvZldvYTZUQ1hpYWQ1RjYrNzhDVmxhdm52WlpEUzc1?=
 =?utf-8?B?MzdLT284MzdxV1pYOWRpUkVOSjlOdG1SSGhrNzNyelhySi9YRHdlKzUraXB0?=
 =?utf-8?B?Z29YOVRjZVMxWUJFUzIvYzJqZjN3ZWxGVWdHWDk2NENGQzFxcXRHQlVwS0Uv?=
 =?utf-8?Q?pW8lmgh6aJ2lLWdqgY/9uHP1/?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	zzs3r6bnLJ3DASFE5AJDW0zsiv5kngcNv+++5OwI5lJpqHphiPzGMceQnXatbrmeE6lbytcx+cuSUHWVFNOsDT5zTvvgpt8G78/zk9vqc9bIEjZ1C5u9YONTLLQB0/V52FZ0vuu1lkgtblMt1hF8tJtWWf3gSveSB4fY/boxnPrQdpmgRiedz73fZGFJbBX9e5n03yy5joMuwxlZs+w+SFOszL2xk81zIbqhCwJGE9lZW/HIR4p7zxeQsBTkljoXtLvJ46gmvvNmndhLFFnCxnaFBRFcMbvtV98VuxqRzaClyXtP1iTbJlmY3S5ti8BCFVkGY3FkfUv4tKSxAiHsFpG3MIMx/2gXbNc1RwmXOKMaMCdV7/VpguZc7jvgNbKq12kTK/JWVIDzeqqmFyrtQhkiuJN7/a/0YkPBEyPUatcNn156k4oFyjNPRs4uI7JRIj7hj3HZ2e79BYgiFJq40PRscULAxCtHXmHSuLlvxG1fUamlOMWhEWcMH92hM27Wq9uv+MsFy3eHyGGitPHQuIeTIq62fJd8XZja5c9g0OCPTkOfn4v10G6xK25tTrc4MUw/Uy5dC4yt1Xzo1ZEgxbmpKmkL6UeTMxxwOFCwel4=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fd421bf5-c935-4262-2509-08dc6decc5fd
X-MS-Exchange-CrossTenant-AuthSource: CH3PR10MB6810.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2024 16:51:28.3360
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: J2WhD/q3iBXGDZav1Y6iCwj1urvDwMxittTlkjEWoh9YGbdNbIkvNYqH6SI8w8ATdMx/6HHvfzyROLeGZJ9neQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR10MB7984
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26
 definitions=2024-05-06_11,2024-05-06_02,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0
 mlxlogscore=999 bulkscore=0 mlxscore=0 adultscore=0 malwarescore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2404010000 definitions=main-2405060118
X-Proofpoint-GUID: cGRbPJwA7Aq8lAMZsnftFmv_6ztjL2Y-
X-Proofpoint-ORIG-GUID: cGRbPJwA7Aq8lAMZsnftFmv_6ztjL2Y-

On 5/2/24 18:50, Barry Song wrote:
> From: Barry Song <v-songbaohua@oppo.com>
> 
> 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 <khalid.aziz@oracle.com>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Andreas Larsson <andreas@gaisler.com>
> Signed-off-by: Barry Song <v-songbaohua@oppo.com>

Looks good to me.

Reviewed-by: Khalid Aziz <khalid.aziz@oracle.com>


> ---
>   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) {