From nobody Thu Apr 9 12:07:36 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F592C54EE9 for ; Tue, 13 Sep 2022 11:06:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231874AbiIMLGx (ORCPT ); Tue, 13 Sep 2022 07:06:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231497AbiIMLGp (ORCPT ); Tue, 13 Sep 2022 07:06:45 -0400 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58E274662D for ; Tue, 13 Sep 2022 04:06:44 -0700 (PDT) Received: by mail-pl1-x635.google.com with SMTP id p18so11435700plr.8 for ; Tue, 13 Sep 2022 04:06:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:from:to:cc:subject:date; bh=Dna0jbzOe4cc+tkUwZnxiT+7ajfuKJQBNUXCBRN9zpY=; b=FguiKJYDPfwB9opcnzRmp2m7Zjz6vt088E9qXaPs3WSu56u5B8mDrVpjUGSZAL/DFg spRLkGQTl9+E2SJlbOX4bBumtrUVAJh0IyzqXs46lF4iPT1CAvIkIvdMdY4D0JwfZul0 blbmcBWbFuShVxk36ZmO1qNTGzC6COchLgHoFKP+JXtrApoEFApNNwZp4d/T724+J8J8 KLLAeUkw0eu2IEafc9Colz+7Rxk2OudJ3HnxKEys+F7HYrx9eKeovEKFTzrWxffv005K Bl1VHPPFxUJHI9tvJpL1yRXXmzTIHoOVHs3fJZNFl7Yh5qGHQSDlCGAdy4hYjTshbzTg AQSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date; bh=Dna0jbzOe4cc+tkUwZnxiT+7ajfuKJQBNUXCBRN9zpY=; b=5dX6B1MMubuhNWeQlTzKuZ2PHQih7XIGc0qQztaNaIXqhQTtV2+CxKXrgX3Tt1ffsB tGYTDSYJc4gIrZ1Mw+GTZMpwFjTsJd8NDmMJOMfoMXdxLzlsuW3Phys8zafQVt5+06aI qAQALw3cn/E3qsav4ewV05+J5VuTgcjHVUBU1SsM8kwY5P/zjbfqSnBaejy7boPr1gid I3sWy6TupxgdiCbF4tT6Bl8S0haGHuFdoxC76kO4iPmg//eHK8gVvGTFCNJTJMkq2u/O gYuweAMiWmxcA97LBZtTYrG/Inp33XpOWEDv+zHnR8Jo746XIcNvRujJMQZZo4mLBM1Q PjyA== X-Gm-Message-State: ACgBeo1cUbuM/5ydfijzCXIgpAkM+MucEf2GU9pTf6c0OWk9gMYm8gNV d0NoGfpNGRDjcsn3qU8DjrI= X-Google-Smtp-Source: AA6agR7hbfK/XhnYBW4UGtVSi43kFhgabslRYF4wkTOloB+sM7cGUSDPDfKT5ZIksBdwlnEv+9fjdQ== X-Received: by 2002:a17:90b:1e0d:b0:202:91ec:e167 with SMTP id pg13-20020a17090b1e0d00b0020291ece167mr3351243pjb.174.1663067203891; Tue, 13 Sep 2022 04:06:43 -0700 (PDT) Received: from localhost.localdomain ([156.236.96.165]) by smtp.gmail.com with ESMTPSA id cm3-20020a17090afa0300b002000d577cc3sm6888658pjb.55.2022.09.13.04.06.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 04:06:43 -0700 (PDT) From: Yue Hu To: xiang@kernel.org, chao@kernel.org Cc: linux-erofs@lists.ozlabs.org, linux-kernel@vger.kernel.org, zhangwen@coolpad.com, shaojunjun@coolpad.com, zbestahu@gmail.com, Yue Hu Subject: [RFC PATCH v4 1/2] erofs: support interlaced uncompressed data for compressed files Date: Tue, 13 Sep 2022 19:05:51 +0800 Message-Id: <2ef3d0fb6d1fa2d036ad4217d474d6efd12f63b9.1663066966.git.huyue2@coolpad.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yue Hu Currently, uncompressed data is all handled in the shifted way, which means we have to shift the whole on-disk plain pcluster to get the logical data. However, since we are also using in-place I/O for uncompressed data, data copy will be reduced a lot if pcluster is recorded in the interlaced way as illustrated below: _______________________________________________________________ | | | |_ tail part |_ head part _| |<- blk0 ->| .. |<- blkn-2 ->|<- blkn-1 ->| The logical data then becomes: ________________________________________________________ |_ head part _|_ blk0 _| .. |_ blkn-2 _|_ tail part _| In addition, non-4k plain pclusters are also survived by the interlaced way, which can be used for non-4k lclusters as well. However, it's almost impossible to de-duplicate uncompressed data in the interlaced way, therefore shifted uncompressed data is still useful. Signed-off-by: Yue Hu Reviewed-by: Gao Xiang --- fs/erofs/decompressor.c | 47 ++++++++++++++++++++++++----------------- fs/erofs/erofs_fs.h | 2 ++ fs/erofs/internal.h | 1 + fs/erofs/zmap.c | 14 ++++++++---- 4 files changed, 41 insertions(+), 23 deletions(-) diff --git a/fs/erofs/decompressor.c b/fs/erofs/decompressor.c index 2d55569f96ac..51b7ac7166d9 100644 --- a/fs/erofs/decompressor.c +++ b/fs/erofs/decompressor.c @@ -317,52 +317,61 @@ static int z_erofs_lz4_decompress(struct z_erofs_deco= mpress_req *rq, return ret; } =20 -static int z_erofs_shifted_transform(struct z_erofs_decompress_req *rq, - struct page **pagepool) +static int z_erofs_transform_plain(struct z_erofs_decompress_req *rq, + struct page **pagepool) { - const unsigned int nrpages_out =3D + const unsigned int inpages =3D PAGE_ALIGN(rq->inputsize) >> PAGE_SHIFT; + const unsigned int outpages =3D PAGE_ALIGN(rq->pageofs_out + rq->outputsize) >> PAGE_SHIFT; const unsigned int righthalf =3D min_t(unsigned int, rq->outputsize, PAGE_SIZE - rq->pageofs_out); const unsigned int lefthalf =3D rq->outputsize - righthalf; + const unsigned int interlaced_offset =3D + rq->alg =3D=3D Z_EROFS_COMPRESSION_SHIFTED ? 0 : rq->pageofs_out; unsigned char *src, *dst; =20 - if (nrpages_out > 2) { + if (outpages > 2 && rq->alg =3D=3D Z_EROFS_COMPRESSION_SHIFTED) { DBG_BUGON(1); - return -EIO; + return -EFSCORRUPTED; } =20 if (rq->out[0] =3D=3D *rq->in) { - DBG_BUGON(nrpages_out !=3D 1); + DBG_BUGON(rq->pageofs_out); return 0; } =20 - src =3D kmap_atomic(*rq->in) + rq->pageofs_in; + src =3D kmap_local_page(rq->in[inpages - 1]) + rq->pageofs_in; if (rq->out[0]) { - dst =3D kmap_atomic(rq->out[0]); - memcpy(dst + rq->pageofs_out, src, righthalf); - kunmap_atomic(dst); + dst =3D kmap_local_page(rq->out[0]); + memcpy(dst + rq->pageofs_out, src + interlaced_offset, + righthalf); + kunmap_local(dst); } =20 - if (nrpages_out =3D=3D 2) { - DBG_BUGON(!rq->out[1]); - if (rq->out[1] =3D=3D *rq->in) { + if (outpages > inpages) { + DBG_BUGON(!rq->out[outpages - 1]); + if (rq->out[outpages - 1] !=3D rq->in[inpages - 1]) { + dst =3D kmap_local_page(rq->out[outpages - 1]); + memcpy(dst, interlaced_offset ? src : + (src + righthalf), lefthalf); + kunmap_local(dst); + } else if (!interlaced_offset) { memmove(src, src + righthalf, lefthalf); - } else { - dst =3D kmap_atomic(rq->out[1]); - memcpy(dst, src + righthalf, lefthalf); - kunmap_atomic(dst); } } - kunmap_atomic(src); + kunmap_local(src); return 0; } =20 static struct z_erofs_decompressor decompressors[] =3D { [Z_EROFS_COMPRESSION_SHIFTED] =3D { - .decompress =3D z_erofs_shifted_transform, + .decompress =3D z_erofs_transform_plain, .name =3D "shifted" }, + [Z_EROFS_COMPRESSION_INTERLACED] =3D { + .decompress =3D z_erofs_transform_plain, + .name =3D "interlaced" + }, [Z_EROFS_COMPRESSION_LZ4] =3D { .decompress =3D z_erofs_lz4_decompress, .name =3D "lz4" diff --git a/fs/erofs/erofs_fs.h b/fs/erofs/erofs_fs.h index 2b48373f690b..5c1de6d7ad71 100644 --- a/fs/erofs/erofs_fs.h +++ b/fs/erofs/erofs_fs.h @@ -295,11 +295,13 @@ struct z_erofs_lzma_cfgs { * bit 1 : HEAD1 big pcluster (0 - off; 1 - on) * bit 2 : HEAD2 big pcluster (0 - off; 1 - on) * bit 3 : tailpacking inline pcluster (0 - off; 1 - on) + * bit 4 : interlaced plain pcluster (0 - off; 1 - on) */ #define Z_EROFS_ADVISE_COMPACTED_2B 0x0001 #define Z_EROFS_ADVISE_BIG_PCLUSTER_1 0x0002 #define Z_EROFS_ADVISE_BIG_PCLUSTER_2 0x0004 #define Z_EROFS_ADVISE_INLINE_PCLUSTER 0x0008 +#define Z_EROFS_ADVISE_INTERLACED_PCLUSTER 0x0010 =20 struct z_erofs_map_header { __le16 h_reserved1; diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index cfee49d33b95..f3ed36445d73 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -436,6 +436,7 @@ struct erofs_map_blocks { =20 enum { Z_EROFS_COMPRESSION_SHIFTED =3D Z_EROFS_COMPRESSION_MAX, + Z_EROFS_COMPRESSION_INTERLACED, Z_EROFS_COMPRESSION_RUNTIME_MAX }; =20 diff --git a/fs/erofs/zmap.c b/fs/erofs/zmap.c index d58549ca1df9..7196235a441c 100644 --- a/fs/erofs/zmap.c +++ b/fs/erofs/zmap.c @@ -679,12 +679,18 @@ static int z_erofs_do_map_blocks(struct inode *inode, goto out; } =20 - if (m.headtype =3D=3D Z_EROFS_VLE_CLUSTER_TYPE_PLAIN) - map->m_algorithmformat =3D Z_EROFS_COMPRESSION_SHIFTED; - else if (m.headtype =3D=3D Z_EROFS_VLE_CLUSTER_TYPE_HEAD2) + if (m.headtype =3D=3D Z_EROFS_VLE_CLUSTER_TYPE_PLAIN) { + if (vi->z_advise & Z_EROFS_ADVISE_INTERLACED_PCLUSTER) + map->m_algorithmformat =3D + Z_EROFS_COMPRESSION_INTERLACED; + else + map->m_algorithmformat =3D + Z_EROFS_COMPRESSION_SHIFTED; + } else if (m.headtype =3D=3D Z_EROFS_VLE_CLUSTER_TYPE_HEAD2) { map->m_algorithmformat =3D vi->z_algorithmtype[1]; - else + } else { map->m_algorithmformat =3D vi->z_algorithmtype[0]; + } =20 if ((flags & EROFS_GET_BLOCKS_FIEMAP) || ((flags & EROFS_GET_BLOCKS_READMORE) && --=20 2.17.1