c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 18:11:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Invert minclsyspri and maxclsyspri

Browse Source 
On Linux the meaning of a processes priority is inverted with respect
to illumos.  High values on Linux indicate a _low_ priority while high
value on illumos indicate a _high_ priority.

In order to preserve the logical meaning of the minclsyspri and
maxclsyspri macros when they are used by the illumos wrapper functions
their values have been inverted.  This way when changes are merged
from upstream illumos we won't need to remember to invert the macro.
It could also lead to confusion.

Note this change also reverts some of the priorities changes in prior
commit 62aa81a.  The rational is as follows:

spl_kmem_cache    - High priority may result in blocked memory allocs
spl_system_taskq  - May perform I/O for file backed VDEVs
spl_dynamic_taskq - New taskq threads should be spawned promptly

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ned Bass <bass6@llnl.gov>
Issue zfsonlinux/zfs#3607
This commit is contained in:
Brian Behlendorf 2015-07-24 10:32:55 -07:00
parent 4699d76d19
commit 9dc5ffbec8
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sys/sysmacros.h
View File

@ -93,8 +93,8 @@
* *
* Treat shim tasks as SCHED_NORMAL tasks * Treat shim tasks as SCHED_NORMAL tasks
*/ */
#define minclsyspri (MAX_RT_PRIO) #define minclsyspri (MAX_PRIO-1)
#define maxclsyspri (MAX_PRIO-1) #define maxclsyspri (MAX_RT_PRIO)
#define defclsyspri (DEFAULT_PRIO) #define defclsyspri (DEFAULT_PRIO)
#ifndef NICE_TO_PRIO #ifndef NICE_TO_PRIO

2
include/sys/taskq.h
View File

@ -129,7 +129,7 @@ extern int taskq_member(taskq_t *, void *);
#define taskq_create_proc(name, nthreads, pri, min, max, proc, flags) \ #define taskq_create_proc(name, nthreads, pri, min, max, proc, flags) \
taskq_create(name, nthreads, pri, min, max, flags) taskq_create(name, nthreads, pri, min, max, flags)
#define taskq_create_sysdc(name, nthreads, min, max, proc, dc, flags) \ #define taskq_create_sysdc(name, nthreads, min, max, proc, dc, flags) \
taskq_create(name, nthreads, defclsyspri, min, max, flags) taskq_create(name, nthreads, maxclsyspri, min, max, flags)
int spl_taskq_init(void); int spl_taskq_init(void);
void spl_taskq_fini(void); void spl_taskq_fini(void);

2
module/spl/spl-kmem-cache.c
View File

@ -1718,7 +1718,7 @@ spl_kmem_cache_init(void)
init_rwsem(&spl_kmem_cache_sem); init_rwsem(&spl_kmem_cache_sem);
INIT_LIST_HEAD(&spl_kmem_cache_list); INIT_LIST_HEAD(&spl_kmem_cache_list);
spl_kmem_cache_taskq = taskq_create("spl_kmem_cache", spl_kmem_cache_taskq = taskq_create("spl_kmem_cache",
spl_kmem_cache_kmem_threads, defclsyspri, spl_kmem_cache_kmem_threads, maxclsyspri,
spl_kmem_cache_kmem_threads * 8, INT_MAX, spl_kmem_cache_kmem_threads * 8, INT_MAX,
TASKQ_PREPOPULATE | TASKQ_DYNAMIC); TASKQ_PREPOPULATE | TASKQ_DYNAMIC);
spl_register_shrinker(&spl_kmem_cache_shrinker); spl_register_shrinker(&spl_kmem_cache_shrinker);

5
module/spl/spl-taskq.c
View File

@ -935,7 +935,6 @@ taskq_create(const char *name, int nthreads, pri_t pri,
int count = 0, rc = 0, i; int count = 0, rc = 0, i;
ASSERT(name != NULL); ASSERT(name != NULL);
ASSERT(pri <= maxclsyspri);
ASSERT(minalloc >= 0); ASSERT(minalloc >= 0);
ASSERT(maxalloc <= INT_MAX); ASSERT(maxalloc <= INT_MAX);
ASSERT(!(flags & (TASKQ_CPR_SAFE))); /* Unsupported */ ASSERT(!(flags & (TASKQ_CPR_SAFE))); /* Unsupported */
@ -1077,12 +1076,12 @@ int
spl_taskq_init(void) spl_taskq_init(void)
{ {
system_taskq = taskq_create("spl_system_taskq", MAX(boot_ncpus, 64), system_taskq = taskq_create("spl_system_taskq", MAX(boot_ncpus, 64),
defclsyspri, boot_ncpus, INT_MAX, TASKQ_PREPOPULATE|TASKQ_DYNAMIC); maxclsyspri, boot_ncpus, INT_MAX, TASKQ_PREPOPULATE|TASKQ_DYNAMIC);
if (system_taskq == NULL) if (system_taskq == NULL)
return (1); return (1);
dynamic_taskq = taskq_create("spl_dynamic_taskq", 1, dynamic_taskq = taskq_create("spl_dynamic_taskq", 1,
defclsyspri, boot_ncpus, INT_MAX, TASKQ_PREPOPULATE); maxclsyspri, boot_ncpus, INT_MAX, TASKQ_PREPOPULATE);
if (dynamic_taskq == NULL) { if (dynamic_taskq == NULL) {
taskq_destroy(system_taskq); taskq_destroy(system_taskq);
return (1); return (1);