Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 21 Jul 2023 10:10:55 +0100
From:   Simon Horman <simon.horman@corigine.com>
To:     Ard Biesheuvel <ardb@kernel.org>
Cc:     linux-crypto@vger.kernel.org,
        Herbert Xu <herbert@gondor.apana.org.au>,
        Eric Biggers <ebiggers@kernel.org>,
        Kees Cook <keescook@chromium.org>,
        Haren Myneni <haren@us.ibm.com>,
        Nick Terrell <terrelln@fb.com>,
        Minchan Kim <minchan@kernel.org>,
        Sergey Senozhatsky <senozhatsky@chromium.org>,
        Jens Axboe <axboe@kernel.dk>,
        Giovanni Cabiddu <giovanni.cabiddu@intel.com>,
        Richard Weinberger <richard@nod.at>,
        David Ahern <dsahern@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Steffen Klassert <steffen.klassert@secunet.com>,
        linux-kernel@vger.kernel.org, linux-block@vger.kernel.org,
        qat-linux@intel.com, linuxppc-dev@lists.ozlabs.org,
        linux-mtd@lists.infradead.org, netdev@vger.kernel.org
Subject: Re: [RFC PATCH 01/21] crypto: scomp - Revert "add support for
 deflate rfc1950 (zlib)"
Message-ID: <ZLpLnx4vtdYPuxrH@corigine.com>
References: <20230718125847.3869700-1-ardb@kernel.org>
 <20230718125847.3869700-2-ardb@kernel.org>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230718125847.3869700-2-ardb@kernel.org>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zQblw/bQw51fmROv7tDJNln+3IUqWID30UIPh+Ztoec+383ff4xzezVDRE5u?=
 =?us-ascii?Q?iVwS1jLyw08fM+x7Xjm2LnwawLDjOAUm2WLr8FBubO0ynQc0pE7fJAv1PSUI?=
 =?us-ascii?Q?nxsmMljyuxP2fQ0b0fagnX7r/VMipPcrY1Q0nnLao5fjLX/E4TJ3n6b+DMUv?=
 =?us-ascii?Q?PsYpRaNzUTFA6Amtu0WGdbYWKLONkJQTD/zPI+1rEYHLnHgyrwNebAJHsFbC?=
 =?us-ascii?Q?qqQwoBreWvFvBLSYCMb7m5kRLkmRgNafL47u1vsmSbUfMufNieezegvZhCOv?=
 =?us-ascii?Q?jL9LKklJzblgSoKZHkw9e4jrLxslPb+dQqdOABTnZTFsU40LRifmFB5X9HH0?=
 =?us-ascii?Q?QoICcVhrP++mWAnAHkhsqVuAwL9uh8fcCrN3p5df3rJZ+wqzW1XDb5znFlWM?=
 =?us-ascii?Q?F6BZknWRwueOFN6Y/C0Hf320FMwUSwlKwqe/PmxRS9v66MGArXZJwEq3NFRF?=
 =?us-ascii?Q?KxrhY/T9DXQDu1J83GwNZ8c6MSw5VmJTjx4BCTqv3/LWEn6v3XUDXTP4tm6D?=
 =?us-ascii?Q?3ZzyqzQadVpWxe17Yy7yHWoXfZ036ZjJAYhk9l4qbr+/LIF2rg6vx9LrRW1W?=
 =?us-ascii?Q?c5A0GecH7jZWDKMC6/hhKX+bolatMXn2ckzCOSs/zkCVBKjLu6tW/Jh6gnM1?=
 =?us-ascii?Q?HFq2GT/CLGnJLwClbk2Wd6GELMah4O8Y4Wzjw5i+ZqceyjXxYg2Wii5iKzPX?=
 =?us-ascii?Q?y16ZUyqvHxP1oGMTV+R56tkRsCLS5ESbuXka/DsIqQLzC+6/evuk1Sq2bXCl?=
 =?us-ascii?Q?URfJ+4Oz92m7xoHZCOt9vp5WicEacSrebqA/U/aaHxoDAUArkO4RsGPZb/XQ?=
 =?us-ascii?Q?THURTOKEaK46VHV7ziEctZVhnTTcgMRsvgq+7htJZHZWBP4Agx1CuiIzRK1t?=
 =?us-ascii?Q?FCC9xSvNIDVEXa77HAkHDbQKExQhk9fdrgHwilWUof2u5WEfLVTyuRYdiYQs?=
 =?us-ascii?Q?mitz71Joqj6n2hXHIeMNsiX/j/BgtHjl5fzgptleeOeAQxUbg6MnMJwuRkmf?=
 =?us-ascii?Q?hl2U3plAFymsLBW8Ml2xh+gUJI+atNmO1wFVfiFUldWE+GXbUJOeLvtuHp/o?=
 =?us-ascii?Q?B4nzvsIfjlTXkpMIpxTX73R9Zte+f3AnfMlGTH/bjMhkMGOAmBB6/2NIuKjj?=
 =?us-ascii?Q?pmq/2G7YL3JN+bIcS43jPb51aRfKztdai9w4/OTW5pyR0HJ8oBrGJkj96TUv?=
 =?us-ascii?Q?WsFihB05NR378+PPAs+ryRnc37YwaiylogKoyvtddO6yJ7YOh0R5paBF8VC7?=
 =?us-ascii?Q?RS8emYrVqcVLyuZRIk5/YWocuo75tWY81u4RxQoOUFF/8MWZsUUWU/QQqNvq?=
 =?us-ascii?Q?ByPm6cg8VVDcQbQ6MniXINS1fXo5BqwnI7qbJ+oQeBT0SglqE6mE900COBho?=
 =?us-ascii?Q?mYoo/FjK6ds4QZzhUR41ToNN0gyojf09EQV+GSCXa1CfgUL46YD5xcshDBtM?=
 =?us-ascii?Q?yXyYp4v46PVZECckt/VW4IGIAFhgBvAkCiz+oFEIehbqkJOuGMn765MINOKg?=
 =?us-ascii?Q?Wo2t49o/GOeM08tQ6Vuk63mhHsud1VUJ5wgBuxv/Y7p8yxDtnBvE5BSCOa0V?=
 =?us-ascii?Q?R9PuxhQq4czZGi43tgVgf4nzzAyBMFBPT2ayaFWdeRbr4QIm1I6++oSAOueI?=
 =?us-ascii?Q?XQ=3D=3D?=
X-OriginatorOrg: corigine.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0ced8cd5-32b5-449a-331e-08db89ca6935
X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2023 09:11:04.7827
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: tlK+HylJSvJreeg1sn4yeWime7V1tP1Vr4k3SRLWJ2r8ni9H2VglORLH9LlBfrfJ5m6xC5D2b9T+oeh4KaoVvTTb1Cjvpi5mJNJVd2p0Law=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR13MB4437
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

On Tue, Jul 18, 2023 at 02:58:27PM +0200, Ard Biesheuvel wrote:
> This reverts commit a368f43d6e3a001e684e9191a27df384fbff12f5.
> 
> "zlib-deflate" was introduced 6 years ago, but it does not have any
> users. So let's remove the generic implementation and the test vectors,
> but retain the "zlib-deflate" entry in the testmgr code to avoid
> introducing warning messages on systems that implement zlib-deflate in
> hardware.
> 
> Note that RFC 1950 which forms the basis of this algorithm dates back to
> 1996, and predates RFC 1951, on which the existing IPcomp is based and
> which we have supported in the kernel since 2003. So it seems rather
> unlikely that we will ever grow the need to support zlib-deflate.
> 
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
>  crypto/deflate.c | 61 +++++-----------
>  crypto/testmgr.c |  8 +--
>  crypto/testmgr.h | 75 --------------------
>  3 files changed, 18 insertions(+), 126 deletions(-)
> 
> diff --git a/crypto/deflate.c b/crypto/deflate.c
> index b2a46f6dc961e71d..f4f127078fe2a5aa 100644
> --- a/crypto/deflate.c
> +++ b/crypto/deflate.c
> @@ -39,24 +39,20 @@ struct deflate_ctx {
>  	struct z_stream_s decomp_stream;
>  };
>  
> -static int deflate_comp_init(struct deflate_ctx *ctx, int format)
> +static int deflate_comp_init(struct deflate_ctx *ctx)
>  {
>  	int ret = 0;
>  	struct z_stream_s *stream = &ctx->comp_stream;
>  
>  	stream->workspace = vzalloc(zlib_deflate_workspacesize(
> -				    MAX_WBITS, MAX_MEM_LEVEL));
> +				-DEFLATE_DEF_WINBITS, DEFLATE_DEF_MEMLEVEL));
>  	if (!stream->workspace) {
>  		ret = -ENOMEM;
>  		goto out;
>  	}
> -	if (format)
> -		ret = zlib_deflateInit(stream, 3);
> -	else
> -		ret = zlib_deflateInit2(stream, DEFLATE_DEF_LEVEL, Z_DEFLATED,
> -					-DEFLATE_DEF_WINBITS,
> -					DEFLATE_DEF_MEMLEVEL,
> -					Z_DEFAULT_STRATEGY);
> +	ret = zlib_deflateInit2(stream, DEFLATE_DEF_LEVEL, Z_DEFLATED,
> +	                        -DEFLATE_DEF_WINBITS, DEFLATE_DEF_MEMLEVEL,
> +	                        Z_DEFAULT_STRATEGY);

nit: The two lines above partially use spaces instead of tabs for
      indentation.

...