From patchwork Thu Nov 17 02:06:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Huey X-Patchwork-Id: 9433393 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 68BDF60756 for ; Thu, 17 Nov 2016 02:07:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57728291E4 for ; Thu, 17 Nov 2016 02:07:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4C034291E6; Thu, 17 Nov 2016 02:07:50 +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=unavailable 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 52AE5291E4 for ; Thu, 17 Nov 2016 02:07:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938318AbcKQCGf (ORCPT ); Wed, 16 Nov 2016 21:06:35 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:33352 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932559AbcKQCGb (ORCPT ); Wed, 16 Nov 2016 21:06:31 -0500 Received: by mail-pg0-f67.google.com with SMTP id 3so16171931pgd.0 for ; Wed, 16 Nov 2016 18:06:31 -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=fLljBS3Q1mq5eD/20ourlPQN7sqGzw7xVWWpW04dd4ql/xUVBGFZRZ+gk9F6+Qmlji YAiQ9ydqVdkszhQCriqYYQR8ZjQMz/jcrgjM/UVF0EW1Qwf4Pqs+8P8Wh0zcxrO2Nt7n X+WmNSQ9CGJa/APBnBBZOX7FFMHBuSxVIy+lcoEWc9SP+Mtv7gLZYcj6u1j7fWk/Vo+F j1T49Q/EYwVHN/FPx8+7STiUj9AjDnekfrIlGpK/N5Y1VrxCcNRASBmD+nD32f3goISp 8g25RruOfEI6tTl3F39lBQZtMLIr2ZLn4n6AwMMmBXMoqN9n/O3K73mcXDo5h6hF4Sf9 6N7g== 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=TtqzZ4b1BueTa4g8dijfAV4oHDH1/b44x9/hNUcRViEebJ0YYfAWpktHwbx/vUDqCb sk4A5im9hFe0V133nqsorah44mT9PYgUJM0iW4G/q2y3yz8k3yShv4ndp04QKDLx0765 hoZqTiOzHZg3aZ6bcY09hrW0S/MeGaxzHqhIpIf4JtH8kfQxL/6XtPVTfKI2MiVmxzY8 HpiuJThB5hJ4nBHk5x1nppg/NasAi7VCb3gzcc92wZ9JsUFEzmwpQW8AKV+xf9UdVupr 8308pq/D1HaWu+693t05yj2wmBvNa/yq20mAPheCveobaKtAgEJVrccl0A+CRcP+y1uK rAfg== X-Gm-Message-State: ABUngvenufs9bzxXUnxE7qYz6NL1cNsbwU6ZiVi+U7VUeF1SMSBCppb2gfEikiOO5596kg== X-Received: by 10.98.166.136 with SMTP id r8mr1058873pfl.113.1479348390681; Wed, 16 Nov 2016 18:06:30 -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 y20sm805793pfj.26.2016.11.16.18.06.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Nov 2016 18:06:30 -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 , Nadav Amit 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 Message-Id: <20161117020610.5302-4-khuey@kylehuey.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161117020610.5302-1-khuey@kylehuey.com> References: <20161117020610.5302-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; }