Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4468673ybz; Tue, 28 Apr 2020 11:48:57 -0700 (PDT) X-Google-Smtp-Source: APiQypLvPrHi+BSsSfKFxWG8onaWY2NOqquWqTDSBzG5eu1ZpObeIhE8d6SpKXWOm+73XwfR4UoQ X-Received: by 2002:a17:906:3f45:: with SMTP id f5mr9151348ejj.18.1588099736768; Tue, 28 Apr 2020 11:48:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588099736; cv=none; d=google.com; s=arc-20160816; b=tLCd8TjzI3UoxeX7627zSzE4bTrqS0OX7gfzUdytMJmz2tC28yxRy89M+dhrHLPNPT ItpSNZKtojleA5hYsF1Mq7g68aMlJyngh+ZV4337+tYPIUK4yUMM4YS1/uxAckJi8Y/T H/koY4dYJrEbFZnZ36wNk9l/CqvoX2gS5q4zfyzbnZ8jABUT5NxjeeYeCWGiD3qw5tEm sKV7MNktLkfaRfFd4sFUJUPKevmeeeWAI25QtOK3HX5dAC4VE/NQDCnNTVaUU3ga5eO6 C59W6pVf7U3vPfSWOz7dACXTv4clCX031DND/6zQZIyWqBk2gP9b542m+AvlpzYhhKj6 R33A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+2cl9h7w6x9C5Cw9TZea9MV0NJna6oRzS752RBUJVBg=; b=ZS22tKgOZ3tlC7+DZuNf2w0ss4zwrGUSvyf0Y9QEGi3ZKdgHgAeWpJqJYQKQjKUsyf thVzKDQ98NG0+lo9+z8p07q1vKeb4iRSqpFNWTmozKGsynDnD1VIIXPRL/okhcj8fmLq BjuNzvIbn4e7G7gEEPo43J89zU6Z+OnML+Kr5pDg/hseHSgw9Yhgazc+ON315UrmAG+Q R1e7i8tTSUKwLeK0BXclxtjB8lIGGp2pO+mHvEcc97ckpkYpe0yJGjcavMO7UbO9Bgtz 5MnJHusnzSa4b3auTnq1sb5gwt0LrIHTvgtxHTNvzo3yd9atoFNSbKHuqI49LB07DhUL ypuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SiX0LFqq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ba9si2105953edb.114.2020.04.28.11.48.33; Tue, 28 Apr 2020 11:48:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SiX0LFqq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728892AbgD1SmK (ORCPT + 99 others); Tue, 28 Apr 2020 14:42:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:33804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730375AbgD1SmF (ORCPT ); Tue, 28 Apr 2020 14:42:05 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6CF0E2076A; Tue, 28 Apr 2020 18:42:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588099324; bh=Da0053hyOO/K1puxquK2wZ9Z/CuFC+ci/8vo4tv5wv8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SiX0LFqqBf5w6z1DIgUDHsiuLaKnoE84GPqPRp9ZYyHzYYYBn00TJQx0+HXSJt9qE /CypMVakQYCIDGtCCT0O0QFcvvqXh1xhYIXYYCd0AlQKp79sFKe9Fca7tD2z9ePwDl TmVVok/StxBFahelimxcQtcQUKodaH78JOf2pVzM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Longpeng , Andrew Morton , Mike Kravetz , Jason Gunthorpe , Matthew Wilcox , Sean Christopherson , Linus Torvalds Subject: [PATCH 5.4 105/168] mm/hugetlb: fix a addressing exception caused by huge_pte_offset Date: Tue, 28 Apr 2020 20:24:39 +0200 Message-Id: <20200428182245.677917874@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200428182231.704304409@linuxfoundation.org> References: <20200428182231.704304409@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Longpeng commit 3c1d7e6ccb644d517a12f73a7ff200870926f865 upstream. Our machine encountered a panic(addressing exception) after run for a long time and the calltrace is: RIP: hugetlb_fault+0x307/0xbe0 RSP: 0018:ffff9567fc27f808 EFLAGS: 00010286 RAX: e800c03ff1258d48 RBX: ffffd3bb003b69c0 RCX: e800c03ff1258d48 RDX: 17ff3fc00eda72b7 RSI: 00003ffffffff000 RDI: e800c03ff1258d48 RBP: ffff9567fc27f8c8 R08: e800c03ff1258d48 R09: 0000000000000080 R10: ffffaba0704c22a8 R11: 0000000000000001 R12: ffff95c87b4b60d8 R13: 00005fff00000000 R14: 0000000000000000 R15: ffff9567face8074 FS: 00007fe2d9ffb700(0000) GS:ffff956900e40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffd3bb003b69c0 CR3: 000000be67374000 CR4: 00000000003627e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: follow_hugetlb_page+0x175/0x540 __get_user_pages+0x2a0/0x7e0 __get_user_pages_unlocked+0x15d/0x210 __gfn_to_pfn_memslot+0x3c5/0x460 [kvm] try_async_pf+0x6e/0x2a0 [kvm] tdp_page_fault+0x151/0x2d0 [kvm] ... kvm_arch_vcpu_ioctl_run+0x330/0x490 [kvm] kvm_vcpu_ioctl+0x309/0x6d0 [kvm] do_vfs_ioctl+0x3f0/0x540 SyS_ioctl+0xa1/0xc0 system_call_fastpath+0x22/0x27 For 1G hugepages, huge_pte_offset() wants to return NULL or pudp, but it may return a wrong 'pmdp' if there is a race. Please look at the following code snippet: ... pud = pud_offset(p4d, addr); if (sz != PUD_SIZE && pud_none(*pud)) return NULL; /* hugepage or swap? */ if (pud_huge(*pud) || !pud_present(*pud)) return (pte_t *)pud; pmd = pmd_offset(pud, addr); if (sz != PMD_SIZE && pmd_none(*pmd)) return NULL; /* hugepage or swap? */ if (pmd_huge(*pmd) || !pmd_present(*pmd)) return (pte_t *)pmd; ... The following sequence would trigger this bug: - CPU0: sz = PUD_SIZE and *pud = 0 , continue - CPU0: "pud_huge(*pud)" is false - CPU1: calling hugetlb_no_page and set *pud to xxxx8e7(PRESENT) - CPU0: "!pud_present(*pud)" is false, continue - CPU0: pmd = pmd_offset(pud, addr) and maybe return a wrong pmdp However, we want CPU0 to return NULL or pudp in this case. We must make sure there is exactly one dereference of pud and pmd. Signed-off-by: Longpeng Signed-off-by: Andrew Morton Reviewed-by: Mike Kravetz Reviewed-by: Jason Gunthorpe Cc: Matthew Wilcox Cc: Sean Christopherson Cc: Link: http://lkml.kernel.org/r/20200413010342.771-1-longpeng2@huawei.com Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/hugetlb.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5016,8 +5016,8 @@ pte_t *huge_pte_offset(struct mm_struct { pgd_t *pgd; p4d_t *p4d; - pud_t *pud; - pmd_t *pmd; + pud_t *pud, pud_entry; + pmd_t *pmd, pmd_entry; pgd = pgd_offset(mm, addr); if (!pgd_present(*pgd)) @@ -5027,17 +5027,19 @@ pte_t *huge_pte_offset(struct mm_struct return NULL; pud = pud_offset(p4d, addr); - if (sz != PUD_SIZE && pud_none(*pud)) + pud_entry = READ_ONCE(*pud); + if (sz != PUD_SIZE && pud_none(pud_entry)) return NULL; /* hugepage or swap? */ - if (pud_huge(*pud) || !pud_present(*pud)) + if (pud_huge(pud_entry) || !pud_present(pud_entry)) return (pte_t *)pud; pmd = pmd_offset(pud, addr); - if (sz != PMD_SIZE && pmd_none(*pmd)) + pmd_entry = READ_ONCE(*pmd); + if (sz != PMD_SIZE && pmd_none(pmd_entry)) return NULL; /* hugepage or swap? */ - if (pmd_huge(*pmd) || !pmd_present(*pmd)) + if (pmd_huge(pmd_entry) || !pmd_present(pmd_entry)) return (pte_t *)pmd; return NULL;