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 96F35C4345F for ; Mon, 22 Apr 2024 18:12:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F02516B0088; Mon, 22 Apr 2024 14:12:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EB1FD6B0089; Mon, 22 Apr 2024 14:12:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA09C6B008A; Mon, 22 Apr 2024 14:12:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id BD0BC6B0088 for ; Mon, 22 Apr 2024 14:12:28 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 6934CA0D84 for ; Mon, 22 Apr 2024 18:12:28 +0000 (UTC) X-FDA: 82037962776.17.812782F Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf01.hostedemail.com (Postfix) with ESMTP id 916244000A for ; Mon, 22 Apr 2024 18:12:26 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=LOBzOifv; dmarc=pass (policy=quarantine) header.from=oracle.com; spf=pass (imf01.hostedemail.com: domain of jianfeng.w.wang@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=jianfeng.w.wang@oracle.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713809546; 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:references:dkim-signature; bh=h2aJVJArUJppOuNUB8MhAiy4kIo6wvRJzEmWmrN+uiw=; b=UQ5rWgMSH1avUGP9hZdqMj/bEjJAW012pghNtpW4cLSAC8Zolbn/lv3mB1dmWVl7iXmR1q SnnNYIW5pVqMZLp1GV7Nu6CVJZFsmYoPv0SVlp2tE3AmOGKZgM6ZSdtayLyqy6Rij8Of+N A2mmMYRKksorwtNV/3d3RLu7NlOwrYE= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=LOBzOifv; dmarc=pass (policy=quarantine) header.from=oracle.com; spf=pass (imf01.hostedemail.com: domain of jianfeng.w.wang@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=jianfeng.w.wang@oracle.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713809546; a=rsa-sha256; cv=none; b=7ehjO3C15mQnCGf8bhkL4uNYq1Juhx/pFVLLlNkkgH6h6cXqab3gXoyGS+JDzvJYvXWDrU CK/IlRvDThQpOD8V9YTR6yEud96YNKpSvmf4EIjoTxZNISjZuYnVDoMw0raZGi7barrVIa MDBJMFMqWtM2swcfLOD8JpBULM85mSE= Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43MHmkbB017430; Mon, 22 Apr 2024 18:12:18 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=corp-2023-11-20; bh=h2aJVJArUJppOuNUB8MhAiy4kIo6wvRJzEmWmrN+uiw=; b=LOBzOifvSAOoTq37KKqiDF2zhcN9iBBTXvRPcM4xnr5CbIZ0xBn9ZKiTlwwGhahUl3PZ jiljWwQBoklLhkU2sPjd32TnVNqwx+75VxvR0dAmtUON4wxGmuI5B+jyHGOHeOrEOkFa G9ZTobbQ+mChfY1QUdtUdq/0tiYiVQhj4ZL0a4PqM37SmPXXqfnXfhEFzhZhxogm9Gke tNRk5A1BxF0KdC9YaoI/Z98rTsajp5mtx9a906HKebDXEpALzOyrX/UBK4XaQ+aAAiiq cRazZFHcVdonbotEm+DPr72ZfpyDVsWPKILz31rN3ls8KCba+UlOPtgZG5TCGIx+TG8Q /g== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xm4g4bcaf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Apr 2024 18:12:18 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43MGdmcF010840; Mon, 22 Apr 2024 18:12:17 GMT Received: from jfwang-mac.us.oracle.com (dhcp-10-65-139-207.vpn.oracle.com [10.65.139.207]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 3xm456e85c-1; Mon, 22 Apr 2024 18:12:17 +0000 From: Jianfeng Wang To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, willy@infradead.org Subject: [PATCH] mm: huge_memory: convert __do_huge_pmd_anonymous_page() to use folios Date: Mon, 22 Apr 2024 11:12:16 -0700 Message-ID: <20240422181216.91938-1-jianfeng.w.wang@oracle.com> X-Mailer: git-send-email 2.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-22_13,2024-04-22_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0 bulkscore=0 mlxlogscore=999 spamscore=0 malwarescore=0 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404220076 X-Proofpoint-GUID: NHWZ67OHThxTLmE0aMPA4vFcqYmuu8KF X-Proofpoint-ORIG-GUID: NHWZ67OHThxTLmE0aMPA4vFcqYmuu8KF X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 916244000A X-Rspam-User: X-Stat-Signature: 9feqmbhexwwb49azszndqj5afjtrib8e X-HE-Tag: 1713809546-932998 X-HE-Meta: U2FsdGVkX181Gm2C3dJutVq3DAtueAhbU77wKzqwl3WzFvdoDAo9+1FMmtycX1KoTCNVe3+SLjC5nylyUjzV7IT9GrXw7YwuMnnEtT1VGSwssE3ITB+VqadNoTbW4wf4nBvTvjWMP4hW/knxKJiCDCiEkIb4pUWnpAFntNjMj1PFJo9WTSQZbJzNJQFYZ0hScD4azsEYqjpSwIZjF7RVUSPMiGLHjirTiIVyHqrG+R9sTX3hkngc7qEgQLp6dtnpQC/RHi7ArVxDYiFrx21h7PMYm0mzFWDP9Oy8/9v5DhA3bb+xWEezJfZRDp+C8wZIJkeze3+cN17p1k8Bi56sPtrmTN+GjiV6tm7MQoXYpM1p/ELuPgccD9nwWfWKuUQnlmGqETuFKSwP5/CiRdaR17kAZmRYQW2UiRZ2Rs6QJkpmvTgtg+mY7QNBwnFaepnjM7q9dfo2GAW/pLU2ZYOMusnGUWSyBE0qxUixFRnq+SMZK80vLjAj4qUx5i4BYWtxc+993aiUqRuUfafURT6sOaCpUtmR0Lc6XV6QUSC5cUDyS0dkS8UIlfQa7ZLD+CUbe/Ia+xRuae3S2LQ1nTwKO6TEny5eStd8261VsNdddzSJHTojx0Rcfhc3EmSVuQGfWLSwTDfzL1BAxZcvbsxII+3usOEjdEwe+ec4TRZZ/090WBoN+Vp0RL3Rb8twdv/zkfFeUUKkb46H0Y3YASbFDbULEQJ51W08dHhUDAdG7Z6zKQQhEA8UpoetIahHBOFA+4UBKaW1+DY6RrMt8ZpKLoW6u6apG+SC4X1BPOgdZ5EPmByatqSOXD85FFy5B8WjafU81ly2QQmsolU/dxEPSOD7LOiZwNozkjnI3i6KCyyVWvqmZhtlVWq+GcebptDKNZ+wCaZw86ITpxJrYVvj2YmxRRo+Vri+WubiW41Avx73HcYYzFCYDF2tU7mF5tg5n2102VoubJVKtOKoPlP 01LokexB jEq8/UcSXoOSC4Z5KxlCAG5AqOdONYHwtnl7k9Wy4W+pUfzN24DcyRDmuaOjSB0wbYkWMA9OBm2Gi7wFMtQeIMXZIzVkeAsSHj358tKnQV+lg0/hvn/Wx2QAs/HlJ1ySKAhz8XHLP7vNLuKG1zwjlB68lsRoqx7bAo7vH3vqF5zEkDzk/eKwNunrI36z7neY9R30S60l9OjCjh2lJgZmVeHcdTGERAUHsXOVlMrd8q2hmvpaj96OvuHxbps8UqET99mpp 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: Change __do_huge_pmd_anonymous_page() to take folio as input, as its caller has used folio. Save one unnecessary call to compound_head(). Signed-off-by: Jianfeng Wang --- mm/huge_memory.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 89f58c7603b2..83566ee738e0 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -866,10 +866,9 @@ unsigned long thp_get_unmapped_area(struct file *filp, unsigned long addr, EXPORT_SYMBOL_GPL(thp_get_unmapped_area); static vm_fault_t __do_huge_pmd_anonymous_page(struct vm_fault *vmf, - struct page *page, gfp_t gfp) + struct folio *folio, gfp_t gfp) { struct vm_area_struct *vma = vmf->vma; - struct folio *folio = page_folio(page); pgtable_t pgtable; unsigned long haddr = vmf->address & HPAGE_PMD_MASK; vm_fault_t ret = 0; @@ -890,7 +889,7 @@ static vm_fault_t __do_huge_pmd_anonymous_page(struct vm_fault *vmf, goto release; } - clear_huge_page(page, vmf->address, HPAGE_PMD_NR); + clear_huge_page(&folio->page, vmf->address, HPAGE_PMD_NR); /* * The memory barrier inside __folio_mark_uptodate makes sure that * clear_huge_page writes become visible before the set_pmd_at() @@ -918,7 +917,7 @@ static vm_fault_t __do_huge_pmd_anonymous_page(struct vm_fault *vmf, return ret; } - entry = mk_huge_pmd(page, vma->vm_page_prot); + entry = mk_huge_pmd(&folio->page, vma->vm_page_prot); entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); folio_add_new_anon_rmap(folio, vma, haddr); folio_add_lru_vma(folio, vma); @@ -1051,7 +1050,7 @@ vm_fault_t do_huge_pmd_anonymous_page(struct vm_fault *vmf) count_vm_event(THP_FAULT_FALLBACK); return VM_FAULT_FALLBACK; } - return __do_huge_pmd_anonymous_page(vmf, &folio->page, gfp); + return __do_huge_pmd_anonymous_page(vmf, folio, gfp); } static void insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, -- 2.42.1