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 X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6346EC4707F for ; Thu, 27 May 2021 20:19:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0D3E36054E for ; Thu, 27 May 2021 20:19:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D3E36054E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A07456B0071; Thu, 27 May 2021 16:19:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B8126B0072; Thu, 27 May 2021 16:19:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8590D8D0001; Thu, 27 May 2021 16:19:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0034.hostedemail.com [216.40.44.34]) by kanga.kvack.org (Postfix) with ESMTP id 4E2A46B0071 for ; Thu, 27 May 2021 16:19:45 -0400 (EDT) Received: from smtpin38.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id ECE89BBC5 for ; Thu, 27 May 2021 20:19:44 +0000 (UTC) X-FDA: 78188126688.38.4AC7B63 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf13.hostedemail.com (Postfix) with ESMTP id 54872E005F2C for ; Thu, 27 May 2021 20:19:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622146784; 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=wtpikodp79ycSP9XpJQBScIRhvTfN0ZcMiLJ1ThP9JQ=; b=dy4i3t47swMFHKoto79JZRoQVk/5nTd4ofnX4tRGbZ72u7geDJzWgSrmhBYMIOO0OaqZ1U WlIvZUkPS2F2dFp21u32nbNjUl+rrJLr8n3ZTF5NoAxKhet8CkxP3Mi+Y5jeiuNvfYwKKe Q/2v4apCns4FKd3lxDPjCIA12vajYrc= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-272-kcQa0sgDOCqt98qeH0vc7A-1; Thu, 27 May 2021 16:19:40 -0400 X-MC-Unique: kcQa0sgDOCqt98qeH0vc7A-1 Received: by mail-qk1-f199.google.com with SMTP id s4-20020a3790040000b02902fa7aa987e8so1319187qkd.14 for ; Thu, 27 May 2021 13:19:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wtpikodp79ycSP9XpJQBScIRhvTfN0ZcMiLJ1ThP9JQ=; b=JL4uO+7EiH/kLrLk59OTxBAvXylFFwI3lEK6V1SepKWn7pCN/zQ46QUcbbzKFwaOtN rkElEl+owXs+xc+W/y0PFWUMH9S75+p1mibGe0/ZYP3sOx61lAAzIKSvi99M2U8+LulM j/XkaWmSi6UXB/QhgG+wYe71Z4PqtHkeOUvSOdfnZAarRA+xETfaaPuqc40YDWkZq2zp nvU2yOQl/jPNa/rda7fbSA00d9xBmMecTDJAh7jIDOhfGRgW3650KSnnayf5+4Rk99D7 ahE4TzaAFy1+4RBaon1MwGreTa2k2P6Wg55dNnXNYoO7+KCqElzkcj/7o2ZJd8xDjfeA UUGA== X-Gm-Message-State: AOAM533/LlZShriL55e6yalMlTWCKwx+gY3+81xjWufqq+Qkk9CIMBDH rpD6a3+DjFsUDEQYE8Gb3mtAmJAEXxExh0yg938lGBaFfAeO3WzpZjSl0Vj9b4lx+eJPBXX7Uvd qqwtXorTPa4c= X-Received: by 2002:a37:9b84:: with SMTP id d126mr286656qke.209.1622146779775; Thu, 27 May 2021 13:19:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy4BrGFtNQT6/UXbcwV9vau/8TD3QkZQ1uE6aEORoTDdjOwC1wOoNc2OKlNxy0x4hF1f7DlsQ== X-Received: by 2002:a37:9b84:: with SMTP id d126mr286628qke.209.1622146779507; Thu, 27 May 2021 13:19:39 -0700 (PDT) Received: from localhost.localdomain (bras-base-toroon474qw-grc-72-184-145-4-219.dsl.bell.ca. [184.145.4.219]) by smtp.gmail.com with ESMTPSA id u14sm2089536qkp.80.2021.05.27.13.19.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 13:19:38 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Axel Rasmussen , "Kirill A . Shutemov" , Hugh Dickins , Andrew Morton , Miaohe Lin , Mike Rapoport , Jerome Glisse , Andrea Arcangeli , Nadav Amit , Mike Kravetz , peterx@redhat.com, Jason Gunthorpe , Matthew Wilcox Subject: [PATCH v3 03/27] mm: Clear vmf->pte after pte_unmap_same() returns Date: Thu, 27 May 2021 16:19:03 -0400 Message-Id: <20210527201927.29586-4-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210527201927.29586-1-peterx@redhat.com> References: <20210527201927.29586-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="US-ASCII" Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dy4i3t47; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf13.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=peterx@redhat.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 54872E005F2C X-Stat-Signature: pcoey5s7xpmnk7zkkcei6o7wkenb59wd X-HE-Tag: 1622146776-638458 Content-Transfer-Encoding: quoted-printable 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: pte_unmap_same() will always unmap the pte pointer. After the unmap, vmf= ->pte will not be valid any more. We should clear it. It was safe only because no one is accessing vmf->pte after pte_unmap_sam= e() returns, since the only caller of pte_unmap_same() (so far) is do_swap_pa= ge(), where vmf->pte will in most cases be overwritten very soon. pte_unmap_same() will be used in other places in follow up patches, so th= at vmf->pte will not always be re-written. This patch enables us to call functions like finish_fault() because that'll conditionally unmap the pte= by checking vmf->pte first. Or, alloc_set_pte() will make sure to allocate = a new pte even after calling pte_unmap_same(). Since we'll need to modify vmf->pte, directly pass in vmf into pte_unmap_= same() and then we can also avoid the long parameter list. Reviewed-by: Miaohe Lin Signed-off-by: Peter Xu --- mm/memory.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 2b7ffcbca175..0ccaae2647c0 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2710,19 +2710,20 @@ EXPORT_SYMBOL_GPL(apply_to_existing_page_range); * proceeding (but do_wp_page is only called after already making such a= check; * and do_anonymous_page can safely check later on). */ -static inline int pte_unmap_same(struct mm_struct *mm, pmd_t *pmd, - pte_t *page_table, pte_t orig_pte) +static inline int pte_unmap_same(struct vm_fault *vmf) { int same =3D 1; #if defined(CONFIG_SMP) || defined(CONFIG_PREEMPTION) if (sizeof(pte_t) > sizeof(unsigned long)) { - spinlock_t *ptl =3D pte_lockptr(mm, pmd); + spinlock_t *ptl =3D pte_lockptr(vmf->vma->vm_mm, vmf->pmd); spin_lock(ptl); - same =3D pte_same(*page_table, orig_pte); + same =3D pte_same(*vmf->pte, vmf->orig_pte); spin_unlock(ptl); } #endif - pte_unmap(page_table); + pte_unmap(vmf->pte); + /* After unmap of pte, the pointer is invalid now - clear it. */ + vmf->pte =3D NULL; return same; } =20 @@ -3441,7 +3442,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) vm_fault_t ret =3D 0; void *shadow =3D NULL; =20 - if (!pte_unmap_same(vma->vm_mm, vmf->pmd, vmf->pte, vmf->orig_pte)) + if (!pte_unmap_same(vmf)) goto out; =20 entry =3D pte_to_swp_entry(vmf->orig_pte); --=20 2.31.1