From: Al Viro <viro@ZenIV.linux.org.uk> To: Mike Marshall <hubcap@omnibond.com> Cc: linux-fsdevel <linux-fsdevel@vger.kernel.org> Subject: Re: [PATCH 4/4] orangefs: simplify compat ioctl handling Date: Thu, 31 May 2018 22:03:27 +0100 [thread overview] Message-ID: <20180531210327.GI30522@ZenIV.linux.org.uk> (raw) In-Reply-To: <CAOg9mSSkK6JKs3221yWHYJk6_BOACM64OUN8kwZnDEqicnbhAA@mail.gmail.com> On Thu, May 31, 2018 at 04:54:06PM -0400, Mike Marshall wrote: > Thanks for the cleanup. This runs through xfstests with no regressions > on 4.17-rc7. > > I studied what to do about the sparse warning, looked at the code, and > looked for hints from the original authors in the pvfs svn commit messages. > > No luck with the old commit messages. > > I got the sparse warning to quit with this change, which also runs through > xfstests with no regressions, does it seem OK? > > > $ git diff > diff --git a/fs/orangefs/protocol.h b/fs/orangefs/protocol.h > index 61ee8d64c842..d403cf29a99b 100644 > --- a/fs/orangefs/protocol.h > +++ b/fs/orangefs/protocol.h > @@ -342,7 +342,7 @@ enum { > * that may be 32 bit! > */ > struct ORANGEFS_dev_map_desc { > - void *ptr; > + void __user *ptr; > __s32 total_size; > __s32 size; > __s32 count; You want more than that - --- a/fs/orangefs/orangefs-bufmap.c +++ b/fs/orangefs/orangefs-bufmap.c @@ -138,7 +138,7 @@ static int get(struct slot_map *m) /* used to describe mapped buffers */ struct orangefs_bufmap_desc { - void *uaddr; /* user space address pointer */ + void __user *uaddr; /* user space address pointer */ struct page **page_array; /* array of mapped pages */ int array_count; /* size of above arrays */ struct list_head list_link; to go with it. FWIW, the following takes care of almost all sparse warnings in there; up to you whether to split it or not: diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c index 26358efbf794..84f44365bfb3 100644 --- a/fs/orangefs/file.c +++ b/fs/orangefs/file.c @@ -544,7 +544,7 @@ static int orangefs_fault(struct vm_fault *vmf) return filemap_fault(vmf); } -const struct vm_operations_struct orangefs_file_vm_ops = { +static const struct vm_operations_struct orangefs_file_vm_ops = { .fault = orangefs_fault, .map_pages = filemap_map_pages, .page_mkwrite = filemap_page_mkwrite, diff --git a/fs/orangefs/orangefs-bufmap.c b/fs/orangefs/orangefs-bufmap.c index 4f927023d095..0a29f57d4c8f 100644 --- a/fs/orangefs/orangefs-bufmap.c +++ b/fs/orangefs/orangefs-bufmap.c @@ -138,7 +138,7 @@ static int get(struct slot_map *m) /* used to describe mapped buffers */ struct orangefs_bufmap_desc { - void *uaddr; /* user space address pointer */ + void __user *uaddr; /* user space address pointer */ struct page **page_array; /* array of mapped pages */ int array_count; /* size of above arrays */ struct list_head list_link; @@ -215,19 +215,6 @@ int orangefs_bufmap_shift_query(void) static DECLARE_WAIT_QUEUE_HEAD(bufmap_waitq); static DECLARE_WAIT_QUEUE_HEAD(readdir_waitq); -/* - * orangefs_get_bufmap_init - * - * If bufmap_init is 1, then the shared memory system, including the - * buffer_index_array, is available. Otherwise, it is not. - * - * returns the value of bufmap_init - */ -int orangefs_get_bufmap_init(void) -{ - return __orangefs_bufmap ? 1 : 0; -} - static struct orangefs_bufmap * orangefs_bufmap_alloc(struct ORANGEFS_dev_map_desc *user_desc) diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c index 6e35f2f3c897..0732cb08173e 100644 --- a/fs/orangefs/orangefs-debugfs.c +++ b/fs/orangefs/orangefs-debugfs.c @@ -114,7 +114,7 @@ static const struct seq_operations help_debug_ops = { .show = help_show, }; -const struct file_operations debug_help_fops = { +static const struct file_operations debug_help_fops = { .owner = THIS_MODULE, .open = orangefs_debug_help_open, .read = seq_read, diff --git a/fs/orangefs/protocol.h b/fs/orangefs/protocol.h index 61ee8d64c842..d403cf29a99b 100644 --- a/fs/orangefs/protocol.h +++ b/fs/orangefs/protocol.h @@ -342,7 +342,7 @@ enum { * that may be 32 bit! */ struct ORANGEFS_dev_map_desc { - void *ptr; + void __user *ptr; __s32 total_size; __s32 size; __s32 count; diff --git a/fs/orangefs/waitqueue.c b/fs/orangefs/waitqueue.c index 0577d6dba8c8..3de323f17506 100644 --- a/fs/orangefs/waitqueue.c +++ b/fs/orangefs/waitqueue.c @@ -17,8 +17,11 @@ #include "orangefs-kernel.h" #include "orangefs-bufmap.h" -static int wait_for_matching_downcall(struct orangefs_kernel_op_s *, long, bool); -static void orangefs_clean_up_interrupted_operation(struct orangefs_kernel_op_s *); +static int wait_for_matching_downcall(struct orangefs_kernel_op_s *op, + long timeout, bool interruptible) + __acquires(op->lock); +static void orangefs_clean_up_interrupted_operation(struct orangefs_kernel_op_s *op) + __releases(op->lock); /* * What we do in this function is to walk the list of operations that are @@ -245,7 +248,8 @@ bool orangefs_cancel_op_in_progress(struct orangefs_kernel_op_s *op) * Change an op to the "given up" state and remove it from its list. */ static void - orangefs_clean_up_interrupted_operation(struct orangefs_kernel_op_s *op) +orangefs_clean_up_interrupted_operation(struct orangefs_kernel_op_s *op) + __releases(op->lock) { /* * handle interrupted cases depending on what state we were in when @@ -315,6 +319,7 @@ static void static int wait_for_matching_downcall(struct orangefs_kernel_op_s *op, long timeout, bool interruptible) + __acquires(op->lock) { long n;
next prev parent reply other threads:[~2018-05-31 21:03 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-23 19:19 aio poll and a new in-kernel poll API V13 Christoph Hellwig 2018-05-23 19:19 ` [PATCH 01/33] fix io_destroy()/aio_complete() race Christoph Hellwig 2018-05-23 19:19 ` [PATCH 02/33] uapi: turn __poll_t sparse checkin on by default Christoph Hellwig 2018-05-23 19:19 ` [PATCH 03/33] fs: unexport poll_schedule_timeout Christoph Hellwig 2018-05-23 19:19 ` [PATCH 04/33] fs: cleanup do_pollfd Christoph Hellwig 2018-05-23 19:19 ` [PATCH 05/33] fs: update documentation to mention __poll_t and match the code Christoph Hellwig 2018-05-23 19:19 ` [PATCH 06/33] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig 2018-05-23 19:19 ` [PATCH 07/33] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig 2018-05-23 19:19 ` [PATCH 08/33] aio: simplify KIOCB_KEY handling Christoph Hellwig 2018-05-23 19:19 ` [PATCH 09/33] aio: simplify cancellation Christoph Hellwig 2018-05-23 19:19 ` [PATCH 10/33] aio: implement IOCB_CMD_POLL Christoph Hellwig 2018-05-23 19:20 ` [PATCH 11/33] aio: try to complete poll iocbs without context switch Christoph Hellwig 2018-05-23 19:20 ` [PATCH 12/33] net: refactor socket_poll Christoph Hellwig 2018-05-23 19:20 ` [PATCH 13/33] net: add support for ->poll_mask in proto_ops Christoph Hellwig 2018-05-23 19:20 ` [PATCH 14/33] net: remove sock_no_poll Christoph Hellwig 2018-05-23 19:20 ` [PATCH 15/33] net/tcp: convert to ->poll_mask Christoph Hellwig 2018-05-23 19:20 ` [PATCH 16/33] net/unix: " Christoph Hellwig 2018-05-23 19:20 ` [PATCH 17/33] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig 2018-05-23 19:20 ` [PATCH 18/33] net/dccp: convert to ->poll_mask Christoph Hellwig 2018-05-23 19:20 ` [PATCH 19/33] net/atm: " Christoph Hellwig 2018-05-23 19:20 ` [PATCH 20/33] net/vmw_vsock: " Christoph Hellwig 2018-05-23 19:20 ` [PATCH 21/33] net/tipc: " Christoph Hellwig 2018-05-23 19:20 ` [PATCH 22/33] net/sctp: " Christoph Hellwig 2018-05-23 19:20 ` [PATCH 23/33] net/bluetooth: " Christoph Hellwig 2018-05-23 19:20 ` [PATCH 24/33] net/caif: " Christoph Hellwig 2018-05-23 19:20 ` [PATCH 25/33] net/nfc: " Christoph Hellwig 2018-05-23 19:20 ` [PATCH 26/33] net/phonet: " Christoph Hellwig 2018-05-23 19:20 ` [PATCH 27/33] net/iucv: " Christoph Hellwig 2018-05-23 19:20 ` [PATCH 28/33] net/rxrpc: " Christoph Hellwig 2018-05-23 19:20 ` [PATCH 29/33] crypto: af_alg: " Christoph Hellwig 2018-05-23 19:20 ` [PATCH 30/33] pipe: " Christoph Hellwig 2018-05-23 19:20 ` [PATCH 31/33] eventfd: switch " Christoph Hellwig 2018-05-23 19:20 ` [PATCH 32/33] timerfd: convert " Christoph Hellwig 2018-05-23 19:20 ` [PATCH 33/33] random: " Christoph Hellwig 2018-05-26 0:11 ` aio poll and a new in-kernel poll API V13 Al Viro 2018-05-26 7:09 ` Al Viro 2018-05-26 7:23 ` Christoph Hellwig 2018-05-27 22:27 ` Al Viro 2018-05-27 22:28 ` [PATCH 1/4] aio: all callers of aio_{read,write,fsync,poll} treat 0 and -EIOCBQUEUED the same way Al Viro 2018-05-27 22:28 ` [PATCH 2/4] aio_read_events_ring(): make a bit more readable Al Viro 2018-05-27 22:28 ` [PATCH 3/4] aio: shift copyin of iocb into io_submit_one() Al Viro 2018-05-28 5:16 ` Christoph Hellwig 2018-05-27 22:28 ` [PATCH 4/4] aio: fold do_io_submit() into callers Al Viro 2018-05-27 23:14 ` Al Viro 2018-05-28 5:24 ` Christoph Hellwig 2018-05-28 5:15 ` [PATCH 1/4] aio: all callers of aio_{read,write,fsync,poll} treat 0 and -EIOCBQUEUED the same way Christoph Hellwig 2018-05-28 14:04 ` Al Viro 2018-05-28 17:54 ` Al Viro 2018-05-28 17:57 ` [PATCH v2 1/6] aio: take list removal to (some) callers of aio_complete() Al Viro 2018-05-28 17:57 ` [PATCH v2 2/6] aio: all callers of aio_{read,write,fsync,poll} treat 0 and -EIOCBQUEUED the same way Al Viro 2018-05-29 6:08 ` Christoph Hellwig 2018-05-28 17:57 ` [PATCH v2 3/6] aio_read_events_ring(): make a bit more readable Al Viro 2018-05-28 17:57 ` [PATCH v2 4/6] aio: shift copyin of iocb into io_submit_one() Al Viro 2018-05-28 17:57 ` [PATCH v2 5/6] aio: fold do_io_submit() into callers Al Viro 2018-05-29 6:10 ` Christoph Hellwig 2018-05-28 17:57 ` [PATCH v2 6/6] aio: sanitize the limit checking in io_submit(2) Al Viro 2018-05-29 6:10 ` Christoph Hellwig 2018-05-29 6:08 ` [PATCH v2 1/6] aio: take list removal to (some) callers of aio_complete() Christoph Hellwig 2018-05-28 22:20 ` [PATCH 1/4] vmsplice: lift import_iovec() into do_vmsplice() Al Viro 2018-05-28 22:20 ` [PATCH 2/4] vmsplice(): lift importing iovec into vmsplice(2) and compat counterpart Al Viro 2018-05-28 22:20 ` [PATCH 3/4] signalfd: lift sigmask copyin and size checks to callers of do_signalfd4() Al Viro 2018-05-28 22:20 ` [PATCH 4/4] orangefs: simplify compat ioctl handling Al Viro 2018-05-31 11:11 ` kbuild test robot 2018-05-31 20:54 ` Mike Marshall 2018-05-31 21:03 ` Al Viro [this message] 2018-06-01 21:13 ` Mike Marshall 2018-06-06 22:57 ` [1/4] vmsplice: lift import_iovec() into do_vmsplice() Andrei Vagin 2018-06-07 17:56 ` Andrei Vagin 2018-06-11 20:14 ` Cyrill Gorcunov 2018-06-11 20:16 ` Al Viro 2018-06-11 20:18 ` Cyrill Gorcunov 2018-06-14 22:22 ` Andrey Vagin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180531210327.GI30522@ZenIV.linux.org.uk \ --to=viro@zeniv.linux.org.uk \ --cc=hubcap@omnibond.com \ --cc=linux-fsdevel@vger.kernel.org \ --subject='Re: [PATCH 4/4] orangefs: simplify compat ioctl handling' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).