[PATCH -next] misc: watch_queue: Fix build error

[PATCH -next] misc: watch_queue: Fix build error

[YueHaibing]

drivers/misc/watch_queue.c: In function watch_queue_account_mem:
drivers/misc/watch_queue.c:309:38: error: struct user_struct has no member named locked_vm; did you mean locked_shm?
  cur_pages = atomic_long_read(&user->locked_vm);
                                      ^~~~~~~~~
                                      locked_shm

struct user_struct {
...
   #if defined(CONFIG_PERF_EVENTS) || defined(CONFIG_BPF_SYSCALL) || \
       defined(CONFIG_NET) || defined(CONFIG_IO_URING)
           atomic_long_t locked_vm;
   #endif
...
}

If none of the CONFIGS is defined, locked_vm will be unavailable.

Reported-by: Hulk Robot <hulkci@huawei.com>
Fixes: 064756fb355a ("General notification queue with user mmap()'able ring buffer")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 include/linux/sched/user.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/linux/sched/user.h b/include/linux/sched/user.h
index 917d88e..126494d 100644
--- a/include/linux/sched/user.h
+++ b/include/linux/sched/user.h
@@ -33,7 +33,8 @@ 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
 
-- 
2.7.4

Re: [PATCH -next] misc: watch_queue: Fix build error

[David Howells]

Thanks, I've folded that in.

David

Re: [PATCH -next] misc: watch_queue: Fix build error

[Yuehaibing]

On 2019/9/4 20:20, David Howells wrote:
> Thanks, I've folded that in.

This issue still occur in linux-next 20191008 :

drivers/misc/watch_queue.c: In function ‘watch_queue_account_mem’:
drivers/misc/watch_queue.c:315:38: error: ‘struct user_struct’ has no member named ‘locked_vm’; did you mean ‘locked_shm’?
  cur_pages = atomic_long_read(&user->locked_vm);
                                      ^~~~~~~~~
                                      locked_shm
drivers/misc/watch_queue.c:321:50: error: ‘struct user_struct’ has no member named ‘locked_vm’; did you mean ‘locked_shm’?
  } while (atomic_long_try_cmpxchg_relaxed(&user->locked_vm, &cur_pages,
                                                  ^~~~~~~~~
                                                  locked_shm
drivers/misc/watch_queue.c: In function ‘watch_queue_unaccount_mem’:
drivers/misc/watch_queue.c:333:44: error: ‘struct user_struct’ has no member named ‘locked_vm’; did you mean ‘locked_shm’?
   atomic_long_sub(wqueue->nr_pages, &user->locked_vm);
                                            ^~~~~~~~~
                                            locked_shm
scripts/Makefile.build:265: recipe for target 'drivers/misc/watch_queue.o' failed

> 
> David
> 
> .
>