From nobody Thu Oct 2 21:41:03 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B6FDC24469E for ; Wed, 10 Sep 2025 19:28:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.177.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757532483; cv=none; b=sS2YEAQu2q7V3FbD2oPyxPPKr1MPBF9cxxq2OGJ/mrjG0ki0vTZmDv8RZ9FKLemuQZU9yEpKMeFrLFEhV8xfm4ludoWyaR0Rd8lzHBc3ZRcJUn7BGEVxvv6EpwrfOx98yGNq9lStPZwfReKcZmIMNAHRND1rAKCF9Y8zD08XUyE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757532483; c=relaxed/simple; bh=Y0TcY/eB/U4Vpzndwoj8Dze+OEy6HFCppTmLuiWahdo=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=J+IM4RrNLwkt5gV23ecMvYXQX3d9AmZkvB/uTkQw0ELqx8FTLa0ntS6nE+YFnL/6tPfbADWClODcxfu1xOJg7O8hzLH8UXUwDZjP0G2DwMp7OV0T7yB/JfBxwoAEatH8bGelvemwoFsmzLUZ5EZsXA949wsSvAXMzHzvqPCgxnY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=m9Ok4QJb; arc=none smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="m9Ok4QJb" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 58AGfi7L009730; Wed, 10 Sep 2025 19:27:46 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=corp-2025-04-25; bh=+3EvZZKa0EsHJ+k17Rw45a+OlDYuj Nqb0fATCwyYnhA=; b=m9Ok4QJb9k5JjO7aptMB541odBWiAzv5wXCtlrXGJVZYT yWCs3pzLyO18rdwT4LcDbH97QfLMsI2qSHAmXIFTY7DUD43IqCwe/BF2LsPDQNfn geisvrvNp79dP8vesdiDTpt5B+P5gZ/l1SoYB80L02/QV9SjLzpL59D54YcoD/xu nlujQhFSdetwKuFQRZKsfHhYVmG+rzFUIt8a/dNLqyvtr6hcONeAqwtwMtxSD1Bk KibaEyfwdIgOnq4TAv5leecYcmiy/y8DZlHzz7F6CqKzUH5jYwg+Vwpo7msLS13Z AURRmWR7Xxbrpr7HEEpCSkXU9VkShHU9Y/km7nuuQ== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 4922shvs4k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 10 Sep 2025 19:27:45 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 58AI8EXD030633; Wed, 10 Sep 2025 19:27:45 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 490bdbdrsx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 10 Sep 2025 19:27:44 +0000 Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 58AJRiuP011847; Wed, 10 Sep 2025 19:27:44 GMT Received: from brm-x62-16.us.oracle.com (brm-x62-16.us.oracle.com [10.80.150.37]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 490bdbdrsb-1; Wed, 10 Sep 2025 19:27:44 +0000 From: Jane Chu To: harry.yoo@oracle.com, osalvador@suse.de, liushixin2@huawei.com, muchun.song@linux.dev, david@redhat.com, akpm@linux-foundation.org, jannh@google.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] mm/hugetlb: fix copy_hugetlb_page_range() to use ->pt_share_count Date: Wed, 10 Sep 2025 13:27:30 -0600 Message-ID: <20250910192730.635688-1-jane.chu@oracle.com> X-Mailer: git-send-email 2.43.5 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-09-10_04,2025-09-10_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 suspectscore=0 spamscore=0 phishscore=0 bulkscore=0 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2508110000 definitions=main-2509100180 X-Authority-Analysis: v=2.4 cv=esTfzppX c=1 sm=1 tr=0 ts=68c1d132 cx=c_pps a=OOZaFjgC48PWsiFpTAqLcw==:117 a=OOZaFjgC48PWsiFpTAqLcw==:17 a=yJojWOMRYYMA:10 a=yPCof4ZbAAAA:8 a=mG3bTaASnfPRmh1c64YA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwOTA4MDE2NSBTYWx0ZWRfX4oTgxgB7KWyI LoDkC897DT0RhsQkLREDK5nk9BaoelX0jahQNA6OfxBiQemXDoKwHeQc9IoMizAUTTX/xmpp8aT 5uMTtDcasO85h2lGb58gK2JjNbMWIyffpiA1diPSCVXZgl1+sxKeZ3DYwOOinv3xmUkjZygb22N Cxx/I6rohpLeEaAOeuyR1GAoB6FAdj3mu2Fk1A3HhzzPmcnZRFk33I36G/7Mnt2T8hpbeTJEPNm u58GGHkjp9+Tl9g+ZNzIMt4NPp74NvjC4gTR+ElewzksbDqSp/LIMEzx7BDO10GbJwGzIAKirdj 8SlU0G+y730OIYwFrwAJBYEd8Tz5u9D/nkEEKcG6ASD8dDCefBME0+W54BCjFNWrK2VcvEumfKq ReX0gwtu X-Proofpoint-GUID: cB11w8JWxVTPS89nD9VMWUUWkk2EVzgC X-Proofpoint-ORIG-GUID: cB11w8JWxVTPS89nD9VMWUUWkk2EVzgC Content-Type: text/plain; charset="utf-8" commit 59d9094df3d79 ("mm: hugetlb: independent PMD page table shared count= ") introduced ->pt_share_count dedicated to hugetlb PMD share count tracking, but omitted fixing copy_hugetlb_page_range(), leaving the function relying = on page_count() for tracking that no longer works. When lazy page table copy for hugetlb is disabled, that is, revert commit bcd51a3c679d ("hugetlb: lazy page table copies in fork()") fork()'ing with hugetlb PMD sharing quickly lockup - [ 239.446559] watchdog: BUG: soft lockup - CPU#75 stuck for 27s! [ 239.446611] RIP: 0010:native_queued_spin_lock_slowpath+0x7e/0x2e0 [ 239.446631] Call Trace: [ 239.446633] [ 239.446636] _raw_spin_lock+0x3f/0x60 [ 239.446639] copy_hugetlb_page_range+0x258/0xb50 [ 239.446645] copy_page_range+0x22b/0x2c0 [ 239.446651] dup_mmap+0x3e2/0x770 [ 239.446654] dup_mm.constprop.0+0x5e/0x230 [ 239.446657] copy_process+0xd17/0x1760 [ 239.446660] kernel_clone+0xc0/0x3e0 [ 239.446661] __do_sys_clone+0x65/0xa0 [ 239.446664] do_syscall_64+0x82/0x930 [ 239.446668] ? count_memcg_events+0xd2/0x190 [ 239.446671] ? syscall_trace_enter+0x14e/0x1f0 [ 239.446676] ? syscall_exit_work+0x118/0x150 [ 239.446677] ? arch_exit_to_user_mode_prepare.constprop.0+0x9/0xb0 [ 239.446681] ? clear_bhb_loop+0x30/0x80 [ 239.446684] ? clear_bhb_loop+0x30/0x80 [ 239.446686] entry_SYSCALL_64_after_hwframe+0x76/0x7e There are two options to resolve the potential latent issue: 1. warn against PMD sharing in copy_hugetlb_page_range(), 2. fix it. This patch opts for the second option. Fixes: 59d9094df3d79 ("mm: hugetlb: independent PMD page table shared count= ") Signed-off-by: Jane Chu Reviewed-by: Harry Yoo --- mm/hugetlb.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 753f99b4c718..8ca5b4f7805f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5594,18 +5594,13 @@ int copy_hugetlb_page_range(struct mm_struct *dst, = struct mm_struct *src, break; } =20 - /* - * If the pagetables are shared don't copy or take references. - * - * dst_pte =3D=3D src_pte is the common case of src/dest sharing. - * However, src could have 'unshared' and dst shares with - * another vma. So page_count of ptep page is checked instead - * to reliably determine whether pte is shared. - */ - if (page_count(virt_to_page(dst_pte)) > 1) { +#ifdef CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING + /* If the pagetables are shared don't copy or take references. */ + if (ptdesc_pmd_pts_count(virt_to_ptdesc(dst_pte)) > 0) { addr |=3D last_addr_mask; continue; } +#endif =20 dst_ptl =3D huge_pte_lock(h, dst, dst_pte); src_ptl =3D huge_pte_lockptr(h, src, src_pte); --=20 2.43.5