Received: by 2002:a5d:925a:0:0:0:0:0 with SMTP id e26csp961309iol; Thu, 9 Jun 2022 18:58:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvjsDZNOtdhb01ACd5leubHQJb67acNGMMxNUR/0FoqEYQ0ETonDnUBaSWrzS4SVmwziyH X-Received: by 2002:a62:1dc6:0:b0:51b:fee0:ecc0 with SMTP id d189-20020a621dc6000000b0051bfee0ecc0mr28631960pfd.85.1654826300605; Thu, 09 Jun 2022 18:58:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654826300; cv=none; d=google.com; s=arc-20160816; b=fxJod8zuUat7JPgq8LjhtSaoFFMYEA4ZirjY7+N4JQEsd52pQ3SIOe60a5JYenoJ8W X8CXRHSQR1W4ORVK0uN1vm94xMBG+rYacIk0UK/JlhDa3rXWxL1Uq7Kfe/lXgPludEu/ M+9VS466LwTyddQL0Dn2S4bklwSlyfKvZbWZihSGb32tgyuPy/JQ77SUcmFp7tyMhVmW EOdqmKDHzp8sFrtindKPBKtvXf6ecjNHD1UiG1OyPafqDr6SbqZB2//QBW+tEFYgZJb3 zxYCGi04PqaLH/7t3cioP175FbZEov5ZkEdcyhqu+/MOXTbpb2TmsaDr5+gZUmuZVi/s /FvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=eMc32X/LG6Z8TwD+zNHEh+hFbaMCmqWi0/o54N9U4X0=; b=b3cZyfqW2bJKsPzGJtsMUxFPd+JzIYp+a4gXenkFigTsKceCkp1CHVQowMQ2+xE7q1 AxO7fR3F0+IKEYzFGIbPXd015Tbq8z1zG+Rj4A2iYjx0w/UJIwiMrWfLiNlVH3+kslZW rdDiVj/9SRkeu/A2T+1nnYCiUotbYJt3f3CmtiBZBUEy4Q8uQ1LbqxjEit2tuqq/femP 5a43kGlKguKx9EQLxW6apq06fQswH5v9/GlnVhby3lfBo2mzX98W5X4UqGlM5vMtptfd AxOIyG3Qwo+46ycDi4kco7s3Lnh3N1uHQb3iWLTlnZaYuNVLIrWW2ByPkXSoBBVMKbPw 169Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="V/T2/cF7"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s4-20020a170902988400b00167895fb8f1si13970969plp.137.2022.06.09.18.58.05; Thu, 09 Jun 2022 18:58:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="V/T2/cF7"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S241438AbiFJBcv (ORCPT + 99 others); Thu, 9 Jun 2022 21:32:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231573AbiFJBcs (ORCPT ); Thu, 9 Jun 2022 21:32:48 -0400 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB11D232A44 for ; Thu, 9 Jun 2022 18:32:47 -0700 (PDT) Received: by mail-pf1-x430.google.com with SMTP id 187so22554312pfu.9 for ; Thu, 09 Jun 2022 18:32:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=eMc32X/LG6Z8TwD+zNHEh+hFbaMCmqWi0/o54N9U4X0=; b=V/T2/cF72+nZ5rzDzZ9B3IznZY7IG20V9kaZ9Bt3L1B5jSrEMVpwGF8ipKZN9BvJX5 CnSip0HuZzrHxWPj4sI61mF+f2qVcd/MSiF7wZDBKTMiyPTM8P8HC8MSl7uAA2K3gJAb GGPNj38ifWROv2uwLLspF5+tVZqmmNqF9Kj/3vlnS5vsvXXEFZK6jenDpgAFRliQo1g0 kwQ0Xy14y9vjvgPk1vMUvmKEbf12YbGgu8szSpbe3nUIJAKpCkDqr0axx2gjwOUA+/Gg Bd8hPgGKJpBzAmFKMtaNeY4VfYcyf1ndUjjHeByx8KFNZ+d7KrCS6JQaIuCSGhlYhUok I7hQ== 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=eMc32X/LG6Z8TwD+zNHEh+hFbaMCmqWi0/o54N9U4X0=; b=eF0ro0i13crt6u562VSFyMdK9vq2Yjg3Org4Bfy6OH6imQDMk7/a3J8GHI9snqwClR cIMT4w3p3ZuZQvNb1uDna9pquoXuPj05v+QeOLwIpaCQq0kkxK3/CkOzhCHqh60n4EoP czbbEt4T8/Lp67cm7f3SJYYlIKC3H9WLFStaCq8fqRYLfDNgk/ykVpyaVfrix4d4oLcG R9x0NQnKgKJjUbcOi8YztbZT+gX4veTPbkPFtyJpPmMZ7wkTJih9H2mw0yqL47vmcTBT Xd6PsmdTH/tOMzszutwsKSKHapgGfg481ve8i6wMzfBxJrm9RUk3c09fTxqJcahyJ5Va HNIg== X-Gm-Message-State: AOAM532ESXaz5QoCWyizNubWuzPcq/pc3xH7gOlEEjaaJ/D26x2hbgY8 54xtkt3Tynnw43ssw+cHyb4U2h0nNt0gvLKufCyQ1xsIh6wir+hm X-Received: by 2002:a65:5504:0:b0:3fb:ac7a:ac1e with SMTP id f4-20020a655504000000b003fbac7aac1emr37635913pgr.476.1654824767177; Thu, 09 Jun 2022 18:32:47 -0700 (PDT) MIME-Version: 1.0 References: <20220606150305.1883410-1-hsinyi@chromium.org> <20220606150305.1883410-4-hsinyi@chromium.org> In-Reply-To: From: Xiongwei Song Date: Fri, 10 Jun 2022 09:32:20 +0800 Message-ID: Subject: Re: [PATCH v5 3/3] squashfs: implement readahead To: Hsin-Yi Wang Cc: Phillip Lougher , Matthew Wilcox , Xiongwei Song , Marek Szyprowski , Andrew Morton , Zheng Liang , Zhang Yi , Hou Tao , Miao Xie , "linux-mm @ kvack . org" , "squashfs-devel @ lists . sourceforge . net" , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 9, 2022 at 10:46 PM Xiongwei Song wrote: > > This version is bad for my test. I ran the test below > "for cnt in $(seq 0 9); do echo 3 > /proc/sys/vm/drop_caches; echo > "Loop ${cnt}:"; time -v find /software/test[0-9][0-9] | xargs -P 24 -i > cat {} > /dev/null 2>/dev/null; echo ""; done" > in 90 partitions. > > With 9eec1d897139 reverted: Sorry, it's with readahead enabled in linux 5.10. Regards, Xiongwei > 1:06.18 (1m + 6.18s) > 1:05.65 > 1:06.34 > 1:06.88 > 1:06.52 > 1:06.78 > 1:06.61 > 1:06.99 > 1:06.60 > 1:06.79 > > With this version: > 2:36.85 (2m + 36.85s) > 2:28.89 > 1:43.46 > 1:41.50 > 1:42.75 > 1:43.46 > 1:43.67 > 1:44.41 > 1:44.91 > 1:45.44 > > Any thoughts? > > Regards, > Xiongwei > > On Mon, Jun 6, 2022 at 11:03 PM Hsin-Yi Wang wrote: > > > > Implement readahead callback for squashfs. It will read datablocks > > which cover pages in readahead request. For a few cases it will > > not mark page as uptodate, including: > > - file end is 0. > > - zero filled blocks. > > - current batch of pages isn't in the same datablock. > > - decompressor error. > > Otherwise pages will be marked as uptodate. The unhandled pages will be > > updated by readpage later. > > > > Suggested-by: Matthew Wilcox > > Signed-off-by: Hsin-Yi Wang > > Reported-by: Matthew Wilcox > > Reported-by: Phillip Lougher > > Reported-by: Xiongwei Song > > Reported-by: Marek Szyprowski > > Reported-by: Andrew Morton > > --- > > v4->v5: > > - Handle short file cases reported by Marek and Matthew. > > - Fix checkpatch error reported by Andrew. > > > > v4: https://lore.kernel.org/lkml/20220601103922.1338320-4-hsinyi@chromium.org/ > > v3: https://lore.kernel.org/lkml/20220523065909.883444-4-hsinyi@chromium.org/ > > v2: https://lore.kernel.org/lkml/20220517082650.2005840-4-hsinyi@chromium.org/ > > v1: https://lore.kernel.org/lkml/20220516105100.1412740-3-hsinyi@chromium.org/ > > --- > > fs/squashfs/file.c | 124 ++++++++++++++++++++++++++++++++++++++++++++- > > 1 file changed, 123 insertions(+), 1 deletion(-) > > > > diff --git a/fs/squashfs/file.c b/fs/squashfs/file.c > > index a8e495d8eb86..fbd096cd15f4 100644 > > --- a/fs/squashfs/file.c > > +++ b/fs/squashfs/file.c > > @@ -39,6 +39,7 @@ > > #include "squashfs_fs_sb.h" > > #include "squashfs_fs_i.h" > > #include "squashfs.h" > > +#include "page_actor.h" > > > > /* > > * Locate cache slot in range [offset, index] for specified inode. If > > @@ -495,7 +496,128 @@ static int squashfs_read_folio(struct file *file, struct folio *folio) > > return 0; > > } > > > > +static void squashfs_readahead(struct readahead_control *ractl) > > +{ > > + struct inode *inode = ractl->mapping->host; > > + struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; > > + size_t mask = (1UL << msblk->block_log) - 1; > > + unsigned short shift = msblk->block_log - PAGE_SHIFT; > > + loff_t start = readahead_pos(ractl) & ~mask; > > + size_t len = readahead_length(ractl) + readahead_pos(ractl) - start; > > + struct squashfs_page_actor *actor; > > + unsigned int nr_pages = 0; > > + struct page **pages; > > + int i, file_end = i_size_read(inode) >> msblk->block_log; > > + unsigned int max_pages = 1UL << shift; > > + > > + readahead_expand(ractl, start, (len | mask) + 1); > > + > > + if (file_end == 0) > > + return; > > + > > + pages = kmalloc_array(max_pages, sizeof(void *), GFP_KERNEL); > > + if (!pages) > > + return; > > + > > + actor = squashfs_page_actor_init_special(pages, max_pages, 0); > > + if (!actor) > > + goto out; > > + > > + for (;;) { > > + pgoff_t index; > > + int res, bsize; > > + u64 block = 0; > > + unsigned int expected; > > + > > + nr_pages = __readahead_batch(ractl, pages, max_pages); > > + if (!nr_pages) > > + break; > > + > > + if (readahead_pos(ractl) >= i_size_read(inode)) > > + goto skip_pages; > > + > > + index = pages[0]->index >> shift; > > + if ((pages[nr_pages - 1]->index >> shift) != index) > > + goto skip_pages; > > + > > + expected = index == file_end ? > > + (i_size_read(inode) & (msblk->block_size - 1)) : > > + msblk->block_size; > > + > > + bsize = read_blocklist(inode, index, &block); > > + if (bsize == 0) > > + goto skip_pages; > > + > > + if (nr_pages < max_pages) { > > + struct squashfs_cache_entry *buffer; > > + unsigned int block_mask = max_pages - 1; > > + int offset = pages[0]->index - (pages[0]->index & ~block_mask); > > + > > + buffer = squashfs_get_datablock(inode->i_sb, block, > > + bsize); > > + if (buffer->error) { > > + squashfs_cache_put(buffer); > > + goto skip_pages; > > + } > > + > > + expected -= offset * PAGE_SIZE; > > + for (i = 0; i < nr_pages && expected > 0; i++, > > + expected -= PAGE_SIZE, offset++) { > > + int avail = min_t(int, expected, PAGE_SIZE); > > + > > + squashfs_fill_page(pages[i], buffer, > > + offset * PAGE_SIZE, avail); > > + unlock_page(pages[i]); > > + } > > + > > + squashfs_cache_put(buffer); > > + continue; > > + } > > + > > + res = squashfs_read_data(inode->i_sb, block, bsize, NULL, > > + actor); > > + > > + if (res == expected) { > > + int bytes; > > + > > + /* Last page may have trailing bytes not filled */ > > + bytes = res % PAGE_SIZE; > > + if (bytes) { > > + void *pageaddr; > > + > > + pageaddr = kmap_atomic(pages[nr_pages - 1]); > > + memset(pageaddr + bytes, 0, PAGE_SIZE - bytes); > > + kunmap_atomic(pageaddr); > > + } > > + > > + for (i = 0; i < nr_pages; i++) { > > + flush_dcache_page(pages[i]); > > + SetPageUptodate(pages[i]); > > + } > > + } > > + > > + for (i = 0; i < nr_pages; i++) { > > + unlock_page(pages[i]); > > + put_page(pages[i]); > > + } > > + } > > + > > + kfree(actor); > > + kfree(pages); > > + return; > > + > > +skip_pages: > > + for (i = 0; i < nr_pages; i++) { > > + unlock_page(pages[i]); > > + put_page(pages[i]); > > + } > > + > > + kfree(actor); > > +out: > > + kfree(pages); > > +} > > > > const struct address_space_operations squashfs_aops = { > > - .read_folio = squashfs_read_folio > > + .read_folio = squashfs_read_folio, > > + .readahead = squashfs_readahead > > }; > > -- > > 2.36.1.255.ge46751e96f-goog > > > >