From patchwork Fri Apr 30 19:52:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Lespinasse X-Patchwork-Id: 12234199 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 328A7C43461 for ; Fri, 30 Apr 2021 19:53:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D5C836145A for ; Fri, 30 Apr 2021 19:53:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D5C836145A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=lespinasse.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 33CF46B0080; Fri, 30 Apr 2021 15:52:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9A5B16B0093; Fri, 30 Apr 2021 15:52:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C89DD6B0095; Fri, 30 Apr 2021 15:52:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0104.hostedemail.com [216.40.44.104]) by kanga.kvack.org (Postfix) with ESMTP id 3E1EE6B007D for ; Fri, 30 Apr 2021 15:52:38 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id F301E18069D46 for ; Fri, 30 Apr 2021 19:52:37 +0000 (UTC) X-FDA: 78090080754.21.6BBD405 Received: from server.lespinasse.org (server.lespinasse.org [63.205.204.226]) by imf25.hostedemail.com (Postfix) with ESMTP id 1762160006C0 for ; Fri, 30 Apr 2021 19:52:31 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=lespinasse.org; i=@lespinasse.org; q=dns/txt; s=srv-14-ed; t=1619812353; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=xyC4YWMYQXg5okBOT+I25AzHoSz3IJwuaB8/iA0p/AY=; b=4alexkTsyC3uZni2zW955kLIH7/cxJEXaY5kAd+KYDy1zPDGn17cBxujc6Cmd2xX8mlsi 9BjuR3Z6KRJsIohCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lespinasse.org; i=@lespinasse.org; q=dns/txt; s=srv-14-rsa; t=1619812353; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=xyC4YWMYQXg5okBOT+I25AzHoSz3IJwuaB8/iA0p/AY=; b=F9lBNAo30q0ql99dAFCdVKf27nzoKGBO6/YkgLB360VcrFXl9oOJn/NiXASR/OpX6yu5q AYM1MAxJgm+qsk5q1FYDKUbOplpLlwf8c6J1NbjZN/N6L+5dTdI3pxu2ZjmTK+6IVX+nuH5 LMrFAIzKe0xIJwC3UqPVQlQBLow7LKLo6lS4ULhcubgcjVWe7ZzrvfbqAW6+/ukLUWOGY/b Enp2whRD+IPVFO3yWGpb5vwaAVi84bDRLUYwoIVDyFE0wwYC//bioKbWK0vm8u+PPo6Z4uA SITn326/KMoS5eM2sILhnDcUVF5qUpYVtm71XlOCgBfBLHuQ55YAnrE5CuOA== Received: from zeus.lespinasse.org (zeus.lespinasse.org [IPv6:fd00::150:0]) by server.lespinasse.org (Postfix) with ESMTPS id 8ACF116033B; Fri, 30 Apr 2021 12:52:33 -0700 (PDT) Received: by zeus.lespinasse.org (Postfix, from userid 1000) id 7D23219F523; Fri, 30 Apr 2021 12:52:33 -0700 (PDT) From: Michel Lespinasse To: Linux-MM , Linux-Kernel Cc: Laurent Dufour , Peter Zijlstra , Michal Hocko , Matthew Wilcox , Rik van Riel , Paul McKenney , Andrew Morton , Suren Baghdasaryan , Joel Fernandes , Andy Lutomirski , Michel Lespinasse Subject: [PATCH 19/29] mm: implement speculative handling in do_numa_page() Date: Fri, 30 Apr 2021 12:52:20 -0700 Message-Id: <20210430195232.30491-20-michel@lespinasse.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210430195232.30491-1-michel@lespinasse.org> References: <20210430195232.30491-1-michel@lespinasse.org> MIME-Version: 1.0 X-Stat-Signature: 45y6akr8jnm1mpqdyhmre4x78cxmq443 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 1762160006C0 Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=lespinasse.org header.s=srv-14-ed header.b=4alexkTs; dkim=pass header.d=lespinasse.org header.s=srv-14-rsa header.b=F9lBNAo3; spf=pass (imf25.hostedemail.com: domain of walken@lespinasse.org designates 63.205.204.226 as permitted sender) smtp.mailfrom=walken@lespinasse.org; dmarc=pass (policy=none) header.from=lespinasse.org Received-SPF: none (lespinasse.org>: No applicable sender policy available) receiver=imf25; identity=mailfrom; envelope-from=""; helo=server.lespinasse.org; client-ip=63.205.204.226 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619812351-971314 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: change do_numa_page() to use pte_spinlock() when locking the page table, so that the mmap sequence counter will be validated in the speculative case. Signed-off-by: Michel Lespinasse --- mm/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index eceb1b6e904c..a2230269e034 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4198,8 +4198,8 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) * validation through pte_unmap_same(). It's of NUMA type but * the pfn may be screwed if the read is non atomic. */ - vmf->ptl = pte_lockptr(vma->vm_mm, vmf->pmd); - spin_lock(vmf->ptl); + if (!pte_spinlock(vmf)) + return VM_FAULT_RETRY; if (unlikely(!pte_same(*vmf->pte, vmf->orig_pte))) { pte_unmap_unlock(vmf->pte, vmf->ptl); goto out;