watch_queue: make locked_vm accessible
PATCH 1/2 watch_queue: make locked_vm accessible
The locked_vm member of struct user_struct is guarded by an #ifdef, which breaks building the new watch_queue driver when all the other subsystems that need it are disabled:
drivers/misc/watch_queue.c:315:38: error: no member named 'locked_vm' in 'struct user_struct'; did you mean 'locked_shm'?
Add watch_queue to the list.
--- include/linux/sched/user.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/sched/user.h +1 -1
@@ -33,7 +33,7 @@ struct user_struct {kuid_t uid;#if defined(CONFIG_PERF_EVENTS ) || defined(CONFIG_BPF_SYSCALL ) || \ - defined(CONFIG_NET ) || defined(CONFIG_IO_URING ) + defined(CONFIG_NET ) || defined(CONFIG_IO_URING ) || defined(CONFIG_WATCH_QUEUE )atomic_long_t locked_vm;#endif
Signature · 1 line
2.20.0
PATCH 2/2 watch_queue: disable sample
Building in a separate object directory causes a compilation failure for a missing header:
samples/watch_queue/watch_test.c:23:10: fatal error: linux/watch_queue.h: No such file or directory
I could not figure out why this does not work and applied this patch locally. It would be good to fix this properly for 5.4 instead.
--- samples/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
samples/Makefile +1 -1
@@ -20,4 +20,4 @@ obj-$(CONFIG_SAMPLE_TRACE_PRINTK) += trace_printk/ obj-$(CONFIG_VIDEO_PCI_SKELETON) += v4l/ obj-y += vfio-mdev/ subdir-$(CONFIG_SAMPLE_VFS) += vfs -subdir-$(CONFIG_SAMPLE_WATCH_QUEUE) += watch_queue +#subdir-$(CONFIG_SAMPLE_WATCH_QUEUE) += watch_queue
Signature · 1 line
2.20.0
Quoted 7 lines · Arnd Bergmann
The
locked_vmmember of structuser_structis guarded by an #ifdef, which breaks building the newwatch_queuedriver when all the other subsystems that need it are disabled:
drivers/misc/watch_queue.c:315:38: error: no member named 'locked_vm' in 'structuser_struct'; did you mean 'locked_shm'?Add
watch_queueto the list.
Should we either:
1) Make it unconditionally available
or
2) Introduce a symbol for this that others can select, like CONFIG_NEEDS_USER_LOCKED_VM or something like that.
?
Signature · 1 line
Jens Axboe