Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp677536pxb; Tue, 19 Oct 2021 10:37:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDVYS+cpIp4X2sKq3FWlPA8NMKoYRuCq7vNu0ZXiux1qNLEIlU7Cuu4IHu5X47/k6zsAl1 X-Received: by 2002:a17:906:8893:: with SMTP id ak19mr39766746ejc.124.1634665038083; Tue, 19 Oct 2021 10:37:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634665038; cv=none; d=google.com; s=arc-20160816; b=O6SkD878//D3Gu7cA4uzGpTBRMZg4yHWVN/8VEGm7AbjN5KkTB3H924SD1cK5Yg8Fi aqevGTtP8trbxuvFclpU7qN3FIg7qacL4XLtdDAP200+eW1jAkzIjYsLEE6Vs6nXDTY0 AmdWTnkHTXVkUwSCUAjsrHkSU00TY2odl3VRmEqb6/LHAmA5HRAx2a7L5KlOOamaAmfK jp7hJ44B6kqo8NZps6HkVwqmBD3TQz+qq85OCDiByuI1p//WTGnHdEbRTa8ud0404DJI tloeG4CsEHpQo/RXm0FISuiCUbtsC17tWpPNDicV4pDPUyNht2yQlqxAXE9EfpaUk9N8 NVbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=ZNRPA5Y035ENoBEEnphzYyCovDbPmtOdSVwcFg1HX7s=; b=lNb593VhHRG56om9AJuuuKr4I8qg2zYsRRj642JF1kd4MQPynynp+t7RMargNIPAyd 6sEp28WpdZfOhc3/d1xtajG02Up5h0DBPT33cI288KJg1e+WUzBHauSILIky3o7DiL7e iRdlkeNd5h1vlTKmYg9CS7B624NbaR77r0064xiFl48cnG11l+Q5rvOe7aohzKE+ayG9 MOFurrv+HSNURCqKq5pRK8CIyAGL54WtVNs3HE9OBfxAsHJlcCHjHRukufpchZDQ19+I IwSm9fHJXSPh1SSYqHbmCHXkPmmY1YDhlyZP7inX34arknpMxSj1Z1R2OGxNFzOXRXZy NP2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="fWgyvW/r"; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x16si40200056edd.36.2021.10.19.10.36.54; Tue, 19 Oct 2021 10:37:18 -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=@gmail.com header.s=20210112 header.b="fWgyvW/r"; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232526AbhJSRdi (ORCPT + 99 others); Tue, 19 Oct 2021 13:33:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234517AbhJSRdg (ORCPT ); Tue, 19 Oct 2021 13:33:36 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 967ABC061749; Tue, 19 Oct 2021 10:31:22 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id w19so15787207edd.2; Tue, 19 Oct 2021 10:31:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ZNRPA5Y035ENoBEEnphzYyCovDbPmtOdSVwcFg1HX7s=; b=fWgyvW/rGsgnqNAqcunvXvurYtUn79Lt9cXScpF8vT/QKp/yJbFyPWfTGHHbMfr/Qr GmNvEaQyWOTAxUopNX2k3hC8XzH885aPukNHbhrdmAZNVdSZaisl+nuR10NVzLmxTXnF KjxhuC1XxwokYIoBQ2DTG07QpcuH5KOdqegBZBrq/7CQZlHaFKQj7zCy9ts0sjel92ob oionIRvKDb52cCzSdPZSLI0iqF3dVG6b44ypmE7eqEdZJX8//4VCwBV9zOP4iGDYUb5H qrGsO7h3o6UIjEWEcF4aQTbpuJt2EJiw2gQIWSQWZUzKZYXQWFnBF4tv4HaU6RLomJf1 xvIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ZNRPA5Y035ENoBEEnphzYyCovDbPmtOdSVwcFg1HX7s=; b=iS/RG1hW3jakpK6zljWa6HXl1DMhhDAuXglT2U5aPK9TPTnLT2nFOoPy2kxi9XB646 U3+dVz1dIufroDYGf6v8t+EMKaLaNFZKujGgE9cbNIQVh/9ffF13hIELWdhxQ0esY9mE WTy3EGRzfyL7CPEytcP+KnxrD3iTUyd3WvQPTkIZtwXn219PejPmuldBdDue3geENvh3 tqYcJQzbrasAkGScGJDvzsQOLuuLw4bd2L6IWit9VN1xGQtltiVdSdWN/f4dUt76PvX/ Ubq79bfMvacxfQ6qSCTmO45n0BBfIYq5RzoYQZ9lAIWlJmHfdUczYZrxowPiZu4V4ShM dqlQ== X-Gm-Message-State: AOAM533kTQSMq6HJrsfcW+Amoy+KHt3k6T0ZoQ7jCZBlW8jnXr8v5UQB 9e1Yi5NmXRzXfDwtyytZaAEc/YuX8Gm4CEZxK8T+IZ7o X-Received: by 2002:a17:906:a94b:: with SMTP id hh11mr40193608ejb.85.1634664603268; Tue, 19 Oct 2021 10:30:03 -0700 (PDT) MIME-Version: 1.0 References: <20211014191615.6674-1-shy828301@gmail.com> <20211014191615.6674-6-shy828301@gmail.com> <20211019055221.GC2268449@u2004> In-Reply-To: <20211019055221.GC2268449@u2004> From: Yang Shi Date: Tue, 19 Oct 2021 10:29:51 -0700 Message-ID: Subject: Re: [v4 PATCH 5/6] mm: shmem: don't truncate page if memory failure happens To: Naoya Horiguchi Cc: =?UTF-8?B?SE9SSUdVQ0hJIE5BT1lBKOWggOWPoyDnm7TkuZ8p?= , Hugh Dickins , "Kirill A. Shutemov" , Matthew Wilcox , Peter Xu , Oscar Salvador , Andrew Morton , Linux MM , Linux FS-devel Mailing List , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Oct 18, 2021 at 10:52 PM Naoya Horiguchi wrote: > > On Thu, Oct 14, 2021 at 12:16:14PM -0700, Yang Shi wrote: > > The current behavior of memory failure is to truncate the page cache > > regardless of dirty or clean. If the page is dirty the later access > > will get the obsolete data from disk without any notification to the > > users. This may cause silent data loss. It is even worse for shmem > > since shmem is in-memory filesystem, truncating page cache means > > discarding data blocks. The later read would return all zero. > > > > The right approach is to keep the corrupted page in page cache, any > > later access would return error for syscalls or SIGBUS for page fault, > > until the file is truncated, hole punched or removed. The regular > > storage backed filesystems would be more complicated so this patch > > is focused on shmem. This also unblock the support for soft > > offlining shmem THP. > > > > Signed-off-by: Yang Shi > > --- > > mm/memory-failure.c | 10 +++++++++- > > mm/shmem.c | 37 ++++++++++++++++++++++++++++++++++--- > > mm/userfaultfd.c | 5 +++++ > > 3 files changed, 48 insertions(+), 4 deletions(-) > > > > diff --git a/mm/memory-failure.c b/mm/memory-failure.c > > index cdf8ccd0865f..f5eab593b2a7 100644 > > --- a/mm/memory-failure.c > > +++ b/mm/memory-failure.c > > @@ -57,6 +57,7 @@ > > #include > > #include > > #include > > +#include > > #include "internal.h" > > #include "ras/ras_event.h" > > > > @@ -866,6 +867,7 @@ static int me_pagecache_clean(struct page_state *ps, struct page *p) > > { > > int ret; > > struct address_space *mapping; > > + bool extra_pins; > > > > delete_from_lru_cache(p); > > > > @@ -894,6 +896,12 @@ static int me_pagecache_clean(struct page_state *ps, struct page *p) > > goto out; > > } > > > > + /* > > + * The shmem page is kept in page cache instead of truncating > > + * so is expected to have an extra refcount after error-handling. > > + */ > > + extra_pins = shmem_mapping(mapping); > > + > > /* > > * Truncation is a bit tricky. Enable it per file system for now. > > * > > @@ -903,7 +911,7 @@ static int me_pagecache_clean(struct page_state *ps, struct page *p) > > out: > > unlock_page(p); > > > > - if (has_extra_refcount(ps, p, false)) > > + if (has_extra_refcount(ps, p, extra_pins)) > > ret = MF_FAILED; > > > > return ret; > > diff --git a/mm/shmem.c b/mm/shmem.c > > index b5860f4a2738..69eaf65409e6 100644 > > --- a/mm/shmem.c > > +++ b/mm/shmem.c > > @@ -2456,6 +2456,7 @@ shmem_write_begin(struct file *file, struct address_space *mapping, > > struct inode *inode = mapping->host; > > struct shmem_inode_info *info = SHMEM_I(inode); > > pgoff_t index = pos >> PAGE_SHIFT; > > + int ret = 0; > > > > /* i_rwsem is held by caller */ > > if (unlikely(info->seals & (F_SEAL_GROW | > > @@ -2466,7 +2467,15 @@ shmem_write_begin(struct file *file, struct address_space *mapping, > > return -EPERM; > > } > > > > - return shmem_getpage(inode, index, pagep, SGP_WRITE); > > + ret = shmem_getpage(inode, index, pagep, SGP_WRITE); > > + > > + if (*pagep && PageHWPoison(*pagep)) { > > shmem_getpage() could return with pagep == NULL, so you need check ret first > to avoid NULL pointer dereference. Realy? IIUC pagep can't be NULL. It is a pointer's pointer passed in by the caller, for example, generic_perform_write(). Of course, "*pagep" could be NULL. > > > + unlock_page(*pagep); > > + put_page(*pagep); > > + ret = -EIO; > > + } > > + > > + return ret; > > } > > > > static int > > @@ -2555,6 +2564,11 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to) > > unlock_page(page); > > } > > > > + if (page && PageHWPoison(page)) { > > + error = -EIO; > > Is it cleaner to add PageHWPoison() check in the existing "if (page)" block > just above? Then, you don't have to check "page != NULL" twice. > > @@ -2562,7 +2562,11 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to) > if (sgp == SGP_CACHE) > set_page_dirty(page); > unlock_page(page); > > + if (PageHWPoison(page)) { > + error = -EIO; > + break; > + } Yeah, it looks better indeed. > } > > /* > > > Thanks, > Naoya Horiguchi