Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp4271916pxu; Mon, 12 Oct 2020 14:28:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzTkP1xH+340dbrIQcUKpHVYLMGXc7E+lTvqsKm5ozU57anTIPntlcBd07WUtHrae/7xfUf X-Received: by 2002:a17:906:9941:: with SMTP id zm1mr4608209ejb.337.1602538092238; Mon, 12 Oct 2020 14:28:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602538092; cv=none; d=google.com; s=arc-20160816; b=BNk2fP+TcjRlS6ZdzpajJd3hR0TmdFNhimSBu1DCtFn96tZVvJz+bP4uZlje8bkIwi rnzlr/sZneJQTiaPxYD6ozROEsh2V4KcjyWh840SDp+Hf8KT+sz8AI+EeGAsZT1dqmdK tPgepz1EZXbgenrr66SPR6lJjTr8tOf9FE8lQcDctV5MY7l5xIxcHwV2rmGM2p9A3vSQ CSDGrCXQXJTCvlp1SkgMN2HPCH6M+AdXT/QEI/YEjfrNw8FjsWtvBox9lfU9cVCrmdol RQPNir4A+vPwxKoaQvyO36H/Asgqw6d4mQWAj6B/4AjagXNeL/eiADFa8gJ/uxTlZBwD Sjlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1P0IlbMgOfxTa93a8tNSU4e434/84WsjZ3c5Z7jIAv0=; b=nbYHjF9jlUlKZaOJ8oXoP4Y304p7aKy/ciWMTyD+3IfSR9SXW8jKfNhmmYJHRr1Rb8 fGZmrIx/B/0lj4bHNxv9vk6dE03ZwSqtzVCkLnNsqkHSgfMVzR5WtUz0l3uOm+9h61Yo 5R6H/SOijvymuql0U+sdJlBiXV4Fx6PEh/DejWABUNowetf+JY/dB/d+ieIYsHGwLiD6 cyffr8mlbVkXv+ZlvqCthsPhIneC/7pYPY7W2Uk3Qwtn6b7mOW+3neMNo139Glpcj0Po 7a0hKvajE34zPdcZBTVWlML3I50He6asn2vtDcu/f0LD3T9wqgRwTpKPYfmvnNK/0c4z b0Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KW+YsTsV; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k2si13134999edx.333.2020.10.12.14.27.49; Mon, 12 Oct 2020 14:28:12 -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=KW+YsTsV; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730374AbgJLNe6 (ORCPT + 99 others); Mon, 12 Oct 2020 09:34:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:37084 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730293AbgJLNeg (ORCPT ); Mon, 12 Oct 2020 09:34:36 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 88B742076E; Mon, 12 Oct 2020 13:34:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602509675; bh=2S04RFvvVLLZMiamcImsydRymXsrhGfX2IJ4trFc/k0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KW+YsTsVKpKwZIGDk5ZZZmeODnvj48F28tfv3jyluYwPczJJZHXtkY1Mh5c8k1NSs k46NePZMvPM6NtCLw/CbY+nPfDOK07v2NvK1LAEc7RA6lgbiBBM1j0OHuA10k0l2PJ D55b+0F4/R26KEwfVrq0LJH+8Y65V5Ck0Yb0a0yk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Denis Lisov , Qian Cai , Hugh Dickins , "Matthew Wilcox (Oracle)" , Linus Torvalds , Suren Baghdasaryan Subject: [PATCH 4.9 36/54] mm/khugepaged: fix filemap page_to_pgoff(page) != offset Date: Mon, 12 Oct 2020 15:26:58 +0200 Message-Id: <20201012132631.263233592@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012132629.585664421@linuxfoundation.org> References: <20201012132629.585664421@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hugh Dickins commit 033b5d77551167f8c24ca862ce83d3e0745f9245 upstream. There have been elusive reports of filemap_fault() hitting its VM_BUG_ON_PAGE(page_to_pgoff(page) != offset, page) on kernels built with CONFIG_READ_ONLY_THP_FOR_FS=y. Suren has hit it on a kernel with CONFIG_READ_ONLY_THP_FOR_FS=y and CONFIG_NUMA is not set: and he has analyzed it down to how khugepaged without NUMA reuses the same huge page after collapse_file() failed (whereas NUMA targets its allocation to the respective node each time). And most of us were usually testing with CONFIG_NUMA=y kernels. collapse_file(old start) new_page = khugepaged_alloc_page(hpage) __SetPageLocked(new_page) new_page->index = start // hpage->index=old offset new_page->mapping = mapping xas_store(&xas, new_page) filemap_fault page = find_get_page(mapping, offset) // if offset falls inside hpage then // compound_head(page) == hpage lock_page_maybe_drop_mmap() __lock_page(page) // collapse fails xas_store(&xas, old page) new_page->mapping = NULL unlock_page(new_page) collapse_file(new start) new_page = khugepaged_alloc_page(hpage) __SetPageLocked(new_page) new_page->index = start // hpage->index=new offset new_page->mapping = mapping // mapping becomes valid again // since compound_head(page) == hpage // page_to_pgoff(page) got changed VM_BUG_ON_PAGE(page_to_pgoff(page) != offset) An initial patch replaced __SetPageLocked() by lock_page(), which did fix the race which Suren illustrates above. But testing showed that it's not good enough: if the racing task's __lock_page() gets delayed long after its find_get_page(), then it may follow collapse_file(new start)'s successful final unlock_page(), and crash on the same VM_BUG_ON_PAGE. It could be fixed by relaxing filemap_fault()'s VM_BUG_ON_PAGE to a check and retry (as is done for mapping), with similar relaxations in find_lock_entry() and pagecache_get_page(): but it's not obvious what else might get caught out; and khugepaged non-NUMA appears to be unique in exposing a page to page cache, then revoking, without going through a full cycle of freeing before reuse. Instead, non-NUMA khugepaged_prealloc_page() release the old page if anyone else has a reference to it (1% of cases when I tested). Although never reported on huge tmpfs, I believe its find_lock_entry() has been at similar risk; but huge tmpfs does not rely on khugepaged for its normal working nearly so much as READ_ONLY_THP_FOR_FS does. Reported-by: Denis Lisov Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=206569 Link: https://lore.kernel.org/linux-mm/?q=20200219144635.3b7417145de19b65f258c943%40linux-foundation.org Reported-by: Qian Cai Link: https://lore.kernel.org/linux-xfs/?q=20200616013309.GB815%40lca.pw Reported-and-analyzed-by: Suren Baghdasaryan Fixes: 87c460a0bded ("mm/khugepaged: collapse_shmem() without freezing new_page") Signed-off-by: Hugh Dickins Cc: stable@vger.kernel.org # v4.9+ Reviewed-by: Matthew Wilcox (Oracle) Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/khugepaged.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -802,6 +802,18 @@ static struct page *khugepaged_alloc_hug static bool khugepaged_prealloc_page(struct page **hpage, bool *wait) { + /* + * If the hpage allocated earlier was briefly exposed in page cache + * before collapse_file() failed, it is possible that racing lookups + * have not yet completed, and would then be unpleasantly surprised by + * finding the hpage reused for the same mapping at a different offset. + * Just release the previous allocation if there is any danger of that. + */ + if (*hpage && page_count(*hpage) > 1) { + put_page(*hpage); + *hpage = NULL; + } + if (!*hpage) *hpage = khugepaged_alloc_hugepage(wait);