From patchwork Thu Nov 10 23:40:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Huey X-Patchwork-Id: 9422237 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A198E60484 for ; Thu, 10 Nov 2016 23:42:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9347C28B41 for ; Thu, 10 Nov 2016 23:42:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 866C028C1F; Thu, 10 Nov 2016 23:42:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 307B428B41 for ; Thu, 10 Nov 2016 23:42:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936358AbcKJXmn (ORCPT ); Thu, 10 Nov 2016 18:42:43 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35511 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935827AbcKJXlM (ORCPT ); Thu, 10 Nov 2016 18:41:12 -0500 Received: by mail-pf0-f195.google.com with SMTP id i88so101823pfk.2 for ; Thu, 10 Nov 2016 15:41:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kylehuey.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ytDzrTF/46q9MBepqVn2F8+i1Ydgm8um+3WJanyBXHo=; b=ACJJQgCZDOBjdvnCxqHavV5XG/STXROCnuRZSVyGdSWKKZo/7GKgoAxjKfIoJ/8wUl 4Iz3DyHt+tZmqW44qNfyB8gLDmCZ8klNncGd/OzRSx+z2t63cNnvRGeB0sSS84hZB7s0 Ap4hTkBXXrG/xWedzJZYqsz7zVun+XHkEQnQwKjyRE+C9z9RacqgU3oGwDRDBW3bBc1B jfKHYU7XZGRjuaSE8024iEiTnT4gTCW9e94z1trS0rJ413G1nVdx/SKecckgig/PIY+X 5l1h5m1e9mEfVm6H3EaGPRgPE9JVg4GqbCunPREc1qYoTEWOxaQ4UbzsJRmvLHEdkEIV XG7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ytDzrTF/46q9MBepqVn2F8+i1Ydgm8um+3WJanyBXHo=; b=PvSzXM2MZWv36x3bjiTTtWnGve3lLZHU8PN/1AieSK0MbQL2Ng0rCp/J1h7mzY2oBi mydLyVZChFOklBdHjobJixU0jmNn5Rlrh7ndADRxBfUIBPOmY1n4CmJwWwUWoWFs2Rc8 F6t/Ml17bo6Yl6dHuf2mr6n0AjMMxhcNqkdNKsQSH3vU/Twe0m6dkhFTyCD1zsr0WNFx Q/uReQ5v1Kt1ihsi848mu2lLFPxJeJ/pcEMrR0pRQBWp3HKNiHnXdzq4krei8321idHt G4+ua+VkEVhFT7aYhs0BZb655Q68mEJ4SQeSPWSNWE7PlMg5YkJJgsJqQmqEM/WdEcZq LLUg== X-Gm-Message-State: ABUngvfBMN/l4EPzkXZ3+cIIoG7pzobZhS0SLNL4fpp/aWDZ+TszLXQVd5F9VNUuvfnYUw== X-Received: by 10.98.89.6 with SMTP id n6mr561818pfb.43.1478821271502; Thu, 10 Nov 2016 15:41:11 -0800 (PST) Received: from minbar.hsd1.ca.comcast.net (c-73-162-102-141.hsd1.ca.comcast.net. [73.162.102.141]) by smtp.gmail.com with ESMTPSA id z6sm9789779pay.31.2016.11.10.15.41.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Nov 2016 15:41:10 -0800 (PST) From: Kyle Huey X-Google-Original-From: Kyle Huey To: Robert O'Callahan , Thomas Gleixner , Andy Lutomirski , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Jeff Dike , Richard Weinberger , Alexander Viro , Shuah Khan , Dave Hansen , Borislav Petkov , Peter Zijlstra , Boris Ostrovsky , Len Brown , "Rafael J. Wysocki" , Dmitry Safonov , David Matlack 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 v11 3/7] x86/arch_prctl: Add do_arch_prctl_common Date: Thu, 10 Nov 2016 15:40:51 -0800 Message-Id: <20161110234055.8654-4-khuey@kylehuey.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161110234055.8654-1-khuey@kylehuey.com> References: <20161110234055.8654-1-khuey@kylehuey.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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; }