Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp2691861iog; Mon, 27 Jun 2022 00:23:46 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ux3igSapqEKPo4A23ySDliUdofThH0lYoo0Gq1dS7YW4AJHgLWG/O21TXX/czUq7h1RoBl X-Received: by 2002:a17:902:f78c:b0:169:b76f:2685 with SMTP id q12-20020a170902f78c00b00169b76f2685mr13084530pln.41.1656314626085; Mon, 27 Jun 2022 00:23:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656314626; cv=none; d=google.com; s=arc-20160816; b=TJvKTDQZKD+y52/Kx0ts8F+Yjc9XS+JBufNwXHj851mR2+lXrJuHcgs8mIcuVb4/cb hIaIQ+FR+0BGIA55ZfySs6FtDFLviK150Y7ezeXbWb0AK6qjWN6odHvxKiGq7gqFrKmi KlUA5DcuZm1CLmioWOeCWCyQLBklpZqnHR2B9uyLXOfnt5Z3LgWuwqXzIptkfolAZ/aQ qAE/8T/WySCjBHVQJyidKJo6MG3r1SoA7943I9r+dFH90gozfLykg/4Lc8oTe5TM1n/k gG7f+nZBCfOzwowX/1KcYtowgXKTIZbxZqMTnDXO1xcpgMiC1ROAA2sIwIMSBrd6K5yn yDPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id; bh=2ZQ+eejdn5pfaRsvOW7rc4FQJQXJ2Fd29xjvHg1iNAg=; b=tGqA8yVAUavsaQp5OjHXdplxjLSLI9QYQ2kr8Iw5wjsOXAUZIUv3J5khUNN0CMwqKv CJgo92rZCQo9/hCGJnDFXLDstcTeIBPF3LXsBn1Y4LS91TW0/9rQRionwPndd+epQwF7 GMJLV2WEVBBXCMXY2kcXc0/MhbPDudxqaV0gm+VDTTM4shp01/D0w1RV/mOe7PiBUniQ RnD+PrISS05fqkzq1XKu/MTb+tv+fR36iRdV9/8ZVtduzayCebe8OrEtcjyn1Bk0xkwY jNX3JaJHNrSO1Z+2hxekjMlRr22oacq/OKWRg6wr0y0ITMTkocQSOa2Vs5xMTmAMu3kC FE/w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id pi4-20020a17090b1e4400b001e318172115si8208310pjb.39.2022.06.27.00.23.34; Mon, 27 Jun 2022 00:23:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232795AbiF0HO1 (ORCPT + 99 others); Mon, 27 Jun 2022 03:14:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232066AbiF0HO0 (ORCPT ); Mon, 27 Jun 2022 03:14:26 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5EC1A26F2 for ; Mon, 27 Jun 2022 00:14:25 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4CDD81758; Mon, 27 Jun 2022 00:14:25 -0700 (PDT) Received: from [10.162.42.6] (unknown [10.162.42.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 32FF03F5A1; Mon, 27 Jun 2022 00:14:21 -0700 (PDT) Message-ID: Date: Mon, 27 Jun 2022 12:44:19 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: [PATCH] mm: hugetlb: kill set_huge_swap_pte_at() Content-Language: en-US To: Qi Zheng , mike.kravetz@oracle.com, songmuchun@bytedance.com, akpm@linux-foundation.org, catalin.marinas@arm.com, will@kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20220626145717.53572-1-zhengqi.arch@bytedance.com> <037fc8c3-9b71-cb83-8882-95d5459a494f@bytedance.com> From: Anshuman Khandual In-Reply-To: <037fc8c3-9b71-cb83-8882-95d5459a494f@bytedance.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,NICE_REPLY_A, RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 6/27/22 12:25, Qi Zheng wrote: > > > On 2022/6/27 14:18, Anshuman Khandual wrote: >> >> >> On 6/26/22 20:27, Qi Zheng wrote: >>> The commit e5251fd43007 ("mm/hugetlb: introduce set_huge_swap_pte_at() >>> helper") add set_huge_swap_pte_at() to handle swap entries on >>> architectures that support hugepages consisting of contiguous ptes. >>> And currently the set_huge_swap_pte_at() is only overridden by arm64. >>> >>> The set_huge_swap_pte_at() provide a sz parameter to help determine >>> the number of entries to be updated. But in fact, all hugetlb swap >>> entries contain pfn information, so we can find the corresponding >>> folio through the pfn recorded in the swap entry, then the folio_size() >>> is the number of entries that need to be updated. >>> >>> And considering that users will easily cause bugs by ignoring the >>> difference between set_huge_swap_pte_at() and set_huge_pte_at(). >>> Let's handle swap entries in set_huge_pte_at() and remove the >>> set_huge_swap_pte_at(), then we can call set_huge_pte_at() >>> anywhere, which simplifies our coding. >>> >>> Signed-off-by: Qi Zheng >>> --- >>>   arch/arm64/include/asm/hugetlb.h |  3 --- >>>   arch/arm64/mm/hugetlbpage.c      | 34 ++++++++++++++++---------------- >>>   include/linux/hugetlb.h          | 13 ------------ >>>   mm/hugetlb.c                     |  8 +++----- >>>   mm/rmap.c                        | 11 +++-------- >>>   5 files changed, 23 insertions(+), 46 deletions(-) >>> >>> diff --git a/arch/arm64/include/asm/hugetlb.h b/arch/arm64/include/asm/hugetlb.h >>> index 1fd2846dbefe..d20f5da2d76f 100644 >>> --- a/arch/arm64/include/asm/hugetlb.h >>> +++ b/arch/arm64/include/asm/hugetlb.h >>> @@ -46,9 +46,6 @@ extern void huge_pte_clear(struct mm_struct *mm, unsigned long addr, >>>                  pte_t *ptep, unsigned long sz); >>>   #define __HAVE_ARCH_HUGE_PTEP_GET >>>   extern pte_t huge_ptep_get(pte_t *ptep); >>> -extern void set_huge_swap_pte_at(struct mm_struct *mm, unsigned long addr, >>> -                 pte_t *ptep, pte_t pte, unsigned long sz); >>> -#define set_huge_swap_pte_at set_huge_swap_pte_at >>>     void __init arm64_hugetlb_cma_reserve(void); >>>   diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c >>> index c9e076683e5d..58b89b9d13e0 100644 >>> --- a/arch/arm64/mm/hugetlbpage.c >>> +++ b/arch/arm64/mm/hugetlbpage.c >>> @@ -238,6 +238,13 @@ static void clear_flush(struct mm_struct *mm, >>>       flush_tlb_range(&vma, saddr, addr); >>>   } >>>   +static inline struct folio *hugetlb_swap_entry_to_folio(swp_entry_t entry) >>> +{ >>> +    VM_BUG_ON(!is_migration_entry(entry) && !is_hwpoison_entry(entry)); >>> + >>> +    return page_folio(pfn_to_page(swp_offset(entry))); >>> +} >> >> Extracting this huge page size from swap entry is an additional operation which >> will increase the over all cost for set_huge_swap_pte_at(). At present the size > > Hmm, I think this cost is very small. And replacing > set_huge_swap_pte_at() by transparently handling swap entries helps > reduce possible bugs, which is worthwhile. Possible bugs ? There are just six call sites for this function. Although this proposed patch is functionally correct, I dont see a valid enough reason to increase the overall cost in the path.