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 CAEF5C43334 for ; Fri, 17 Jun 2022 08:29:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3DAD66B0078; Fri, 17 Jun 2022 04:29:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 38A576B007B; Fri, 17 Jun 2022 04:29:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 251E86B007D; Fri, 17 Jun 2022 04:29:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 134656B0078 for ; Fri, 17 Jun 2022 04:29:32 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id 10E3E8155E for ; Fri, 17 Jun 2022 08:29:31 +0000 (UTC) X-FDA: 79587053742.25.561003B Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by imf16.hostedemail.com (Postfix) with ESMTP id 9ADE318008C for ; Fri, 17 Jun 2022 08:29:30 +0000 (UTC) Received: by mail-ej1-f54.google.com with SMTP id n10so7400711ejk.5 for ; Fri, 17 Jun 2022 01:29:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=YTuPF5XEzCGBKJ3Isq0bPgMxP/V4UajwZO7gE1YaLpc=; b=GoVqNBv9H1LhebEz9+6aVsx7lIOjd3cHR731EwA8XaVvr93MxC43SgEG94XHPsqYZu yrt5xKukgyY+f6q7bax0dMt47Xl7UNOg7LdT0xNbQgOHMkuWSRl2JD1ozEEHqhPw5x5+ VJoYEm5E8LY5elO0ptF4jqhBW/OoltUrJFCMU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=YTuPF5XEzCGBKJ3Isq0bPgMxP/V4UajwZO7gE1YaLpc=; b=5w50um7FsaNymX3OBK7Hgz1cQ/SK1OfitzeBTtNO1EeFKk/okll2xhYlXeGawaYHh+ SxC31RPMSXg/gjsWPlPMWcBnkMs5LW0hziwfVVpVZFvhel7g/3p1LSR84p4k6R93qEtA diIUvYfJ3/GzdUaJo2GxxinRJCD1Vaj4Ipd5tjYy51DLD1MM1Lp05qImK/4EavP0P7JS EaZxgsGtbHm7X3plLbONokH+i4XCyIPDLcYapdBbjYxbWUV0DslCM+n1VkpQgvGIhDtj IriWWM+GWg/RtoHTW3S5Arr0D+fTW6OVf6P9TVPcZxDTa/0hnksiSVycr7Ie8zewdtV8 irBw== X-Gm-Message-State: AJIora8cZMp5sfY8oBEP6nftvIihpVhGRmK4MSbCdhHybhWqjOGABZie FyAvO66d7R2l4v8nq3PS2AJ0fjFB03Xh98EFN8JUNA== X-Google-Smtp-Source: AGRyM1u73FI2QNVjoIx4iM/dQYqInoO0y/XWGhHUClbTPLVyZ8NsiD1XihY2D04rCpC+iyM7Ceg+BgHIdFfDbdiIixo= X-Received: by 2002:a17:907:868f:b0:702:f865:55de with SMTP id qa15-20020a170907868f00b00702f86555demr8340167ejc.24.1655454569043; Fri, 17 Jun 2022 01:29:29 -0700 (PDT) MIME-Version: 1.0 References: <20220613082802.1301238-4-hsinyi@chromium.org> <20220617030345.24712-1-phillip@squashfs.org.uk> In-Reply-To: <20220617030345.24712-1-phillip@squashfs.org.uk> From: Hsin-Yi Wang Date: Fri, 17 Jun 2022 16:29:03 +0800 Message-ID: Subject: Re: [PATCH 4/3] squashfs: support reading fragments in readahead call To: Phillip Lougher Cc: Xiongwei.Song@windriver.com, akpm@linux-foundation.org, houtao1@huawei.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, m.szyprowski@samsung.com, miaoxie@huawei.com, squashfs-devel@lists.sourceforge.net, willy@infradead.org, yi.zhang@huawei.com, zhengliang6@huawei.com Content-Type: text/plain; charset="UTF-8" ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=GoVqNBv9; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf16.hostedemail.com: domain of hsinyi@chromium.org designates 209.85.218.54 as permitted sender) smtp.mailfrom=hsinyi@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655454570; 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=YTuPF5XEzCGBKJ3Isq0bPgMxP/V4UajwZO7gE1YaLpc=; b=x3mp91d75X8777kmWqvGu1Xj61vU+6A+roBrms1SJV80BB+Gu/7jdOfPocNB+VkDI+jObl zK6qiW1Mj+QIVbwf+vyfg4/S3t9anu9NByQkhU+unluWZkYdSvSdt/cloOnxcprFIA3pyj fvP6EUn7E0swONIfIQPnP4wAgj9bCXo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655454570; a=rsa-sha256; cv=none; b=gwbjXhZ8Auf0HjQG+DsG32AwD+pWr6BdR/E4LchCoQsXqkzKE8Nh1sn2aLDXxo2CxGRuUa azktm43O7avBmMys3AD3ZSwKFAJqCpBGGtBB0Lo0ltE1/k8Oj0JVgtc+Og4o40kn+PgxDu Q2+kaLXxbdJLKxWivCk6v0nxbWEEmuE= X-Rspam-User: X-Stat-Signature: 7dadpcc7jam9gjuc3bsw8ajgwzicqzep X-Rspamd-Queue-Id: 9ADE318008C Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=GoVqNBv9; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf16.hostedemail.com: domain of hsinyi@chromium.org designates 209.85.218.54 as permitted sender) smtp.mailfrom=hsinyi@chromium.org X-Rspamd-Server: rspam05 X-HE-Tag: 1655454570-194777 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, Jun 17, 2022 at 11:04 AM Phillip Lougher wrote: > > This patch adds a function which can be used to read fragments in the > readahead call. > > This function is necessary because filesystems built with the -tailends > (or -always-use-fragments) option may have fragments present which > cannot be currently handled. > > Signed-off-by: Phillip Lougher > --- > fs/squashfs/file.c | 35 +++++++++++++++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > > diff --git a/fs/squashfs/file.c b/fs/squashfs/file.c > index f0c64ee272d5..3a4cce16d7da 100644 > --- a/fs/squashfs/file.c > +++ b/fs/squashfs/file.c > @@ -497,6 +497,41 @@ static int squashfs_read_folio(struct file *file, struct folio *folio) > return res; > } > > +static unsigned int squashfs_readahead_fragment(struct page **page, hi Phillip, Since the buffer->error is int, and also the variable to receive the value is res, I modified it when sending it with the series, though it won't affect the result. > + unsigned int pages, unsigned int expected) > +{ > + struct inode *inode = page[0]->mapping->host; > + struct squashfs_cache_entry *buffer = squashfs_get_fragment(inode->i_sb, > + squashfs_i(inode)->fragment_block, > + squashfs_i(inode)->fragment_size); > + struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; > + unsigned int n, mask = (1 << (msblk->block_log - PAGE_SHIFT)) - 1; > + > + if (buffer->error) > + goto out; > + > + expected += squashfs_i(inode)->fragment_offset; > + > + for (n = 0; n < pages; n++) { > + unsigned int base = (page[n]->index & mask) << PAGE_SHIFT; > + unsigned int offset = base + squashfs_i(inode)->fragment_offset; > + > + if (expected > offset) { > + unsigned int avail = min_t(unsigned int, expected - > + offset, PAGE_SIZE); > + > + squashfs_fill_page(page[n], buffer, offset, avail); > + } > + > + unlock_page(page[n]); > + put_page(page[n]); > + } > + > +out: > + squashfs_cache_put(buffer); > + return buffer->error; > +} > + > static void squashfs_readahead(struct readahead_control *ractl) > { > struct inode *inode = ractl->mapping->host; > -- > 2.34.1 >