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 390C4EE645A for ; Fri, 15 Sep 2023 12:15:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AF6506B0338; Fri, 15 Sep 2023 08:15:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AA5F76B0340; Fri, 15 Sep 2023 08:15:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 995396B0342; Fri, 15 Sep 2023 08:15:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 8AD396B0338 for ; Fri, 15 Sep 2023 08:15:12 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 62ABE803D5 for ; Fri, 15 Sep 2023 12:15:12 +0000 (UTC) X-FDA: 81238726464.08.148DB9C Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id 5108540013 for ; Fri, 15 Sep 2023 12:15:10 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hh6qr8cf; dmarc=none; spf=none (imf07.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=1694780110; 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=9cnxnW7ESMZ0JG3goy/SixkPNAd8GwuVMtcmWWhCh8M=; b=M79CCnxUAwmrPVvt50JbXAgltIAWQw9XXyerQduAKLgMZMLIC3GeCMLo5eyxWPoJLVm/Ib AI6izijQAtnS4m6QD194BzsGbT3bUDyUPasv0Idcsas9Gf9Ecnv+u7Y3+ZPbbyEd2puNK0 3QF+g1SxhouA2N6aWO7l9Pm0fqxKAVc= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hh6qr8cf; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694780110; a=rsa-sha256; cv=none; b=t4XnJdzA99IE969Fne/rEUk+dAd3mJPyoxesZ3JpfxdhQT41m5ChwvHgouO7JtM8O7u8O4 YP+M7INEoApYjen9YA5P04Zw7nJFUc6iUjV6el7VFcX93f1p4GkF+pXSfkmOibvoTkwuVs lo0LhkiNFsSQaV6U9ZWxbNQxZ5ZN5IY= 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=9cnxnW7ESMZ0JG3goy/SixkPNAd8GwuVMtcmWWhCh8M=; b=hh6qr8cfEsfSY8d709qeQzGUkh UqWbKETiUA6IhftO6ApR9FkEpzteHmM+8ekxGG4ssTV4swSkqsb1TXp7TEXFZmosyzLUBBOxCxCrV lUG8Crmn4dfj7jxugqd8oCM8Q/6igBT/i9H9+7IY7mFu9sfs0InzwaJ8D82+W1GJtsjHT1LAMul5E lGrj/xb0Tk2yDdB26P2rvy6GpP88l0V3thIIOSknLo2fVBpglW/ONxUboUlhJ4vZEzqDRpK53DDT/ f4aWb4/Nm9XHkK57VOp7Rr4oRjRAmnJWS0/bZp2jyLt65GoP4gBWCbe9R83/9KVSRXryzj9mZRKd3 wJ9rqGzA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qh7iq-009cFS-1s; Fri, 15 Sep 2023 12:14:56 +0000 Date: Fri, 15 Sep 2023 13:14:55 +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-Queue-Id: 5108540013 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: a937eyhei14g7b1btmjqp9gdtksywc1y X-HE-Tag: 1694780110-122216 X-HE-Meta: U2FsdGVkX1/JAjvRo48htYhNBrT3FzLp2Mu8x+uekKOHBSvPkWXfzDLCFLCogb11ki14PhvLkN/v5gISDhVyiXXVoc0YgxulyfJe9+fEZJ5Xlg1EvfEAIto5nJXFZOYybJbEJJu1KL7ff22IG1I2IkslyFRoOte9I4CPn0cXCkOt7proCEKWTI82C1DqpLHBk5CB0/7eVv/OFAOoMOGDbRZb0sJ5HH2SJ8JmI262fKLs/CEVUXcDZeTLzXttAhGvfMJyANNLYl3A2Ur5BqjDBCOYmNz6rYb17FBvTNMV4eeAvM7ngCsW6S2U011xzWDwyfsy9xd5THBNUEs9bX1zf3cqoi3bX/HMa0jEz+x1N25xPO9hXKOXEB3JGaCW7x/Th7ngwpxqZp/p3zkSXUELwPq44QyyhL6BjvnMCtZrNDujJNp7Vnter4GL73wP94cJu4DHuFqvzR6eWOALJpTh+9w0Qs/w4eqtr5DHJ+qViYAPr4ZWdrgctwqxx9/a+hszcZLqERNP7smuWJLqXW9AN0QxoWU9oHhKoAGHWL204Yhb8TqjqQkcHq698Babjw4KCvHQpSCDE05dwslT7YMcfDOp0c01izvwkOnlebwWGxztnyxky//2mVRaLN8VmGnZAsmBBzt7aMbcdRUJaMOSx//GS+pU1Q94pX7v0yHznFH0KZXsjGQXIDrHuZMEq94S3r6/kZguVbYrsZVAQCPydnOLwEsPbnz7R0GfeWNWOVbQXshHTAlMGxlT+9pTCfp6t5WNQctcfA3UF4ePXnduQFf5ovyfBXIOBYWlSp0hcMLIn4pZg1hJGsFpz20E8vERFoGmpX9zwqndic8NNI4CWAvzS8hS/V4reIROyc8paMQllXwRCRHvXLVxYtkm1hkbfpJZi3+MrOAjCUbxolpgMxeOkYI58FOGu7cQARrHe75DQdBJwEpsPLqUTBg2VmMrgr8PLa9DsEF2J/rvapT S+NQwkJJ J9mQdRuBmgocDvFLg5dou29F9f8rAJDIB4oI/IDxoSkoAwQjEC5ZYB8vF08jj4abLo5EcmKjciMqZyGxreRg6XGRUQcjh5MiHuw19iR0ZCwfmUYRRpsmJyG2hrSKXMoJZhZSl4ZcR/ZY7XojGLftK1rzchcbMnuRi6heCO1MsCUITfMHJiNZGxij3YGFb0FSMoDeqOUjcdAZ5b40= 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: > @@ -1810,13 +1815,14 @@ static void shmem_set_folio_swapin_error(struct inode *inode, pgoff_t index, > return; > > folio_wait_writeback(folio); > + num_swap_pages = folio_nr_pages(folio); > delete_from_swap_cache(folio); > /* > * Don't treat swapin error folio as alloced. Otherwise inode->i_blocks > * won't be 0 when inode is released and thus trigger WARN_ON(i_blocks) > * in shmem_evict_inode(). > */ > - shmem_recalc_inode(inode, -1, -1); > + shmem_recalc_inode(inode, num_swap_pages, num_swap_pages); Shouldn't that be -num_swap_pages? > swap_free(swap); > } > > @@ -1903,7 +1909,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, > if (error) > goto failed; > > - shmem_recalc_inode(inode, 0, -1); > + shmem_recalc_inode(inode, 0, folio_nr_pages(folio)); > > if (sgp == SGP_WRITE) > folio_mark_accessed(folio); Also here.