Commit c65e6815 authored by Mikhail Zaslonko's avatar Mikhail Zaslonko Committed by Linus Torvalds
Browse files

s390/boot: add dfltcc= kernel command line parameter 

Add the new kernel command line parameter 'dfltcc=' to configure s390
zlib hardware support.

Format: { on | off | def_only | inf_only | always }
 on:       s390 zlib hardware support for compression on
           level 1 and decompression (default)
 off:      No s390 zlib hardware support
 def_only: s390 zlib hardware support for deflate
           only (compression on level 1)
 inf_only: s390 zlib hardware support for inflate
           only (decompression)
 always:   Same as 'on' but ignores the selected compression
           level always using hardware support (used for debugging)

Link: http://lkml.kernel.org/r/20200103223334.20669-5-zaslonko@linux.ibm.com


Signed-off-by: default avatarMikhail Zaslonko <zaslonko@linux.ibm.com>
Cc: Chris Mason <clm@fb.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: David Sterba <dsterba@suse.com>
Cc: Eduard Shishkin <edward6@linux.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 12619610

Documentation/admin-guide/kernel-parameters.txt

+12 −0
Original line number Diff line number Diff line
@@ -834,6 +834,18 @@ 
			dump out devices still on the deferred probe list after

			retrying.



	dfltcc=		[HW,S390]

			Format: { on | off | def_only | inf_only | always }

			on:       s390 zlib hardware support for compression on

			          level 1 and decompression (default)

			off:      No s390 zlib hardware support

			def_only: s390 zlib hardware support for deflate

			          only (compression on level 1)

			inf_only: s390 zlib hardware support for inflate

			          only (decompression)

			always:   Same as 'on' but ignores the selected compression

			          level always using hardware support (used for debugging)



	dhash_entries=	[KNL]

			Set number of hash buckets for dentry cache.

arch/s390/boot/ipl_parm.c

+14 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
char __bootdata(early_command_line)[COMMAND_LINE_SIZE];

struct ipl_parameter_block __bootdata_preserved(ipl_block);

int __bootdata_preserved(ipl_block_valid);

unsigned int __bootdata_preserved(zlib_dfltcc_support) = ZLIB_DFLTCC_FULL;



unsigned long __bootdata(vmalloc_size) = VMALLOC_DEFAULT_SIZE;

unsigned long __bootdata(memory_end);
@@ -229,6 +230,19 @@ void parse_boot_command_line(void) 
		if (!strcmp(param, "vmalloc") && val)

			vmalloc_size = round_up(memparse(val, NULL), PAGE_SIZE);



		if (!strcmp(param, "dfltcc")) {

			if (!strcmp(val, "off"))

				zlib_dfltcc_support = ZLIB_DFLTCC_DISABLED;

			else if (!strcmp(val, "on"))

				zlib_dfltcc_support = ZLIB_DFLTCC_FULL;

			else if (!strcmp(val, "def_only"))

				zlib_dfltcc_support = ZLIB_DFLTCC_DEFLATE_ONLY;

			else if (!strcmp(val, "inf_only"))

				zlib_dfltcc_support = ZLIB_DFLTCC_INFLATE_ONLY;

			else if (!strcmp(val, "always"))

				zlib_dfltcc_support = ZLIB_DFLTCC_FULL_DEBUG;

		}



		if (!strcmp(param, "noexec")) {

			rc = kstrtobool(val, &enabled);

			if (!rc && !enabled)

arch/s390/include/asm/setup.h

+7 −0
Original line number Diff line number Diff line
@@ -79,6 +79,13 @@ struct parmarea { 
	char command_line[ARCH_COMMAND_LINE_SIZE];	/* 0x10480 */

};



extern unsigned int zlib_dfltcc_support;

#define ZLIB_DFLTCC_DISABLED		0

#define ZLIB_DFLTCC_FULL		1

#define ZLIB_DFLTCC_DEFLATE_ONLY	2

#define ZLIB_DFLTCC_INFLATE_ONLY	3

#define ZLIB_DFLTCC_FULL_DEBUG		4



extern int noexec_disabled;

extern int memory_end_set;

extern unsigned long memory_end;

arch/s390/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ unsigned long __bootdata_preserved(__etext_dma); 
unsigned long __bootdata_preserved(__sdma);

unsigned long __bootdata_preserved(__edma);

unsigned long __bootdata_preserved(__kaslr_offset);

unsigned int __bootdata_preserved(zlib_dfltcc_support);

EXPORT_SYMBOL(zlib_dfltcc_support);



unsigned long VMALLOC_START;

EXPORT_SYMBOL(VMALLOC_START);

lib/zlib_dfltcc/dfltcc.c

+4 −1
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ void dfltcc_reset( 
    dfltcc_state->param.nt = 1;



    /* Initialize tuning parameters */

    if (zlib_dfltcc_support == ZLIB_DFLTCC_FULL_DEBUG)

        dfltcc_state->level_mask = DFLTCC_LEVEL_MASK_DEBUG;

    else

        dfltcc_state->level_mask = DFLTCC_LEVEL_MASK;

    dfltcc_state->block_size = DFLTCC_BLOCK_SIZE;

    dfltcc_state->block_threshold = DFLTCC_FIRST_FHT_BLOCK_SIZE;

CRA Git | Maintained and supported by SUSTech CRA and CCSE