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 1B7A3C021B8 for ; Wed, 26 Feb 2025 13:23:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4CA82280021; Wed, 26 Feb 2025 08:23:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 47D76280022; Wed, 26 Feb 2025 08:23:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22F31280021; Wed, 26 Feb 2025 08:23:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id F2C2828000C for ; Wed, 26 Feb 2025 08:23:11 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 5E3EDA04E8 for ; Wed, 26 Feb 2025 13:23:11 +0000 (UTC) X-FDA: 83162161782.07.2C632AD Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf24.hostedemail.com (Postfix) with ESMTP id BB7B218001E for ; Wed, 26 Feb 2025 13:23:07 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WWLcTFmE; spf=pass (imf24.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.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=1740576187; 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=BAb0fo+MBCG8218JfZux3TlZkyXUvKJVFQvJ8mnhkhM=; b=S/9S3q1q6911nq+YpMFQbJktK7BcqbaV0rnzFr707TYNlEPO/j5HZrqgntxNbYlBVeAUkw iM+nBEK5vkWGfZLtIr8/36dF/pXt9TV4Ztzglp9LG+irrRHWCuwSwwh0DATi284Q8pTfpD nqhJ9LfYJ9mMsB8fhkac13xnzHJRmkk= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WWLcTFmE; spf=pass (imf24.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.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=1740576187; a=rsa-sha256; cv=none; b=cExp7M12xK9IICO15JtiileLbHBatYKb0FnrdvObTnTu7fl+5KcPz+9siOOkviG3nbXF07 ng3dHL9dIgLqMTOfHtT9qu81/H3JphKSCFsMhMPUlsTtCZ/Hqx1hLMLIHwH6NuFMg5Dv4W IQrvmddYAQibn0TclOzw9dbXTmRBft0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740576187; 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=BAb0fo+MBCG8218JfZux3TlZkyXUvKJVFQvJ8mnhkhM=; b=WWLcTFmEAjE2cvdCw8BIk2UtqnA4z7FgZHlfwld8mHuSGxOWRjJxa/9ZgMqfz5y74wZ0xj IjyRLM8TrXjE072ji8Ld4xbuQdzfQsWRzwPlUqlDpJNM7UlRJqJ0CRfEu5CGUtxw8QTLbV kNJ10kHI0Jv2A6Oz2pD8PZ0lGLuX+Ww= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-648-hjBqfClGONSCWiPPH0gkuQ-1; Wed, 26 Feb 2025 08:23:05 -0500 X-MC-Unique: hjBqfClGONSCWiPPH0gkuQ-1 X-Mimecast-MFC-AGG-ID: hjBqfClGONSCWiPPH0gkuQ_1740576184 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4394c0a58e7so52129335e9.0 for ; Wed, 26 Feb 2025 05:23:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740576184; x=1741180984; 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=BAb0fo+MBCG8218JfZux3TlZkyXUvKJVFQvJ8mnhkhM=; b=DG6RUmQdfUyTVR9LgWdI6DmQ3VCkmUKdt+g0uNBJ7N05/UhaNKO8fhrITILhUVGQuV WFbumYijBZc8p4n5EVd4W9JzisKT/Y5eGr5sN2qsrWNNKGtA4tFJ7F6g9Fue/DRd5gNo 95+exs5Qe+z6coSml24nneQhszopIgBSu38lTX3Kd2Q1NIXSBN2AxcYRrxR9Yi2jfmPv hNoAIzXg3PUlf14ItEHvWgX/DnRPmIrOBdeStADRyrL626uuek8BYewzKEJZiFMlfaFz drzrUVuxqpEioK1NoBhUGUnVSlYnKT4tTrQeBfiwwa0JqO7arWzlSDL6/FFqWzojtxze t8PA== X-Gm-Message-State: AOJu0Yz6Qpv9twT3Y3kYdIq2YqnZz6P7uYRR8uOJ6wWXvfaoyDE7UWcX qcF4UTtGVghJ2SzMJf6qp/h6gjGeYQzspeYok4ns0SYxF9H4tBThdX4aMAbcuApOJycVQUYRNcJ +YinsPxjfF50Yu95YHMlb+hbXUVJbUkT3PXr0huWbe2f3flVc X-Gm-Gg: ASbGncvllDvpf8f7DIh/tfHWs05PP6rd8wkFPtsJPM8LthoAR/qAWA6tu/7413dIvoJ gpIEDlohHy4qBOc3tj+WF0h3nJ2L63dnFf1l91o1zKSF9pmA0gyQU+r7rIZSd1vl7azEtjPEjOW 0xX98/qaxQpRLWrTL2ya+y7KDpcpy+cZALNetf600BMVo6gsSPMeBlsI/jVTUYw8PZ6ZN02iHUh KWw2wrpeTF/lM0RqqmMaAR/ZQofpEh2tcK+ABw9qSzguKDtfbHEkzvMz04HOavfOZwpXnKs+QAj F2A3e0U413TLfmmZoCVBR4iuU0fnSnOmr5c8nmfi2ZzL9e+wREXF198b6dfbNKIy+FSSp+jAED5 A X-Received: by 2002:a05:600c:4592:b0:439:94ef:3780 with SMTP id 5b1f17b1804b1-439aebe4a26mr212630775e9.30.1740576184278; Wed, 26 Feb 2025 05:23:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IGoD5SxjMPjT8fOACKzMgPJ46QVfUBCrCDwzS4nahkgUmdQJJ3IdcsNuACc+12Ckl886xGDnw== X-Received: by 2002:a05:600c:4592:b0:439:94ef:3780 with SMTP id 5b1f17b1804b1-439aebe4a26mr212630455e9.30.1740576183915; Wed, 26 Feb 2025 05:23:03 -0800 (PST) Received: from localhost (p200300cbc747ff009d854afba7df6c45.dip0.t-ipconnect.de. [2003:cb:c747:ff00:9d85:4afb:a7df:6c45]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-43aba549eb9sm21310625e9.37.2025.02.26.05.23.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 05:23:03 -0800 (PST) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Simona Vetter , Alistair Popple , Jason Gunthorpe Subject: [PATCH v2 3/5] mm/memory: pass folio and pte to restore_exclusive_pte() Date: Wed, 26 Feb 2025 14:22:55 +0100 Message-ID: <20250226132257.2826043-4-david@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250226132257.2826043-1-david@redhat.com> References: <20250226132257.2826043-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: LI2qoK6I70X-MIkm-wTXeFHNZaHs1waIYuSGCIOLg1c_1740576184 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Queue-Id: BB7B218001E X-Stat-Signature: hhqbjf39gmu8ogqtynoopiep1uawdfwm X-Rspamd-Server: rspam03 X-HE-Tag: 1740576187-652790 X-HE-Meta: U2FsdGVkX1/UHEoZoeogps4+kW54vHuqIAsbGyfQwe4k7MMAcMn5TKUY3hQV/Tx3bx/GIrIwMuwC7fGMh9JGb9hT+gRSflU4Nz4DoV5d60zCsMaARq7d//99Vw0xgrGOvax0gy0S82klw4PCjJCis3MwGhRcvVy41u8ZGdvw91LPnQ9WDiNjlCSeCRMblKnHLAGFxwpeJB2hBgqUlNEXUHJDYdTr3noisolgmJhyH7TX7e79t4ryqy7rletrMZO66lcyLY3EAZOIwK/AUzUOMGnf83711LYRwZmv3ufVBwWOsLP2OLsBs1P+jE8gwLCFESVu+goZ0SKfMlLVEES6yXTVOeLI9bYY8ltiSr4xVXh56cLbECbVCuCeK1MasOKDPZL8Uwy0GqcDxN+B5IwIPc7/m2gYIjS1jxPW/P2JyUDkXVp7lkIMNYED45r5mmGxDGRjGHsdY3+/lmstJSAV0pPTtA97+Fieu0gelBJQIf0UnRHo0UfqtJZePjbPbTve/MZzBDW8eM4VXFgw/mh2k2Feh6GbvAM9sevzRuwWfTQ6N2Sjd5gWNp4n3H3MUPURiU9RVWvX62xwI8OH+8zk3KIy6O72UswJ5st5sOBmzV9CE8YWJ8hdWBwWaypPVX9se5I23raPgJ83ztN1s5f+BK/DKKHVQ1ik4oeOf+OgRV9FE+rNNeYE/zGeNbiuA80C/3kqarzY9nrtkPWUpMZyM7HsLpA7mGmJmyeSykmpYCXlMHwXHXUGyeJDmebAM0myRDt/eHvw0VYNihL/2OHj/xT5QCpxEfEZnOdP28Cvn3IMl3oqwWSsTuIoH42l5uS5w3H8kaq7vRwuklEBiWoogBthpwkLHpPj/+4aDpILiN2EbF/mgeXT0pFaI6I8rM8FiMrQB5UXcEhd2WF6Umh926naFZehuD3+nlXU1LDGBoHx63f6Hhy2Ea+aM4BzsgmX2CgRsRbKe8jsHVyzYrx HiVAP6Af y3Zw6numrKVXYJByT5eCSbsFU32pm5eGqodwWreVpXIgSHCSu+mju6J2VAIcRUkExxeDK1emDVshB9yPabgbZPtXE6cneh3F9jb1R4KqsOAUU01aSGKSFGE1U2CayL1+5/qy42lxoHYR8A8gu17pTCQJQs6izWf1Mdg0NQ6rm9rQA5tyh8xRhF9i9vEsY0AO8CTLJI3s1Z5EJYe7297k6TlLuZyHgLLhBUaKj/xwfffOFNgcEoYXgsdz0q0oF7U/S+rQPbDti1gGAidJx6g2DJewYQ051SBjStyRINwyG4RiZUqXC24ks8hKcyrXYRjCsIzMcq75BGNj4Oop5uicnPCnwgun5PpG8q6fUyFmA3P3Jqyi4bJ9JNISHDHA6a/oScUruUOlMJ9c3ay80VnDDIaPswOmZ8HH7DfhhR0huclDEYLiIVcryba2n62Eo6eZclPf0D9UddeSITgDp8d0pQoWV/7edWua+AmPtSwAmQtd2b1mLx9+Z+agtJ8YmTbj5YZJpuDjSB3D07ZF2fTp5NLXMaOLgy5mjISySriTWTHZRHZo= 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: Let's pass the folio and the pte to restore_exclusive_pte(), so we can avoid repeated page_folio() and ptep_get(). To do that, pass the pte to try_restore_exclusive_pte() and use a folio in there already. While at it, just avoid the "swp_entry_t entry" variable in try_restore_exclusive_pte() and add a folio-locked check to restore_exclusive_pte(). Reviewed-by: Alistair Popple Signed-off-by: David Hildenbrand --- mm/memory.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 507045fa719cc..2a0b4dd858769 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -719,14 +719,13 @@ struct folio *vm_normal_folio_pmd(struct vm_area_struct *vma, #endif static void restore_exclusive_pte(struct vm_area_struct *vma, - struct page *page, unsigned long address, - pte_t *ptep) + struct folio *folio, struct page *page, unsigned long address, + pte_t *ptep, pte_t orig_pte) { - struct folio *folio = page_folio(page); - pte_t orig_pte; pte_t pte; - orig_pte = ptep_get(ptep); + VM_WARN_ON_FOLIO(!folio_test_locked(folio), folio); + pte = pte_mkold(mk_pte(page, READ_ONCE(vma->vm_page_prot))); if (pte_swp_soft_dirty(orig_pte)) pte = pte_mksoft_dirty(pte); @@ -753,16 +752,15 @@ static void restore_exclusive_pte(struct vm_area_struct *vma, * Tries to restore an exclusive pte if the page lock can be acquired without * sleeping. */ -static int -try_restore_exclusive_pte(pte_t *src_pte, struct vm_area_struct *vma, - unsigned long addr) +static int try_restore_exclusive_pte(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, pte_t orig_pte) { - swp_entry_t entry = pte_to_swp_entry(ptep_get(src_pte)); - struct page *page = pfn_swap_entry_to_page(entry); + struct page *page = pfn_swap_entry_to_page(pte_to_swp_entry(orig_pte)); + struct folio *folio = page_folio(page); - if (trylock_page(page)) { - restore_exclusive_pte(vma, page, addr, src_pte); - unlock_page(page); + if (folio_trylock(folio)) { + restore_exclusive_pte(vma, folio, page, addr, ptep, orig_pte); + folio_unlock(folio); return 0; } @@ -868,7 +866,7 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm, * (ie. COW) mappings. */ VM_BUG_ON(!is_cow_mapping(src_vma->vm_flags)); - if (try_restore_exclusive_pte(src_pte, src_vma, addr)) + if (try_restore_exclusive_pte(src_vma, addr, src_pte, orig_pte)) return -EBUSY; return -ENOENT; } else if (is_pte_marker_entry(entry)) { @@ -4030,7 +4028,8 @@ static vm_fault_t remove_device_exclusive_entry(struct vm_fault *vmf) vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, vmf->address, &vmf->ptl); if (likely(vmf->pte && pte_same(ptep_get(vmf->pte), vmf->orig_pte))) - restore_exclusive_pte(vma, vmf->page, vmf->address, vmf->pte); + restore_exclusive_pte(vma, folio, vmf->page, vmf->address, + vmf->pte, vmf->orig_pte); if (vmf->pte) pte_unmap_unlock(vmf->pte, vmf->ptl); -- 2.48.1