From patchwork Mon Aug 26 19:58:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 11115469 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 47F781395 for ; Mon, 26 Aug 2019 19:58:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1A02A206E0 for ; Mon, 26 Aug 2019 19:58:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aELsTISK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1A02A206E0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:57304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2L8h-0004d0-Aj for patchwork-qemu-devel@patchwork.kernel.org; Mon, 26 Aug 2019 15:58:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46942) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2L88-00048G-VB for qemu-devel@nongnu.org; Mon, 26 Aug 2019 15:58:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2L87-0000Ft-IM for qemu-devel@nongnu.org; Mon, 26 Aug 2019 15:58:20 -0400 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]:43820) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i2L87-0000Dk-AH for qemu-devel@nongnu.org; Mon, 26 Aug 2019 15:58:19 -0400 Received: by mail-lj1-x243.google.com with SMTP id h15so16221527ljg.10 for ; Mon, 26 Aug 2019 12:58:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=J9Rzk0r0q9DaVzm4NE0J/46AyVyU96JGwvfkeFkqlec=; b=aELsTISKTwoHXr7iLJZgVU+JLhsoEJFdr7js4lulrDp0IyzVlntpEwsf0XsmGvL3Vu le82+QiNkyo9ObQ4ewkP3OiJ6v4K+msfAOmkchelUoedOT9i9IPY3WIOWBjo2pSVyOEI F8aE07TimBmnsMhv3BPgKIIGS1ssPSriYdhSeLawOnNk3zT6e2qS3i5O4u/S16z8JQKb LmlLWTp4SNiRHkqgVM3v99dHzVI9nb0C7g00WU5VklLTnvJleO+qbx7sD5Tqy0GInKfD zX5p7xPXJ8ZwIctjadjW06CR4JorxMMKsAuI2feioG7nC96vdsc47u2fdV5MQjqb+Jo1 +8Mg== 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=J9Rzk0r0q9DaVzm4NE0J/46AyVyU96JGwvfkeFkqlec=; b=R82OzoJ/sY0nWlSWJKPj4QIw6unhBtu1bPSk4eVHJaEQd6wIHUE1ic351UCJoUrrnP mc9iGIf/MXNlAzWVHvdUp4Dqa4Ew8hsUjbqX6KWizbOyuSxkMFB56XP4E7tVaL4OkP2l SUuJS6MTStj8jXpnqwOn7xLgasol4K7x9v03akOCPCDlufoO44LlStb/kf1/MhQ+eq/5 ws2mSUFc6hx3CaGVnjpA6qFe4wcsuvpzZUb/ac/A7+b2dRVLF2lo4TyvWznVUEXONsPI vN3ItlMkHOHiDj87YaYk6FUwJRp39vXGtuoRyz4wwMAA3HP2DVHJP9zgK1S21DE2ScFs dkNg== X-Gm-Message-State: APjAAAUw2P+1CH/x9lpwrK6eSWy08rg1TY0epaT/iHdH/VghwmtWZOug pWeawZuDqmktVHO8kwfVMsPjUCpuois= X-Google-Smtp-Source: APXvYqwMEYPR/dUrqcroxXupMela2x942aWhJhoPirtjWWCzXws+vNAnadKfFswFVMgenc5OwK0NRQ== X-Received: by 2002:a05:651c:1104:: with SMTP id d4mr11343760ljo.90.1566849497186; Mon, 26 Aug 2019 12:58:17 -0700 (PDT) Received: from octofox.cadence.com (jcmvbkbc-1-pt.tunnel.tserv24.sto1.ipv6.he.net. [2001:470:27:1fa::2]) by smtp.gmail.com with ESMTPSA id b11sm2263542lfi.91.2019.08.26.12.58.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Aug 2019 12:58:15 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Mon, 26 Aug 2019 12:58:06 -0700 Message-Id: <20190826195806.15998-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::243 Subject: [Qemu-devel] [PATCH v3] target/xtensa: linux-user: add call0 ABI support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Max Filippov , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Xtensa binaries built for call0 ABI don't rotate register window on function calls and returns. Invocation of signal handlers from the kernel is therefore different in windowed and call0 ABIs. There's currently no way to determine xtensa ELF binary ABI from the binary itself. Add handler for the -xtensa-abi-call0 command line parameter/QEMU_XTENSA_ABI_CALL0 envitonment variable to the qemu-user and record ABI choice. Use it to initialize PS.WOE in xtensa_cpu_reset. Check PS.WOE in setup_rt_frame to determine how a signal should be delivered. Signed-off-by: Max Filippov Reviewed-by: Laurent Vivier --- Changes v2->v3: - revert to checking PS.WOE in the setup_rt_frame Changes v1->v2: - move handling of QEMU_XTENSA_ABI_CALL0 to linux-user/main.c - check xtensa_abi_call0 instead of PS.WOE in the setup_rt_frame linux-user/main.c | 17 +++++++++++++++++ linux-user/xtensa/signal.c | 25 +++++++++++++++++-------- target/xtensa/cpu.c | 24 ++++++++++++++++++++---- target/xtensa/cpu.h | 3 +++ 4 files changed, 57 insertions(+), 12 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 47917bbb20fc..9e50b2d2a92f 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -393,6 +393,13 @@ static void handle_arg_trace(const char *arg) trace_file = trace_opt_parse(arg); } +#if defined(TARGET_XTENSA) +static void handle_arg_abi_call0(const char *arg) +{ + xtensa_set_abi_call0(); +} +#endif + struct qemu_argument { const char *argv; const char *env; @@ -446,6 +453,10 @@ static const struct qemu_argument arg_table[] = { "", "[[enable=]][,events=][,file=]"}, {"version", "QEMU_VERSION", false, handle_arg_version, "", "display version information and exit"}, +#if defined(TARGET_XTENSA) + {"xtensa-abi-call0", "QEMU_XTENSA_ABI_CALL0", false, handle_arg_abi_call0, + "", "assume CALL0 Xtensa ABI"}, +#endif {NULL, NULL, false, NULL, NULL, NULL} }; @@ -710,6 +721,12 @@ int main(int argc, char **argv, char **envp) } } +#if defined(TARGET_XTENSA) + if (getenv("QEMU_XTENSA_ABI_CALL0")) { + xtensa_set_abi_call0(); + } +#endif + target_environ = envlist_to_environ(envlist, NULL); envlist_free(envlist); diff --git a/linux-user/xtensa/signal.c b/linux-user/xtensa/signal.c index 8d54ef3ae34b..590f0313ffe9 100644 --- a/linux-user/xtensa/signal.c +++ b/linux-user/xtensa/signal.c @@ -134,6 +134,8 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, abi_ulong frame_addr; struct target_rt_sigframe *frame; uint32_t ra; + bool abi_call0; + unsigned base; int i; frame_addr = get_sigframe(ka, env, sizeof(*frame)); @@ -182,20 +184,27 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, __put_user(0x00, &frame->retcode[5]); #endif } - env->sregs[PS] = PS_UM | (3 << PS_RING_SHIFT); - if (xtensa_option_enabled(env->config, XTENSA_OPTION_WINDOWED_REGISTER)) { - env->sregs[PS] |= PS_WOE | (1 << PS_CALLINC_SHIFT); - } memset(env->regs, 0, sizeof(env->regs)); env->pc = ka->_sa_handler; env->regs[1] = frame_addr; env->sregs[WINDOW_BASE] = 0; env->sregs[WINDOW_START] = 1; - env->regs[4] = (ra & 0x3fffffff) | 0x40000000; - env->regs[6] = sig; - env->regs[7] = frame_addr + offsetof(struct target_rt_sigframe, info); - env->regs[8] = frame_addr + offsetof(struct target_rt_sigframe, uc); + abi_call0 = (env->sregs[PS] & PS_WOE) == 0; + env->sregs[PS] = PS_UM | (3 << PS_RING_SHIFT); + + if (abi_call0) { + base = 0; + env->regs[base] = ra; + } else { + env->sregs[PS] |= PS_WOE | (1 << PS_CALLINC_SHIFT); + base = 4; + env->regs[base] = (ra & 0x3fffffff) | 0x40000000; + } + env->regs[base + 2] = sig; + env->regs[base + 3] = frame_addr + offsetof(struct target_rt_sigframe, + info); + env->regs[base + 4] = frame_addr + offsetof(struct target_rt_sigframe, uc); unlock_user_struct(frame, frame_addr, 1); return; diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index 76db1741a796..c65dcf9dd782 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -53,6 +53,20 @@ static bool xtensa_cpu_has_work(CPUState *cs) #endif } +#ifdef CONFIG_USER_ONLY +static bool abi_call0; + +void xtensa_set_abi_call0(void) +{ + abi_call0 = true; +} + +bool xtensa_abi_call0(void) +{ + return abi_call0; +} +#endif + /* CPUClass::reset() */ static void xtensa_cpu_reset(CPUState *s) { @@ -70,10 +84,12 @@ static void xtensa_cpu_reset(CPUState *s) XTENSA_OPTION_INTERRUPT) ? 0x1f : 0x10; env->pending_irq_level = 0; #else - env->sregs[PS] = - (xtensa_option_enabled(env->config, - XTENSA_OPTION_WINDOWED_REGISTER) ? PS_WOE : 0) | - PS_UM | (3 << PS_RING_SHIFT); + env->sregs[PS] = PS_UM | (3 << PS_RING_SHIFT); + if (xtensa_option_enabled(env->config, + XTENSA_OPTION_WINDOWED_REGISTER) && + !xtensa_abi_call0()) { + env->sregs[PS] |= PS_WOE; + } #endif env->sregs[VECBASE] = env->config->vecbase; env->sregs[IBREAKENABLE] = 0; diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index 0459243e6bb1..b363ffcf1066 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -673,6 +673,9 @@ static inline MemoryRegion *xtensa_get_er_region(CPUXtensaState *env) { return env->system_er; } +#else +void xtensa_set_abi_call0(void); +bool xtensa_abi_call0(void); #endif static inline uint32_t xtensa_replicate_windowstart(CPUXtensaState *env)