From: Kyle Huey <me@kylehuey.com> To: "Robert O'Callahan" <robert@ocallahan.org>, "Thomas Gleixner" <tglx@linutronix.de>, "Andy Lutomirski" <luto@kernel.org>, "Ingo Molnar" <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>, x86@kernel.org, "Paolo Bonzini" <pbonzini@redhat.com>, "Radim Krčmář" <rkrcmar@redhat.com>, "Jeff Dike" <jdike@addtoit.com>, "Richard Weinberger" <richard@nod.at>, "Alexander Viro" <viro@zeniv.linux.org.uk>, "Shuah Khan" <shuah@kernel.org>, "Dave Hansen" <dave.hansen@linux.intel.com>, "Borislav Petkov" <bp@suse.de>, "Peter Zijlstra" <peterz@infradead.org>, "Boris Ostrovsky" <boris.ostrovsky@oracle.com>, "Len Brown" <len.brown@intel.com>, "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>, "Dmitry Safonov" <dsafonov@virtuozzo.com>, "David Matlack" <dmatlack@google.com>, "Nadav Amit" <nadav.amit@gmail.com> Cc: linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net, user-mode-linux-user@lists.sourceforge.net, linux-fsdevel@vger.kernel.org, linux-kselftest@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH v12 3/7] x86/arch_prctl: Add do_arch_prctl_common Date: Wed, 16 Nov 2016 18:06:06 -0800 [thread overview] Message-ID: <20161117020610.5302-4-khuey@kylehuey.com> (raw) In-Reply-To: <20161117020610.5302-1-khuey@kylehuey.com> Add do_arch_prctl_common() to handle arch_prctls that are not specific to 64 bit mode. Call it from the syscall entry point, but not any of the other callsites in the kernel, which all want one of the existing 64 bit only arch_prctls. Signed-off-by: Kyle Huey <khuey@kylehuey.com> --- arch/x86/include/asm/proto.h | 2 ++ arch/x86/kernel/process.c | 5 +++++ arch/x86/kernel/process_64.c | 8 +++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/proto.h b/arch/x86/include/asm/proto.h index f8e9194..fa66909 100644 --- a/arch/x86/include/asm/proto.h +++ b/arch/x86/include/asm/proto.h @@ -26,9 +26,11 @@ void entry_SYSCALL_compat(void); void entry_INT80_compat(void); #endif void x86_configure_nx(void); void x86_report_nx(void); extern int reboot_force; +long do_arch_prctl_common(struct task_struct *task, int code, unsigned long arg2); + #endif /* _ASM_X86_PROTO_H */ diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 0888a87..d0126b2 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -579,8 +579,13 @@ unsigned long get_wchan(struct task_struct *p) } fp = READ_ONCE_NOCHECK(*(unsigned long *)fp); } while (count++ < 16 && p->state != TASK_RUNNING); out: put_task_stack(p); return ret; } + +long do_arch_prctl_common(struct task_struct *task, int code, unsigned long arg2) +{ + return -EINVAL; +} diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 611df20..bf75d26 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -612,15 +612,21 @@ long do_arch_prctl_64(struct task_struct *task, int code, unsigned long arg2) break; } return ret; } SYSCALL_DEFINE2(arch_prctl, int, code, unsigned long, arg2) { - return do_arch_prctl_64(current, code, arg2); + long ret; + + ret = do_arch_prctl_64(current, code, arg2); + if (ret == -EINVAL) + ret = do_arch_prctl_common(current, code, arg2); + + return ret; } unsigned long KSTK_ESP(struct task_struct *task) { return task_pt_regs(task)->sp; } -- 2.10.2
WARNING: multiple messages have this Message-ID (diff)
From: Kyle Huey <me@kylehuey.com> To: "Robert O'Callahan" <robert@ocallahan.org>, "Thomas Gleixner" <tglx@linutronix.de>, "Andy Lutomirski" <luto@kernel.org>, "Ingo Molnar" <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>, x86@kernel.org, "Paolo Bonzini" <pbonzini@redhat.com>, "Radim Krčmář" <rkrcmar@redhat.com>, "Jeff Dike" <jdike@addtoit.com>, "Richard Weinberger" <richard@nod.at>, "Alexander Viro" <viro@zeniv.linux.org.uk>, "Shuah Khan" <shuah@kernel.org>, "Dave Hansen" <dave.hansen@linux.intel.com>, "Borislav Petkov" <bp@suse.de>, "Peter Zijlstra" <peterz@infradead.org>, "Boris Ostrovsky" <boris.ostrovsky@oracle.com>, "Len Brown" <len.brown@intel.com>, "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>, "Dmitry Safonov" <dsafonov@virtuozzo.com>, "David Matlack" <dmatlack@google.> Cc: linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net, user-mode-linux-user@lists.sourceforge.net, linux-fsdevel@vger.kernel.org, linux-kselftest@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH v12 3/7] x86/arch_prctl: Add do_arch_prctl_common Date: Wed, 16 Nov 2016 18:06:06 -0800 [thread overview] Message-ID: <20161117020610.5302-4-khuey@kylehuey.com> (raw) In-Reply-To: <20161117020610.5302-1-khuey@kylehuey.com> Add do_arch_prctl_common() to handle arch_prctls that are not specific to 64 bit mode. Call it from the syscall entry point, but not any of the other callsites in the kernel, which all want one of the existing 64 bit only arch_prctls. Signed-off-by: Kyle Huey <khuey@kylehuey.com> --- arch/x86/include/asm/proto.h | 2 ++ arch/x86/kernel/process.c | 5 +++++ arch/x86/kernel/process_64.c | 8 +++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/proto.h b/arch/x86/include/asm/proto.h index f8e9194..fa66909 100644 --- a/arch/x86/include/asm/proto.h +++ b/arch/x86/include/asm/proto.h @@ -26,9 +26,11 @@ void entry_SYSCALL_compat(void); void entry_INT80_compat(void); #endif void x86_configure_nx(void); void x86_report_nx(void); extern int reboot_force; +long do_arch_prctl_common(struct task_struct *task, int code, unsigned long arg2); + #endif /* _ASM_X86_PROTO_H */ diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 0888a87..d0126b2 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -579,8 +579,13 @@ unsigned long get_wchan(struct task_struct *p) } fp = READ_ONCE_NOCHECK(*(unsigned long *)fp); } while (count++ < 16 && p->state != TASK_RUNNING); out: put_task_stack(p); return ret; } + +long do_arch_prctl_common(struct task_struct *task, int code, unsigned long arg2) +{ + return -EINVAL; +} diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 611df20..bf75d26 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -612,15 +612,21 @@ long do_arch_prctl_64(struct task_struct *task, int code, unsigned long arg2) break; } return ret; } SYSCALL_DEFINE2(arch_prctl, int, code, unsigned long, arg2) { - return do_arch_prctl_64(current, code, arg2); + long ret; + + ret = do_arch_prctl_64(current, code, arg2); + if (ret == -EINVAL) + ret = do_arch_prctl_common(current, code, arg2); + + return ret; } unsigned long KSTK_ESP(struct task_struct *task) { return task_pt_regs(task)->sp; } -- 2.10.2
next prev parent reply other threads:[~2016-11-17 2:06 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-17 2:06 [PATCH v12 0/7] x86/arch_prctl Add ARCH_[GET|SET]_CPUID for controlling the CPUID instruction Kyle Huey 2016-11-17 2:06 ` Kyle Huey 2016-11-17 2:06 ` [PATCH v12 1/7] x86/arch_prctl/64: Use SYSCALL_DEFINE2 to define sys_arch_prctl Kyle Huey 2016-11-17 2:06 ` Kyle Huey 2016-11-17 2:06 ` [PATCH v12 2/7] x86/arch_prctl/64: Rename do_arch_prctl to do_arch_prctl_64 Kyle Huey 2016-11-17 2:06 ` Kyle Huey 2016-11-18 7:27 ` Ingo Molnar 2016-11-18 7:27 ` Ingo Molnar 2016-11-18 7:28 ` Thomas Gleixner 2016-11-18 7:28 ` Thomas Gleixner 2016-11-18 8:16 ` Ingo Molnar 2016-11-18 8:16 ` Ingo Molnar 2016-11-18 16:39 ` Kyle Huey 2016-11-18 16:39 ` Kyle Huey 2016-11-29 9:26 ` Ingo Molnar 2016-11-29 9:26 ` Ingo Molnar 2016-11-17 2:06 ` Kyle Huey [this message] 2016-11-17 2:06 ` [PATCH v12 3/7] x86/arch_prctl: Add do_arch_prctl_common Kyle Huey 2016-11-17 2:06 ` [PATCH v12 4/7] x86/syscalls/32: Wire up arch_prctl on x86-32 Kyle Huey 2016-11-17 2:06 ` Kyle Huey 2016-11-18 7:30 ` Ingo Molnar 2016-11-18 7:30 ` Ingo Molnar 2016-11-17 2:06 ` [PATCH v12 5/7] x86/cpufeature: Detect CPUID faulting support Kyle Huey 2016-11-17 2:06 ` Kyle Huey 2016-11-17 16:51 ` Borislav Petkov 2016-11-17 16:51 ` Borislav Petkov 2016-11-17 2:06 ` [PATCH v12 6/7] x86/arch_prctl: Add ARCH_[GET|SET]_CPUID Kyle Huey 2016-11-17 2:06 ` Kyle Huey 2016-11-18 8:14 ` Ingo Molnar 2016-11-18 8:14 ` Ingo Molnar 2016-11-18 8:49 ` Thomas Gleixner 2016-11-18 8:49 ` Thomas Gleixner 2016-11-21 8:27 ` Ingo Molnar 2016-11-21 8:27 ` Ingo Molnar 2016-11-22 17:26 ` Andy Lutomirski 2016-11-22 17:26 ` Andy Lutomirski 2016-11-18 15:55 ` Kyle Huey 2016-11-18 15:55 ` Kyle Huey 2016-11-18 17:32 ` Andy Lutomirski 2016-11-18 17:32 ` Andy Lutomirski 2016-11-17 2:06 ` [PATCH v12 7/7] KVM: x86: virtualize cpuid faulting Kyle Huey 2016-11-17 2:06 ` Kyle Huey 2016-11-17 12:31 ` Paolo Bonzini 2016-11-17 12:31 ` Paolo Bonzini
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=20161117020610.5302-4-khuey@kylehuey.com \ --to=me@kylehuey.com \ --cc=boris.ostrovsky@oracle.com \ --cc=bp@suse.de \ --cc=dave.hansen@linux.intel.com \ --cc=dmatlack@google.com \ --cc=dsafonov@virtuozzo.com \ --cc=hpa@zytor.com \ --cc=jdike@addtoit.com \ --cc=kvm@vger.kernel.org \ --cc=len.brown@intel.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-kselftest@vger.kernel.org \ --cc=luto@kernel.org \ --cc=mingo@redhat.com \ --cc=nadav.amit@gmail.com \ --cc=pbonzini@redhat.com \ --cc=peterz@infradead.org \ --cc=rafael.j.wysocki@intel.com \ --cc=richard@nod.at \ --cc=rkrcmar@redhat.com \ --cc=robert@ocallahan.org \ --cc=shuah@kernel.org \ --cc=tglx@linutronix.de \ --cc=user-mode-linux-devel@lists.sourceforge.net \ --cc=user-mode-linux-user@lists.sourceforge.net \ --cc=viro@zeniv.linux.org.uk \ --cc=x86@kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.