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 7F35EC3ABBE for ; Mon, 5 May 2025 18:25:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3A2646B008C; Mon, 5 May 2025 14:25:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 32BCF6B0093; Mon, 5 May 2025 14:25:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0BB046B0095; Mon, 5 May 2025 14:25:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id D943C6B008C for ; Mon, 5 May 2025 14:25:24 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 38A70BF1CD for ; Mon, 5 May 2025 18:25:25 +0000 (UTC) X-FDA: 83409681810.26.7B6331C Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) by imf25.hostedemail.com (Postfix) with ESMTP id 54EEDA0010 for ; Mon, 5 May 2025 18:25:23 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=NObTKWdX; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.219.177 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746469523; 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=CIawxaOA1yq3dDDPxvebCqxillGmdiJRaxJm+NUOk1E=; b=w46RcXromJuft3+skdrGbJPbd38i7Nf8Y34foUCejO7DePZhWWiQtfX8a74/U32P/7QaH/ Ts0fCt867Vl7+SE2jU885bAXZlS4sbpzKuMgslmXbVbMbVOt6rFOkPiYInJ2nOECWcNR8X FSPTIOp9HWehCUjbSeenUGVvt9JckvQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746469523; a=rsa-sha256; cv=none; b=boV7/z3lRRn2Evq7s4FvpRqLWDj8fVwoFQgf8d9rHecjA/EAc9O0qVxMSgYhK6IDiXSr4x EbeeQPPHZD+qfx+xgRVXyWtJ0cSpBGsnM4sovSppYBN8d1CmeOUffKRUr9QV7vawZHUqSW uXMMgCgtsOcetwm7WdiXT7Sa1dW/TFg= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=NObTKWdX; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.219.177 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com Received: by mail-yb1-f177.google.com with SMTP id 3f1490d57ef6-e756416045bso3565297276.2 for ; Mon, 05 May 2025 11:25:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746469522; x=1747074322; 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=CIawxaOA1yq3dDDPxvebCqxillGmdiJRaxJm+NUOk1E=; b=NObTKWdXgS5iSJclltpAy9iBD7G8GAav6coALQbBhe4aipgFhZhQAA6DuwJVoR6c01 ddzxOPmF8YTkzm0xBeEHcA9UrxXLkAebd5A7ibQ5jIrBHFSx9SLmDPoYe6c6uR8PWdRI 3HK2Vz62Tx46C1v60HTezO9C+qk7e5LRguiRLeKSSuKLHrnROI1VChw2mULpv6yr5in1 WoO+I0aIAaBRSXmgVubWwVNMbrGoIkJaZYpT8rrWIFI1BzRQYlrUoT6KHR2FmFtqOntr eOFVgz2P221oOAx5b0otHCc5rJWRARhM28zIxDc8btjhP8ZAXOSt6P69nQ1ry0Z9aIgv lXHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746469522; x=1747074322; 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=CIawxaOA1yq3dDDPxvebCqxillGmdiJRaxJm+NUOk1E=; b=B0Uj53TkRe9YhOByezT9dhyAK9d+5dvoHbZpo2gNt8lXrpQBSNxpkVvUPUJhHRlVoB Ox3m0dzUwixWXUFTfthRB98xNxjB4axfl+cdEDpuE3S6PyE4cPueYlgFeBKV9/s2cIiy gNYE9ze2OLU8XpTQF7EYZEH6u1QPoFLKK2NONeRLvkDPIlbzVnf9o/ySIx0HYSiR8FCO R0O2oL2oFx42SwdI66mpFtioNerDfV7UEWIknj6xS89swjdhk4s+XJjY1GgKjDdpZZUu bVki3CLebRoHeEsGXRuYdYmdscZqlGw4mxpcw4igUDO1qtzUoo1ooA9pJfIgBH1aIH1t ffrQ== X-Forwarded-Encrypted: i=1; AJvYcCVkg7A8oIs5lQOFLxk9NGjjR/ONkWOXkghK4a6fgPYAB64/08gcgEAlCoj0bXSL7s3wrSYEoMjOrQ==@kvack.org X-Gm-Message-State: AOJu0Yx0LjkIfqTcDM3uepUdolM6oBPKeFT+SVDkDUxO9GoDp+OX892T EPgy1tVCQiuoojT4u5q7AVy7mnez5G48Qp6SYX43IPKbqc/74ZIY X-Gm-Gg: ASbGncs3b8fjFrYDhsOo5hTEpgxeQkzhzvK/yJvrCVwFnSQ0gfbYhMi4jH+Bd16Sldk mWzN9R9+UwGtoAF+YEXfQlPxW/gdVXGjuSu/k4S8etR0mJF2ufaTDnseBma4YRs2s09MvOz0y/I 5E+m/43mWT4/sV57UI2ShfvKR9MJaUjOicxNOZo2zyx9R94GxpU/azc77eua64Lh4m1xTydwuei 6MAnufvE8n5M7oUcC83k+vXun0+Ki1Ptl8DaLzzMgmtPFI2NSxDpNgVTvk2A8fn7u1Yv3y25gpm cYrteHxfHf59veKha0+0pZwuTBlQuS5KnO0Y9nTQEjSW43ih3R0= X-Google-Smtp-Source: AGHT+IGRFXsz8jbwnyUuTX30xB3c00jZI+IfJoxJduQHI3H6iannozkIKEv8GJlmkl+bwqv0hvnq4g== X-Received: by 2002:a05:6902:2e0f:b0:e73:930:cc30 with SMTP id 3f1490d57ef6-e756555a7aamr16340605276.16.1746469522367; Mon, 05 May 2025 11:25:22 -0700 (PDT) Received: from localhost.localdomain ([50.205.20.42]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e755e7a897asm2113429276.38.2025.05.05.11.25.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 May 2025 11:25:21 -0700 (PDT) From: nifan.cxl@gmail.com To: muchun.song@linux.dev, willy@infradead.org, osalvador@suse.de Cc: mcgrof@kernel.org, a.manzanares@samsung.com, dave@stgolabs.net, akpm@linux-foundation.org, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, nifan.cxl@gmail.com, Fan Ni , Sidhartha Kumar Subject: [PATCH v4 2/4] mm/hugetlb: Refactor unmap_hugepage_range() to take folio instead of page Date: Mon, 5 May 2025 11:22:42 -0700 Message-ID: <20250505182345.506888-4-nifan.cxl@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250505182345.506888-2-nifan.cxl@gmail.com> References: <20250505182345.506888-2-nifan.cxl@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 54EEDA0010 X-Rspam-User: X-Stat-Signature: x67qoksg1y1co6pjso1t49e4i6dc55mx X-HE-Tag: 1746469523-649932 X-HE-Meta: U2FsdGVkX1+FHJpMpzRQsm9dqExSOmMtQF7yotHGi0mL20cRpu/C9TlLPMOEG93tPPwAbiqmh+QZ23KLzVztSbTR/QbnMJ7TBtFRHj5vVtcUFYulN/Ls3c37QmMu5ENHAWZjEXG8BEcHKx2quGIuSVygi5h3MhXLTd9cdcvzN87dh24561fbBZUC5bii9M3Ciq85Cm4phqsVDGFLvnaGm+VinNkdEOOqQAFLh9z0TuH+l3NByP/Lzkl/jbH/1A5n31SeDNnvcGPo+fPePmOlWt55L9h2asCTg19+jRsC46bwEsJa/FQJyIPnQhJyYr9W1xkBZLDPt6qKAJMZg+/WhQWmcIbhXLX8Pj/Qn+03294iKKTK9xfgF023j+pnWSll1eIOO/DsqPRU1fbmzos4SBtE+Vy8QLgBmx7/TNUAS16gPqCp2iIyF+aP5kwntsTHe8Dw6/MjWKbgJ0adL0OWqfHc3fDeu3NdnG7t2uas9UakplYkR/41RsnYkAQ3jxmbC1GW34llUcb0P9FN+3Ehqv35+81nC4jTyjlFDgZt7HXy3SCCyawoZyJObHG/peC+I+ZFoVR8OatNTTHZw7czli7ghB/ilO75X2F0YjoFx6DMnf5lKwRE8UBCTZZ5gKP2yhhZlMQKCOc2mqCw3l/kUYjcf1mzfS0CRTYVxzhlrz7LjwNIhB+asoOtYXyG5nt8dFge5rGpUx7qFPXebpZ4DY5q1ncJw94/LhZz7tCqhpcE2ITpY5LnnXVch7Eaen6bpkE0I9JrObzv3EaSgqrq5Ai+VHlnV9EWDEBX4suONSpjol0Ua58vcra966WrSh1FvQmfXWNDHiVjSAC9uwqvUZYi7p7YEONnXl6LaMkHYAGSf3HJMLWbAPUJbaIBgO2hClS3CFle5Y5EC/NAIdkOo9/EW0ByU+8RSa3HL2vSzSwagYdJjLI4XncuL9L1PuDwzZ4LdGWXA+NFeSl86hB aCEbgjYa Sh5T7DLj4e07TrzPBTvDgm9VQUWv5Xjl/uyksRfFN7fRk1DJd2W7OOuqkcaYj4vSEptlmeiyVSdIkNlVBJ1dEo/BEovUJuO4ZE+u3I+6rlzi7mXaGtDjZk/U3TEURxetLcHsnxNgUV5irKFdgBCLXvZQ5HPNIPDZPG2txc1OtebW/z0N8nlHsejqVLFKchX5r45ONMa71CJo3bBMgQU/eYpnWZDoI04igTLVOb0pGdSbcyvXW+dxT2jsKnT0y7QQ2wSiUDH7SXDaMKVPY52mWYfZELi5bil9YRIeWL7WDOnMb9XPkNaVr3MJ+kDlIEeizcnRWneieyDamBnsH2fdroy2Wh53fZyTcty11W+VR21smaee1DEayjybrlVJUiEgDevAImc/5DTIIvm4ZYRKyHotRHZVrkujihTVpEAy3rExReKzuWp+1wL3fRjISXPWDND15c4QYm8HEHtu/HL6OmEQ93l9B2CHf3BG5PYGAcB0mJP7CHNvuVQCGzzatrN+Ke/i2D+uraNhAmFa7LkUsSpWeQ6lduR1jdXp8R97sgMA7bOsEI/4hbLoAOaaKbB/BVWXA 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: Fan Ni The function unmap_hugepage_range() has two kinds of users: 1) unmap_ref_private(), which passes in the head page of a folio. Since unmap_ref_private() already takes folio and there are no other uses of the folio struct in the function, it is natural for unmap_hugepage_range() to take folio also. 2) All other uses, which pass in NULL pointer. In both cases, we can pass in folio. Refactor unmap_hugepage_range() to take folio. Signed-off-by: Fan Ni Reviewed-by: Muchun Song Reviewed-by: Sidhartha Kumar Reviewed-by: Oscar Salvador Acked-by: David Hildenbrand --- include/linux/hugetlb.h | 4 ++-- mm/hugetlb.c | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 23ebf49c5d6a..f6d5f24e793c 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -129,8 +129,8 @@ int move_hugetlb_page_tables(struct vm_area_struct *vma, int copy_hugetlb_page_range(struct mm_struct *, struct mm_struct *, struct vm_area_struct *, struct vm_area_struct *); void unmap_hugepage_range(struct vm_area_struct *, - unsigned long, unsigned long, struct page *, - zap_flags_t); + unsigned long start, unsigned long end, + struct folio *, zap_flags_t); void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, unsigned long start, unsigned long end, diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 0c2b264a7ab8..c339ffe05556 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6046,7 +6046,7 @@ void __hugetlb_zap_end(struct vm_area_struct *vma, } void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, - unsigned long end, struct page *ref_page, + unsigned long end, struct folio *folio, zap_flags_t zap_flags) { struct mmu_notifier_range range; @@ -6058,7 +6058,8 @@ void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, mmu_notifier_invalidate_range_start(&range); tlb_gather_mmu(&tlb, vma->vm_mm); - __unmap_hugepage_range(&tlb, vma, start, end, ref_page, zap_flags); + __unmap_hugepage_range(&tlb, vma, start, end, + &folio->page, zap_flags); mmu_notifier_invalidate_range_end(&range); tlb_finish_mmu(&tlb); @@ -6116,7 +6117,7 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma, if (!is_vma_resv_set(iter_vma, HPAGE_RESV_OWNER)) unmap_hugepage_range(iter_vma, address, address + huge_page_size(h), - &folio->page, 0); + folio, 0); } i_mmap_unlock_write(mapping); } -- 2.47.2