From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAWIF-0000Vu-2M for qemu-devel@nongnu.org; Mon, 23 Apr 2018 03:53:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAWID-0000a9-LN for qemu-devel@nongnu.org; Mon, 23 Apr 2018 03:53:47 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:6653) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fAWID-0000YJ-Cj for qemu-devel@nongnu.org; Mon, 23 Apr 2018 03:53:45 -0400 From: Christophe Lyon Date: Mon, 23 Apr 2018 09:51:55 +0200 Message-ID: <20180423075215.4572-5-christophe.lyon@st.com> In-Reply-To: <20180423075215.4572-1-christophe.lyon@st.com> References: <20180423075215.4572-1-christophe.lyon@st.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [ARM/FDPIC v2 4/4] linux-user: ARM-FDPIC: Add support for signals for FDPIC targets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, christophe.lyon@linaro.org, peter.maydell@linaro.org, riku.voipio@iki.fi, laurent@vivier.eu The FDPIC restorer needs to deal with a function descriptor, hence we have to extend 'retcode' such that it can hold the instructions needed to perform this. The restorer sequence uses the same thumbness as the exception handler (mainly to support Thumb-only architectures). Co-Authored-By: Micka=C3=ABl Gu=C3=AAn=C3=A9 Signed-off-by: Christophe Lyon diff --git a/linux-user/signal.c b/linux-user/signal.c index 8d9e6e8..d01b459 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -2045,13 +2045,13 @@ struct sigframe_v1 { struct target_sigcontext sc; abi_ulong extramask[TARGET_NSIG_WORDS-1]; - abi_ulong retcode; + abi_ulong retcode[4]; }; =20 struct sigframe_v2 { struct target_ucontext_v2 uc; - abi_ulong retcode; + abi_ulong retcode[4]; }; =20 struct rt_sigframe_v1 @@ -2060,14 +2060,14 @@ struct rt_sigframe_v1 abi_ulong puc; struct target_siginfo info; struct target_ucontext_v1 uc; - abi_ulong retcode; + abi_ulong retcode[4]; }; =20 struct rt_sigframe_v2 { struct target_siginfo info; struct target_ucontext_v2 uc; - abi_ulong retcode; + abi_ulong retcode[4]; }; =20 #define TARGET_CONFIG_CPU_32 1 @@ -2090,6 +2090,21 @@ static const abi_ulong retcodes[4] =3D { SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN }; =20 +/* + * Stub needed to make sure the FD register (r9) contains the right + * value. + */ +static const unsigned long sigreturn_fdpic_codes[3] =3D { + 0xe59fc004, /* ldr r12, [pc, #4] to read function descriptor */ + 0xe59c9004, /* ldr r9, [r12, #4] to setup GOT */ + 0xe59cf000 /* ldr pc, [r12] to jump into restorer */ +}; + +static const unsigned long sigreturn_fdpic_thumb_codes[3] =3D { + 0xc008f8df, /* ldr r12, [pc, #8] to read function descriptor */ + 0x9004f8dc, /* ldr r9, [r12, #4] to setup GOT */ + 0xf000f8dc /* ldr pc, [r12] to jump into restorer */ +}; =20 static inline int valid_user_regs(CPUARMState *regs) { @@ -2149,7 +2164,21 @@ setup_return(CPUARMState *env, struct target_sigac= tion *ka, { abi_ulong handler =3D ka->_sa_handler; abi_ulong retcode; - int thumb =3D handler & 1; + abi_ulong funcdesc_ptr =3D 0; + + int thumb; + int is_fdpic =3D ((TaskState *)thread_cpu->opaque)->is_fdpic; + + if (is_fdpic) { + /* In FDPIC mode, ka->_sa_handler points to a function + * descriptor (FD). The first word contains the address of the + * handler. The second word contains the value of the PIC + * register (r9). */ + funcdesc_ptr =3D ka->_sa_handler; + get_user_ual(handler, funcdesc_ptr); + } + thumb =3D handler & 1; + uint32_t cpsr =3D cpsr_read(env); =20 cpsr &=3D ~CPSR_IT; @@ -2160,20 +2189,50 @@ setup_return(CPUARMState *env, struct target_siga= ction *ka, } =20 if (ka->sa_flags & TARGET_SA_RESTORER) { - retcode =3D ka->sa_restorer; - } else { - unsigned int idx =3D thumb; + if (is_fdpic) { + /* For FDPIC we ensure that the restorer is called with a + * correct r9 value. For that we need to write code on + * the stack that sets r9 and jumps back to restorer + * value. + */ + if (thumb) { + __put_user(sigreturn_fdpic_thumb_codes[0], rc); + __put_user(sigreturn_fdpic_thumb_codes[1], rc + 1); + __put_user(sigreturn_fdpic_thumb_codes[2], rc + 2); + __put_user((abi_ulong)ka->sa_restorer, rc + 3); + } else { + __put_user(sigreturn_fdpic_codes[0], rc); + __put_user(sigreturn_fdpic_codes[1], rc + 1); + __put_user(sigreturn_fdpic_codes[2], rc + 2); + __put_user((abi_ulong)ka->sa_restorer, rc + 3); + } =20 - if (ka->sa_flags & TARGET_SA_SIGINFO) { - idx +=3D 2; + retcode =3D rc_addr + thumb; + } else { + retcode =3D ka->sa_restorer; } + } else { + if (is_fdpic) { + qemu_log_mask(LOG_UNIMP, + "arm: FDPIC signal return not implemented"); + abort(); + } else { + unsigned int idx =3D thumb; + + if (ka->sa_flags & TARGET_SA_SIGINFO) { + idx +=3D 2; + } =20 - __put_user(retcodes[idx], rc); + __put_user(retcodes[idx], rc); =20 - retcode =3D rc_addr + thumb; + retcode =3D rc_addr + thumb; + } } =20 env->regs[0] =3D usig; + if (is_fdpic) { + get_user_ual(env->regs[9], funcdesc_ptr + 4); + } env->regs[13] =3D frame_addr; env->regs[14] =3D retcode; env->regs[15] =3D handler & (thumb ? ~1 : ~3); @@ -2270,7 +2329,7 @@ static void setup_frame_v1(int usig, struct target_= sigaction *ka, __put_user(set->sig[i], &frame->extramask[i - 1]); } =20 - setup_return(regs, ka, &frame->retcode, frame_addr, usig, + setup_return(regs, ka, frame->retcode, frame_addr, usig, frame_addr + offsetof(struct sigframe_v1, retcode)); =20 unlock_user_struct(frame, frame_addr, 1); @@ -2292,7 +2351,7 @@ static void setup_frame_v2(int usig, struct target_= sigaction *ka, =20 setup_sigframe_v2(&frame->uc, set, regs); =20 - setup_return(regs, ka, &frame->retcode, frame_addr, usig, + setup_return(regs, ka, frame->retcode, frame_addr, usig, frame_addr + offsetof(struct sigframe_v2, retcode)); =20 unlock_user_struct(frame, frame_addr, 1); @@ -2347,7 +2406,7 @@ static void setup_rt_frame_v1(int usig, struct targ= et_sigaction *ka, __put_user(set->sig[i], &frame->uc.tuc_sigmask.sig[i]); } =20 - setup_return(env, ka, &frame->retcode, frame_addr, usig, + setup_return(env, ka, frame->retcode, frame_addr, usig, frame_addr + offsetof(struct rt_sigframe_v1, retcode)); =20 env->regs[1] =3D info_addr; @@ -2378,7 +2437,7 @@ static void setup_rt_frame_v2(int usig, struct targ= et_sigaction *ka, =20 setup_sigframe_v2(&frame->uc, set, env); =20 - setup_return(env, ka, &frame->retcode, frame_addr, usig, + setup_return(env, ka, frame->retcode, frame_addr, usig, frame_addr + offsetof(struct rt_sigframe_v2, retcode)); =20 env->regs[1] =3D info_addr; --=20 2.6.3