From: Nick Terrell <terrelln@fb.com>

Since this is a large patch, I have also prepared a pull request as an
alternate means of fetching the commit:

The following changes since commit 7eb172143d5508b4da468ed59ee857c6e5e01da6:

  Linux 6.14-rc5 (2025-03-02 11:48:20 -0800)

are available in the Git repository at:

  https://github.com/terrelln/linux.git tags/2025-03-13-zstd-v1.5.7-v1

for you to fetch changes up to 65d1f5507ed2c78c64fce40e44e5574a9419eb09:

----------------------------------------------------------------
zstd: Import upstream v1.5.7

----------------------------------------------------------------

Nick Terrell (1):
  zstd: Import upstream v1.5.7

 include/linux/zstd.h                          |   87 +-
 include/linux/zstd_errors.h                   |   30 +-
 include/linux/zstd_lib.h                      | 1123 ++++--
 lib/zstd/Makefile                             |    3 +-
 lib/zstd/common/allocations.h                 |   56 +
 lib/zstd/common/bits.h                        |  150 +
 lib/zstd/common/bitstream.h                   |  155 +-
 lib/zstd/common/compiler.h                    |  151 +-
 lib/zstd/common/cpu.h                         |    3 +-
 lib/zstd/common/debug.c                       |    9 +-
 lib/zstd/common/debug.h                       |   37 +-
 lib/zstd/common/entropy_common.c              |   42 +-
 lib/zstd/common/error_private.c               |   13 +-
 lib/zstd/common/error_private.h               |   88 +-
 lib/zstd/common/fse.h                         |  103 +-
 lib/zstd/common/fse_decompress.c              |  132 +-
 lib/zstd/common/huf.h                         |  240 +-
 lib/zstd/common/mem.h                         |    3 +-
 lib/zstd/common/portability_macros.h          |   45 +-
 lib/zstd/common/zstd_common.c                 |   38 +-
 lib/zstd/common/zstd_deps.h                   |   16 +-
 lib/zstd/common/zstd_internal.h               |  153 +-
 lib/zstd/compress/clevels.h                   |    3 +-
 lib/zstd/compress/fse_compress.c              |   74 +-
 lib/zstd/compress/hist.c                      |   13 +-
 lib/zstd/compress/hist.h                      |   10 +-
 lib/zstd/compress/huf_compress.c              |  441 ++-
 lib/zstd/compress/zstd_compress.c             | 3293 ++++++++++++-----
 lib/zstd/compress/zstd_compress_internal.h    |  621 +++-
 lib/zstd/compress/zstd_compress_literals.c    |  157 +-
 lib/zstd/compress/zstd_compress_literals.h    |   25 +-
 lib/zstd/compress/zstd_compress_sequences.c   |   21 +-
 lib/zstd/compress/zstd_compress_sequences.h   |   16 +-
 lib/zstd/compress/zstd_compress_superblock.c  |  394 +-
 lib/zstd/compress/zstd_compress_superblock.h  |    3 +-
 lib/zstd/compress/zstd_cwksp.h                |  222 +-
 lib/zstd/compress/zstd_double_fast.c          |  245 +-
 lib/zstd/compress/zstd_double_fast.h          |   27 +-
 lib/zstd/compress/zstd_fast.c                 |  703 +++-
 lib/zstd/compress/zstd_fast.h                 |   16 +-
 lib/zstd/compress/zstd_lazy.c                 |  840 +++--
 lib/zstd/compress/zstd_lazy.h                 |  195 +-
 lib/zstd/compress/zstd_ldm.c                  |  102 +-
 lib/zstd/compress/zstd_ldm.h                  |   17 +-
 lib/zstd/compress/zstd_ldm_geartab.h          |    3 +-
 lib/zstd/compress/zstd_opt.c                  |  571 +--
 lib/zstd/compress/zstd_opt.h                  |   55 +-
 lib/zstd/compress/zstd_preSplit.c             |  239 ++
 lib/zstd/compress/zstd_preSplit.h             |   34 +
 lib/zstd/decompress/huf_decompress.c          |  887 +++--
 lib/zstd/decompress/zstd_ddict.c              |    9 +-
 lib/zstd/decompress/zstd_ddict.h              |    3 +-
 lib/zstd/decompress/zstd_decompress.c         |  375 +-
 lib/zstd/decompress/zstd_decompress_block.c   |  724 ++--
 lib/zstd/decompress/zstd_decompress_block.h   |   10 +-
 .../decompress/zstd_decompress_internal.h     |   19 +-
 lib/zstd/decompress_sources.h                 |    2 +-
 lib/zstd/zstd_common_module.c                 |    5 +-
 lib/zstd/zstd_compress_module.c               |   75 +-
 lib/zstd/zstd_decompress_module.c             |    4 +-
 60 files changed, 8749 insertions(+), 4381 deletions(-)
 create mode 100644 lib/zstd/common/allocations.h
 create mode 100644 lib/zstd/common/bits.h
 create mode 100644 lib/zstd/compress/zstd_preSplit.c
 create mode 100644 lib/zstd/compress/zstd_preSplit.h

-- 
2.48.1

On Thu, Mar 13, 2025 at 01:59:20PM -0700, Nick Terrell wrote:
> From: Nick Terrell <terrelln@fb.com>
> 
> Since this is a large patch, I have also prepared a pull request as an
> alternate means of fetching the commit:
> 
> The following changes since commit 7eb172143d5508b4da468ed59ee857c6e5e01da6:
> 
>   Linux 6.14-rc5 (2025-03-02 11:48:20 -0800)
> 
> are available in the Git repository at:
> 
>   https://github.com/terrelln/linux.git tags/2025-03-13-zstd-v1.5.7-v1

This tag is not in the branch that is pulled to the linux-next tree, the
zstd-next branch still points to v6.14-rc5. This means the 1.5.7 update
hasn't been exposed to linux-next testing. Please update the branch to
the tag as well, the merge window opens next week leaving little time
before sending the pull request.

I've tested this patch with fstests and btrfs, no problems found, but
regarding the process the updates need to be in linux-next 1-2 weeks
before the merge window. We're past that. As this is restarting the zstd
merging I hope we can get away with that this time, skipping another
development cycle would be unfortunate but also not helping anything.

> On Mar 18, 2025, at 6:16 AM, David Sterba <dsterba@suse.cz> wrote:
> 
> > 
> On Thu, Mar 13, 2025 at 01:59:20PM -0700, Nick Terrell wrote:
>> From: Nick Terrell <terrelln@fb.com>
>> 
>> Since this is a large patch, I have also prepared a pull request as an
>> alternate means of fetching the commit:
>> 
>> The following changes since commit 7eb172143d5508b4da468ed59ee857c6e5e01da6:
>> 
>>  Linux 6.14-rc5 (2025-03-02 11:48:20 -0800)
>> 
>> are available in the Git repository at:
>> 
>>  https://github.com/terrelln/linux.git  tags/2025-03-13-zstd-v1.5.7-v1
> 
> This tag is not in the branch that is pulled to the linux-next tree, the
> zstd-next branch still points to v6.14-rc5. This means the 1.5.7 update
> hasn't been exposed to linux-next testing. Please update the branch to
> the tag as well, the merge window opens next week leaving little time
> before sending the pull request.
> 
> I've tested this patch with fstests and btrfs, no problems found, but
> regarding the process the updates need to be in linux-next 1-2 weeks
> before the merge window. We're past that. As this is restarting the zstd
> merging I hope we can get away with that this time, skipping another
> development cycle would be unfortunate but also not helping anything.

Thanks David, I've pushed my linux-next trees yesterday morning,
hopefully it will be early enough. Thank you for testing as well!

Best,
Nick Terrell

On Tue, Mar 18, 2025 at 02:16:36PM +0100, David Sterba wrote:
> On Thu, Mar 13, 2025 at 01:59:20PM -0700, Nick Terrell wrote:
> > From: Nick Terrell <terrelln@fb.com>
> > 
> > Since this is a large patch, I have also prepared a pull request as an
> > alternate means of fetching the commit:
> > 
> > The following changes since commit 7eb172143d5508b4da468ed59ee857c6e5e01da6:
> > 
> >   Linux 6.14-rc5 (2025-03-02 11:48:20 -0800)
> > 
> > are available in the Git repository at:
> > 
> >   https://github.com/terrelln/linux.git tags/2025-03-13-zstd-v1.5.7-v1
> 
> This tag is not in the branch that is pulled to the linux-next tree, the
> zstd-next branch still points to v6.14-rc5. This means the 1.5.7 update
> hasn't been exposed to linux-next testing. Please update the branch to
> the tag as well, the merge window opens next week leaving little time
> before sending the pull request.

I'm taking a proactive step and the tag mentioned above is now merged to
my btrfs for-next branch snapshot. As it's been pulled from your tree
the commit id (65d1f5507ed2c78c64fce40e44e5574a9419eb09) is the same and
git will handle it transparently in case you update your zstd-next
branch.