Commit 06447ae5 authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by Jens Axboe
Browse files

ioprio: move user space relevant ioprio bits to UAPI includes 



systemd added a modified copy of include/linux/ioprio.h into its
code to get the relevant content definitions for the exposed
ioprio_[get|set] system calls.

Move the user space relevant ioprio bits to the UAPI includes to be
able to use the ioprio_[get|set] syscalls as intended.

Cc: Kay Sievers <kay@vrfy.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org
Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20210714195655.181943-1-socketcan@hartkopp.net


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c500bee1

include/linux/ioprio.h

+1 −40
Original line number Diff line number Diff line
@@ -6,46 +6,7 @@ 
#include <linux/sched/rt.h>

#include <linux/iocontext.h>



/*

 * Gives us 8 prio classes with 13-bits of data for each class

 */

#define IOPRIO_CLASS_SHIFT	(13)

#define IOPRIO_PRIO_MASK	((1UL << IOPRIO_CLASS_SHIFT) - 1)



#define IOPRIO_PRIO_CLASS(mask)	((mask) >> IOPRIO_CLASS_SHIFT)

#define IOPRIO_PRIO_DATA(mask)	((mask) & IOPRIO_PRIO_MASK)

#define IOPRIO_PRIO_VALUE(class, data)	(((class) << IOPRIO_CLASS_SHIFT) | data)



#define ioprio_valid(mask)	(IOPRIO_PRIO_CLASS((mask)) != IOPRIO_CLASS_NONE)



/*

 * These are the io priority groups as implemented by CFQ. RT is the realtime

 * class, it always gets premium service. BE is the best-effort scheduling

 * class, the default for any process. IDLE is the idle scheduling class, it

 * is only served when no one else is using the disk.

 */

enum {

	IOPRIO_CLASS_NONE,

	IOPRIO_CLASS_RT,

	IOPRIO_CLASS_BE,

	IOPRIO_CLASS_IDLE,

};



/*

 * 8 best effort priority levels are supported

 */

#define IOPRIO_BE_NR	(8)



enum {

	IOPRIO_WHO_PROCESS = 1,

	IOPRIO_WHO_PGRP,

	IOPRIO_WHO_USER,

};



/*

 * Fallback BE priority

 */

#define IOPRIO_NORM	(4)

#include <uapi/linux/ioprio.h>



/*

 * if process has set io priority explicitly, use that. if not, convert

include/uapi/linux/ioprio.h

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _UAPI_LINUX_IOPRIO_H

#define _UAPI_LINUX_IOPRIO_H



/*

 * Gives us 8 prio classes with 13-bits of data for each class

 */

#define IOPRIO_CLASS_SHIFT	(13)

#define IOPRIO_PRIO_MASK	((1UL << IOPRIO_CLASS_SHIFT) - 1)



#define IOPRIO_PRIO_CLASS(mask)	((mask) >> IOPRIO_CLASS_SHIFT)

#define IOPRIO_PRIO_DATA(mask)	((mask) & IOPRIO_PRIO_MASK)

#define IOPRIO_PRIO_VALUE(class, data)	(((class) << IOPRIO_CLASS_SHIFT) | data)



/*

 * These are the io priority groups as implemented by CFQ. RT is the realtime

 * class, it always gets premium service. BE is the best-effort scheduling

 * class, the default for any process. IDLE is the idle scheduling class, it

 * is only served when no one else is using the disk.

 */

enum {

	IOPRIO_CLASS_NONE,

	IOPRIO_CLASS_RT,

	IOPRIO_CLASS_BE,

	IOPRIO_CLASS_IDLE,

};



#define ioprio_valid(mask)	(IOPRIO_PRIO_CLASS((mask)) != IOPRIO_CLASS_NONE)



/*

 * 8 best effort priority levels are supported

 */

#define IOPRIO_BE_NR	(8)



enum {

	IOPRIO_WHO_PROCESS = 1,

	IOPRIO_WHO_PGRP,

	IOPRIO_WHO_USER,

};



/*

 * Fallback BE priority

 */

#define IOPRIO_NORM	(4)



#endif /* _UAPI_LINUX_IOPRIO_H */