Message ID | 20201012132634.499402561@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=uWP8=DT=vger.kernel.org=stable-owner@kernel.org> 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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,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 C4F49C433E7 for <stable@archiver.kernel.org>; Mon, 12 Oct 2020 13:42:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 979B4221EB for <stable@archiver.kernel.org>; Mon, 12 Oct 2020 13:42:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602510146; bh=S+YFtUA5XDumNX/F9yPoBb0FU8aoU0vSWe/PnjTLB2Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Qw3ComUAyS/8QmazQj6c2+aknPZQJbY7Hnk75wvsStFEvRhifG4zv0U3VVpAOxWxf +a27bAVUYXRTcR7fa5qoGmY88NFbbDEAvXK5S4kd95Mir+oWniYS1nqojae+BiP5Nl 8r+iuxipafWHH22Idxma/hT9pgCzuvJ4fWJ5ExEE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388055AbgJLNmZ (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 12 Oct 2020 09:42:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:46214 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731077AbgJLNlh (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 12 Oct 2020 09:41:37 -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 81DDF221FC; Mon, 12 Oct 2020 13:41:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602510087; bh=S+YFtUA5XDumNX/F9yPoBb0FU8aoU0vSWe/PnjTLB2Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=axl+PVe0dAuJa1xMc5/mUkzcK85QXTz09UbuxNzErx2nvnEu9YYTFWKtrdxoOYdPy swzrDb9T0palA014EZG5MAsWdBu9QjNXPV0jo/qAFtE6czONY6VhQb4MSTMhxGJJ/E trsXULNK5UzaLHsw7V+kVHGumqjDoKm2xIXLEyTM= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Denis Lisov <dennis.lissov@gmail.com>, Qian Cai <cai@lca.pw>, Hugh Dickins <hughd@google.com>, "Matthew Wilcox (Oracle)" <willy@infradead.org>, Linus Torvalds <torvalds@linux-foundation.org>, Suren Baghdasaryan <surenb@google.com> Subject: [PATCH 5.4 34/85] mm/khugepaged: fix filemap page_to_pgoff(page) != offset Date: Mon, 12 Oct 2020 15:26:57 +0200 Message-Id: <20201012132634.499402561@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012132632.846779148@linuxfoundation.org> References: <20201012132632.846779148@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: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -832,6 +832,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);