From patchwork Fri Oct 13 21:21:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10006025 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 5035A60230 for ; Fri, 13 Oct 2017 21:22:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EAF429185 for ; Fri, 13 Oct 2017 21:22:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D20429187; Fri, 13 Oct 2017 21:22:56 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BA18129185 for ; Fri, 13 Oct 2017 21:22:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=Z7q6jgu3V7f5a4FtxDU7MCr2mPVFy0+Lrb+NvIjeFrk=; b=dFf HcSQqFfNe6NpU5xZY/fnMhjr/lWIdjpP3LA0TvWRS7wuBGgEZiAhFsV562OC+l2oW7Xq+FTFB3KUR OSc5MVis3WXfiHZBGkngUX88ulhetBPXhT5nnpRvzZV7mIqCjKtXljEtqMVQCX1QwLJ3X3pqYGeHb 7mzAOeBlQWo2jjhMSMtX5+2bwA2D2z/omNNC52N6VajbCN+8ZjHMdNOje0u7DQfWoX1orymEkmj1J He/I2WwoUNq0c6LTzZb0LjwAlnetzYlRHL5Udf05/rokJjFURLuHznJ9p/aIYV5gcR7dBq5QKGZgp cgNyuKMlgxcN4q/7h8P0xf8BSW6gbOQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e37Pt-0003Qt-LB; Fri, 13 Oct 2017 21:22:49 +0000 Received: from mail-pg0-x22d.google.com ([2607:f8b0:400e:c05::22d]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e37Pp-0003PQ-V2 for linux-arm-kernel@lists.infradead.org; Fri, 13 Oct 2017 21:22:47 +0000 Received: by mail-pg0-x22d.google.com with SMTP id s2so2138473pge.10 for ; Fri, 13 Oct 2017 14:22:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=FPYAykpjfTXYMQzNkUNXi4irGJfSC9ni1byDcJ8Obb4=; b=FOmqPT1+2imn83NYcBr3+QKZunUmdiah838aVHWQcIoN+2G+eb3AgBAsL7AxRpq40V QGNQGFS/0TCgr/+OHhXObv+4lquv2Ex7ABB9Xq9I0tzcUGbHtoMC8R+mWstaVHxqisQ/ HjfSbt/QASHkvpquMzzhS9LKeeMukdk6BMnO6bdrp7vr6fJROBaN7MYYqdhpCo50hkpq ved05vpc+PpBh9qlfMgqUSPSoPIUKYGUqUn1HnuSE7j9Gt9ZnY3CjAIy/Y64srtYWIoM c6Jp6fMj6nN8qwY12GQIfuO+lnCjWoIEIpAT3bYNqVVh726g5FC/ookJdcBrJko6gb+/ Vcow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=FPYAykpjfTXYMQzNkUNXi4irGJfSC9ni1byDcJ8Obb4=; b=N86+uToKXX6Zbt76v/Qu2Faa6wPwTp4oGM9fPutrCfXaa3H2ZwSCeFap7nAGMK4sTk 9t6ybl9+riEWuYejTTVpTwQngn69W1+Hms+4UYAYQFs9b5i5nYFls7/s7ruXeKM5Aq2e fhiZs7f0uXvabMECsipqkMR5VvDk/r/fhM484sGczacmL0nk2wEC8Haa81dd1lfmDGVF M9Hp/vs66s3uvG0x/gtF5kb631T9chrwn9ZwzDyJ39QuPBfCTwB208aNUCMmxMyc0kCY B/rlTz+NjTu/wDC3aUj4XPRo3GZdqgd3DWmPoWxiRzAhIY9T9Fk8U1nP3VoaU5X5e/Pq jDdw== X-Gm-Message-State: AMCzsaWLHrIAOOcb4X9OBLaqZS+T1dZfemp0RpuRbeKaUl4IgBY1IxHz hZjZ5VgliE9ZRLt9Io8h5XYEjw== X-Google-Smtp-Source: AOwi7QAszvbQJyRAmc2KZKF/iiLsGMoU8Ch/oUE2BB4qK0K8uDewKanODycIYOirn8+YxLWj7KTUnA== X-Received: by 10.98.4.67 with SMTP id 64mr2445837pfe.214.1507929744686; Fri, 13 Oct 2017 14:22:24 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([100.98.120.17]) by smtp.gmail.com with ESMTPSA id r18sm4113517pfe.99.2017.10.13.14.22.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Oct 2017 14:22:24 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: [PATCH] arm64: compat: Expose offset to registers in sigframes Date: Fri, 13 Oct 2017 14:21:48 -0700 Message-Id: <20171013212209.146180-1-salyzyn@android.com> X-Mailer: git-send-email 2.15.0.rc0.271.g36b669edcc-goog X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171013_142246_039507_D91F9BC8 X-CRM114-Status: GOOD ( 12.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Catalin Marinas , Kevin Brodsky , Will Deacon , Mark Salyzyn , "Eric W. Biederman" , Andy Gross , Dave Martin , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kevin Brodsky This will be needed to provide unwinding information in compat sigreturn trampolines, part of the future compat vDSO. There is no obvious header the compat_sig* struct's should be moved to, so let's put them in signal32.h. Also fix minor style issues reported by checkpatch. Signed-off-by: Kevin Brodsky Signed-off-by: Mark Salyzyn NB: Basically unchanged as part of a vDSO32 effort through 4 revisions, Resubmitted as a standalone change for quciker approval. --- arch/arm64/include/asm/signal32.h | 46 +++++++++++++++++++++++++++++++++++++++ arch/arm64/kernel/asm-offsets.c | 13 +++++++++++ arch/arm64/kernel/signal32.c | 46 --------------------------------------- 3 files changed, 59 insertions(+), 46 deletions(-) diff --git a/arch/arm64/include/asm/signal32.h b/arch/arm64/include/asm/signal32.h index 81abea0b7650..612d4ba76fcd 100644 --- a/arch/arm64/include/asm/signal32.h +++ b/arch/arm64/include/asm/signal32.h @@ -22,6 +22,52 @@ #define AARCH32_KERN_SIGRET_CODE_OFFSET 0x500 +struct compat_sigcontext { + /* We always set these two fields to 0 */ + compat_ulong_t trap_no; + compat_ulong_t error_code; + + compat_ulong_t oldmask; + compat_ulong_t arm_r0; + compat_ulong_t arm_r1; + compat_ulong_t arm_r2; + compat_ulong_t arm_r3; + compat_ulong_t arm_r4; + compat_ulong_t arm_r5; + compat_ulong_t arm_r6; + compat_ulong_t arm_r7; + compat_ulong_t arm_r8; + compat_ulong_t arm_r9; + compat_ulong_t arm_r10; + compat_ulong_t arm_fp; + compat_ulong_t arm_ip; + compat_ulong_t arm_sp; + compat_ulong_t arm_lr; + compat_ulong_t arm_pc; + compat_ulong_t arm_cpsr; + compat_ulong_t fault_address; +}; + +struct compat_ucontext { + compat_ulong_t uc_flags; + compat_uptr_t uc_link; + compat_stack_t uc_stack; + struct compat_sigcontext uc_mcontext; + compat_sigset_t uc_sigmask; + int __unused[32 - (sizeof(compat_sigset_t) / sizeof(int))]; + compat_ulong_t uc_regspace[128] __aligned(8); +}; + +struct compat_sigframe { + struct compat_ucontext uc; + compat_ulong_t retcode[2]; +}; + +struct compat_rt_sigframe { + struct compat_siginfo info; + struct compat_sigframe sig; +}; + int compat_setup_frame(int usig, struct ksignal *ksig, sigset_t *set, struct pt_regs *regs); int compat_setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set, diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c index db5b305806b7..804072fa695f 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -78,6 +79,18 @@ int main(void) DEFINE(S_STACKFRAME, offsetof(struct pt_regs, stackframe)); DEFINE(S_FRAME_SIZE, sizeof(struct pt_regs)); BLANK(); +#ifdef CONFIG_COMPAT + DEFINE(COMPAT_SIGFRAME_REGS_OFFSET, + offsetof(struct compat_sigframe, uc) + + offsetof(struct compat_ucontext, uc_mcontext) + + offsetof(struct compat_sigcontext, arm_r0)); + DEFINE(COMPAT_RT_SIGFRAME_REGS_OFFSET, + offsetof(struct compat_rt_sigframe, sig) + + offsetof(struct compat_sigframe, uc) + + offsetof(struct compat_ucontext, uc_mcontext) + + offsetof(struct compat_sigcontext, arm_r0)); + BLANK(); +#endif DEFINE(MM_CONTEXT_ID, offsetof(struct mm_struct, context.id.counter)); BLANK(); DEFINE(VMA_VM_MM, offsetof(struct vm_area_struct, vm_mm)); diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c index e09bf5d15606..b69acad2d93c 100644 --- a/arch/arm64/kernel/signal32.c +++ b/arch/arm64/kernel/signal32.c @@ -29,42 +29,6 @@ #include #include -struct compat_sigcontext { - /* We always set these two fields to 0 */ - compat_ulong_t trap_no; - compat_ulong_t error_code; - - compat_ulong_t oldmask; - compat_ulong_t arm_r0; - compat_ulong_t arm_r1; - compat_ulong_t arm_r2; - compat_ulong_t arm_r3; - compat_ulong_t arm_r4; - compat_ulong_t arm_r5; - compat_ulong_t arm_r6; - compat_ulong_t arm_r7; - compat_ulong_t arm_r8; - compat_ulong_t arm_r9; - compat_ulong_t arm_r10; - compat_ulong_t arm_fp; - compat_ulong_t arm_ip; - compat_ulong_t arm_sp; - compat_ulong_t arm_lr; - compat_ulong_t arm_pc; - compat_ulong_t arm_cpsr; - compat_ulong_t fault_address; -}; - -struct compat_ucontext { - compat_ulong_t uc_flags; - compat_uptr_t uc_link; - compat_stack_t uc_stack; - struct compat_sigcontext uc_mcontext; - compat_sigset_t uc_sigmask; - int __unused[32 - (sizeof (compat_sigset_t) / sizeof (int))]; - compat_ulong_t uc_regspace[128] __attribute__((__aligned__(8))); -}; - struct compat_vfp_sigframe { compat_ulong_t magic; compat_ulong_t size; @@ -91,16 +55,6 @@ struct compat_aux_sigframe { unsigned long end_magic; } __attribute__((__aligned__(8))); -struct compat_sigframe { - struct compat_ucontext uc; - compat_ulong_t retcode[2]; -}; - -struct compat_rt_sigframe { - struct compat_siginfo info; - struct compat_sigframe sig; -}; - #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) static inline int put_sigset_t(compat_sigset_t __user *uset, sigset_t *set)