From: Dominik Brodowski <linux@dominikbrodowski.net>
To: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org,
viro@ZenIV.linux.org.uk, arnd@arndb.de,
linux-arch@vger.kernel.org
Cc: Jan Kara <jack@suse.com>
Subject: [PATCH 18/45] fs/quota: add kernel_quotactl() helper; remove in-kernel call to syscall
Date: Thu, 22 Mar 2018 10:00:32 +0100 [thread overview]
Message-ID: <20180322090059.19361-19-linux@dominikbrodowski.net> (raw)
In-Reply-To: <20180322090059.19361-1-linux@dominikbrodowski.net>
Using the fs-internal kernel_quotactl() helper allows us to get rid of
the fs-internal call to the sys_quotactl() syscall.
This patch is part of a series which tries to remove in-kernel calls to
syscalls. On this basis, the syscall entry path can be streamlined.
Cc: Jan Kara <jack@suse.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
fs/quota/compat.c | 8 ++++----
fs/quota/quota.c | 10 ++++++++--
include/linux/quotaops.h | 3 +++
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/fs/quota/compat.c b/fs/quota/compat.c
index 779caed4f078..1577a2fd51f4 100644
--- a/fs/quota/compat.c
+++ b/fs/quota/compat.c
@@ -59,7 +59,7 @@ asmlinkage long sys32_quotactl(unsigned int cmd, const char __user *special,
case Q_GETQUOTA:
dqblk = compat_alloc_user_space(sizeof(struct if_dqblk));
compat_dqblk = addr;
- ret = sys_quotactl(cmd, special, id, dqblk);
+ ret = kernel_quotactl(cmd, special, id, dqblk);
if (ret)
break;
if (copy_in_user(compat_dqblk, dqblk, sizeof(*compat_dqblk)) ||
@@ -75,12 +75,12 @@ asmlinkage long sys32_quotactl(unsigned int cmd, const char __user *special,
get_user(data, &compat_dqblk->dqb_valid) ||
put_user(data, &dqblk->dqb_valid))
break;
- ret = sys_quotactl(cmd, special, id, dqblk);
+ ret = kernel_quotactl(cmd, special, id, dqblk);
break;
case Q_XGETQSTAT:
fsqstat = compat_alloc_user_space(sizeof(struct fs_quota_stat));
compat_fsqstat = addr;
- ret = sys_quotactl(cmd, special, id, fsqstat);
+ ret = kernel_quotactl(cmd, special, id, fsqstat);
if (ret)
break;
ret = -EFAULT;
@@ -113,7 +113,7 @@ asmlinkage long sys32_quotactl(unsigned int cmd, const char __user *special,
ret = 0;
break;
default:
- ret = sys_quotactl(cmd, special, id, addr);
+ ret = kernel_quotactl(cmd, special, id, addr);
}
return ret;
}
diff --git a/fs/quota/quota.c b/fs/quota/quota.c
index 43612e2a73af..860bfbe7a07a 100644
--- a/fs/quota/quota.c
+++ b/fs/quota/quota.c
@@ -833,8 +833,8 @@ static struct super_block *quotactl_block(const char __user *special, int cmd)
* calls. Maybe we need to add the process quotas etc. in the future,
* but we probably should use rlimits for that.
*/
-SYSCALL_DEFINE4(quotactl, unsigned int, cmd, const char __user *, special,
- qid_t, id, void __user *, addr)
+int kernel_quotactl(unsigned int cmd, const char __user *special,
+ qid_t id, void __user *addr)
{
uint cmds, type;
struct super_block *sb = NULL;
@@ -885,3 +885,9 @@ SYSCALL_DEFINE4(quotactl, unsigned int, cmd, const char __user *, special,
path_put(pathp);
return ret;
}
+
+SYSCALL_DEFINE4(quotactl, unsigned int, cmd, const char __user *, special,
+ qid_t, id, void __user *, addr)
+{
+ return kernel_quotactl(cmd, special, id, addr);
+}
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index 2fb6fb11132e..ff63eac16a79 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -105,6 +105,9 @@ int dquot_set_dqblk(struct super_block *sb, struct kqid id,
int __dquot_transfer(struct inode *inode, struct dquot **transfer_to);
int dquot_transfer(struct inode *inode, struct iattr *iattr);
+int kernel_quotactl(unsigned int cmd, const char __user *special,
+ qid_t id, void __user *addr);
+
static inline struct mem_dqinfo *sb_dqinfo(struct super_block *sb, int type)
{
return sb_dqopt(sb)->info + type;
--
2.16.2
next prev parent reply other threads:[~2018-03-22 9:00 UTC|newest]
Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-22 9:00 [PATCH 00/45] remove in-kernel syscall invocations (part 3 == remainder outside arch/) Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 01/45] fs: add ksys_getdents64() helper; remove in-kernel calls to sys_getdents64() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 02/45] fs: add ksys_ioctl() helper; remove in-kernel calls to sys_ioctl() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 03/45] fs: add ksys_lseek() helper; remove in-kernel calls to sys_lseek() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 04/45] fs: add ksys_read() helper; remove in-kernel calls to sys_read() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 05/45] fs: add ksys_sync() helper; remove in-kernel calls to sys_sync() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 06/45] fs: add do_lookup_dcookie() helper; remove in-kernel call to syscall Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 07/45] fs: add do_vmsplice() " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 08/45] fs: add kern_select() helper; remove in-kernel call to sys_select() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 09/45] fs: add ksys_truncate() wrapper; remove in-kernel calls to sys_truncate() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 10/45] fs: add ksys_p{read,write}64() helpers; remove in-kernel calls to syscalls Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 11/45] fs: add ksys_fallocate() wrapper; remove in-kernel calls to sys_fallocate() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 12/45] fs: add do_compat_fcntl64() helper; remove in-kernel call to comapt syscall Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 13/45] fs: add do_compat_select() " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 14/45] fs: add do_compat_signalfd4() " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 15/45] fs: add do_compat_futimesat() " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 16/45] inotify: add do_inotify_init() helper; remove in-kernel call to syscall Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-26 12:25 ` Jan Kara
2018-03-26 12:25 ` Jan Kara
2018-03-22 9:00 ` [PATCH 17/45] fanotify: add do_fanotify_mark() " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-26 12:25 ` Jan Kara
2018-03-26 12:25 ` Jan Kara
2018-03-22 9:00 ` Dominik Brodowski [this message]
2018-03-22 9:00 ` [PATCH 18/45] fs/quota: add kernel_quotactl() " Dominik Brodowski
2018-03-26 12:26 ` Jan Kara
2018-03-26 12:26 ` Jan Kara
2018-03-22 9:00 ` [PATCH 19/45] fs/quota: use COMPAT_SYSCALL_DEFINE for sys32_quotactl() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-26 12:33 ` Jan Kara
2018-03-26 12:33 ` Jan Kara
2018-03-22 9:00 ` [PATCH 20/45] kernel: add do_compat_sigaltstack() helper; remove in-kernel call to compat syscall Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 21/45] kernel: add ksys_setsid() helper; remove in-kernel call to sys_setsid() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 22/45] kernel: provide ksys_*() wrappers for syscalls called by kernel/uid16.c Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 10:21 ` Any chance that kernel/uid6.c can go? [Was: [PATCH 22/45] kernel: provide ksys_*() wrappers for syscalls called by kernel/uid16.c] Dominik Brodowski
2018-03-22 10:21 ` Dominik Brodowski
2018-03-22 17:57 ` Linus Torvalds
2018-03-22 17:57 ` Linus Torvalds
2018-03-22 9:00 ` [PATCH 23/45] sched: add do_sched_yield() helper; remove in-kernel call to sched_yield() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 17:29 ` Peter Zijlstra
2018-03-22 17:29 ` Peter Zijlstra
2018-03-22 17:41 ` Dominik Brodowski
2018-03-22 17:41 ` Dominik Brodowski
2018-03-22 17:44 ` Linus Torvalds
2018-03-22 17:44 ` Linus Torvalds
2018-03-22 9:00 ` [PATCH 24/45] kexec: call do_kexec_load() in compat syscall directly Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 25/45] mm: add kernel_migrate_pages() helper, move compat syscall to mm/mempolicy.c Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 26/45] mm: add kernel_move_pages() helper, move compat syscall to mm/migrate.c Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 27/45] mm: add kernel_mbind() helper; remove in-kernel call to syscall Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 28/45] mm: add kernel_[sg]et_mempolicy() helpers; remove in-kernel calls to syscalls Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 29/45] mm: add ksys_readahead() helper; remove in-kernel calls to sys_readahead() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 30/45] ipc: add semtimedop syscall/compat_syscall wrappers Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 31/45] ipc: add semget syscall wrapper Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 32/45] ipc: add semctl syscall/compat_syscall wrappers Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 33/45] ipc: add msgget syscall wrapper Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 34/45] ipc: add shmget " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 35/45] ipc: add shmdt " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 36/45] ipc: add shmctl syscall/compat_syscall wrappers Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 37/45] ipc: add msgctl " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 38/45] ipc: add msgrcv " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 39/45] ipc: add msgsnd " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 40/45] x86: use _do_fork() in compat_sys_x86_clone() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:26 ` Thomas Gleixner
2018-03-22 9:26 ` Thomas Gleixner
2018-03-22 9:00 ` [PATCH 41/45] x86: remove compat_sys_x86_waitpid() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:27 ` Thomas Gleixner
2018-03-22 9:27 ` Thomas Gleixner
2018-03-22 9:00 ` [PATCH 42/45] x86: fix sys_sigreturn() return type to be long, not unsigned long Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:27 ` Thomas Gleixner
2018-03-22 9:27 ` Thomas Gleixner
2018-03-22 9:00 ` [PATCH 43/45] x86/sigreturn: use SYSCALL_DEFINE0 Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:27 ` Thomas Gleixner
2018-03-22 9:27 ` Thomas Gleixner
2018-03-22 9:00 ` [PATCH 44/45] kernel/sys_ni: sort cond_syscall() entries Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 45/45] bpf: whitelist all syscalls for error injection Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 20:29 ` [PATCH 00/45] remove in-kernel syscall invocations (part 3 == remainder outside arch/) Linus Torvalds
2018-03-22 20:29 ` Linus Torvalds
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=20180322090059.19361-19-linux@dominikbrodowski.net \
--to=linux@dominikbrodowski.net \
--cc=arnd@arndb.de \
--cc=jack@suse.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@ZenIV.linux.org.uk \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox