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 78258EE645C for ; Fri, 15 Sep 2023 13:45:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E2D466B036B; Fri, 15 Sep 2023 09:45:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DDD5E6B0370; Fri, 15 Sep 2023 09:45:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CA5C16B0371; Fri, 15 Sep 2023 09:45:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id BD80C6B036B for ; Fri, 15 Sep 2023 09:45:08 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 940C11CA0BB for ; Fri, 15 Sep 2023 13:45:08 +0000 (UTC) X-FDA: 81238953096.21.02F107A Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf16.hostedemail.com (Postfix) with ESMTP id C7D5718002C for ; Fri, 15 Sep 2023 13:45:06 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=CTCz3ai5; spf=none (imf16.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694785506; a=rsa-sha256; cv=none; b=hhos5uKGZ951ZLGrXjnWIjbpAwfu13qpzT3EBU5naEy9dCpILE3QiKoJm5zVLiZaxOGdkg NHMHzs5zLGCWoQubv1JaELfI7XlOI11Hbb7xhhiKTdHuBKrBgAA+UICL25GXcJsJ4TjHCq DhpDL60CY+Ny7N0rAA2bE0LY+MqO8yM= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=CTCz3ai5; spf=none (imf16.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694785506; 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=jxXdIOJ+m4CtsjucCCh39wV02TblO2va85pXUJ/Yaxs=; b=Mbc1aHniw+EzwdbytA3QD1aXrOQcQRVWzIEfgV2FB3/DIrT1ODi7xfUquyEUrW5a8Ube32 zWcDAvPdgo6xtLuypcAHCi8oxHtqNh97yZsFtZGWl1/oc2GzgwOSHjj76SHO6FqZ/haSvI AnAHaN8PdJQJjJJFozAACVP1qAV1XOk= 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=jxXdIOJ+m4CtsjucCCh39wV02TblO2va85pXUJ/Yaxs=; b=CTCz3ai5firDQReWo5r4TuUiQ5 kXQQkghy72n5L1ex9TNzv7XVPoz7XD1X/f4lUJw6/m0VHAYNSn4JFAZdNIg63Iw0KrL7KWX3vcgAx 336pifuSjH+xM+zHDElonJnmXzzpuBlrs5mnC8uUqMiByFLIra2P6PhSwdcj8kw9DqYFwT2mWN60c rjdTqjQdO3DCAiPOHCcaZ+264z9lBI1+gwt6DAWEvcjr6IY9u/XyP7zThcu4f35rOUVTHaONEnXzL vqVWgPjQFWsYclK8Ujfwc0jZPFSB/w80mArxsYa6YL6oS1PNSCORzHNNh5lBGLJ5Z/5BF0wT72g/T Jr9A9NWQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qh97y-00A1dO-Lq; Fri, 15 Sep 2023 13:44:58 +0000 Date: Fri, 15 Sep 2023 14:44:58 +0100 From: Matthew Wilcox To: Daniel Gomez Cc: "minchan@kernel.org" , "senozhatsky@chromium.org" , "axboe@kernel.dk" , "djwong@kernel.org" , "hughd@google.com" , "akpm@linux-foundation.org" , "mcgrof@kernel.org" , "linux-kernel@vger.kernel.org" , "linux-block@vger.kernel.org" , "linux-xfs@vger.kernel.org" , "linux-fsdevel@vger.kernel.org" , "linux-mm@kvack.org" , "gost.dev@samsung.com" , Pankaj Raghav Subject: Re: [PATCH 3/6] shmem: account for large order folios Message-ID: References: <20230915095042.1320180-1-da.gomez@samsung.com> <20230915095042.1320180-4-da.gomez@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230915095042.1320180-4-da.gomez@samsung.com> X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: C7D5718002C X-Stat-Signature: tgzm9qer3u9b5ryyuguywr5y9b54ygmj X-Rspam-User: X-HE-Tag: 1694785506-927158 X-HE-Meta: U2FsdGVkX19KtL0dHLjrWLk0Xpl38Be73CQQbT8EgmYqgnT99l6eU5xtb8TylyMTxMEwKQ6Q0uNvE6cXy2EswXCGQryAetn3012xW6tYCmsrcivASkqDyAfOxw6y1U4MffSzmvc/sYMypILWTrXWT9Ax1MgI4Sx0RwS5r5Vyus9s2puOof24fvKSXsCUj74ciO7Sg8GXESvZ9pQ/pbu/ObNkeBSCekVn6Qa+vNjFImCbd9hPK3EWfBn8U4ga+R/q+Gh7ToojGOobIZBfOaC+rKd1EB/8EdJ1ssfn8iBJw8iaxdEAVguruxg/MIMkDV4JXJThQRWCvivh25i2ktWJ+k6oi98FR84cBrEG1IFLw3i+Hdp4P4jCrjNGHPuMFMdI7IOd9/W2pTRf73ONGDrX1SfoKKvLDyunbGUEuQSw2VlQ+z6U7flLL4/nyJ6nbMR5KZTEh4XHCFjAebhxObJt5Im6ygd4WMaNVLGX9MkwxQdKlNgb43c+frhS4cP0RNec0iQ89wXv0jMcyv94FBoR2QYLeiw+e+dz5usw9cwN/6CdLLfn0LplWjNjRQFPPgKPM+g2pdWwaS0ehMA1Jc6jV6xXlIsYBh8zr+egX04eugWUf/BW/01CnAObylkd0+gREpWGDec11fM9uq2IKHjQAP+TKFtYZw/wkS8X7dDwNd/lJO7ht1GFnEmFHkDs+6eSmzjxBTs7lJwit3SOO1OiPMv5MvcYuMkuUfSqzgQIkMB0zogyNxVEEp2B4iWRUe4/B7xzeovKSzWV0PoByCLyREUw0ytcw4a9ovJlBI9gO3wTcqUhdM6sBMF9mzkogo4rdHDF6SoFNHSKnoE2PfhkkXeotflZfYrSvNUrB0WihRuy4PyXnja9EVXYuJ5p5vfDxeth1+9qBkMl31X3riH4Dyx6++Uzcp21Z9u9Tcb7CRd9tdResfhxgw3FJzpxyeewPUav6yNTuDrRVxyQCPM 9XzTXzx9 YgIekvy13/sw41tlI8oaIgrSC1Nh2AyLJgpIPRfdy+On4WgkzrFeVVOLapg4aniceMwJGJTnl22Bf/hl42sJyFxjGoqYmWQGPBzwdPEZlhSiOHZvDtoi8Ok9i3Gpq27I0QI1vC/hJsW6eFW8Egg5ZradBsIWbpB13sTXm03VsmgY6KCdw+pdEoKOqNA== 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 Fri, Sep 15, 2023 at 09:51:26AM +0000, Daniel Gomez wrote: > + xas_for_each(&xas, folio, max) { > + if (xas_retry(&xas, folio)) > continue; > - if (xa_is_value(page)) > - swapped++; > + if (xa_is_value(folio)) > + swapped += (folio_nr_pages(folio)); Unnecessary parens. > @@ -1006,10 +1006,12 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, > folio = fbatch.folios[i]; > > if (xa_is_value(folio)) { > + long swaps_freed; > if (unfalloc) > continue; > - nr_swaps_freed += !shmem_free_swap(mapping, > - indices[i], folio); > + swaps_freed = folio_nr_pages(folio); > + if (!shmem_free_swap(mapping, indices[i], folio)) > + nr_swaps_freed += swaps_freed; Broader change (indeed, in a separate patch), why not make shmem_free_swap() return the number of pages freed, rather than returning an errno? > @@ -1075,14 +1077,16 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, > folio = fbatch.folios[i]; > > if (xa_is_value(folio)) { > + long swaps_freed; > if (unfalloc) > continue; > + swaps_freed = folio_nr_pages(folio); > if (shmem_free_swap(mapping, indices[i], folio)) { > /* Swap was replaced by page: retry */ > index = indices[i]; > break; > } > - nr_swaps_freed++; > + nr_swaps_freed += swaps_freed; > continue; ... seems like both callers would prefer that.