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 X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 A03E2C47096 for ; Thu, 3 Jun 2021 22:06:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 13665613F8 for ; Thu, 3 Jun 2021 22:06:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 13665613F8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 87E4D6B0036; Thu, 3 Jun 2021 18:06:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8543B6B006C; Thu, 3 Jun 2021 18:06:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6F59D6B006E; Thu, 3 Jun 2021 18:06:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0027.hostedemail.com [216.40.44.27]) by kanga.kvack.org (Postfix) with ESMTP id 3BF2D6B0036 for ; Thu, 3 Jun 2021 18:06:43 -0400 (EDT) Received: from smtpin34.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id D17318792 for ; Thu, 3 Jun 2021 22:06:42 +0000 (UTC) X-FDA: 78213797844.34.A4696FB Received: from mail-ed1-f52.google.com (unknown [209.85.208.52]) by imf24.hostedemail.com (Postfix) with ESMTP id 99C5AA0021E9 for ; Thu, 3 Jun 2021 22:06:25 +0000 (UTC) Received: by mail-ed1-f52.google.com with SMTP id ba2so7118964edb.2 for ; Thu, 03 Jun 2021 15:06:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=u1tlwNvgMK6HDkbzCbRrxIHsT2mloTx7ykpfpBmaMA0=; b=nbHY1PV1SLGjG+b/ZqVO2Y+L5GYBOYqCA8RXJRsiWjEUYVCKtFajPZ1nvKxCcDcLf1 /GTOlyTfe1nDDR8MAKDVYj97GlJ3cQ/T9SyzQlRbD1ulhLfpp46JbkubYXN+vo0ANPpK C8uhf5c4bkB7N4AkNIOYUfXJbe6bQIV5TXdwie2vnsvSHXkj8LnrZa545RWWGmSrd1KW S593SvG+od8ttC/tp19kfPvurTNlV/3wfpMOkTjw1CwYo8Ha55r2OfTCd8radlQ+9y7I FQotCJXeJEGWfSLJvkG/TN/VtRipfPu10vVAg9riVmNhHxzUPSGIXRcSPNKga5FFCxkf samw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=u1tlwNvgMK6HDkbzCbRrxIHsT2mloTx7ykpfpBmaMA0=; b=dkJKQjJPvkb4hsVRUPmpZEq8YhtumiT0m/yb4Z2IFltzUa/t/WYZVtD0crUGFVsZdo IXP3IkZbS4WipFa5kAlM660qL6nuIr77iw5ZFf1woV5+FueTMi+ULyASCczxdEKq9Fvg mtkDIspTdFvj1T3i2HENsxmaf+XCuhAsD+sdMtWemdUv4+kWJ9nvB2fDrRlqrKB1Imaw UI+ASz3KNFaIDriHNpxWmrw+tHnMPXCqA3PjOOwyFU06u8RdpBYqpYExHJDIoQqUjJ4S Ki7LtuqMghpeYp9gSZosW/xopf7Vd9NnS0noGY0RK2VfcRnXk7/RJS43cm94dtZ/HZrV 7i+g== X-Gm-Message-State: AOAM5311uS2AkJKu+wvAarcVnSVNJwxlfWG1ELa+ld4K+aKjbKQuuc6P skP82MV2AatEF22410w2GH/0kgyK46SE43dQxN8= X-Google-Smtp-Source: ABdhPJy5tcNmtBjOEe53PFEOp8BmQ21C1hdKaX/CIPNuMFm5M8qRylXlT4ZD6fDK2mLZMDof33vts+CxB15fPfyy2XQ= X-Received: by 2002:a05:6402:42d2:: with SMTP id i18mr1488267edc.168.1622757973907; Thu, 03 Jun 2021 15:06:13 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Yang Shi Date: Thu, 3 Jun 2021 15:06:01 -0700 Message-ID: Subject: Re: [PATCH 4/7] mm/thp: fix page_address_in_vma() on file THP tails To: Hugh Dickins Cc: Andrew Morton , "Kirill A. Shutemov" , Wang Yugui , Matthew Wilcox , Naoya Horiguchi , Alistair Popple , Ralph Campbell , Zi Yan , Miaohe Lin , Minchan Kim , Jue Wang , Peter Xu , Jan Kara , Linux MM , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 99C5AA0021E9 Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=nbHY1PV1; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf24.hostedemail.com: domain of shy828301@gmail.com designates 209.85.208.52 as permitted sender) smtp.mailfrom=shy828301@gmail.com X-Rspamd-Server: rspam03 X-Stat-Signature: oscqmem6it71641rz8zg3b8df67ewaqe X-HE-Tag: 1622757985-849733 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: On Tue, Jun 1, 2021 at 2:11 PM Hugh Dickins wrote: > > From: Jue Wang > > Anon THP tails were already supported, but memory-failure may need to use > page_address_in_vma() on file THP tails, which its page->mapping check did > not permit: fix it. > > hughd adds: no current usage is known to hit the issue, but this does fix > a subtle trap in a general helper: best fixed in stable sooner than later. > > Fixes: 800d8c63b2e9 ("shmem: add huge pages support") > Signed-off-by: Jue Wang > Signed-off-by: Hugh Dickins > Cc: Reviewed-by: Yang Shi > --- > mm/rmap.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/mm/rmap.c b/mm/rmap.c > index 144de54efc1c..e05c300048e6 100644 > --- a/mm/rmap.c > +++ b/mm/rmap.c > @@ -716,11 +716,11 @@ unsigned long page_address_in_vma(struct page *page, struct vm_area_struct *vma) > if (!vma->anon_vma || !page__anon_vma || > vma->anon_vma->root != page__anon_vma->root) > return -EFAULT; > - } else if (page->mapping) { > - if (!vma->vm_file || vma->vm_file->f_mapping != page->mapping) > - return -EFAULT; > - } else > + } else if (!vma->vm_file) { > + return -EFAULT; > + } else if (vma->vm_file->f_mapping != compound_head(page)->mapping) { > return -EFAULT; > + } > > return vma_address(page, vma); > } > -- > 2.32.0.rc0.204.g9fa02ecfa5-goog > >