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 X-Spam-Level: X-Spam-Status: No, score=-11.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59100C388F2 for ; Fri, 6 Nov 2020 17:10:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EE3A62072E for ; Fri, 6 Nov 2020 17:10:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=toxicpanda-com.20150623.gappssmtp.com header.i=@toxicpanda-com.20150623.gappssmtp.com header.b="O8ZZhEUu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727229AbgKFRKx (ORCPT ); Fri, 6 Nov 2020 12:10:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726139AbgKFRKx (ORCPT ); Fri, 6 Nov 2020 12:10:53 -0500 Received: from mail-qv1-xf42.google.com (mail-qv1-xf42.google.com [IPv6:2607:f8b0:4864:20::f42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C993C0613D2 for ; Fri, 6 Nov 2020 09:10:52 -0800 (PST) Received: by mail-qv1-xf42.google.com with SMTP id d1so761114qvl.6 for ; Fri, 06 Nov 2020 09:10:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=/T4V4t+QdvwoK1NFTGIFvOZHdTRgisoLRqVT8P2lJvo=; b=O8ZZhEUu0ahk3vx3VEAynSB5X0BHcaeX65/n+GCfnMVQlCjjMM3p23k8VknqbUFUyG xS4iWwZ+m9Z6mkg5EpOdNoMXsSwme47E9SKHvzuTH2cbn6QNDJF2YiIdr4aqoE7iXB/k R26qVZFvuzWp9l9JFughus5JP/AB6TfuCX+HSeXdMTzkEtakFSXtNv9tzCAglH78ZTaw TxKQlv8W2NUJMBS609YgLTLtYOArXV3u02qTZ0YfEviaHGbm+YY/2p/KBah6FMWeQiQ3 QQZnfhpfPbY0agR5AT7VNJeqCdJ5FGWJIUDioISdb0gQmdag4avVcFq3hR21efkD9fzo 9fZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=/T4V4t+QdvwoK1NFTGIFvOZHdTRgisoLRqVT8P2lJvo=; b=l9MOVFh+/Uf/lfhj55fSNtauCD6xsqqHwvMUrCRfzh5q8qQspz42pMeN60Ms88z+ov 56EhCS+Q2Pk9OktZeRHAuddA7JaWwlpm6Q4oJrkfG+tbnAuRXK+fs6YOCvRJmgdVw65p gS0Cbsrv6QhHv9r6RQwDxdUOQYsWR4fkBbldIaKUht7cqu8iAit9BiCYgzgBMxzNgiLr k/mKZ9zewJhGnP2jp+/nUry/0dKsMiYvK5WZfE7c/NoAhnAJR+RU4MGgj6umzr6iLI6f 67anwd0qE0JZmWVlWnII18i5jYf2O44YZuYtPYOWgvBKdx0LIViGJ8otv5ET/z9zLmy6 HAhQ== X-Gm-Message-State: AOAM532ZqSReuCbc1ZSqpIsVik4wOkkzc7CI3lw/IktPf5wmrRr3uSrl YW6VAwaoLyejEfgUSUVvmN46KA== X-Google-Smtp-Source: ABdhPJwF/MdD1qNke+ECauvjnsTNgCBiugOoWghae9wdj3qkdlvkqshdqouzdfR5ybfqevB97gjCZQ== X-Received: by 2002:a0c:e346:: with SMTP id a6mr2528444qvm.9.1604682651091; Fri, 06 Nov 2020 09:10:51 -0800 (PST) Received: from [192.168.1.45] (cpe-174-109-172-136.nc.res.rr.com. [174.109.172.136]) by smtp.gmail.com with ESMTPSA id n4sm799428qkf.42.2020.11.06.09.10.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 Nov 2020 09:10:49 -0800 (PST) Subject: Re: [PATCH v5 5/9] btrfs: zstd: Switch to the zstd-1.4.6 API To: Nick Terrell , Herbert Xu Cc: linux-crypto@vger.kernel.org, linux-btrfs@vger.kernel.org, squashfs-devel@lists.sourceforge.net, linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Kernel Team , Nick Terrell , Chris Mason , Petr Malat , Johannes Weiner , Niket Agarwal , Yann Collet References: <20201103060535.8460-1-nickrterrell@gmail.com> <20201103060535.8460-6-nickrterrell@gmail.com> From: Josef Bacik Message-ID: Date: Fri, 6 Nov 2020 12:10:47 -0500 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20201103060535.8460-6-nickrterrell@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On 11/3/20 1:05 AM, Nick Terrell wrote: > From: Nick Terrell > > Move away from the compatibility wrapper to the zstd-1.4.6 API. This > code is functionally equivalent. > > Signed-off-by: Nick Terrell > --- > fs/btrfs/zstd.c | 48 ++++++++++++++++++++++++++++-------------------- > 1 file changed, 28 insertions(+), 20 deletions(-) > > diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c > index a7367ff573d4..6b466e090cd7 100644 > --- a/fs/btrfs/zstd.c > +++ b/fs/btrfs/zstd.c > @@ -16,7 +16,7 @@ > #include > #include > #include > -#include > +#include > #include "misc.h" > #include "compression.h" > #include "ctree.h" > @@ -159,8 +159,8 @@ static void zstd_calc_ws_mem_sizes(void) > zstd_get_btrfs_parameters(level, ZSTD_BTRFS_MAX_INPUT); > size_t level_size = > max_t(size_t, > - ZSTD_CStreamWorkspaceBound(params.cParams), > - ZSTD_DStreamWorkspaceBound(ZSTD_BTRFS_MAX_INPUT)); > + ZSTD_estimateCStreamSize_usingCParams(params.cParams), > + ZSTD_estimateDStreamSize(ZSTD_BTRFS_MAX_INPUT)); > > max_size = max_t(size_t, max_size, level_size); > zstd_ws_mem_sizes[level - 1] = max_size; > @@ -389,13 +389,23 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping, > *total_in = 0; > > /* Initialize the stream */ > - stream = ZSTD_initCStream(params, len, workspace->mem, > - workspace->size); > + stream = ZSTD_initStaticCStream(workspace->mem, workspace->size); > if (!stream) { > - pr_warn("BTRFS: ZSTD_initCStream failed\n"); > + pr_warn("BTRFS: ZSTD_initStaticCStream failed\n"); > ret = -EIO; > goto out; > } > + { > + size_t ret2; > + > + ret2 = ZSTD_initCStream_advanced(stream, NULL, 0, params, len); > + if (ZSTD_isError(ret2)) { > + pr_warn("BTRFS: ZSTD_initCStream_advanced returned %s\n", > + ZSTD_getErrorName(ret2)); > + ret = -EIO; > + goto out; > + } > + } Please don't do this, you can just add size_t ret2 at the top and not put this in a block. Other than that the code looks fine, once you fix that you can add Reviewed-by: Josef Bacik Thanks, Josef