lib/zlib: add s390 hardware support for kernel zlib_inflate (12619610) · Commits · 戴 / test

lib/decompress_inflate.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,10 @@
		#include "zlib_inflate/inftrees.c"
		#include "zlib_inflate/inffast.c"
		#include "zlib_inflate/inflate.c"
		#ifdef CONFIG_ZLIB_DFLTCC
		#include "zlib_dfltcc/dfltcc.c"
		#include "zlib_dfltcc/dfltcc_inflate.c"
		#endif

		#else /* STATIC */
		/* initramfs et al: linked */
		@@ -76,7 +80,12 @@ STATIC int INIT __gunzip(unsigned char *buf, long len,
		}

		strm->workspace = malloc(flush ? zlib_inflate_workspacesize() :
		#ifdef CONFIG_ZLIB_DFLTCC
		/* Always allocate the full workspace for DFLTCC */
		zlib_inflate_workspacesize());
		#else
		sizeof(struct inflate_state));
		#endif
		if (strm->workspace == NULL) {
		error("Out of memory while allocating workspace");
		goto gunzip_nomem4;
		@@ -123,10 +132,14 @@ STATIC int INIT __gunzip(unsigned char *buf, long len,

		rc = zlib_inflateInit2(strm, -MAX_WBITS);

		#ifdef CONFIG_ZLIB_DFLTCC
		/* Always keep the window for DFLTCC */
		#else
		if (!flush) {
		WS(strm)->inflate_state.wsize = 0;
		WS(strm)->inflate_state.window = NULL;
		}
		#endif

		while (rc == Z_OK) {
		if (strm->avail_in == 0) {

lib/zlib_dfltcc/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,4 +8,4 @@

		obj-$(CONFIG_ZLIB_DFLTCC) += zlib_dfltcc.o

		zlib_dfltcc-objs := dfltcc.o dfltcc_deflate.o dfltcc_syms.o
		zlib_dfltcc-objs := dfltcc.o dfltcc_deflate.o dfltcc_inflate.o dfltcc_syms.o

lib/zlib_dfltcc/dfltcc.h

+28 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,14 @@ int dfltcc_deflate(z_streamp strm,
		int flush,
		block_state *result);
		void dfltcc_reset(z_streamp strm, uInt size);
		int dfltcc_can_inflate(z_streamp strm);
		typedef enum {
		DFLTCC_INFLATE_CONTINUE,
		DFLTCC_INFLATE_BREAK,
		DFLTCC_INFLATE_SOFTWARE,
		} dfltcc_inflate_action;
		dfltcc_inflate_action dfltcc_inflate(z_streamp strm,
		int flush, int *ret);

		#define DEFLATE_RESET_HOOK(strm) \
		dfltcc_reset((strm), sizeof(deflate_state))
		@@ -112,4 +120,24 @@ void dfltcc_reset(z_streamp strm, uInt size);

		#define DEFLATE_NEED_CHECKSUM(strm) (!dfltcc_can_deflate((strm)))

		#define INFLATE_RESET_HOOK(strm) \
		dfltcc_reset((strm), sizeof(struct inflate_state))

		#define INFLATE_TYPEDO_HOOK(strm, flush) \
		if (dfltcc_can_inflate((strm))) { \
		dfltcc_inflate_action action; \
		\
		RESTORE(); \
		action = dfltcc_inflate((strm), (flush), &ret); \
		LOAD(); \
		if (action == DFLTCC_INFLATE_CONTINUE) \
		break; \
		else if (action == DFLTCC_INFLATE_BREAK) \
		goto inf_leave; \
		}

		#define INFLATE_NEED_CHECKSUM(strm) (!dfltcc_can_inflate((strm)))

		#define INFLATE_NEED_UPDATEWINDOW(strm) (!dfltcc_can_inflate((strm)))

		#endif /* DFLTCC_H */

lib/zlib_dfltcc/dfltcc_inflate.c

0 → 100644

+143 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: Zlib

		#include "../zlib_inflate/inflate.h"
		#include "dfltcc_util.h"
		#include "dfltcc.h"
		#include <linux/zutil.h>

		/*
		* Expand.
		*/
		int dfltcc_can_inflate(
		z_streamp strm
		)
		{
		struct inflate_state state = (struct inflate_state )strm->state;
		struct dfltcc_state *dfltcc_state = GET_DFLTCC_STATE(state);

		/* Unsupported compression settings */
		if (state->wbits != HB_BITS)
		return 0;

		/* Unsupported hardware */
		return is_bit_set(dfltcc_state->af.fns, DFLTCC_XPND) &&
		is_bit_set(dfltcc_state->af.fmts, DFLTCC_FMT0);
		}

		static int dfltcc_was_inflate_used(
		z_streamp strm
		)
		{
		struct inflate_state state = (struct inflate_state )strm->state;
		struct dfltcc_param_v0 *param = &GET_DFLTCC_STATE(state)->param;

		return !param->nt;
		}

		static int dfltcc_inflate_disable(
		z_streamp strm
		)
		{
		struct inflate_state state = (struct inflate_state )strm->state;
		struct dfltcc_state *dfltcc_state = GET_DFLTCC_STATE(state);

		if (!dfltcc_can_inflate(strm))
		return 0;
		if (dfltcc_was_inflate_used(strm))
		/* DFLTCC has already decompressed some data. Since there is not
		* enough information to resume decompression in software, the call
		* must fail.
		*/
		return 1;
		/* DFLTCC was not used yet - decompress in software */
		memset(&dfltcc_state->af, 0, sizeof(dfltcc_state->af));
		return 0;
		}

		static dfltcc_cc dfltcc_xpnd(
		z_streamp strm
		)
		{
		struct inflate_state state = (struct inflate_state )strm->state;
		struct dfltcc_param_v0 *param = &GET_DFLTCC_STATE(state)->param;
		size_t avail_in = strm->avail_in;
		size_t avail_out = strm->avail_out;
		dfltcc_cc cc;

		cc = dfltcc(DFLTCC_XPND \| HBT_CIRCULAR,
		param, &strm->next_out, &avail_out,
		&strm->next_in, &avail_in, state->window);
		strm->avail_in = avail_in;
		strm->avail_out = avail_out;
		return cc;
		}

		dfltcc_inflate_action dfltcc_inflate(
		z_streamp strm,
		int flush,
		int *ret
		)
		{
		struct inflate_state state = (struct inflate_state )strm->state;
		struct dfltcc_state *dfltcc_state = GET_DFLTCC_STATE(state);
		struct dfltcc_param_v0 *param = &dfltcc_state->param;
		dfltcc_cc cc;

		if (flush == Z_BLOCK) {
		/* DFLTCC does not support stopping on block boundaries */
		if (dfltcc_inflate_disable(strm)) {
		*ret = Z_STREAM_ERROR;
		return DFLTCC_INFLATE_BREAK;
		} else
		return DFLTCC_INFLATE_SOFTWARE;
		}

		if (state->last) {
		if (state->bits != 0) {
		strm->next_in++;
		strm->avail_in--;
		state->bits = 0;
		}
		state->mode = CHECK;
		return DFLTCC_INFLATE_CONTINUE;
		}

		if (strm->avail_in == 0 && !param->cf)
		return DFLTCC_INFLATE_BREAK;

		if (!state->window \|\| state->wsize == 0) {
		state->mode = MEM;
		return DFLTCC_INFLATE_CONTINUE;
		}

		/* Translate stream to parameter block */
		param->cvt = CVT_ADLER32;
		param->sbb = state->bits;
		param->hl = state->whave; /* Software and hardware history formats match */
		param->ho = (state->write - state->whave) & ((1 << HB_BITS) - 1);
		if (param->hl)
		param->nt = 0; /* Honor history for the first block */
		param->cv = state->flags ? REVERSE(state->check) : state->check;

		/* Inflate */
		do {
		cc = dfltcc_xpnd(strm);
		} while (cc == DFLTCC_CC_AGAIN);

		/* Translate parameter block to stream */
		strm->msg = oesc_msg(dfltcc_state->msg, param->oesc);
		state->last = cc == DFLTCC_CC_OK;
		state->bits = param->sbb;
		state->whave = param->hl;
		state->write = (param->ho + param->hl) & ((1 << HB_BITS) - 1);
		state->check = state->flags ? REVERSE(param->cv) : param->cv;
		if (cc == DFLTCC_CC_OP2_CORRUPT && param->oesc != 0) {
		/* Report an error if stream is corrupted */
		state->mode = BAD;
		return DFLTCC_INFLATE_CONTINUE;
		}
		state->mode = TYPEDO;
		/* Break if operands are exhausted, otherwise continue looping */
		return (cc == DFLTCC_CC_OP1_TOO_SHORT \|\| cc == DFLTCC_CC_OP2_TOO_SHORT) ?
		DFLTCC_INFLATE_BREAK : DFLTCC_INFLATE_CONTINUE;
		}

lib/zlib_inflate/inflate.c

+24 −8

Original line number	Diff line number	Diff line
		@@ -15,6 +15,16 @@
		#include "inffast.h"
		#include "infutil.h"

		/* architecture-specific bits */
		#ifdef CONFIG_ZLIB_DFLTCC
		# include "../zlib_dfltcc/dfltcc.h"
		#else
		#define INFLATE_RESET_HOOK(strm) do {} while (0)
		#define INFLATE_TYPEDO_HOOK(strm, flush) do {} while (0)
		#define INFLATE_NEED_UPDATEWINDOW(strm) 1
		#define INFLATE_NEED_CHECKSUM(strm) 1
		#endif

		int zlib_inflate_workspacesize(void)
		{
		return sizeof(struct inflate_workspace);
		@@ -42,6 +52,7 @@ int zlib_inflateReset(z_streamp strm)
		state->write = 0;
		state->whave = 0;

		INFLATE_RESET_HOOK(strm);
		return Z_OK;
		}

		@@ -66,7 +77,15 @@ int zlib_inflateInit2(z_streamp strm, int windowBits)
		return Z_STREAM_ERROR;
		}
		state->wbits = (unsigned)windowBits;
		#ifdef CONFIG_ZLIB_DFLTCC
		/*
		* DFLTCC requires the window to be page aligned.
		* Thus, we overallocate and take the aligned portion of the buffer.
		*/
		state->window = PTR_ALIGN(&WS(strm)->working_window[0], PAGE_SIZE);
		#else
		state->window = &WS(strm)->working_window[0];
		#endif

		return zlib_inflateReset(strm);
		}
		@@ -227,11 +246,6 @@ static int zlib_inflateSyncPacket(z_streamp strm)
		bits -= bits & 7; \
		} while (0)

		/* Reverse the bytes in a 32-bit value */
		#define REVERSE(q) \
		((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
		(((q) & 0xff00) << 8) + (((q) & 0xff) << 24))

		/*
		inflate() uses a state machine to process as much input data and generate as
		much output data as possible before returning. The state machine is
		@@ -395,6 +409,7 @@ int zlib_inflate(z_streamp strm, int flush)
		if (flush == Z_BLOCK) goto inf_leave;
		/* fall through */
		case TYPEDO:
		INFLATE_TYPEDO_HOOK(strm, flush);
		if (state->last) {
		BYTEBITS();
		state->mode = CHECK;
		@@ -692,7 +707,7 @@ int zlib_inflate(z_streamp strm, int flush)
		out -= left;
		strm->total_out += out;
		state->total += out;
		if (out)
		if (INFLATE_NEED_CHECKSUM(strm) && out)
		strm->adler = state->check =
		UPDATE(state->check, put - out, out);
		out = left;
		@@ -726,7 +741,8 @@ int zlib_inflate(z_streamp strm, int flush)
		*/
		inf_leave:
		RESTORE();
		if (state->wsize \|\| (state->mode < CHECK && out != strm->avail_out))
		if (INFLATE_NEED_UPDATEWINDOW(strm) &&
		(state->wsize \|\| (state->mode < CHECK && out != strm->avail_out)))
		zlib_updatewindow(strm, out);

		in -= strm->avail_in;
		@@ -734,7 +750,7 @@ int zlib_inflate(z_streamp strm, int flush)
		strm->total_in += in;
		strm->total_out += out;
		state->total += out;
		if (state->wrap && out)
		if (INFLATE_NEED_CHECKSUM(strm) && state->wrap && out)
		strm->adler = state->check =
		UPDATE(state->check, strm->next_out - out, out);

Admin message