Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00e9e664 authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

s390/pfault: do not use stack buffers for hardware data 



With CONFIG_VMAP_STACK=y the stack is allocated from the vmalloc space.
Data structures passed to a hardware or a hypervisor interface that
requires V=R can not be allocated on the stack anymore.

Make the init and fini pfault parameter blocks static variables.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent c0f07ff9

arch/s390/mm/fault.c

+21 −17
Original line number Diff line number Diff line
@@ -636,9 +636,7 @@ struct pfault_refbk { 
	u64 reserved;

} __attribute__ ((packed, aligned(8)));



int pfault_init(void)

{

	struct pfault_refbk refbk = {

static struct pfault_refbk pfault_init_refbk = {

	.refdiagc = 0x258,

	.reffcode = 0,

	.refdwlen = 5,
@@ -646,7 +644,11 @@ int pfault_init(void) 
	.refgaddr = __LC_LPP,

	.refselmk = 1ULL << 48,

	.refcmpmk = 1ULL << 48,

		.reserved = __PF_RES_FIELD };

	.reserved = __PF_RES_FIELD

};



int pfault_init(void)

{

        int rc;



	if (pfault_disable)
@@ -658,19 +660,21 @@ int pfault_init(void) 
		"1:	la	%0,8\n"

		"2:\n"

		EX_TABLE(0b,1b)

		: "=d" (rc) : "a" (&refbk), "m" (refbk) : "cc");

		: "=d" (rc)

		: "a" (&pfault_init_refbk), "m" (pfault_init_refbk) : "cc");

        return rc;

}



void pfault_fini(void)

{

	struct pfault_refbk refbk = {

static struct pfault_refbk pfault_fini_refbk = {

	.refdiagc = 0x258,

	.reffcode = 1,

	.refdwlen = 5,

	.refversn = 2,

};



void pfault_fini(void)

{



	if (pfault_disable)

		return;

	diag_stat_inc(DIAG_STAT_X258);
@@ -678,7 +682,7 @@ void pfault_fini(void) 
		"	diag	%0,0,0x258\n"

		"0:	nopr	%%r7\n"

		EX_TABLE(0b,0b)

		: : "a" (&refbk), "m" (refbk) : "cc");

		: : "a" (&pfault_fini_refbk), "m" (pfault_fini_refbk) : "cc");

}



static DEFINE_SPINLOCK(pfault_lock);