From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74290C3A5A4 for ; Mon, 26 Aug 2019 10:29:14 +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 4DC6F2187F for ; Mon, 26 Aug 2019 10:29:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4DC6F2187F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2CFN-0007ja-Br for qemu-devel@archiver.kernel.org; Mon, 26 Aug 2019 06:29:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37896) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2CDm-0006t4-3I for qemu-devel@nongnu.org; Mon, 26 Aug 2019 06:27:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2CDl-0005d3-0Q for qemu-devel@nongnu.org; Mon, 26 Aug 2019 06:27:34 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:50075) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i2CDk-0005ca-O7 for qemu-devel@nongnu.org; Mon, 26 Aug 2019 06:27:32 -0400 Received: from [192.168.100.1] ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [213.165.67.119]) with ESMTPSA (Nemesis) id 1MZCSt-1hfwPZ1l33-00V6S1; Mon, 26 Aug 2019 12:27:28 +0200 To: Max Filippov , qemu-devel@nongnu.org References: <20190825221704.1574-1-jcmvbkbc@gmail.com> From: Laurent Vivier Openpgp: preference=signencrypt Autocrypt: addr=laurent@vivier.eu; prefer-encrypt=mutual; keydata= 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 Message-ID: Date: Mon, 26 Aug 2019 12:27:27 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190825221704.1574-1-jcmvbkbc@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:3VaGTDvdwo7UyUvvBXd78WDA1snnZQO4V5VNLSPFGhpRXVUiKir 1zGsCC4eSNAEyS9uiDA7cYU7RXQv81BvbOxYn5nDmz7tNH39iMkShTf1LhzOu0gOUBOwz02 uP19o/cCVcrR+tlnsxjaKvAmsyqXK5t01deFXwlGiZMEEF4b3H9r/sQUUEAtMG+gCCrIZbY YKNTiv1PaH9gD4id/QXbA== X-UI-Out-Filterresults: notjunk:1;V03:K0:L3fZ6F4+FRY=:D70pFx+0FmsgBkCan59CkN GrtcRo2VbV2Jdtzi1RS5E2W73wxVO1U2iKMdUvQsqNdIleeA1ebNOQDPI+e2STb4fEHjL5WzY UVJJXs78PzNVZnTJPVusn5s+k4Ko+mtSTPsF9TjLuv5FJ9Bfe7e5+tosDuJSTKe2gBVITdl6F PLHJQ/tMKUDCjBWCSsjMFW4OJixQU7BeW7pPeSUBnajHNcm2+Wi/5KkRsakryLOjgp/jUwJOn apQ3SO4hdzL8NEwUiNqhaDP7WbiHbws5O06aRt5KYusooT9G/o09pAMCS/m22qv7ANYxlAFwF 4bxs5u1Yf+79sEDreRYD+esp3ARIHQieSSWneDgpK2FFVGgMn1HPWfhUYDzesj6AU7tm+Dl+G qzsMM2xinojSzXWM46elVno2z5nJRra4UoC6D5TEFi/CXWmG2ucwMKw8U6t8W2ur2kTbJG3zE sDg8jdyaWCuv4+KPJzLi6MvC5BVNHquizRj/7bcSVrzA43uaQuv6f1mEvHuQXgH0GorvLAxxt pHE0Wmn1jy+nC0C9HlID62eMFcz0gWxPwn1Q/cuZNha+qyJMUzrIIBvV0B/ZLDxQleWTf7olz LV4NGneavu+X4S9Ap4zhAzc3MXG+vd26ptLMOuXmdKukL8JqovkOptJ9O14AHEkDcPICTeQyY 7uYBxPAz8FUG2TbkNmbT9YBCSeXWaPXZQQq554fbLDVWbYPe1hSI1exi7ExIAvU6oPi8y9NBF 2j8zaNI2IsIYhKSLy6NEmIXN+FoMs1hQW+54d4W30lfxt7Knm8ta4tKROyY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.10 Subject: Re: [Qemu-devel] [PATCH] 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Le 26/08/2019 à 00:17, Max Filippov a écrit : > 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. Provide an environment variable QEMU_XTENSA_ABI_CALL0 and > use it to initialize PS.WOE in xtensa_cpu_reset. Check this flag in > setup_rt_frame to determine how a signal should be delivered. > > Signed-off-by: Max Filippov > --- > linux-user/xtensa/signal.c | 25 +++++++++++++++++-------- > target/xtensa/cpu.c | 22 ++++++++++++++++++---- > 2 files changed, 35 insertions(+), 12 deletions(-) > > 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; Is this safe to rely on content of sregs[PS]? Why don't you use xtensa_abi_call0()? > + 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..791c061880e7 100644 > --- a/target/xtensa/cpu.c > +++ b/target/xtensa/cpu.c > @@ -53,6 +53,18 @@ static bool xtensa_cpu_has_work(CPUState *cs) > #endif > } > > +#ifdef CONFIG_USER_ONLY > +static int xtensa_abi_call0(void) > +{ > + static int abi_call0 = -1; > + > + if (abi_call0 == -1) { > + abi_call0 = getenv("QEMU_XTENSA_ABI_CALL0") != NULL; Wouldn't it be cleaner to add this in the arg_table[] in linux-user/main.c and then use directly the variable? Thanks, Laurent