From: Sebastian Ott <sebott@linux.ibm.com>

Date: Thu, 18 Oct 2018 11:11:08 +0200

Subject: s390/pci: fix sleeping in atomic during hotplug

Git-commit: 98dfd32620e970eb576ebce5ea39d905cb005e72

Patch-mainline: v5.0-rc1

References: git-fixes bsc#1211364

When triggered by pci hotplug (PEC 0x306) clp_get_state is called

with spinlocks held resulting in the following warning:

zpci: n/a: Event 0x306 reconfigured PCI function 0x0

BUG: sleeping function called from invalid context at mm/page_alloc.c:4324

in_atomic(): 1, irqs_disabled(): 0, pid: 98, name: kmcheck

2 locks held by kmcheck/98:

Change the allocation to use GFP_ATOMIC.

Cc: stable@vger.kernel.org # 4.13+

Signed-off-by: Sebastian Ott <sebott@linux.ibm.com>

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

Acked-by: Miroslav Franc <mfranc@suse.cz>

---

 arch/s390/pci/pci_clp.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c

index 19b2d2a9b43d..eeb7450db18c 100644

--- a/arch/s390/pci/pci_clp.c

+++ b/arch/s390/pci/pci_clp.c

@@ -436,7 +436,7 @@ int clp_get_state(u32 fid, enum zpci_state *state)

 	struct clp_state_data sd = {fid, ZPCI_FN_STATE_RESERVED};

 	int rc;

-	rrb = clp_alloc_block(GFP_KERNEL);

+	rrb = clp_alloc_block(GFP_ATOMIC);

 	if (!rrb)

 		return -ENOMEM;