From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1EFC37CD41 for ; Wed, 24 Jun 2026 06:54:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782284100; cv=none; b=NU19QsKB0M+5ZJOcvOL+3IW8tlqgFMLGMNfA1NucFQbKeXajF3CFObNH1uKJ2XwsbPOsZc0C4m3MuKycXNe9DSwEHgF2FvRxn4LFYGetHDqiwb9264BDRLF1dSCve5o7HVWV/7x2VYFucg6sh+b2e0J3+JiymGRsvoM+VIpguQ8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782284100; c=relaxed/simple; bh=QAg6dLZz7JUcvu3ygEJFaGilWKrUiArOGp8JwZrF1lU=; h=From:To:Cc:Subject:Date:Message-Id; b=dFFl3S9irUlcmKmuey4PuSXHsnYSW4vQNgSs5gc0vMTYjs6RNpwSUUuYxmieN//3Y7x6YitLgtK3ZPSdH053c0yr0dV6sFrXBYHYctEeDosWFAfoHxsEeYpTExtri68krgvwuQpaoIXmKl03P87Z1puJenewJSEbqDeq4TbEBLw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kokBevYq; arc=none smtp.client-ip=209.85.218.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kokBevYq" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-bed19623d6eso84257966b.1 for ; Tue, 23 Jun 2026 23:54:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782284097; x=1782888897; darn=vger.kernel.org; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FgXzFb3dVx+G0VhkHfJ6LeyUsAoRLr+Nz9RsQ6xstwc=; b=kokBevYq1oSZiDgmLu7Re/RixUJ1bmTfwDJhyfpN1i00uxntH4aHNvGholvd1HcAaR ifmWJW/i7EbgFAcI/xRksxN17/WykHL/yvSCBSMd09SlemKxZdzpm2SBOLcFi2Vm087k RPu/1b3S2IEdV21T4BAPoHQZLOUf6mqlxBzTDLk1x9GjdZcshvaBB3sdOk07p767PT84 zLQJkTrzjDCgBy/kJ4CDShwDebCOimmdIKosTDYLmm+bFRvrRdrE//+lKK4G7YFFlUzv 3fTf3aB1oJRoFUrrJDJSKEKLJgwmIsRNLWcAG97wCBdSwATIRS9uuFzdCPkWgrfacwZr QzIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782284097; x=1782888897; h=message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FgXzFb3dVx+G0VhkHfJ6LeyUsAoRLr+Nz9RsQ6xstwc=; b=IkYYIOmHAnTEexba9x4Xb6ZJ53lMvmwbsj0jkv6IsD1XFQ+AdWqUgBzqGtd8UxOtzL joItdI9ZhqySQhYJaMuRUT/nHTB7dg+TDbC6gUIH9/VW181cIulgk+FMHNS1OGfWQwA9 6lL1fZaBqgTEmwM7s3QhBsLXA3Y3aMEJ7d9xs4yw2MzQaV2KC/yVlo3+YRlD4ZTHN7+J rbGggH+1xxPx4lqvYiPal89e1Z0rs72DxerjQZZfoHsHI05OVbwXbSo1NQAQzRmZXwQY CILAj/9McKHJZXH+hfmlJkhP8g4BDTRkoJYQwvxtG5egtHe58KiuLgzF91y8p2dvY2KO u7dQ== X-Forwarded-Encrypted: i=1; AFNElJ9Q6SMoufn5QIsVNoyHyZ64yVn3EQx7M7fogwXnwRtf7gq3E2zh8yRkspGK6XnNJemTEnrXrIC1zrsAmC8=@vger.kernel.org X-Gm-Message-State: AOJu0Yz+6oz/7f+I5Y2+puCaA+0ZAiDjDpIi8wtITzllba7Bfm0KccPJ /hsNYG+EXM5hdnaKmEbSOv4V3qgWb1hzN11ZWq2NErXWHa4U/0V5iV0d X-Gm-Gg: AfdE7ckeV5Msa0aYasqVzacECEr5oMPVsoY0fIIRGO2qTUMnkULpJItthEdMz9oXIMC BY7Iv1Ydbm7zUvBWUiLTNtiF7Q8ClRnzWHtW3Fbj/hvpCWSuO3RWucTl4LKmr7T0PtZo6sHJVso Cl1UOXHVwKaoKehFS0NzJqixVrFo+9im3k8KXltRgcyFGDE2cWyD2pt2gXay38euWUjDwhlHpVs ofP/54YmEQ/nJwGRM5n30WarlyHrLwOazupVxjx5m0ZTKmaicA9/e0AftjcfOAZyC396Ra6Wqit 3zDB3Y5DOp5rPP+iRLQyH09Rb9i6Z8F/xEQTfyuTQcJvCUpqt64/p3s1NVtQmffWZRnW3vw+Dc0 7drRiYmd7FlR6fks6JQuAPvOFBfjznOoMQlIx0OI+33zWpoZc2XplAWgZ4GqzVqV52Zn/hS0S8R oaCSAUD57yCIk= X-Received: by 2002:a17:907:e895:b0:bef:db4:296e with SMTP id a640c23a62f3a-c107d00be34mr326784066b.10.1782284096711; Tue, 23 Jun 2026 23:54:56 -0700 (PDT) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c0c60ac98c9sm606560866b.29.2026.06.23.23.54.56 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jun 2026 23:54:56 -0700 (PDT) From: Wei Yang To: akpm@linux-foundation.org, david@kernel.org, ljs@kernel.org, riel@surriel.com, liam@infradead.org, vbabka@kernel.org, harry@kernel.org, jannh@google.com, ziy@nvidia.com, sj@kernel.org, balbirs@nvidia.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Wei Yang , stable@vger.kernel.org, Lance Yang Subject: [Patch mm-hotfixes v4] mm/page_vma_mapped: fix device-private PMD handling Date: Wed, 24 Jun 2026 06:53:53 +0000 Message-Id: <20260624065353.1622-1-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.11.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Commit 65edfda6f3f2 ("mm/rmap: extend rmap and migration support device-private entries") introduced the concept of device-private PMD entries, but did not correctly update the rmap walk code to account for them. As a result, when page_vma_mapped_walk() encounters device-private PMD entries, it takes no action other than to acquire the PMD lock and exit. However this is highly problematic for two reasons - firstly, device private entries possess a PFN so check_pmd() needs to be called to ensure an overlapping PFN range. Secondly, and more importantly, if PVMW_MIGRATION is set the caller assumes the returned entry is a migration entry, resulting in memory corruption when the caller tries to interpret the device private entry as such. In addition, commit 146287290023 ("mm/huge_memory: implement device-private THP splitting") allowed device private PMDs to be split like THP mappings, but again did not update this code path. As a result, we might race a PMD split prior to acquiring the PMD lock. This patch addresses all of these issues by invoking check_pmd(), ensuring PMVW_MIGRATION is not set and checks whether a split raced us we do for PMD THP and migration entries. Fixes: 65edfda6f3f2 ("mm/rmap: extend rmap and migration support device-private entries") Cc: Signed-off-by: Wei Yang Suggested-by: David Hildenbrand Cc: David Hildenbrand Cc: Balbir Singh Cc: SeongJae Park Cc: Zi Yan Cc: Lorenzo Stoakes Cc: Lance Yang --- v4: * refine subject and commit log based on Lorenzo's suggestion * put pmd device-private entry handling in its own if branch, suggested by Lorenzo v3: * remove cleanup part, only fix the issue for device-private entry * refine user effect description based on Lorenzo's suggestion v2: https://lore.kernel.org/all/20260616063436.20455-1-richard.weiyang@gmail.com/T/#u * specify the possible error case of current code and user visible effect * besides fix, cleanup the pmd entry handling based on David's suggestion v1: https://lore.kernel.org/linux-mm/20260508013728.21285-1-richard.weiyang@gmail.com/ --- mm/page_vma_mapped.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c index 2ccbabfb2cc1..17dff8aab9f9 100644 --- a/mm/page_vma_mapped.c +++ b/mm/page_vma_mapped.c @@ -269,14 +269,24 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) /* THP pmd was split under us: handle on pte level */ spin_unlock(pvmw->ptl); pvmw->ptl = NULL; - } else if (!pmd_present(pmde)) { - const softleaf_t entry = softleaf_from_pmd(pmde); + } else if (pmd_is_device_private_entry(pmde)) { + softleaf_t entry; + + pvmw->ptl = pmd_lock(mm, pvmw->pmd); + pmde = *pvmw->pmd; + entry = softleaf_from_pmd(pmde); - if (softleaf_is_device_private(entry)) { - pvmw->ptl = pmd_lock(mm, pvmw->pmd); + if (likely(softleaf_is_device_private(entry))) { + if (pvmw->flags & PVMW_MIGRATION) + return not_found(pvmw); + if (!check_pmd(softleaf_to_pfn(entry), pvmw)) + return not_found(pvmw); return true; } - + /* device-private pmd was split under us: handle on pte level */ + spin_unlock(pvmw->ptl); + pvmw->ptl = NULL; + } else if (!pmd_present(pmde)) { if ((pvmw->flags & PVMW_SYNC) && thp_vma_suitable_order(vma, pvmw->address, PMD_ORDER) && -- 2.34.1