Skip to contentSkip to conversation

sched/fifo changes for v5.9

GIT PULL Merged Ingo Molnar 2 participants 3 messages Aug 4, 2020 – Aug 6, 2020

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest sched/fifo git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-fifo-2020-08-04

# HEAD: 4fd5750af02ab7bba7c58a073060cc1da8a69173 sched,tracing: Convert to sched_set_fifo()

This tree adds the sched_set_fifo*() encapsulation APIs to remove static priority level knowledge from non-scheduler code.

The three APIs for non-scheduler code to set SCHED_FIFO are:

- sched_set_fifo()
- sched_set_fifo_low()
- sched_set_normal()

These are two FIFO priority levels: default (high), and a 'low' priority level, plus sched_set_normal() to set the policy back to non-SCHED_FIFO.

Since the changes affect a lot of non-scheduler code, we kept this in a separate tree.

When merging to the latest upstream tree there's a conflict in drivers/spi/spi.c, which can be resolved via:

	sched_set_fifo(ctlr->kworker_task);

Thanks,

Ingo

------------------>
Peter Zijlstra (24):
sched: Provide sched_set_fifo() sched,bL_switcher: Convert to sched_set_fifo*() sched,crypto: Convert to sched_set_fifo*() sched,acpi_pad: Convert to sched_set_fifo*() sched,drbd: Convert to sched_set_fifo*() sched,psci: Convert to sched_set_fifo*() sched,msm: Convert to sched_set_fifo*() sched,drm/scheduler: Convert to sched_set_fifo*() sched,ivtv: Convert to sched_set_fifo*() sched,mmc: Convert to sched_set_fifo*() sched,spi: Convert to sched_set_fifo*() sched,powercap: Convert to sched_set_fifo*() sched,ion: Convert to sched_set_normal() sched,powerclamp: Convert to sched_set_fifo() sched,serial: Convert to sched_set_fifo() sched,watchdog: Convert to sched_set_fifo() sched,irq: Convert to sched_set_fifo() sched,locktorture: Convert to sched_set_fifo() sched,rcuperf: Convert to sched_set_fifo_low() sched,rcutorture: Convert to sched_set_fifo_low() sched,psi: Convert to sched_set_fifo_low()
sched: Remove sched_setscheduler*() EXPORTs
sched: Remove sched_set_*() return value sched,tracing: Convert to sched_set_fifo()

 arch/arm/common/bL_switcher.c            |  3 +-
 crypto/crypto_engine.c                   |  3 +-
 drivers/acpi/acpi_pad.c                  |  3 +-
 drivers/block/drbd/drbd_receiver.c       |  5 +---
 drivers/firmware/psci/psci_checker.c     | 10 +------
 drivers/gpu/drm/msm/msm_drv.c            | 13 +--------
 drivers/gpu/drm/scheduler/sched_main.c   |  3 +-
 drivers/media/pci/ivtv/ivtv-driver.c     |  4 +--
 drivers/mmc/core/sdio_irq.c              |  3 +-
 drivers/platform/chrome/cros_ec_spi.c    | 11 ++-----
 drivers/powercap/idle_inject.c           |  4 +--
 drivers/spi/spi.c                        |  4 +--
 drivers/staging/android/ion/ion_heap.c   |  4 +--
 drivers/thermal/intel/intel_powerclamp.c |  5 +---
 drivers/tty/serial/sc16is7xx.c           |  3 +-
 drivers/watchdog/watchdog_dev.c          |  3 +-
 include/linux/sched.h                    |  3 ++
 kernel/irq/manage.c                      |  6 +---
 kernel/locking/locktorture.c             | 10 ++-----
 kernel/rcu/rcuperf.c                     |  8 ++---
 kernel/rcu/rcutorture.c                  |  7 +----
 kernel/sched/core.c                      | 50 ++++++++++++++++++++++++++++++--
 kernel/sched/psi.c                       |  5 +---
 kernel/trace/ring_buffer_benchmark.c     | 48 +++++++++++++++---------------
 24 files changed, 98 insertions(+), 120 deletions(-)
#1 lore raw
Quoted 4 lines · Ingo Molnar

When merging to the latest upstream tree there's a conflict in drivers/spi/spi.c, which can be resolved via:

	sched_set_fifo(ctlr->kworker_task);

Correction, the suggested resolution would be:

	sched_set_fifo(ctlr->kworker->task);

Thanks,

Ingo

merge bot Merged
#2 lore raw
In reply to Ingo Molnar
The pull request you sent on Tue, 4 Aug 2020 13:10:25 +0200:

The pull request you sent on Tue, 4 Aug 2020 13:10:25 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-fifo-2020-08-04

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/6d2b84a4e5b954bd2587e06c29577256f59e0030

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html