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 0A178C0219E for ; Mon, 10 Feb 2025 19:38:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 95940280002; Mon, 10 Feb 2025 14:38:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 90961280001; Mon, 10 Feb 2025 14:38:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 75CFA280002; Mon, 10 Feb 2025 14:38:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 55CA1280001 for ; Mon, 10 Feb 2025 14:38:41 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E414F1C5DB0 for ; Mon, 10 Feb 2025 19:38:40 +0000 (UTC) X-FDA: 83105047200.30.B3AC0D4 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf25.hostedemail.com (Postfix) with ESMTP id 9B4D7A0006 for ; Mon, 10 Feb 2025 19:38:38 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PdE02XrA; spf=pass (imf25.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739216318; a=rsa-sha256; cv=none; b=bdSGEQf8xTZjU3sd7+oaav83rJL6Fi1+Jc8QYTf1/vTfuvwN03V6UXKFIRTPdMMho5xOsV lh3Btb/DT0jghZjEEcs2359FpEljpflojfwWQJfGWddpLAnYPOKuJigqHf8mMk2pYn69Ym PiGfwVaCyk+7ixzzg+2dWgo6izonE1Q= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PdE02XrA; spf=pass (imf25.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739216318; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=8sC+CKPivo9nJ2nwAVN+E4SAgEKJPEiCVQrD/mzwcqM=; b=OfazDnN16dM5b26UXw2WYPazev37jhNUVvXmpnwv3C9Kz5zZBRyQfeWyhGF6KJCxSrEKe6 et2R5L2l3HcDl9vEQ+JkbQbztB/4n6+fN0VhQ4wGby93ObLS7UQJP6ACziBFIiFuxGrKHh ga0IAjddTBLn0JFyfWc30varerpkdjk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739216318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8sC+CKPivo9nJ2nwAVN+E4SAgEKJPEiCVQrD/mzwcqM=; b=PdE02XrAQ0Z3/Ks7U0EExqc5jHg+iXq8xaygP2zD56pBR0wV0Xp9iIJZLOARoAfeLZDwTi h8Za3ZPWLahslaLCX/0DTXTI+vBvT1koONkJyptkdL10130Sp+aoYjPXHh90X4coRYib3u +Nj62xbcvj14Jd8gYNiHMowR1L6wwAA= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-25-HKXvo7p8NNKDjMYtszkLAA-1; Mon, 10 Feb 2025 14:38:36 -0500 X-MC-Unique: HKXvo7p8NNKDjMYtszkLAA-1 X-Mimecast-MFC-AGG-ID: HKXvo7p8NNKDjMYtszkLAA Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-43933b8d9b1so12560685e9.3 for ; Mon, 10 Feb 2025 11:38:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739216315; x=1739821115; 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=8sC+CKPivo9nJ2nwAVN+E4SAgEKJPEiCVQrD/mzwcqM=; b=jC7G5W0lNeoGX3e3Gj/WLivvj9+2X2jMQJcDfJw+r3mQbis3T775j1pFvpGC3hcYsM cZPAsA0aPBGdDlCS8k6tvgMrZgVg/Jckkj0bBXhRfrQnHuqwdAzmKdrssRPp3KLy4xaU 9Apnf0FDR9J9lWFUBczyXML3NbUIc/1o8hqhaWAJymLZ3GGoOtM4RL7sleT1W39GICmt yHYETmvuxZh4mbNBrQPDT7x3lAJ5NsNQd937vIJnGWYycfferc/1FJwtbhXxrbtp474F W99EJvV2J5mWd08UCJs35Bh14zsWhDxHCzPjWfSRd3x4bxEK+qXQKRcygIt0OlwhRDCx NLJQ== X-Forwarded-Encrypted: i=1; AJvYcCVzKctic8JxBFFxR52NyfOiBYWJW244h1MCKZbsjqLko3h44l6vIOkclF84CtiQhdCTrJsV/Nk0VA==@kvack.org X-Gm-Message-State: AOJu0YwciKDU7OPLC98KCWimRIyzEdqT2+KVJwKjYmjdjcCCqJ1r4JTh +Hf5XiZMf9gG+aWHJNBXyqH8k9znEE8ZF6kUA5IktZ1u0KZxy1MV5irW4k+yhlfXGRZXe70znaQ KPycalMXuC9O1VVcl2ZQXneQBxTdhbOVEAZA3vTNMNYvdQN1U X-Gm-Gg: ASbGncvVnv2h5oiAYZEkHgnCG6xYiEYUcIT8fa/JQhC6Ue3EuF96Fz/i+J3quhA8pA3 CO2QU7SdWbOQC//9cqPWl7SvMTR1ykgyzEBbckTOwbUvipWmIarnFowA+WpWLrS6//wUkoI9esB U6t+tYGJesr65tbkFG0UKns8wkEQnqfRIrquse1xEL9K+xojyCaDbA7GoqEbeMXGLB+gSkeC7zf KamQrLZxrB/b0u3r8ZGGKmVaBz4FCvE2igmI/uX4HM+4az8h8TJna4s1DxEJwVIfuYOdUbblrXu jRvG7TXtubsd5u0eHAH1chayvVgUMDZosVbxGTSrzUgRn4QXzugWWFgUF93Hr8MwmQ== X-Received: by 2002:a05:600c:4e91:b0:439:4637:9d9 with SMTP id 5b1f17b1804b1-43946370d97mr43287575e9.12.1739216315615; Mon, 10 Feb 2025 11:38:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IF6B7q2dhfsb9dj8LY+8M1CJU6DFUQTZK7m2VERaPDmly8AB+qIiZRItOcPeyw5uy4LKosd2g== X-Received: by 2002:a05:600c:4e91:b0:439:4637:9d9 with SMTP id 5b1f17b1804b1-43946370d97mr43287075e9.12.1739216315147; Mon, 10 Feb 2025 11:38:35 -0800 (PST) Received: from localhost (p200300cbc734b80012c465cd348aaee6.dip0.t-ipconnect.de. [2003:cb:c734:b800:12c4:65cd:348a:aee6]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4390d94d802sm195260345e9.12.2025.02.10.11.38.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Feb 2025 11:38:33 -0800 (PST) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-doc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org, nouveau@lists.freedesktop.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, damon@lists.linux.dev, David Hildenbrand , Andrew Morton , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jonathan Corbet , Alex Shi , Yanteng Si , Karol Herbst , Lyude Paul , Danilo Krummrich , David Airlie , Simona Vetter , Masami Hiramatsu , Oleg Nesterov , Peter Zijlstra , SeongJae Park , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn , Pasha Tatashin , Peter Xu , Alistair Popple , Jason Gunthorpe Subject: [PATCH v2 08/17] kernel/events/uprobes: handle device-exclusive entries correctly in __replace_page() Date: Mon, 10 Feb 2025 20:37:50 +0100 Message-ID: <20250210193801.781278-9-david@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250210193801.781278-1-david@redhat.com> References: <20250210193801.781278-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: _OLNrBsubkuirE3lMwF-PTefCf5NCEd5T8yByHIfMSM_1739216316 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Queue-Id: 9B4D7A0006 X-Stat-Signature: jac9w3aa7681h9tgfczg4krcczmukqb9 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1739216318-329840 X-HE-Meta: U2FsdGVkX1/iKv9+/FAppCJ86o8iSfsadZYlVBrrSw9y8+U+M9ChPDJo3rGv1vkTfS5Kw5GILhQHMauWuKPNSrafahfTKooB4fux9UzsS62N4C/HA10H34sJ5QxyI0qzu38eWHhVWrMZJP9z0BmHHyNu4I2KDaPX9Twy7wf6klzu47VU0zPPcvWzYM8uB80SW3QkZUL5hBg8NokGfMbTPh/VAMuLIUE251PLVDQe6PZfArgxEyHQt/btSL7hvpiVSlho5zQVPeEK++6Y7qQOTF2e8Nj3GzUYXViXdxoD/5uvFO2B70g/ewTdmP9kzzvJQZQDACqRUgPUKcW0JLdtwjHs2s2IxTgE8d+ymGDmfawAQ1VhuRke7D5ldmQkfKPO3Ii/pOmEWLCGFfuEDkkaG21bCr8Q0kvFavjNeyJ0dFc3S49vEUCN0DnO9GMVdbTOX+NZ8u+h5BgSSVIq8KEr2BGTE3VEsbdVCLqoMTyiK0NmJvMFmGxYFxcCvklB+uI2R0kCUFrqM3DJcF6OAqlE+z+lr69y6aWGppiiJ4/r0XbRJgyxL2pEDY1H4o3KX7CB7uqhImhcgvhC2KCn5a2htsrre4fTFq0eoqYRRBk14YyRLSwXUktko0VplCWEJHORNx6Zxo2xSt+NJfW7V3m++B4sONGTncvQPoUuxLAqLC8toWqBe2BAmpNqW0aUSrUBGVNNWUY06//mqxroZOlNl5nh8lMQ5QJChzGds+/SrQrj5YPsNHe1i0tO/YZYYv19mAkqAB4pbqjLdMU9hoA2/ub15yk6rAPYQ+MS2IgMrAzhi2HHunHbiQAHDB/4gEI8M4uMUc8YQgT3iTarBpaY4uhnYkL3mU3jVHuqWYHdMbuhXDsCv3ZmIg6SVVv4F0wQF7+/sMWsepYGPAAN0LRUqK/ehwiPdiJVpfieTitNsSSYAM/63gwvHeps0dwh0PVlkHun61G4BGofJl1JkUM qbdCDLSe N1tEfj28HolR5TL5WcKpGb6KknLFpFkh8Gb0W9cZRz4JnqFtZds4Wfdid6hl6MUDx/gU5ajBao7/c6VCv2umkqyVIsAWlGrb68Vn8lPwThRNsB0bZHmiEGxMS2nSxFEdTm5CVviIbWCWQM3zekDPcEbjMEy8u5IgAabzQOhqaNXuNkFcB+ByEW1rSrkUpGOlQlD3QGyVpWWcgePeCZUEsiw/7CEKI/XzOUHYa5CKrP9pdIuE/ywn7wOffde5+iLDYQ0FazV0pXmr6tZNaVE+CJZs+noZOnhRUdVU+09evhBJ8XXT3UtC9A+vnsdt0JQPDwE23roARUaH8Lh2LydZgTdUM1E88JcVp2Sx0IqN73RDcJTVIr958TfjhtBbpnBQuXQfT/6GuYzAygqg8X2GWAmPUJEt1kFfaSqYkAPJvXeH/aKgSNHaP7nTeGkPuTrQ6Lv8ersAgIiDsUg+iL+u0XnPrEXzpEHTZjMzUxZnEcTtaGeZH9dpVgKMljFUTRJaMN+bZg8MRv1yl2QfoHhNdOZO4Og== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000027, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Ever since commit b756a3b5e7ea ("mm: device exclusive memory access") we can return with a device-exclusive entry from page_vma_mapped_walk(). __replace_page() is not prepared for that, so teach it about these PFN swap PTEs. Note that device-private entries are so far not applicable on that path, because GUP would never have returned such folios (conversion to device-private happens by page migration, not in-place conversion of the PTE). There is a race between GUP and us locking the folio to look it up using page_vma_mapped_walk(), so this is likely a fix (unless something else could prevent that race, but it doesn't look like). pte_pfn() on something that is not a present pte could give use garbage, and we'd wrongly mess up the mapcount because it was already adjusted by calling folio_remove_rmap_pte() when making the entry device-exclusive. Fixes: b756a3b5e7ea ("mm: device exclusive memory access") Signed-off-by: David Hildenbrand --- kernel/events/uprobes.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 2ca797cbe465f..cd6105b100325 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -173,6 +173,7 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, DEFINE_FOLIO_VMA_WALK(pvmw, old_folio, vma, addr, 0); int err; struct mmu_notifier_range range; + pte_t pte; mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, mm, addr, addr + PAGE_SIZE); @@ -192,6 +193,16 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, if (!page_vma_mapped_walk(&pvmw)) goto unlock; VM_BUG_ON_PAGE(addr != pvmw.address, old_page); + pte = ptep_get(pvmw.pte); + + /* + * Handle PFN swap PTES, such as device-exclusive ones, that actually + * map pages: simply trigger GUP again to fix it up. + */ + if (unlikely(!pte_present(pte))) { + page_vma_mapped_walk_done(&pvmw); + goto unlock; + } if (new_page) { folio_get(new_folio); @@ -206,7 +217,7 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, inc_mm_counter(mm, MM_ANONPAGES); } - flush_cache_page(vma, addr, pte_pfn(ptep_get(pvmw.pte))); + flush_cache_page(vma, addr, pte_pfn(pte)); ptep_clear_flush(vma, addr, pvmw.pte); if (new_page) set_pte_at(mm, addr, pvmw.pte, -- 2.48.1