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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DFD4C6FA82 for ; Sat, 10 Sep 2022 18:27:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 310CB8D0001; Sat, 10 Sep 2022 14:27:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2BFC46B0072; Sat, 10 Sep 2022 14:27:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 186FF8D0001; Sat, 10 Sep 2022 14:27:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 0540B6B0071 for ; Sat, 10 Sep 2022 14:27:10 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id C14EF80210 for ; Sat, 10 Sep 2022 18:27:09 +0000 (UTC) X-FDA: 79897007778.23.64220F4 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf03.hostedemail.com (Postfix) with ESMTP id 86C182007A for ; Sat, 10 Sep 2022 18:27:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=HzbaF/w2gu/Kp3W2KzeU3D5B1emioVuvk2oKXIlN0co=; b=hm0jlUjj5UPTktuEEfUHRHbtOL h5E5opUGiLigsiUuo00mrPc/A4xSEK8VCx+Yx+3vbGl8ODfANdUXogLnu7f5zh29M33K+0qsQ/es7 0xTIeKa1vqEKoFetp/WoYtCPF63JIlhvk76Rm/3uAW6SG6gLhu1HtMF1559ykvfauNUIOqkPbJCfj SIoFYzlt82k3xuVcsZtHS43gi4yUwtW69NwP0xZHAbA5vyoTXRt5vhNkTe5yeDQjOohy7QJmhScaI aDGg00fQdrkBdudzVC5CiEHwVo3HXgsI09f4qFaQknUW4ND6l2DYCkrfLZYuIEhUDs75cOwkuqbmG 2b9Uyy1w==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oX5Bb-00EFd2-Lx; Sat, 10 Sep 2022 18:26:35 +0000 Date: Sat, 10 Sep 2022 19:26:35 +0100 From: Matthew Wilcox To: Christoph Hellwig Cc: Jens Axboe , Johannes Weiner , Suren Baghdasaryan , Andrew Morton , Chris Mason , Josef Bacik , David Sterba , Gao Xiang , Chao Yu , linux-block@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-mm@kvack.org Subject: Re: [PATCH 1/5] mm: add PSI accounting around ->read_folio and ->readahead calls Message-ID: References: <20220910065058.3303831-1-hch@lst.de> <20220910065058.3303831-2-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220910065058.3303831-2-hch@lst.de> ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662834429; a=rsa-sha256; cv=none; b=q8a8XoWE+YmtTbfL6Ywu7AfCUnIdQ/Kc3KZ4/Jq6mxZHtJ66aCSB2mmOwCXMG7CL4MxEav ZI4DsbfqbFlYUm0n9BOKf+RMHInig7iahC9SY+DH+MB2FN26QSI00Aez9oAupznhpIx+gp kUIQBpNs97pZaFHFMEGgATq2Lag5dJ4= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hm0jlUjj; dmarc=none; spf=none (imf03.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662834429; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=HzbaF/w2gu/Kp3W2KzeU3D5B1emioVuvk2oKXIlN0co=; b=LisiEpA1O8RYxxIwYpa6md8K7K8nz8aZsCYfqRBf+kfLDSFfQX6uy9eenr/nWLJa+NPR4T 5pxwv2eugOl6tMO03ZLLX/jaLjvX/51Cpt5eSg6LwzgwlVTRJO4uYHbH8lgTm5aY0z6A3V eAH2zzvLEP5Ozg7G+rprZ4BiF/AqrhE= Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hm0jlUjj; dmarc=none; spf=none (imf03.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Rspamd-Queue-Id: 86C182007A X-Rspamd-Server: rspam11 X-Stat-Signature: uh717ed98raxwrr5hi9onek6angfnmau X-HE-Tag: 1662834428-26036 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 Sat, Sep 10, 2022 at 08:50:54AM +0200, Christoph Hellwig wrote: > @@ -480,11 +487,14 @@ static inline int ra_alloc_folio(struct readahead_control *ractl, pgoff_t index, > if (index == mark) > folio_set_readahead(folio); > err = filemap_add_folio(ractl->mapping, folio, index, gfp); > - if (err) > + if (err) { > folio_put(folio); > - else > - ractl->_nr_pages += 1UL << order; > - return err; > + return err; > + } > + > + ractl->_nr_pages += 1UL << order; > + ractl->_workingset = folio_test_workingset(folio); I don't have time to look at this properly right now (about to catch a bus to the plane), but I think this should be |=, not =?