From nobody Sun May 5 02:08:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522689394268380.42526080120615; Mon, 2 Apr 2018 10:16:34 -0700 (PDT) Received: from localhost ([::1]:49749 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f334H-0005aC-Ro for importer@patchew.org; Mon, 02 Apr 2018 13:16:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f332C-0004EC-RQ for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f332B-0004aB-Tp for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:20 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:52121) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f332B-0004Zj-NU for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:19 -0400 Received: by mail-wm0-x242.google.com with SMTP id v21so27101833wmc.1 for ; Mon, 02 Apr 2018 10:14:19 -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 s87-v6sm142360lfk.69.2018.04.02.10.14.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 10:14:17 -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:in-reply-to:references; bh=n8y8Ot2g0qWhlP/G6JcPHg5mO4aeLBxQcQIBGMLbAKc=; b=WS83QEB+jdjS+s7mQcZfoxFdf+XYPVMRf2qWzCIQNTOOoPVdaJ/H5WE7zbgsBYlZdm 0feCdqJglsqawvStL8asRcbcdeASBQJMEO+8XIvm+hc7pu2xMxengFhTm8J4xA7yzkHv h+CQPrt9uP3KWCenLtj6FPy/HcS68zcWQV/uWhNZDTrPnp/KHAwTJolMjyiwYfslDc0i 1AM3jJaGYexR+Ulnud7F2/7HwebBX7YFwboXDdpAj7EJeR3fAxu/mBkqOMc1+4Db2mmD PcPtsiWqrGDvQiyni5JD6j3JUkF7OUXEfC4XwDOkmDDfKS7bcDDphDWRirc/K1wdZYeY Jxqw== 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:in-reply-to :references; bh=n8y8Ot2g0qWhlP/G6JcPHg5mO4aeLBxQcQIBGMLbAKc=; b=pMSWGddyUEsznOglBzEOCSZAt5WVjQql/hoTR+L34IqyiXdI0I8oTF1TzWI2oePmA2 dDdL7iwFMHtOxz+WxdNoxzXURioGXJDDk8nBXcNK9uP7rZ8GhMZAdiq/+blH13RnsrAG c3beT9FcA7/qxuTfOKA2jDkuHhnKHpqSVqLaQ3R1oYtJ5b2puWAl/cuPp2aEoNpltuP0 2XJd7ihUOKi2gkPROztR1yLNusIKjTJYJkTvERvUpHFVym0rxvDlVEfQ+tvuD4JTjV0b 8v3V//NZ69lRVhEZ8YyuQCKjEta0iCiUxHM1buPIIRkDc8AFlKZxBNJm8UOoGK6cxOu1 y+Gg== X-Gm-Message-State: ALQs6tBNec6J2VZXi0oZ6PlOvsKQ+qWcWGIrryX+eYEq54zeS2VmJF2S s0iaapNxCcUl1Ojjg9+xyRSNPQ== X-Google-Smtp-Source: AIpwx49/RlBx6Hh48IBBXxklQCJOGHjowtp2mWsF5ztm3Vls7e7sBaFdxXCt6kCYt0HEqaRQfgnxkg== X-Received: by 10.46.154.145 with SMTP id p17mr6268628lji.28.1522689258476; Mon, 02 Apr 2018 10:14:18 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Mon, 2 Apr 2018 10:13:47 -0700 Message-Id: <20180402171354.27706-2-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180402171354.27706-1-jcmvbkbc@gmail.com> References: <20180402171354.27706-1-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 1/8] target/xtensa: fix flush_window_regs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Riku Voipio , Laurent Vivier , Max Filippov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" flush_window_regs uses wrong stack frame to save overflow registers in call8 and call12 frames, which results in wrong register values in callers of a function that received a signal. Reimplement flush_window_regs closely following window overflow sequence. Signed-off-by: Max Filippov --- linux-user/signal.c | 55 +++++++++++++++++++++++--------------------------= ---- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index 2ea3e0321f4d..33d5ced30c98 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -7094,52 +7094,45 @@ static abi_ulong get_sigframe(struct target_sigacti= on *sa, =20 static int flush_window_regs(CPUXtensaState *env) { - const uint32_t nareg_mask =3D env->config->nareg - 1; uint32_t wb =3D env->sregs[WINDOW_BASE]; - uint32_t ws =3D (xtensa_replicate_windowstart(env) >> (wb + 1)) & - ((1 << env->config->nareg / 4) - 1); - uint32_t d =3D ctz32(ws) + 1; - uint32_t sp; - abi_long ret =3D 0; - - wb +=3D d; - ws >>=3D d; + uint32_t ws =3D xtensa_replicate_windowstart(env) >> (wb + 1); + unsigned d =3D ctz32(ws) + 1; + unsigned i; + int ret =3D 0; =20 - xtensa_sync_phys_from_window(env); - sp =3D env->phys_regs[(wb * 4 + 1) & nareg_mask]; + for (i =3D d; i < env->config->nareg / 4; i +=3D d) { + uint32_t ssp, osp; + unsigned j; =20 - while (ws && ret =3D=3D 0) { - int d; - int i; - int idx; + ws >>=3D d; + xtensa_rotate_window(env, d); =20 if (ws & 0x1) { - ws >>=3D 1; + ssp =3D env->regs[5]; d =3D 1; } else if (ws & 0x2) { - ws >>=3D 2; + ssp =3D env->regs[9]; + ret |=3D get_user_ual(osp, env->regs[1] - 12); + osp -=3D 32; d =3D 2; - for (i =3D 0; i < 4; ++i) { - idx =3D (wb * 4 + 4 + i) & nareg_mask; - ret |=3D put_user_ual(env->phys_regs[idx], sp + (i - 12) *= 4); - } } else if (ws & 0x4) { - ws >>=3D 3; + ssp =3D env->regs[13]; + ret |=3D get_user_ual(osp, env->regs[1] - 12); + osp -=3D 48; d =3D 3; - for (i =3D 0; i < 8; ++i) { - idx =3D (wb * 4 + 4 + i) & nareg_mask; - ret |=3D put_user_ual(env->phys_regs[idx], sp + (i - 16) *= 4); - } } else { g_assert_not_reached(); } - sp =3D env->phys_regs[((wb + d) * 4 + 1) & nareg_mask]; - for (i =3D 0; i < 4; ++i) { - idx =3D (wb * 4 + i) & nareg_mask; - ret |=3D put_user_ual(env->phys_regs[idx], sp + (i - 4) * 4); + + for (j =3D 0; j < 4; ++j) { + ret |=3D put_user_ual(env->regs[j], ssp - 16 + j * 4); + } + for (j =3D 4; j < d * 4; ++j) { + ret |=3D put_user_ual(env->regs[j], osp - 16 + j * 4); } - wb +=3D d; } + xtensa_rotate_window(env, d); + g_assert(env->sregs[WINDOW_BASE] =3D=3D wb); return ret =3D=3D 0; } =20 --=20 2.11.0 From nobody Sun May 5 02:08:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522689601428636.3491214514719; Mon, 2 Apr 2018 10:20:01 -0700 (PDT) Received: from localhost ([::1]:49912 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f337g-0008Dp-Lo for importer@patchew.org; Mon, 02 Apr 2018 13:20:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f332F-0004GC-G8 for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f332E-0004ao-Op for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:23 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:37379) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f332E-0004aZ-I4 for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:22 -0400 Received: by mail-wr0-x244.google.com with SMTP id l49so14752227wrl.4 for ; Mon, 02 Apr 2018 10:14:22 -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 s87-v6sm142360lfk.69.2018.04.02.10.14.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 10:14:20 -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:in-reply-to:references; bh=v4YCKL1vBU5nmS79MScwm/8XFxNK3yeCj9nHJuEfrfg=; b=luXvLd/wZFJrnSoh7hDMxNqblrfTklMGsOBKhPZ/ZqX4hoxsgW6SVblj5judFfOhVX K9s6uTz+EkrbbRM9Lyvyq8yUeOQH506QmfxOBbO09OAiUbhx2j+YN2E9+MfkTdI+jwlQ +6vnlurhRJ6FN6tDXqGIvRpDZlScneJ9yydAxpoexbqQjSbmgAKpBj4CE8EhnwYte/VY CUJACQEtu6fWYZaErAdtrMDhkxDj+qS5z67iM2JnolyWoHHY7n4G6mKsFZ6hl4UuHwIR zE4PK7dU0WxJW4Py7wnq/ZtmU+/sRs5m3zmMkqZb8xNVB2jkix0IWgpnJ5zYECNQmu9w 09tA== 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:in-reply-to :references; bh=v4YCKL1vBU5nmS79MScwm/8XFxNK3yeCj9nHJuEfrfg=; b=prvgBBR2w3v60Rr+Qzuf2ZcFLV44L1fwuW5TbUO6H+OacUkEjxO5EYbHznZKQ+OdLB XkTSKFYYvj5GHHIiTm2AdUI4aJVrAmxBV9SeeiRWOuJ1inKnFZROaKOfn4WEFnFMbI8s kEqHurJ0ILOd0ID5mugMk0Fmb45ZC3dpPqH3LKYqXbJ+daHubsd7GnfIqX5w4d1dGKbA O5hMUVWEjgUAaQ2mBkhUpldwFCKdzbuKFHOr8yc6nm5Vi2Nd3943PFAO2cnoiYqqPdzz R7GUO2O7ReO6826v4qRmkMtKFeQGZx7wgMy4H0QXG8YRB14Rm1GZf03CJQk4ONETzlpv eGQw== X-Gm-Message-State: ALQs6tAAfVm0wGGDfTL1vJtCREx7YkJbZ0+TPX0fYA049xbrVbg0ScS+ B011y4fLROn6UqZHnSX3P4ZUbA== X-Google-Smtp-Source: AIpwx48zbrQJRXeU++y747FpYKX7VPuMUw6lYYdWhhgNPGEh3NLvQAmt1IxvB3wOY829ocHKZAf2wA== X-Received: by 2002:a19:1b02:: with SMTP id b2-v6mr5926685lfb.3.1522689261187; Mon, 02 Apr 2018 10:14:21 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Mon, 2 Apr 2018 10:13:48 -0700 Message-Id: <20180402171354.27706-3-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180402171354.27706-1-jcmvbkbc@gmail.com> References: <20180402171354.27706-1-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PULL 2/8] target/xtensa: linux-user: rewind pc for restarted syscall X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Riku Voipio , Laurent Vivier , Max Filippov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In case of syscall restart request set pc back to the syscall instruction. Reviewed-by: Laurent Vivier Signed-off-by: Max Filippov --- linux-user/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/linux-user/main.c b/linux-user/main.c index ba09b7d0c873..8907a8411411 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4006,6 +4006,9 @@ void cpu_loop(CPUXtensaState *env) break; =20 case -TARGET_ERESTARTSYS: + env->pc -=3D 3; + break; + case -TARGET_QEMU_ESIGRETURN: break; } --=20 2.11.0 From nobody Sun May 5 02:08:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522689402107142.45728212212043; Mon, 2 Apr 2018 10:16:42 -0700 (PDT) Received: from localhost ([::1]:49750 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f334T-0005gf-2A for importer@patchew.org; Mon, 02 Apr 2018 13:16:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f332I-0004Is-Hs for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f332H-0004bm-Dy for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:26 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:33318) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f332H-0004bJ-7C for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:25 -0400 Received: by mail-wr0-x242.google.com with SMTP id z73so14739986wrb.0 for ; Mon, 02 Apr 2018 10:14:25 -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 s87-v6sm142360lfk.69.2018.04.02.10.14.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 10:14:23 -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:in-reply-to:references; bh=j5nSn1aNSUerGOgyw57JIwjEv9xUvk85KBVgP35Ukts=; b=vbP5jyEWrnEpWEk1JGP/2GkPEqh+lOC5ONyzL/r0SomgcHLSmiHjLADRg/S99tQVmO e1EBzgwO/5aIwMYmUNsrm5rWV1nH0SJTlCCAnbVlYOUnzZu5GZOjJx1ISqUpFWPTrpDh 5x8eXAb/pgJsX9Lq0a25t3eH+OGPkGdTl9A94tY4S8gfRdNSwBtuRyj+1S7pQ5KrJulW Ig7wj+TashipJfYM3U0tOz/1Dxfxz0LJLmrWQsqAfwxso2aqA1dg6LIjq7XEBq27oW9T 9q1ySUlwh3RvG35Uw0tomek6XvV8io8S5cklD2/etXDtCF+eOd/vSeJ5UNmzpQTzp/dQ USCg== 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:in-reply-to :references; bh=j5nSn1aNSUerGOgyw57JIwjEv9xUvk85KBVgP35Ukts=; b=eEJu0TqTsXlxveOcprRof+5J3IEF3klXyiur1uruveolpJMCwsFoxFv8VwoamlocmJ vx95Aldwqb362R5lJq2kNA5Eey9gPG8TdiuEh8r/8rwNlncivFFLg8zdUkELSDBWIYuJ +hi5tsH1wRqbh30SF19caVfz5OtQpgPu126RbtQZBOs0XGukZ/dreaSUn5buio71uhdB 2JTkAIRqzTfnq9wgA/vv9sDFOTpEV7ksMJMpY3k1hBpHsR5GgHyU81dKQf63l7LXO1OO 1dw+zAjz9X97HcoDuGpeUtKohF2VSWGoSx04SX+Ok21J6pj73FQ4DkRs/Przn16FYLn1 FtQQ== X-Gm-Message-State: ALQs6tBTl7Xgi1WRz8aKjpeEfctvTTJSpW7QSeoztGJ0lhCKTQ3JaKE2 cvNRONUc8swDWjnQY23BmUJlZQ== X-Google-Smtp-Source: AIpwx4+vHyAgmUONx3PHEs1Ns2SDTQlq8kvr9lBkx5Xsxl0BlAriC42SiLpPGRQtEEiMc37kzilPvw== X-Received: by 2002:a19:8f91:: with SMTP id s17-v6mr6455756lfk.56.1522689263941; Mon, 02 Apr 2018 10:14:23 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Mon, 2 Apr 2018 10:13:49 -0700 Message-Id: <20180402171354.27706-4-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180402171354.27706-1-jcmvbkbc@gmail.com> References: <20180402171354.27706-1-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PULL 3/8] linux-user: call cpu_copy under clone_lock X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Riku Voipio , Laurent Vivier , Max Filippov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" cpu_copy adds newly created CPU object to container/machine/unattached, but does it w/o proper locking. As a result when multiple threads create threads rapidly QEMU may abort with the following message: GLib-CRITICAL **: g_hash_table_iter_next: assertion 'ri->version =3D=3D ri->hash_table->version' failed ERROR:qemu/qom/object.c:1663:object_get_canonical_path_component: code should not be reached E.g. this issue is observed when running glibc test nptl/tst-eintr1. Move cpu_copy invocation under clone_lock to fix that. Reviewed-by: Laurent Vivier Signed-off-by: Max Filippov --- linux-user/syscall.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 889abbda1e65..18ea79140f16 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6346,6 +6346,10 @@ static int do_fork(CPUArchState *env, unsigned int f= lags, abi_ulong newsp, =20 ts =3D g_new0(TaskState, 1); init_task_state(ts); + + /* Grab a mutex so that thread setup appears atomic. */ + pthread_mutex_lock(&clone_lock); + /* we create a new CPU instance. */ new_env =3D cpu_copy(env); /* Init regs that differ from the parent. */ @@ -6364,9 +6368,6 @@ static int do_fork(CPUArchState *env, unsigned int fl= ags, abi_ulong newsp, cpu_set_tls (new_env, newtls); } =20 - /* Grab a mutex so that thread setup appears atomic. */ - pthread_mutex_lock(&clone_lock); - memset(&info, 0, sizeof(info)); pthread_mutex_init(&info.mutex, NULL); pthread_mutex_lock(&info.mutex); --=20 2.11.0 From nobody Sun May 5 02:08:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 15226897356801013.7242982646709; Mon, 2 Apr 2018 10:22:15 -0700 (PDT) Received: from localhost ([::1]:50029 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f339n-0001WS-9v for importer@patchew.org; Mon, 02 Apr 2018 13:22:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f332L-0004MW-Up for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f332K-0004dU-Rj for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:29 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:38176) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f332K-0004d7-L7 for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:28 -0400 Received: by mail-wm0-x244.google.com with SMTP id i3so4827587wmf.3 for ; Mon, 02 Apr 2018 10:14:28 -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 s87-v6sm142360lfk.69.2018.04.02.10.14.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 10:14:26 -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:in-reply-to:references; bh=/WmIEnaeZ8qvLEGykTGqVxujrlyNTwR253lNIGw7+Y0=; b=jET6KcYZpesEAUFgvuMXFZdaaPhEzkA74jvJkeO5d/KedU6kEcKHbEsEj+dwaW/MgA Zfj0ZU7uppJca57n4iKS7Qsch4iCnbzd0KVS75Wb5H9P5YI7opsDRcgRG+hrxlIO2tAf NjohuwOf8J6X5qWmx9FtECBBvUAiT9vgWmqoRRin5+niLu4Ah9o7IVyiBvjw17ceSM+R W3lug+0vQ86P5IteHTrxnSitYRakVNOIJzabk+8W8gNRRM5X6YAwc+t8eOYFhocegaTx i+HytpE2sPQflRj+XPH8RGDJykTB2nr+jO29ZBD4212WHc0WL3QstHpNiIjPSUOD3vxJ 0ZMw== 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:in-reply-to :references; bh=/WmIEnaeZ8qvLEGykTGqVxujrlyNTwR253lNIGw7+Y0=; b=X93bbyZ2tclV4lrzd4gpmiNmrEK9GDQmmaDzmhpUysnmI8V17Nom9PJZvUnKaOmK5t bSR51ztTWfsUw7u40TtzzBnw7Xm44KVYIzfF5YcHDP2N16Jq16h3+miFP4YpdKdF/oqX mhFrihqQUSmhINIP/Y76oyYCc2GFPiMmLm+YBDgeoUP36NyIRtqnpTqAvt2z6oTfYJgf K6V9ztbNFmolg4KILfiN7h8q25qWHnE0GlIvdypvfIgIge0BMMD9o07sgH/GfDiEnj49 RIKQfCDEnqOBoizvAmjYevF0T3a1l32fEFRfupIGejsZ/iRNBGDzSou9D8ltNKwjUS/P 0Bjg== X-Gm-Message-State: ALQs6tDtIiaH/Cgte7mxE9BaUArOeXy2kEEBxPgOb47eQ47BtNl2qdb6 ltBhFKWH6WDdR+ibbQxqTj6Idw== X-Google-Smtp-Source: AIpwx48hM13KyhpEczey0gYYeWgKl1WXXZXcGVCEM0BOS2TLpJHtPLz8xzbAUxGxmlGC6GTEEtXPvg== X-Received: by 10.46.137.203 with SMTP id c11mr6592834ljk.61.1522689267364; Mon, 02 Apr 2018 10:14:27 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Mon, 2 Apr 2018 10:13:50 -0700 Message-Id: <20180402171354.27706-5-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180402171354.27706-1-jcmvbkbc@gmail.com> References: <20180402171354.27706-1-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PULL 4/8] linux-user: fix mq_getsetattr implementation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Lionel Landwerlin , Riku Voipio , Laurent Vivier , Max Filippov , Aurelien Jarno , "Kirill A . Shutemov" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" mq_getsetattr implementation does not set errno correctly in case of error. Also in the presence of both 2nd and 3rd arguments it calls both mq_getattr and mq_setattr, whereas only the latter call would suffice. Don't call mq_getattr in the presence of the 2nd argument. Don't copy output back to user in case of error. Use get_errno to set errno value. This fixes test rt/tst-mqueue2 from the glibc testsuite. Cc: Lionel Landwerlin Cc: Kirill A. Shutemov Cc: Riku Voipio Cc: Aurelien Jarno Cc: Laurent Vivier Reviewed-by: Laurent Vivier Signed-off-by: Max Filippov --- linux-user/syscall.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 18ea79140f16..d51e2a00ee31 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -12092,15 +12092,16 @@ abi_long do_syscall(void *cpu_env, int num, abi_l= ong arg1, { struct mq_attr posix_mq_attr_in, posix_mq_attr_out; ret =3D 0; - if (arg3 !=3D 0) { - ret =3D mq_getattr(arg1, &posix_mq_attr_out); - copy_to_user_mq_attr(arg3, &posix_mq_attr_out); - } if (arg2 !=3D 0) { copy_from_user_mq_attr(&posix_mq_attr_in, arg2); - ret |=3D mq_setattr(arg1, &posix_mq_attr_in, &posix_mq_att= r_out); + ret =3D get_errno(mq_setattr(arg1, &posix_mq_attr_in, + &posix_mq_attr_out)); + } else if (arg3 !=3D 0) { + ret =3D get_errno(mq_getattr(arg1, &posix_mq_attr_out)); + } + if (ret =3D=3D 0 && arg3 !=3D 0) { + copy_to_user_mq_attr(arg3, &posix_mq_attr_out); } - } break; #endif --=20 2.11.0 From nobody Sun May 5 02:08:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522689597423501.17577204289876; Mon, 2 Apr 2018 10:19:57 -0700 (PDT) Received: from localhost ([::1]:49909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f337c-00088I-JI for importer@patchew.org; Mon, 02 Apr 2018 13:19:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f332O-0004PN-IE for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f332N-0004fB-H3 for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:32 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:54717) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f332N-0004eb-Ay for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:31 -0400 Received: by mail-wm0-x243.google.com with SMTP id h76so27081540wme.4 for ; Mon, 02 Apr 2018 10:14:31 -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 s87-v6sm142360lfk.69.2018.04.02.10.14.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 10:14:29 -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:in-reply-to:references; bh=ktI3Jwvv6apbrNdAUeO2FBMTb6Lw6CPUGov2Aoa3rxI=; b=UizINfJuZKiyrf5wgzce02ZXczc7BbXq6tvEa6SQeV/cpHv8IAmNMEXvQfBrMnxWVI 6xlfKpqJsjk42OgcMIK4C2t6d31Vh42n4RDSyqG1vbl6l6RCTxym8UTiFBBDeJUDGena nkf59ck++29WibjAKkHZNS9gsMVHNK5N7CNI73V9yeyEgIZkGkzuBH+ZueDxAByJiGQa gbAV/+QXPwE5Sf4ECoxezSOb0FzkH3bP5Tsu7z797fNvYrat5c0pkr34qarv2AnYJ9YT 6VQrj7Q752SYiqOHOLgc0mpmpHKpEeHL8uDBGuf80YfruugRYegssjA8IZ3o3X+f8BUZ rnZg== 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:in-reply-to :references; bh=ktI3Jwvv6apbrNdAUeO2FBMTb6Lw6CPUGov2Aoa3rxI=; b=R7Nl8+SGMGFWZICc4GKtz2O1IQs5qr/y+XYXIKgav4QoC+yLHXihan7JyRMAGzRCem UR/luQ08j9+k6Ms3OBQB1XopXZqZcW0DqEP2XnhFiNqwRRGYvyqjJFvj00N/cGcpLIZ+ MmRg8zw0rZQngnZNHm57GtBt8KvLiELuG/cZDxMgQkCqaRvx27r5JtaD0ZMRmiqh4gBB IpcdT/m+nieBFi4t1oHpQgQ2oNMtho0Tn5m6Bluv4z0g1jbaqchI5KSwnaj6JMPVldkV Y/5BSG1ydXv5tlZN6gWQ5nEAezf+iSIw9gemrqMkRIdjnpQWxt0m62KrDdRtbmnX1J+z n/LA== X-Gm-Message-State: ALQs6tDcc3Ad0uE5PAyh2nefvlDaWSKyhhmjrkJuXBloZ8Sw0XJcv/tx BBvU0A2v6iknZeZiuXp2HzMu7Q== X-Google-Smtp-Source: AIpwx4/SX7HJawW0mZRAEEKke8BfCuAqCYSBAIsDSqIqf3I4QyfO0kW+QoPRSSdEga+ttawVgO5Abw== X-Received: by 10.46.158.199 with SMTP id h7mr6519313ljk.103.1522689270106; Mon, 02 Apr 2018 10:14:30 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Mon, 2 Apr 2018 10:13:51 -0700 Message-Id: <20180402171354.27706-6-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180402171354.27706-1-jcmvbkbc@gmail.com> References: <20180402171354.27706-1-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 5/8] target/xtensa: linux-user: fix sysv IPC structures X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Riku Voipio , Laurent Vivier , Max Filippov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" - make target_ipc_perm fields match kernel definitions for xtensa; - add target_semid64_ds with proper order of times and reserved fields for little/big endian specific for xtensa; - add missing reserved fields after time fields to the target_shmid_ds; - fix types of shm_cpid, shm_lpid and shm_nattch fields of target_shmid_ds to match kernel definitions for xtensa. These changes fix guest ipcs output and fix glibc testsuite tests sysvipc/test-sysvsem and sysvipc/test-sysvshm. Reviewed-by: Laurent Vivier Signed-off-by: Max Filippov --- linux-user/xtensa/target_structs.h | 37 ++++++++++++++++++++++++++++++----= --- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/linux-user/xtensa/target_structs.h b/linux-user/xtensa/target_= structs.h index 020e20e242fc..1b3d9ca314ff 100644 --- a/linux-user/xtensa/target_structs.h +++ b/linux-user/xtensa/target_structs.h @@ -8,21 +8,44 @@ struct target_ipc_perm { abi_uint cuid; /* Creator's user ID. */ abi_uint cgid; /* Creator's group ID. */ abi_uint mode; /* Read/write permission. */ - abi_ushort __seq; /* Sequence number. */ + abi_ulong __seq; /* Sequence number. */ + abi_ulong __unused1; + abi_ulong __unused2; +}; + +struct target_semid64_ds { + struct target_ipc_perm sem_perm; +#ifdef TARGET_WORDS_BIGENDIAN + abi_ulong __unused1; + abi_ulong sem_otime; + abi_ulong __unused2; + abi_ulong sem_ctime; +#else + abi_ulong sem_otime; + abi_ulong __unused1; + abi_ulong sem_ctime; + abi_ulong __unused2; +#endif + abi_ulong sem_nsems; + abi_ulong __unused3; + abi_ulong __unused4; }; +#define TARGET_SEMID64_DS =20 struct target_shmid_ds { struct target_ipc_perm shm_perm; /* operation permission struct */ - abi_int shm_segsz; /* size of segment in bytes */ + abi_long shm_segsz; /* size of segment in bytes */ abi_long shm_atime; /* time of last shmat() */ + abi_ulong __unused1; abi_long shm_dtime; /* time of last shmdt() */ - abi_long shm_ctime; /* time of last change by shmctl()= */ - abi_ushort shm_cpid; /* pid of creator */ - abi_ushort shm_lpid; /* pid of last shmop */ - abi_ushort shm_nattch; /* number of current attaches */ - abi_ushort shm_unused; /* compatibility */ abi_ulong __unused2; + abi_long shm_ctime; /* time of last change by shmctl()= */ abi_ulong __unused3; + abi_uint shm_cpid; /* pid of creator */ + abi_uint shm_lpid; /* pid of last shmop */ + abi_ulong shm_nattch; /* number of current attaches */ + abi_ulong __unused4; + abi_ulong __unused5; }; =20 #endif --=20 2.11.0 From nobody Sun May 5 02:08:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522689411225724.7432369302572; Mon, 2 Apr 2018 10:16:51 -0700 (PDT) Received: from localhost ([::1]:49751 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f334c-0005oT-9w for importer@patchew.org; Mon, 02 Apr 2018 13:16:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f332R-0004QK-2A for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f332Q-0004fr-7L for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:35 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:40368) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f332Q-0004fi-0h for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:34 -0400 Received: by mail-wr0-x242.google.com with SMTP id n2so11403831wrj.7 for ; Mon, 02 Apr 2018 10:14:33 -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 s87-v6sm142360lfk.69.2018.04.02.10.14.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 10:14:32 -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:in-reply-to:references; bh=qoLQPexePs9TPaq82SqDsEt7vvTBX1POIh552mg9exg=; b=X85IwWxCMzWrpcu4y8+yiwbi1WtTYm9VUNcFM2K9nu+LiQSts4r57Y/ruvLne73Z/T x6OGE93gKn7gqXqpVp1wgipGTEiS8H947v/kYTy98jlRZjSrXRQOMlwuj6JMeh0kY9PL 5DLot+Df04Uv8ksns9/9OsKvAuCHR29g1UysCV1nsUi3Ht0J9kKMwKaYUrbE2xtl/p5/ rJgDsQqgv4aAFS2J5KPTNad01zzhv+9d09pRKEo/IVzzq/kV6JdLYe7XRcrlcMfLMDNt 2LpQ/WjDFNnali8y47izYSraTW0uDkWNpUS+flixVkGV/v1pV7tRMmgCjekGzc2cVxj4 gq2w== 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:in-reply-to :references; bh=qoLQPexePs9TPaq82SqDsEt7vvTBX1POIh552mg9exg=; b=I1bRYvA92AjE0EuI78Gh20AKTi9uuXzbXRXNL0WnAwmyOhATp6TSYt8mxAsi7FCYC5 5zynv/TexwV30w94hhCHboT4s3DEojB7mEuM4O9HiOtBAv+Fv+f7KjYraKpcZPG7WiTi FHA40KxBG06j2p4myO0zVUYbSZ/VSqYeaCGIiIUnVxxcDJhA/jHcSB/RPxJIzxn0Gv7K JvGR7f1vbHUdwsmeFYkk/xZripURc0RzzM5v1l7uGTTea1DURd29V4bGwyAIJ3Zwqw/w C3YvOIU3pcJUmv0AmxzPtVqa7uWzecTZ2Mxa0rAiIHE9U/WbVWrlSg/PyEEEjUn3EGlH +Blw== X-Gm-Message-State: ALQs6tB4eZrqWMivEiSQ6w0NOmlVFCJ9u8M6/RG/9W2BdKN/HMO3Dx83 rkQq1il2Rh2PhhAFypW06TjQew== X-Google-Smtp-Source: AIpwx48O9a9scFLfZzqXaVkZq+cNxR0F6Vu/jDcBQAK9AQJDGJr8S83ejNnkePoXEH4q0kKOv83aSg== X-Received: by 2002:a19:5745:: with SMTP id l66-v6mr6458285lfb.135.1522689272876; Mon, 02 Apr 2018 10:14:32 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Mon, 2 Apr 2018 10:13:52 -0700 Message-Id: <20180402171354.27706-7-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180402171354.27706-1-jcmvbkbc@gmail.com> References: <20180402171354.27706-1-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PULL 6/8] linux-user: fix error propagation in clock_gettime X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Riku Voipio , Laurent Vivier , Max Filippov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" host_to_target_timespec may return error if target address could not be locked, but it is ignored. Propagate return value of host_to_target_timespec to the caller of clock_gettime. Reviewed-by: Laurent Vivier Signed-off-by: Max Filippov --- linux-user/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index d51e2a00ee31..52e2f9c16479 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -11884,7 +11884,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_lon= g arg1, struct timespec ts; ret =3D get_errno(clock_gettime(arg1, &ts)); if (!is_error(ret)) { - host_to_target_timespec(arg2, &ts); + ret =3D host_to_target_timespec(arg2, &ts); } break; } --=20 2.11.0 From nobody Sun May 5 02:08:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522689735623994.8011517355695; Mon, 2 Apr 2018 10:22:15 -0700 (PDT) Received: from localhost ([::1]:50023 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f339i-0001P6-7V for importer@patchew.org; Mon, 02 Apr 2018 13:22:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f332T-0004SW-QF for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f332S-0004hN-TF for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:37 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:39102) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f332S-0004hB-MX for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:36 -0400 Received: by mail-wr0-x241.google.com with SMTP id c24so14737575wrc.6 for ; Mon, 02 Apr 2018 10:14:36 -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 s87-v6sm142360lfk.69.2018.04.02.10.14.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 10:14:35 -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:in-reply-to:references; bh=NaqfdjomDrD9UQm5dU1gPY/QxlUL1yD2UjXucSUDx8s=; b=BT18fXXPKFE5KkXo4P9eJ+5cRpw9RjRfjccxTHJF85unE0zJnUWlOc703K9Y8epgvx hRFwUZmZFtn89+JHEoASv+CqenriO43QNYdzEUfFXO3ZL+6TyjeqeclMmVuGZuFtU+NQ WUaiR/x7uLPekRMZ7yLkF1tRCrO5uTZp1UO4r7xxW6uU8GbNqjB8GQxVlklD5sbgnSZ7 t/f/ByqXeoRBMnQuWrk+s8kPtuNb9df7f+E1E8Fzez6YXzi7pNaXlI8qrcZnSCZBCrVr PB5t+J+usSxiANh90Z4hyF1ZfoGgMFADvGxYZok8BI5CJbirk9sZ0I4uC9qTtzkSZtwN Qq7A== 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:in-reply-to :references; bh=NaqfdjomDrD9UQm5dU1gPY/QxlUL1yD2UjXucSUDx8s=; b=ood2fAA4Pa5dXOgQVLAJFuWc+Tv8rRBP0exfeCBKQ7AF7/kiNEnheulGPkHJmlF7cV nAtWQ7kCU+ulPpooC0eLFw1KJLg/OKscSVPJ2E1qZ3oVel/QX3RJlVEWGzcraopQ4bsr CYmJTxna1mBNqlenU4xKwYB59u4NlSsoXSvgNCs1506vPk3nbJPx6dW1Ejwm8abfsRjk cwfhWjma1qcit5U+BCbm/EwxbLAusz8x+7XVR4r9Hj4crSLpetVTHMxcmQLyYYRDOHDO i5VdNNsG4rzBPo0FAAs3Xd45kwBdqxhfXso6j6Rv9moMSveJaxsL3SuTj+aEEKXpX2c4 wtBA== X-Gm-Message-State: ALQs6tBZ0j46wvWzK6zP5MyCr2RB6XhqBN5GvoG3XOQ4IGcoha43eyV3 b3u13+5JVAKukw64VFEWV7i5/Q== X-Google-Smtp-Source: AIpwx4/fNs018aa87fEIH+Z0oV/QEtFSmzg0DiCsuQuhelj75YfON3NtfTD9kZ40ORvblL9ztY5IMw== X-Received: by 2002:a19:d89a:: with SMTP id r26-v6mr6015381lfi.25.1522689275545; Mon, 02 Apr 2018 10:14:35 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Mon, 2 Apr 2018 10:13:53 -0700 Message-Id: <20180402171354.27706-8-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180402171354.27706-1-jcmvbkbc@gmail.com> References: <20180402171354.27706-1-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PULL 7/8] linux-user: implement clock_settime X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Riku Voipio , Laurent Vivier , Max Filippov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This fixes glibc testsuite test rt/tst-clock2. Signed-off-by: Max Filippov --- linux-user/syscall.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 52e2f9c16479..924fd68efcdd 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -11878,6 +11878,18 @@ abi_long do_syscall(void *cpu_env, int num, abi_lo= ng arg1, goto unimplemented_nowarn; #endif =20 +#ifdef TARGET_NR_clock_settime + case TARGET_NR_clock_settime: + { + struct timespec ts; + + ret =3D target_to_host_timespec(&ts, arg2); + if (!is_error(ret)) { + ret =3D get_errno(clock_settime(arg1, &ts)); + } + break; + } +#endif #ifdef TARGET_NR_clock_gettime case TARGET_NR_clock_gettime: { --=20 2.11.0 From nobody Sun May 5 02:08:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152268986503619.291802259312703; Mon, 2 Apr 2018 10:24:25 -0700 (PDT) Received: from localhost ([::1]:50226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f33Bw-0003IA-8k for importer@patchew.org; Mon, 02 Apr 2018 13:24:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f332W-0004VB-F9 for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f332V-0004ie-Ki for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:40 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:41039) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f332V-0004hz-DO for qemu-devel@nongnu.org; Mon, 02 Apr 2018 13:14:39 -0400 Received: by mail-wr0-x244.google.com with SMTP id s12so4130973wrc.8 for ; Mon, 02 Apr 2018 10:14:39 -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 s87-v6sm142360lfk.69.2018.04.02.10.14.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 10:14:37 -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:in-reply-to:references; bh=R1C6+I5jW74bkd20G57A81TllHcjX1vbNlju+BzNyH8=; b=pv7kuRGs7fv4smVBeDE+rZ1bhRCZWPY0nN6YFHt4EuWx+3vghuzdVM59LTgZgAc3H7 w9c5nWSuHHV1ACOan3OfRS8ITk14HOPcjCc3asmt7Nc/csM+i3V9G8pncSvpZ9okGwtc obIhI4ltbri4ThzjKktVFCmHgvx7YYE2cl0eVoaBkY/mFABru/+ZRP4d2BKKuI8ElXQQ eOQh3NjuivxKhi8BmBI13uXHJsQoPwITsYmpk4nEf/FAGDqrF94+pP79bAqdryA5aAKJ K0pvAEbJiz6xySogSGDpAHDJpC1rMVBm4+lje5FP83U1bC1dmJHU1I1Ofqcvt8CufMQi kSSg== 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:in-reply-to :references; bh=R1C6+I5jW74bkd20G57A81TllHcjX1vbNlju+BzNyH8=; b=ZxOIG6qiPvzcbKdvIg+wZnKAXekELaqTIZTqvJwdoICjtuDc19lDf7KAWoWxh/KZAA 5NBw3UeQfBGljxrrZyl/8wAtMKIsxi+VHWMjtXRhyHphBW3D/hnpeATK4KaiaIZT2kxb +X6Hipk5OeCWvQ9JhXVAXm/9ppjEkKvn8MvXvb59CjpOq00HMRhyT3FnGHwRnkShYQnO igMQf9InS4P1g7do4iClfI4lcC22SqFLmdbe0AVrtocS0d8jxM76o2OYAJaSDK7HYO++ Ilh9uPZootj48Z6Y/Sds6jhbcs+Eo3dr2cVRViV/QcoptCU8WQAegnpfpknijOroWf/j 1XWg== X-Gm-Message-State: ALQs6tBP1gZiK4a/e6PVsJ6A6sWH/ZhbF0hwIQxWsEQsdZx2pjusO5qF y2Y4Cl4FzcpUMCY+X9NEAUcA7A== X-Google-Smtp-Source: AIpwx48bfA/HxcDLel9/AQF9I4v4xHyJSdhBJg77fb+2lvLWKHbCZRCzZWJ0/Xq90etaOJcy74XL/w== X-Received: by 2002:a19:fe2:: with SMTP id 95-v6mr6426567lfp.13.1522689278268; Mon, 02 Apr 2018 10:14:38 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Mon, 2 Apr 2018 10:13:54 -0700 Message-Id: <20180402171354.27706-9-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180402171354.27706-1-jcmvbkbc@gmail.com> References: <20180402171354.27706-1-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PULL 8/8] target/xtensa: linux-user: fix fadvise64 call X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Riku Voipio , Laurent Vivier , Max Filippov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" fadvise64_64 on xtensa passes advice as the second argument and so must be handled similar to PPC. This fixes glibc testsuite tests posix/tst-posix_fadvise and posix/tst-posix_fadvise64. Reviewed-by: Laurent Vivier Signed-off-by: Max Filippov --- linux-user/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 924fd68efcdd..5ef517613577 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -11509,7 +11509,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_lon= g arg1, =20 #ifdef TARGET_NR_fadvise64_64 case TARGET_NR_fadvise64_64: -#if defined(TARGET_PPC) +#if defined(TARGET_PPC) || defined(TARGET_XTENSA) /* 6 args: fd, advice, offset (high, low), len (high, low) */ ret =3D arg2; arg2 =3D arg3; --=20 2.11.0