From: Nick Terrell via Linux-erofs <linux-erofs@lists.ozlabs.org>
To: Gao Xiang <hsiangkao@redhat.com>
Cc: "linux-erofs@lists.ozlabs.org" <linux-erofs@lists.ozlabs.org>,
LKML <linux-kernel@vger.kernel.org>,
Yann Collet <yann.collet.73@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
Miao Xie <miaoxie@huawei.com>
Subject: Re: [PATCH v2] lib/lz4: explicitly support in-place decompression
Date: Mon, 30 Nov 2020 18:19:34 +0000 [thread overview]
Message-ID: <73E0BBBC-434D-4877-8E43-F995F8F4FE25@fb.com> (raw)
In-Reply-To: <20201122030749.2698994-1-hsiangkao@redhat.com>
> On Nov 21, 2020, at 7:07 PM, Gao Xiang <hsiangkao@redhat.com> wrote:
>
> LZ4 final literal copy could be overlapped when doing
> in-place decompression, so it's unsafe to just use memcpy()
> on an optimized memcpy approach but memmove() instead.
>
> Upstream LZ4 has updated this years ago [1] (and the impact
> is non-sensible [2] plus only a few bytes remain), this commit
> just synchronizes LZ4 upstream code to the kernel side as well.
>
> It can be observed as EROFS in-place decompression failure
> on specific files when X86_FEATURE_ERMS is unsupported,
> memcpy() optimization of commit 59daa706fbec ("x86, mem:
> Optimize memcpy by avoiding memory false dependece") will
> be enabled then.
>
> Currently most modern x86-CPUs support ERMS, these CPUs just
> use "rep movsb" approach so no problem at all. However, it can
> still be verified with forcely disabling ERMS feature...
>
> arch/x86/lib/memcpy_64.S:
> ALTERNATIVE_2 "jmp memcpy_orig", "", X86_FEATURE_REP_GOOD, \
> - "jmp memcpy_erms", X86_FEATURE_ERMS
> + "jmp memcpy_orig", X86_FEATURE_ERMS
>
> We didn't observe any strange on arm64/arm/x86 platform before
> since most memcpy() would behave in an increasing address order
> ("copy upwards" [3]) and it's the correct order of in-place
> decompression but it really needs an update to memmove() for sure
> considering it's an undefined behavior according to the standard
> and some unique optimization already exists in the kernel.
>
> [1] https://github.com/lz4/lz4/commit/33cb8518ac385835cc17be9a770b27b40cd0e15b
> [2] https://github.com/lz4/lz4/pull/717#issuecomment-497818921
> [3] https://sourceware.org/bugzilla/show_bug.cgi?id=12518
> Cc: Yann Collet <yann.collet.73@gmail.com>
> Cc: Nick Terrell <terrelln@fb.com>
> Cc: Miao Xie <miaoxie@huawei.com>
> Cc: Chao Yu <yuchao0@huawei.com>
> Cc: Li Guifu <bluce.liguifu@huawei.com>
> Cc: Guo Xuenan <guoxuenan@huawei.com>
> Signed-off-by: Gao Xiang <hsiangkao@redhat.com>
> ---
> changes since v1:
> - refine commit message;
> - Cc more people.
>
> Hi Andrew,
>
> Could you kindly consider picking this patch up, although
> the impact is EROFS but it touchs in-kernel lz4 library
> anyway...
>
> Thanks,
> Gao Xiang
>
> lib/lz4/lz4_decompress.c | 6 +++++-
> lib/lz4/lz4defs.h | 1 +
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/lib/lz4/lz4_decompress.c b/lib/lz4/lz4_decompress.c
> index 00cb0d0b73e1..8a7724a6ce2f 100644
> --- a/lib/lz4/lz4_decompress.c
> +++ b/lib/lz4/lz4_decompress.c
> @@ -263,7 +263,11 @@ static FORCE_INLINE int LZ4_decompress_generic(
> }
> }
>
> - LZ4_memcpy(op, ip, length);
> + /*
> + * supports overlapping memory regions; only matters
> + * for in-place decompression scenarios
> + */
> + LZ4_memmove(op, ip, length);
> ip += length;
> op += length;
>
> diff --git a/lib/lz4/lz4defs.h b/lib/lz4/lz4defs.h
> index c91dd96ef629..673bd206aa98 100644
> --- a/lib/lz4/lz4defs.h
> +++ b/lib/lz4/lz4defs.h
> @@ -146,6 +146,7 @@ static FORCE_INLINE void LZ4_writeLE16(void *memPtr, U16 value)
> * environments. This is needed when decompressing the Linux Kernel, for example.
> */
> #define LZ4_memcpy(dst, src, size) __builtin_memcpy(dst, src, size)
> +#define LZ4_memmove(dst, src, size) __builtin_memmove(dst, src, size)
>
> static FORCE_INLINE void LZ4_copy8(void *dst, const void *src)
> {
> --
> 2.18.4
>
Looks good to me! You can add:
Reviewed-by: Nick Terrell <terrelln@fb.com>
next prev parent reply other threads:[~2020-11-30 18:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20201121191024.2631523-1-hsiangkao@redhat.com>
2020-11-22 3:07 ` [PATCH v2] lib/lz4: explicitly support in-place decompression Gao Xiang
2020-11-30 18:19 ` Nick Terrell via Linux-erofs [this message]
2020-11-30 18:54 ` Gao Xiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=73E0BBBC-434D-4877-8E43-F995F8F4FE25@fb.com \
--to=linux-erofs@lists.ozlabs.org \
--cc=akpm@linux-foundation.org \
--cc=hsiangkao@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=miaoxie@huawei.com \
--cc=terrelln@fb.com \
--cc=yann.collet.73@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).