Received: by 2002:a25:23cc:0:0:0:0:0 with SMTP id j195csp62495ybj; Wed, 6 May 2020 11:35:25 -0700 (PDT) X-Google-Smtp-Source: APiQypLaISqhkyPLaIQByWRae5/lDSAwMSBQnd+OUYaApdAU7g7wWBWQG8YOxqAFtHDkqzxYYAOg X-Received: by 2002:a17:906:7282:: with SMTP id b2mr8906418ejl.161.1588790125467; Wed, 06 May 2020 11:35:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588790125; cv=none; d=google.com; s=arc-20160816; b=kBhqM9jfYQj1qcj+wJUpVb3yJ/ZGVzHITIKgddtAyIHTqgHh7g4JpUwiOdqzHQbk2A ojtDkoEolMhPOLelawBHKisSkoX+0dFG0LCjJVc4bUv0nGa5P7VppfosxOUotCKC13Gd ZHEPpXSnF5dJEZf0PpuAzGJqgaqEw86rS3n7n02WXyfqj9uO45KczXLGIk8Jo9q06U87 j/QAZraVVPhwgQ4ivuR978ZtvdVjK32ucQ6776YuFkUbCHo/ShmJmRyG9EWlCeYckQOu JZ3+YIxdCb6aB/vj8BtLuVWy4FJIRu0I+hLVUHjhzaJ3/VkOmnj48EqDuEBMSA1/kPW3 Fsog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=Fq3C3PbiEHBNQ27byMZOeuqdKYIZw/ni/msqiBB7jyw=; b=NH/DdLUtm/W5/shrfmOUeOkA2xBmimhmR6Uuo3eOgoGTL2S5kg7pbK3cUbZ+NjGh1h S4ucrfN5ypkOBA+wah/p16WW+znLSX5tTZQ12G0ScPiQY7pIQw8fK25kCqp/FLHDA9OJ x87fLRhlCjySplFSAYZnudzx7jsTP9g5cvOyOCDOXKZcjG8IrVgh4yCdtnDt25ywTExL sMb6BgM9/8xPNpXjpVn7qMeHweWt75zbjj75VkLu3xrQMuIT0N0sv3O1y0M0UiSZmrT+ tuAame+ENsn0lxvDlWIffHbPIDe+CWFxHrS1VA6SLnNt1Ab/vIoGQtzX3kHZBx5bRo70 +6lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=rJLEiPN7; 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 i24si1663470edy.602.2020.05.06.11.35.02; Wed, 06 May 2020 11:35:25 -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=20161025 header.b=rJLEiPN7; 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 S1730464AbgEFScg (ORCPT + 99 others); Wed, 6 May 2020 14:32:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729313AbgEFScf (ORCPT ); Wed, 6 May 2020 14:32:35 -0400 Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E2EDC061A0F; Wed, 6 May 2020 11:32:35 -0700 (PDT) Received: by mail-ed1-x544.google.com with SMTP id a8so2896540edv.2; Wed, 06 May 2020 11:32:35 -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=Fq3C3PbiEHBNQ27byMZOeuqdKYIZw/ni/msqiBB7jyw=; b=rJLEiPN7+PxVlf0QK9PQNUT6kdIjMim7/Ob4MOBhcoNSlOu2jcUZTT6HZnRkZBplSw gZ7/yA0PANlt5Anpszzp4vP722DW0sXC9Gm78C9nyFl2PR2ny6S4LFG+8XYxupDtF+M7 svQk0iI11QWz45fTvs5s2+YBLElpfugmc/46+FDIU5YtMEcbsh0Er/PXglJhernwl7Sq 5JiIoVLofL284wjgrRU7sH68j4j+ZtIrlo8hPqZf3iQPaACAasJnBrboSvJDeNuQoWKi LrRNEPC/B9g1dqRX1W/SNp+CcAAboD7hzPJ08Ioz+pqzHU0laa/KsjTEOXl5mNNPghME G5Aw== 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=Fq3C3PbiEHBNQ27byMZOeuqdKYIZw/ni/msqiBB7jyw=; b=MJp/1VGoeM9AvUAaERCqjkAVxT/bD0ml9HP+stHiyK7jRRp1LLIsO6yVlarKpSmvV0 /PAPYgWSnH5sB1WCzDTGIGKSALbMtWbUMlGtl/w2gukNV9csfC1uMCKZI6iWxGen9SaU j23uryfIQ8gaDcle+dFBc+ipnXR3TMCClcFrz8BZHhMx8ySnOfjh3iqZiyit1w/cBUGR GKkyB5+I2PiInn0JidfuLtIXaVBceyJ/ZbnFYh7efPlgcbUOrg+Hyn13eZaj73qQPkiY qLoWHyvBN9M6B/2Lo1lew0lFo26IlpY0rRt7EuuIbSWmsbtuvB2dm/QavxYGwF5oWvaW 8jxQ== X-Gm-Message-State: AGi0PuYUrABMq86MUjFXcVe4SSUryFYDk4hKo/P+K41PwOeEEEXt0CDf fcSWzz1OetKSAw8BJH4Cyk6uM/7DTSRY+rCvi74= X-Received: by 2002:a05:6402:558:: with SMTP id i24mr7963797edx.347.1588789953782; Wed, 06 May 2020 11:32:33 -0700 (PDT) MIME-Version: 1.0 References: <20200429133657.22632-1-willy@infradead.org> <20200429133657.22632-19-willy@infradead.org> <20200504031036.GB16070@bombadil.infradead.org> In-Reply-To: <20200504031036.GB16070@bombadil.infradead.org> From: Yang Shi Date: Wed, 6 May 2020 11:32:10 -0700 Message-ID: Subject: Re: [PATCH v3 18/25] mm: Allow large pages to be added to the page cache To: Matthew Wilcox Cc: Linux FS-devel Mailing List , Linux MM , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, May 3, 2020 at 8:10 PM Matthew Wilcox wrote: > > On Wed, Apr 29, 2020 at 06:36:50AM -0700, Matthew Wilcox wrote: > > @@ -886,7 +906,7 @@ static int __add_to_page_cache_locked(struct page *page, > > /* Leave page->index set: truncation relies upon it */ > > if (!huge) > > mem_cgroup_cancel_charge(page, memcg, false); > > - put_page(page); > > + page_ref_sub(page, nr); > > return xas_error(&xas); > > } > > ALLOW_ERROR_INJECTION(__add_to_page_cache_locked, ERRNO); > > This is wrong. page_ref_sub() will not call __put_page() if the refcount > gets to zero. What do people prefer? > > - put_page(page); > > (a) > + put_thp(page); > > (b) > + put_page_nr(page, nr); > > (c) > + if (page_ref_sub_return(page, nr) == 0) > + __put_page(page); b or c IMHO. The shmem uses page_ref_add/page_ref_sub so we'd better follow it. If go with b, it sounds better to add get_page_nr() as well. >