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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCF80C433F5 for ; Tue, 12 Oct 2021 01:57:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 56A2B60F43 for ; Tue, 12 Oct 2021 01:57:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 56A2B60F43 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id EAF7B900002; Mon, 11 Oct 2021 21:57:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E86606B0071; Mon, 11 Oct 2021 21:57:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D75BB900002; Mon, 11 Oct 2021 21:57:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0037.hostedemail.com [216.40.44.37]) by kanga.kvack.org (Postfix) with ESMTP id CAD106B006C for ; Mon, 11 Oct 2021 21:57:15 -0400 (EDT) Received: from smtpin35.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 82D072D4C2 for ; Tue, 12 Oct 2021 01:57:15 +0000 (UTC) X-FDA: 78686122830.35.D8AC39B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf27.hostedemail.com (Postfix) with ESMTP id 1C6A87001958 for ; Tue, 12 Oct 2021 01:57:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634003834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Z1mp2JWM4YiVwlRlVLQCKfDNv4dQeC/M1PO4QIwth7g=; b=SaCL6njIzDO1nJLVVU3FS3qX1gbSjo3nRCNmX/KKmtSAchTVjFuCS0OI4XwwE/f3MreDLi Tz2cA1jAFypKV7r9dts8NuZlh7kRW8gEATC97UIo6uw+HG9fDBke1E86zfdYAIyffC6v3t nRfXnkMX+HrBFieup5tkb8CidYGXEfk= Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-555-N3mQgFnYN7SAZuaqIbR2fw-1; Mon, 11 Oct 2021 21:57:13 -0400 X-MC-Unique: N3mQgFnYN7SAZuaqIbR2fw-1 Received: by mail-pf1-f198.google.com with SMTP id t79-20020a627852000000b0044d0ecd9f7aso2444250pfc.13 for ; Mon, 11 Oct 2021 18:57:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Z1mp2JWM4YiVwlRlVLQCKfDNv4dQeC/M1PO4QIwth7g=; b=qj7aDVCrR4DaV45Yi3goIYRg2Uw3sh6lkxmSoNrq+RYKZNHwcN19Ra8EJzgaUds+AV Ep9py4CcSkz0Ezrxh+kKXEnH8+H5Kt5we0AMgovsmV82FYLz2Lvi46Kx78mUsRlrfulg cv1esf8xHBI5OkmhcF5TgCFkfmgOl7X2V0hiUGszymdFikQScyhgQ3ht+iKwoy+N5ds5 LEAPVTs4MSm0GQfk3Zh7lKGVZAw8VLAck0Ee2z5llZUALOsVgOeEvkP6ifGtzpt929RC X+IwIl+OCc6MlCkP6tRP13VmcWJfA4MV2L3UviXhMMEgVZz46yAvN9tUyNekjcJPjv9W lWAQ== X-Gm-Message-State: AOAM531Sb1PbcZcqmCL49CIXr5gBQ3qye2m7nhR5kvq17zvTihpRNXQK LM6uoTxMCvGn/GSxTtXPeS0m4SWAKZOV+didMlMZpgLQDYbzOHOGZhkaDSLCwDk/vd4CPBxfurj M99PW7QvSZ1g= X-Received: by 2002:aa7:9884:0:b0:44c:4c1f:6e6 with SMTP id r4-20020aa79884000000b0044c4c1f06e6mr29290660pfl.57.1634003830902; Mon, 11 Oct 2021 18:57:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoY/Xa4Xw7ivczlmO9ms2t13BWtRuBIDKwNXoKSSChisi8+RUQEKHw9Ho6XNS5pE3+tIDo/g== X-Received: by 2002:aa7:9884:0:b0:44c:4c1f:6e6 with SMTP id r4-20020aa79884000000b0044c4c1f06e6mr29290627pfl.57.1634003830485; Mon, 11 Oct 2021 18:57:10 -0700 (PDT) Received: from t490s ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id b23sm9193853pfi.135.2021.10.11.18.57.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Oct 2021 18:57:09 -0700 (PDT) Date: Tue, 12 Oct 2021 09:57:02 +0800 From: Peter Xu To: Yang Shi Cc: naoya.horiguchi@nec.com, hughd@google.com, kirill.shutemov@linux.intel.com, willy@infradead.org, osalvador@suse.de, akpm@linux-foundation.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [v3 PATCH 4/5] mm: shmem: don't truncate page if memory failure happens Message-ID: References: <20210930215311.240774-1-shy828301@gmail.com> <20210930215311.240774-5-shy828301@gmail.com> MIME-Version: 1.0 In-Reply-To: <20210930215311.240774-5-shy828301@gmail.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SaCL6njI; spf=none (imf27.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 216.205.24.124) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 1C6A87001958 X-Stat-Signature: g6wjx1grirk98rhx7s66xszbugtewicp X-HE-Tag: 1634003834-744911 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 Thu, Sep 30, 2021 at 02:53:10PM -0700, Yang Shi wrote: > diff --git a/mm/shmem.c b/mm/shmem.c > index 88742953532c..75c36b6a405a 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,17 @@ 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) { > + if (PageHWPoison(*pagep)) { > + unlock_page(*pagep); > + put_page(*pagep); > + ret = -EIO; > + } > + } > + > + return ret; > } > > static int > @@ -2555,6 +2566,11 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to) > unlock_page(page); > } > > + if (page && PageHWPoison(page)) { > + error = -EIO; > + break; > + } > + > /* > * We must evaluate after, since reads (unlike writes) > * are called without i_rwsem protection against truncate [...] > @@ -4193,6 +4216,10 @@ struct page *shmem_read_mapping_page_gfp(struct address_space *mapping, > page = ERR_PTR(error); > else > unlock_page(page); > + > + if (PageHWPoison(page)) > + page = ERR_PTR(-EIO); > + > return page; > #else > /* > diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c > index 7a9008415534..b688d5327177 100644 > --- a/mm/userfaultfd.c > +++ b/mm/userfaultfd.c > @@ -233,6 +233,11 @@ static int mcontinue_atomic_pte(struct mm_struct *dst_mm, > goto out; > } > > + if (PageHWPoison(page)) { > + ret = -EIO; > + goto out_release; > + } > + > ret = mfill_atomic_install_pte(dst_mm, dst_pmd, dst_vma, dst_addr, > page, false, wp_copy); > if (ret) > -- > 2.26.2 > These are shmem_getpage_gfp() call sites: shmem_getpage[151] return shmem_getpage_gfp(inode, index, pagep, sgp, shmem_fault[2112] err = shmem_getpage_gfp(inode, vmf->pgoff, &vmf->page, SGP_CACHE, shmem_read_mapping_page_gfp[4188] error = shmem_getpage_gfp(inode, index, &page, SGP_CACHE, These are further shmem_getpage() call sites: collapse_file[1735] if (shmem_getpage(mapping->host, index, &page, shmem_undo_range[965] shmem_getpage(inode, start - 1, &page, SGP_READ); shmem_undo_range[980] shmem_getpage(inode, end, &page, SGP_READ); shmem_write_begin[2467] return shmem_getpage(inode, index, pagep, SGP_WRITE); shmem_file_read_iter[2544] error = shmem_getpage(inode, index, &page, sgp); shmem_fallocate[2733] error = shmem_getpage(inode, index, &page, SGP_FALLOC); shmem_symlink[3079] error = shmem_getpage(inode, 0, &page, SGP_WRITE); shmem_get_link[3120] error = shmem_getpage(inode, 0, &page, SGP_READ); mcontinue_atomic_pte[235] ret = shmem_getpage(inode, pgoff, &page, SGP_READ); Wondering whether this patch covered all of them. This also reminded me that whether we should simply fail shmem_getpage_gfp() directly, then all above callers will get a proper failure, rather than we do PageHWPoison() check everywhere? -- Peter Xu