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 3C18EC38145 for ; Thu, 8 Sep 2022 20:48:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A575F6B0072; Thu, 8 Sep 2022 16:48:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A06E36B0073; Thu, 8 Sep 2022 16:48:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8CE158D0002; Thu, 8 Sep 2022 16:48:22 -0400 (EDT) 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 7B7736B0072 for ; Thu, 8 Sep 2022 16:48:22 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 4AC7D1203D2 for ; Thu, 8 Sep 2022 20:48:22 +0000 (UTC) X-FDA: 79890106044.28.449D0D9 Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by imf15.hostedemail.com (Postfix) with ESMTP id F3B60A0077 for ; Thu, 8 Sep 2022 20:48:21 +0000 (UTC) Received: by mail-lj1-f169.google.com with SMTP id l12so12971228ljg.9 for ; Thu, 08 Sep 2022 13:48:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=mFw2h/Ri2/bIxA8fteahahsAIbUWAOrFqK6aSuy87lQ=; b=n4rTTgToDl5DYCN6bLMJk0mgVYr1H7F22SRmYfIXkncpwutmjQwkXquSwkiZ3/wm7s gUbtPS7wlm41dsTuTnEETgFcy4EvmKnpSuMRM3ze5bj0cFYqyfuhjNs+ZOuFl0vRFmgr qArFsOc776Cbz5fTPdvRY+m5/F3jszfugzhZ5KLt4OcsIiFp+xQEu7231d4qmi3B5BVP mJqBMXZVux97mKIJUGrdokPkHREH5mwyejadgSbugbgeEzBpXQbR2PhLk53odyUZF5+N iEoErCCdjdCfnYes3+OOPGODYZ5Tix6XxnsSeSsWJaVM5TaEZIGZRJMaco8EcHMtw/xT 8SIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=mFw2h/Ri2/bIxA8fteahahsAIbUWAOrFqK6aSuy87lQ=; b=QLAUnVYxg9yGKbHaE+xSt1NFCLn6bR9ejPtxzPcRR5cESTDkQrCYlWRUYqMZu+KDYh hl6J+Cq9+v1baSGLsOol0cQTlL/vl0iCtHeWjyLMnslkRDENTBKNuvIbdP0RxwEb54l4 Rh/yU8JU9888rb1g3SA7aeBhSArv06q2ueanrddqqp1ThguH9+2/ur7BijSCzunflulW WZP9++6BYB3+9bHYw/UL0g1V0t2WbVeS4EV3KH36ldMgIVAckfZ9s7mzKRFkgd/O7S6w BvQckkD10P8XwO3vFdNw+xHTNmGsT/SS52c/mH0kveBMOy1q+C5J8g3Loh/J4ESXxH8M gU1g== X-Gm-Message-State: ACgBeo0zL8JVgWsdTvrpBQfIHVGbU7IYjgBsiBmUQ4OWdDivteF21bme LO3BU6fOFO/jNiAWPDdGU7CWMuPOClnRNA== X-Google-Smtp-Source: AA6agR4qNb7yw9CwK8YVXamz9lVNOsxk5VoeFFCF2eZ9wQ+TxW8Wyg3YU7Z5hBSVSNMplKLVy/A5uw== X-Received: by 2002:a2e:3002:0:b0:26a:b199:46df with SMTP id w2-20020a2e3002000000b0026ab19946dfmr2805220ljw.304.1662670100391; Thu, 08 Sep 2022 13:48:20 -0700 (PDT) Received: from saproj-Latitude-5501.yandex.net ([2a02:6b8:0:40c:3f3a:cd4:e3fd:6ec6]) by smtp.gmail.com with ESMTPSA id g1-20020a0565123b8100b00494767f1a4fsm3180725lfv.21.2022.09.08.13.48.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Sep 2022 13:48:20 -0700 (PDT) From: Sergei Antonov To: linux-mm@kvack.org, akpm@linux-foundation.org Cc: linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Sergei Antonov , "Kirill A . Shutemov" Subject: [PATCH] mm: bring back update_mmu_cache() to finish_fault() Date: Thu, 8 Sep 2022 23:48:09 +0300 Message-Id: <20220908204809.2012451-1-saproj@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662670102; a=rsa-sha256; cv=none; b=WrQQvR8C8Z1EWoxYbZIJsWywcGO51vuCeFhCz2Niw/IKI0TKMGCHTq3tquVuyjDpHOhOlE A6pn546YM0SxgqM9QEr/8Jw9if14tsJjcrITdvm1672LEKi2F5Rol6LPXNM0BEPjQYzCvJ /VdeBUpbENJPLQZTNXVm5QI907wzW5A= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=n4rTTgTo; spf=pass (imf15.hostedemail.com: domain of saproj@gmail.com designates 209.85.208.169 as permitted sender) smtp.mailfrom=saproj@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662670102; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=mFw2h/Ri2/bIxA8fteahahsAIbUWAOrFqK6aSuy87lQ=; b=303d9s+XHP4Ho8syxMieFE9YN56Zj9cN0laI6D/W20QUdCGEMkwBqUQkXH69Ks4UWDduiY X4zQ5s8VLDZoCL4+3fkynjuayIBVFUgpcVHCyMi+B1RckjTM8ZiZTw2NkY8afKmGEmAt4Z ea8xRVxCWd+bl5a6P9F/AFsoM8HtkOI= X-Stat-Signature: cr1b7g7ojqo59bnpk4rgeiqybokuxm1m X-Rspamd-Queue-Id: F3B60A0077 X-Rspamd-Server: rspam11 X-Rspam-User: Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=n4rTTgTo; spf=pass (imf15.hostedemail.com: domain of saproj@gmail.com designates 209.85.208.169 as permitted sender) smtp.mailfrom=saproj@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-HE-Tag: 1662670101-309018 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: Running this test program on ARMv4 a few times (sometimes just once) reproduces the bug. int main() { unsigned i; char paragon[SIZE]; void* ptr; memset(paragon, 0xAA, SIZE); ptr = mmap(NULL, SIZE, PROT_READ | PROT_WRITE, MAP_ANON | MAP_SHARED, -1, 0); if (ptr == MAP_FAILED) return 1; printf("ptr = %p\n", ptr); for (i=0;i<10000;i++){ memset(ptr, 0xAA, SIZE); if (memcmp(ptr, paragon, SIZE)) { printf("Unexpected bytes on iteration %u!!!\n", i); break; } } munmap(ptr, SIZE); } In the "ptr" buffer there appear runs of zero bytes which are aligned by 16 and their lengths are multiple of 16. Linux v5.11 does not have the bug, "git bisect" finds the first bad commit: f9ce0be71d1f ("mm: Cleanup faultaround and finish_fault() codepaths") Before the commit update_mmu_cache() was called during a call to filemap_map_pages() as well as finish_fault(). After the commit finish_fault() lacks it. Bring back update_mmu_cache() to finish_fault() to fix the bug. Also call update_mmu_tlb() only when returning VM_FAULT_NOPAGE to more closely reproduce the code of alloc_set_pte() function that existed before the commit. On many platforms update_mmu_cache() is nop: x86, see arch/x86/include/asm/pgtable ARMv6+, see arch/arm/include/asm/tlbflush.h So, it seems, few users ran into this bug. Fixes: f9ce0be71d1f ("mm: Cleanup faultaround and finish_fault() codepaths") Signed-off-by: Sergei Antonov Cc: Kirill A. Shutemov --- mm/memory.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 4ba73f5aa8bb..a78814413ac0 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4386,14 +4386,20 @@ vm_fault_t finish_fault(struct vm_fault *vmf) vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, vmf->address, &vmf->ptl); - ret = 0; + /* Re-check under ptl */ - if (likely(!vmf_pte_changed(vmf))) + if (likely(!vmf_pte_changed(vmf))) { do_set_pte(vmf, page, vmf->address); - else + + /* no need to invalidate: a not-present page won't be cached */ + update_mmu_cache(vma, vmf->address, vmf->pte); + + ret = 0; + } else { + update_mmu_tlb(vma, vmf->address, vmf->pte); ret = VM_FAULT_NOPAGE; + } - update_mmu_tlb(vma, vmf->address, vmf->pte); pte_unmap_unlock(vmf->pte, vmf->ptl); return ret; } -- 2.34.1