summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-08-22 10:12:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-08-22 10:12:49 -0700
commitd57ce84004a0d13ada89fbceec21539559cb72f2 (patch)
tree7191622c6afa5b84b37269e9ce4fe537d1d15699 /drivers/s390
parentb2d9e99622796576eb6faa236b2d1f592cc43ace (diff)
parentb97bf44f99155e57088e16974afb1f2d7b5287aa (diff)
downloadlinux-d57ce84004a0d13ada89fbceec21539559cb72f2.tar.gz
linux-d57ce84004a0d13ada89fbceec21539559cb72f2.tar.bz2
linux-d57ce84004a0d13ada89fbceec21539559cb72f2.zip
Merge tag 's390-5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Vasily Gorbik: - a couple of fixes for storage key handling relevant for debugging - add cond_resched into potentially slow subchannels scanning loop - fixes for PF/VF linking and to ignore stale PCI configuration request events * tag 's390-5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/pci: fix PF/VF linking on hot plug s390/pci: re-introduce zpci_remove_device() s390/pci: fix zpci_bus_link_virtfn() s390/ptrace: fix storage key handling s390/runtime_instrumentation: fix storage key handling s390/pci: ignore stale configuration request event s390/cio: add cond_resched() in the slow_eval_known_fn() loop
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/cio/css.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 94edbb33d0d1..aca022239b33 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -677,6 +677,11 @@ static int slow_eval_known_fn(struct subchannel *sch, void *data)
rc = css_evaluate_known_subchannel(sch, 1);
if (rc == -EAGAIN)
css_schedule_eval(sch->schid);
+ /*
+ * The loop might take long time for platforms with lots of
+ * known devices. Allow scheduling here.
+ */
+ cond_resched();
}
return 0;
}