From patchwork Mon Jul 2 11:03:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 140723 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3853931ljj; Mon, 2 Jul 2018 04:04:30 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd3mZ62gdveS0khqgvSHzpxWfCOON9fa9/X/UVw6u9yb3n7PxXxjr2vmuDpeoFzGmp8IrPi X-Received: by 2002:a62:d693:: with SMTP id a19-v6mr20257964pfl.248.1530529470202; Mon, 02 Jul 2018 04:04:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530529470; cv=none; d=google.com; s=arc-20160816; b=dHt8V8EmflFGhJWB/V8NjBZnRmaTLQlJpQLd52Ad90pjfHfCwMzaUhQB7bVsioq6mq YkDpPm4yfeHEwnfd++sn+pc1LIMBZ/Nj8h1/5EAIdpLK+EH2B8aCHzDTTeeiR+bx0NTh f/FvCAy368at79jASMY3+nMutmtNWMYuSr0PDghIb9JKySYCsgHavR+Ev/lvnJoY60cr nlt+yjOkX6SsdvFXE3CCEKxoJ+YTzXtVNaOfXS7Jy/sCu4FJjqoIiku/r+gBQVkUXn+b rIL6pN1ZyC0US2XnRfFtlphHFJpEQkGeNvk6mlCjq31OhGfuC22yGp1pA0QXZ+Eu4n8e FnTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=o2Vwu/mIZO9UmdKS9iG2grbTlVRiQtkepjAdhCXcLGE=; b=Fa6NcYmUSejPBPrneWy7U4+umTg3qty8kPEXGBSP7SBq9XpKgPtWNUv18CIbpJy/2V GwyMRzYVcV4OLrc90/X4BQf5B3bX/ZAIflGLcOeH9MAnTqJnJzI2d/ljuh6Zn+iMoH11 dN2jVdVBSyhEp9sjhYNcDCqvqFOYvchFl+DTqc3mYmJLoXIaj7lmxk8E3nnCABJOcSGx pLObIRi+unmUvL9EPphjU+8PWFZHmg1sB4MNet58xF+zbJG6QwHvxxtggKjEAoNlyEUJ PM9zwHrX3kBXoDxGQWKBWx7tZYTf6lTwtLB0NIwtVykbco7f3I4ZZfl9TY76AxY5Ljbg Mmng== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b9-v6si17896170plk.111.2018.07.02.04.04.29; Mon, 02 Jul 2018 04:04:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934166AbeGBLE0 (ORCPT + 31 others); Mon, 2 Jul 2018 07:04:26 -0400 Received: from foss.arm.com ([217.140.101.70]:57422 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752862AbeGBLEW (ORCPT ); Mon, 2 Jul 2018 07:04:22 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F12C818A; Mon, 2 Jul 2018 04:04:21 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id DFA913F5BA; Mon, 2 Jul 2018 04:04:19 -0700 (PDT) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org, will.deacon@arm.com Cc: linux-kernel@vger.kernel.org, catalin.marinas@arm.com, dave.martin@arm.com, hch@infradead.org, james.morse@arm.com, linux@dominikbrodowski.net, linux-fsdevel@vger.kernel.org, marc.zyngier@arm.com, mark.rutland@arm.com, viro@zeniv.linux.org.uk Subject: [PATCHv4 00/19] arm64: invoke syscalls with pt_regs Date: Mon, 2 Jul 2018 12:03:56 +0100 Message-Id: <20180702110415.10465-1-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This series reworks arm64's syscall handling to minimize the propagation of user-controlled register values into speculated code paths. As with x86 [1], a wrapper is generated for each syscall, which extracts the argument from a struct pt_regs. During kernel entry from userspace, registers are zeroed. The arm64 kernel code directly invokes some syscalls which the x86 code doesn't, so I've added ksys_* wrappers for these, following the x86 example. The rest of the series is arm64-specific. I've pushed the series out to my arm64/syscall-regs branch [2] on kernel.org. Since v1 [3]: * Rebase atop of arm64 for-next/core (for SSBD conflicts) * Move ksys_personality logic into * Move kcompat_sys_* wrappers to * Fix scno bounds check to use unsigned comparison * Fix sve_user_reset() call in el0_svc_handler() * Add BUILD_BUG() to the !CONFIG_ARM64_SVE stubs * Accumulate acked-by / reviewed-by tags Since v2 [4]: * Rebase to v4.18-rc1 * Take upper 32 RES0 bits of SCTLR_ELx into account * Accumulate acks Since v3 [5]: * Rebase to v4.18-rc3 to avoid conflict with FPSIMD/SVE fixes * Accumulate acks / reviewed-by tags * Rework __invoke_syscall() for consistency with do_ni_syscall() * Rename sve_user_reset() to sve_user_discard() * Tidied up comment placement * Typo fixes Thanks, Mark. [1] https://lkml.kernel.org/r/20180330093720.6780-1-linux@dominikbrodowski.net [2] git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git [3] https://lkml.kernel.org/r/20180514094640.27569-1-mark.rutland@arm.com [4] https://lkml.kernel.org/r/20180601112441.37810-1-mark.rutland@arm.com [5] https://lkml.kernel.org/r/20180618120310.39527-1-mark.rutland@arm.com Mark Rutland (19): arm64: consistently use unsigned long for thread flags arm64: move SCTLR_EL{1,2} assertions to arm64: kill config_sctlr_el1() arm64: kill change_cpacr() arm64: move sve_user_{enable,disable} to arm64: remove sigreturn wrappers arm64: convert raw syscall invocation to C arm64: convert syscall trace logic to C arm64: convert native/compat syscall entry to C arm64: don't restore GPRs when context tracking arm64: don't reload GPRs after apply_ssbd arm64: zero GPRs upon entry from EL0 kernel: add ksys_personality() kernel: add kcompat_sys_{f,}statfs64() arm64: remove in-kernel call to sys_personality() arm64: use {COMPAT,}SYSCALL_DEFINE0 for sigreturn arm64: use SYSCALL_DEFINE6() for mmap arm64: convert compat wrappers to C arm64: implement syscall wrappers arch/arm64/Kconfig | 1 + arch/arm64/include/asm/fpsimd.h | 17 +++- arch/arm64/include/asm/syscall_wrapper.h | 80 ++++++++++++++++ arch/arm64/include/asm/sysreg.h | 30 ++---- arch/arm64/include/asm/unistd32.h | 26 ++--- arch/arm64/kernel/Makefile | 5 +- arch/arm64/kernel/armv8_deprecated.c | 8 +- arch/arm64/kernel/cpu_errata.c | 3 +- arch/arm64/kernel/entry.S | 157 ++++--------------------------- arch/arm64/kernel/entry32.S | 121 ------------------------ arch/arm64/kernel/fpsimd.c | 19 ---- arch/arm64/kernel/signal.c | 5 +- arch/arm64/kernel/signal32.c | 6 +- arch/arm64/kernel/sys.c | 19 ++-- arch/arm64/kernel/sys32.c | 127 ++++++++++++++++++++++--- arch/arm64/kernel/syscall.c | 137 +++++++++++++++++++++++++++ arch/arm64/kernel/traps.c | 18 +--- arch/arm64/mm/fault.c | 2 +- fs/statfs.c | 14 ++- include/linux/compat.h | 11 +++ include/linux/syscalls.h | 11 +++ 21 files changed, 453 insertions(+), 364 deletions(-) create mode 100644 arch/arm64/include/asm/syscall_wrapper.h delete mode 100644 arch/arm64/kernel/entry32.S create mode 100644 arch/arm64/kernel/syscall.c -- 2.11.0