From patchwork Sat Jul 8 14:57:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 1805194 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=gmx.de header.i=deller@gmx.de header.a=rsa-sha256 header.s=s31663417 header.b=C0Gc/CO+; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qytgc24rdz20Nq for ; Sun, 9 Jul 2023 00:58:34 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qI9NS-00061I-1W; Sat, 08 Jul 2023 10:57:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qI9NI-0005zt-1x for qemu-devel@nongnu.org; Sat, 08 Jul 2023 10:57:28 -0400 Received: from mout.gmx.net ([212.227.17.20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qI9NF-00034Y-7E for qemu-devel@nongnu.org; Sat, 08 Jul 2023 10:57:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1688828241; x=1689433041; i=deller@gmx.de; bh=oVA7DOmdo4bxdT4W+7xeCgzvc45ieCdprU3mDyZaow0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=C0Gc/CO+RJi5O6kyGMgRvYcUCTO6EEJ5M/utdU6kK9VENZ3syeC8wQIAO9PwTeXarNqN6vv 0F84+VJPZlOj+P+LUL385DefNdu/AeK36y0+if3rstqbr/k3+hN6IURIixz0kaNfdvxmCYn6O ztPrgupuQldHjhjusqW85B1zvx4Ntcd+6Xp3R3zB9C8+DvPodbOQPCSBpCi3ejkDsxKbdnimW VAzcKNC5CVf5pIKyc120UnXX1buyUSrYE7KFtviA5XRwPt/sLmcTdmCxx8PEA8d/Iyi96AWhs jg/+okcKjQ0DnKDRFye+LQzjLEPqreWTRa998CDjh644j2BYRcbQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from p100.fritz.box ([94.134.155.129]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MrhUK-1pfk9t26NQ-00nfDH; Sat, 08 Jul 2023 16:57:21 +0200 From: Helge Deller To: qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson Cc: Helge Deller Subject: [PULL 1/3] linux-user: Fix fcntl() and fcntl64() to return O_LARGEFILE for 32-bit targets Date: Sat, 8 Jul 2023 16:57:18 +0200 Message-ID: <20230708145720.136671-2-deller@gmx.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230708145720.136671-1-deller@gmx.de> References: <20230708145720.136671-1-deller@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:r34w/tBWaiV3ww68WP1NIIzPRxUQU7kgChub+yBr3V+ACEa5SjJ 8v6zUAgnFfjgjSQ0S0qLCeojG2cU7MqEkS80ceBsxX40R2fHFFOCvap5ZyHnSPyWrwRmXro 6WeLSPPDaEP2fzLOsT2jDCksv6VTNxXZ2TQ3l7R3L+Nd6mo17pTMQrV293HCpYRV5PKoezA 19u67vLlcU4/ln8ZhNF/w== UI-OutboundReport: notjunk:1;M01:P0:yIMBPfIcWdE=;lL8Dt4C4rW8X4WGLV+KDUDebctm Et64BPxDqELxJDxkMELI0bg/IP4/kQz8iRkrRKiOLgZepICc2ldua+AVGBgX1lKTgMowDVcmp dCtMVp3ToCR2pOvj+9PamUTXOBNTyEdQXm+HkHC83v54lb8aEG/C/S9sMVH46PhloMQu5aYcm MUJelxuhvWZBSgTQL4yrzUeq03fwTjXHyTkjQBiVAWyT35cre+aw1NIT8rVeusb+8WtnI0PHz sIE/SQLD4W1MWpV9ysm61FXEGH6hk7VNkIe+QIvCQIEddZlTytajjhSvyXTcWOzFa3JoFfYwK Gm0apSoAJMvCNI7GUzje64Y0r51To/ScxeeZi7y1vEYmMZfxFwhoG785QFXVOqAsYQcBUH9mY zKlcPZFzgfF+V4CHhveST1D5LqL/RVZ4zF0zVPUMTvwsHhiGeKbSTeFSaaOhhoAfvorGfQsXG tnVeucwwp2rX97xqEAutY4ZWAPOBhvT3+T+AVgjBT5nR3gK7CMg0wZF7GdXEVjNxdUhhqQexr g4C4EKWiAkG+vqlgNO3XIcDG2fEwnL8eM9BYUjAHFjmrfQKC2OygpcPu3PvAY9JfL+ot01Gy9 Qhk0RUg/5E9kJyVn+zAhM7OtYIBGBiwLaBp01uORB+znQ08vfJwCbnMs3kWTX4geyG1e/j7Tu F9xfNHuYfpHs4ytV6t0zsq8H0NoWB4DoYQmBtD8krK7WvgRtJK3/d48+mu4eGJoGUr8ZZWz/2 uBdO9BvHB2a9kqJwCqplpYGTvyumqm4m/6stPHsOvtC3qePEMZKCPUCvy+enlhTmQewNBjtFI 5x7/WIGPZ8Y01nKSqC3IpSbDfrR07LFaZWwyC0luaG5q21LC8qCZE99nnC+6Q74RTtzcPSAab n41/5xuuVKrfOLLobCZ3+9mW6P5cPscJJ6T8hsLcPFW9RjzJ/E39xCGHImC0564kNAyN6tjRO tJKdrvnnVK3c4l0lhoucFPgN6Z8= Received-SPF: pass client-ip=212.227.17.20; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When running a 32-bit guest on a 64-bit host, fcntl[64](F_GETFL) should return with the TARGET_O_LARGEFILE flag set, because all 64-bit hosts support large files unconditionally. But on 64-bit hosts, O_LARGEFILE has the value 0, so the flag translation can't be done with the fcntl_flags_tbl[]. Instead add the TARGET_O_LARGEFILE flag afterwards. Note that for 64-bit guests the compiler will optimize away this code, since TARGET_O_LARGEFILE is zero. Signed-off-by: Helge Deller Reviewed-by: Richard Henderson --- linux-user/syscall.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.41.0 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 08162cc966..10f05b1e55 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7132,6 +7132,10 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) ret = get_errno(safe_fcntl(fd, host_cmd, arg)); if (ret >= 0) { ret = host_to_target_bitmask(ret, fcntl_flags_tbl); + /* tell 32-bit guests it uses largefile on 64-bit hosts: */ + if (O_LARGEFILE == 0 && HOST_LONG_BITS == 64) { + ret |= TARGET_O_LARGEFILE; + } } break; From patchwork Sat Jul 8 14:57:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 1805195 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=gmx.de header.i=deller@gmx.de header.a=rsa-sha256 header.s=s31663417 header.b=aA2Kx56S; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qytgm3JWrz20Nq for ; Sun, 9 Jul 2023 00:58:44 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qI9NI-00060J-PM; Sat, 08 Jul 2023 10:57:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qI9NG-0005zd-S9 for qemu-devel@nongnu.org; Sat, 08 Jul 2023 10:57:26 -0400 Received: from mout.gmx.net ([212.227.17.21]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qI9NF-00034X-6o for qemu-devel@nongnu.org; Sat, 08 Jul 2023 10:57:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1688828241; x=1689433041; i=deller@gmx.de; bh=oo3GBOSXiL40Lf5vi714n1QkrlsT47SxACuqeDPOeP4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=aA2Kx56SjHUU9s00ArQz39opMkfytAAn+5f5m65IqXzjHGkYrZX+AkLs3AjEbTe91YI4cB1 zqkElQ0Urwan2gQ3blaQ1ROqrKFaM8ur0B2oglQX+fiwOj0gPLhn5HiAeTh0HwdVbzKzG5mqG Zy0qzoqX4j05D4C1dyBkmJFzKNRiqQ66PRU0GdiQcCdaayTkpj9ioSCpZjyONf24G/LtPowHH ZXB4hu6tCOW2sZg2Zelv8fKsyBlUrqwj78md5skdRI8FhbYoQBF1co2vv0RG1qT0EgjtAya8g QlTL/zIV+8FrCObTPsiLuRSRnu2XUEi43VvHkdjyrCaDQQwxWpog== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from p100.fritz.box ([94.134.155.129]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M4JmT-1qHsG02qsj-000Jq2; Sat, 08 Jul 2023 16:57:21 +0200 From: Helge Deller To: qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson Cc: Helge Deller Subject: [PULL 2/3] linux-user: Fix accept4(SOCK_NONBLOCK) syscall Date: Sat, 8 Jul 2023 16:57:19 +0200 Message-ID: <20230708145720.136671-3-deller@gmx.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230708145720.136671-1-deller@gmx.de> References: <20230708145720.136671-1-deller@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:rYdtbELtqkUnMupNkOAtIV3XQOj4NCMqrYa3CwXbxppmqiCc3Jw jpwVTxbwtS2QiWveBiJhJdjfP5yQ1Jq1hLHHl/uXrI/KmF3UUJJHrhmuYHLEVTCGDz0bAPj 9gr9KQ1CVZD4MUH1sg5fCyDbkj1cLthhSo/HxK+7N7z/nDf96l47uBDg5uZObEViR+L8ETO ytYIMlYklgeF/lEjuK4lg== UI-OutboundReport: notjunk:1;M01:P0:LZqfhJBQ8Q0=;og4b340bJUKlwgkF8jxJDaEvue1 26pO4fdhSOYK9rWPqeWuJNiyvnZ2s6cMBF0lStv27A4VvlPqmdvv57FaDoSI8a+sliACf1ph8 obsYzlscHs63mkISLcYVghY0d77vrRnJhUnzzaHgVFCyT30cKf2RyeFkfs3aXwCV3FlCMMtVQ BR2iL1AYCe2ivXh6/bXNK5MBQAL1H/yIOabQY1woEYgugnIbUU6hxQu0CdbRNH1N40dzgr1U1 w5PCzuhCbt9GiGNIhXijbpiKi+sQT4lB6J2vxL9h+duOZ5E804o8kMnZFYyxyeevH9Po4HrXS e6DqUxBCe+aW0IkxYTquCa8D8n4i5LV1CmoZtCp/1sSUNQztVuxc18YUXIAldtneiyGMnU7Gc WhB1ZYp1FR590fj7GmQ8/2yqDBeHaD5AmaoRSJLMMZ9lgb7mCb1Hz77O5KriVkQ4/Ki3N92sH HqwnzdBIZ0MXepYohZntgkb60Aq7G52Fa0ubkYIb+lGxSlzE7w9m3XZ+Ho1u856wQnKitNRho J6cQM11n6Yh7OIdr0aU8sMF2UfnQot/6fseOlSe2C1f8GBZ3DCRHfwLuC+/woNyGdNQo8iQ17 bjyqSjkF+NytdnJla6pfp/M/vezleJOxyHrrJM7S56zFBE+wnYUNBzaKNVggMsCVfql6ZCSuM fh9fbVse/VK/iQjLVSGEOD5yj6BZymoJLvITRLN8b535w/pfBMzOAzMQsB6oTNd9Y7YhaxCCC eNIiGbmlaoUyHrRNnyJ77BAqBjANt5K3KXCV3ecTrzg/cD9004hqAYd+qjQKcdMOR+XewEDfu 2QqLg2QrIKhcVS0ny1TntGE3nETuD/HcBZvIyYQ3HhW2BEhMnzq5Xw+aRHu5V5UXAvA9sHJO7 ghzKTPd/cNhI1QSoAgpPfHzL92HuP7d+/Ob4wOUwWD+wYV5EZ7Bdmo+JoNQ0UxcSrHna/Yp0K dQLGOhm8CnB0E1Bo2FROyoIAgoo= Received-SPF: pass client-ip=212.227.17.21; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The Linux accept4() syscall allows two flags only: SOCK_NONBLOCK and SOCK_CLOEXEC, and returns -EINVAL if any other bits have been set. Change the qemu implementation accordingly, which means we can not use the fcntl_flags_tbl[] translation table which allows too many other values. Beside the correction in behaviour, this actually fixes the accept4() emulation for hppa, mips and alpha targets for which SOCK_NONBLOCK is different than TARGET_SOCK_NONBLOCK (aka O_NONBLOCK). The fix can be verified with the testcase of the debian lwt package, which hangs forever in a read() syscall without this patch. Signed-off-by: Helge Deller Reviewed-by: Richard Henderson --- linux-user/syscall.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) -- 2.41.0 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 10f05b1e55..9b9e3bd5e3 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -3440,7 +3440,17 @@ static abi_long do_accept4(int fd, abi_ulong target_addr, abi_long ret; int host_flags; - host_flags = target_to_host_bitmask(flags, fcntl_flags_tbl); + if (flags & ~(TARGET_SOCK_CLOEXEC | TARGET_SOCK_NONBLOCK)) { + return -TARGET_EINVAL; + } + + host_flags = 0; + if (flags & TARGET_SOCK_NONBLOCK) { + host_flags |= SOCK_NONBLOCK; + } + if (flags & TARGET_SOCK_CLOEXEC) { + host_flags |= SOCK_CLOEXEC; + } if (target_addr == 0) { return get_errno(safe_accept4(fd, NULL, NULL, host_flags)); From patchwork Sat Jul 8 14:57:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 1805197 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=gmx.de header.i=deller@gmx.de header.a=rsa-sha256 header.s=s31663417 header.b=IKPNkRKH; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qytgq2bcbz20Nq for ; Sun, 9 Jul 2023 00:58:47 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qI9NZ-00061q-Pj; Sat, 08 Jul 2023 10:57:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qI9NI-000600-9O for qemu-devel@nongnu.org; Sat, 08 Jul 2023 10:57:28 -0400 Received: from mout.gmx.net ([212.227.17.21]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qI9NG-00034c-2i for qemu-devel@nongnu.org; Sat, 08 Jul 2023 10:57:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1688828242; x=1689433042; i=deller@gmx.de; bh=4vNCKFekNbv+5ANANaDwSKyxfbXdKrgpehQ4Dcc1UMU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=IKPNkRKHM9LqP0au4yVEwSo8pmv4QJxeI+YkxCayvcO3+Dn/IltcseaKSpa2tcvGvQZHd73 2FUhiPx/JZbuCpeuTV63PxI1RmXvFcEjPWtpYdOivKUYKk+lhHXQ7pfF2+FoS5hhy0jch6l/1 H8fpe9KCHs1u8wURpwzIKhKgprParAHp5HsCW1GA8czqlR9CC+62GTWuMrgvcTYv1BPD8WIdz AvO2966Ho5JcytsPETvsGZld/NSfVRajkAVsE9vdJWkPo/VMovr57mjirTxzBgMF8xKb786f2 0eBvP1mjx+6638lhrfoJaFvXBa80Z2G2y70LY5vTcaSvGUIqoFNw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from p100.fritz.box ([94.134.155.129]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MAOJP-1q7NsY3SO3-00BpM4; Sat, 08 Jul 2023 16:57:21 +0200 From: Helge Deller To: qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson Cc: Helge Deller Subject: [PULL 3/3] linux-user: Improve strace output of pread64() and pwrite64() Date: Sat, 8 Jul 2023 16:57:20 +0200 Message-ID: <20230708145720.136671-4-deller@gmx.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230708145720.136671-1-deller@gmx.de> References: <20230708145720.136671-1-deller@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:fssPYm3fYGMtxB/g5WU+YD3/OY8L4J9pGHEdIZEIVVcg+m8UlwR Cuvl4zw+EgftpgZesy8pNs2LfTK+Ysobm3sh3o8PYbRcyMKrDvtg5q9jmVhyC5PbcY+j+U2 aBMiVvI2h5nTie7lR4eCKDiy0FQE3bhWpP9ZEGQkFYSfEBfNaS0LjPNy0cCmzGfThDpOCeo Jc924lO3FDvhOyypEQemg== UI-OutboundReport: notjunk:1;M01:P0:Hea2zwU3TIA=;QONE50yGGDzdLcfVBjOyzmvpWAZ yqnHxFm8yoQ8UccRiu0JeKgxtYAihtL5N21IVCwRBURdngi6Nr/lbmjFY1ZwRlIir7ttNNAbw bOmekZIF8JhZTSruldr7xpZTcfGZEujnkIqKmn6ZWq2kW6tdtcc36BIQsPI6N3aXw7Qce5I+6 4US3WqQjZtsremYci8tG6mE/5GjCFOSAPtEhYyfevm7sRij4G01NLY9MRZSM7v/0Fv2OLVG/V VwxhB5lCa5WmpenVYXI3PYk1L6KNayB4o26dJZs4/ha+NYWGoFSVwmKDjobSqgwd0vUzFDRks 6aSpkRYNfYUtlRxfd8oCB7yJlpBgplPMOBmTYzzZpbWgtSqRU25hJb7J8bClH+sSTwYVU/D5t UQ7eeWel/q+AjP4j2GZdGtWbZEOop0X52D6+FufbmtQw5hRuXqx2lUS36OXdP0di6r0wuqvFW XlNM9MeWPjI2/XnC1CJ1l+RFv1ph7sJBV1oYm6cBo7HNOlmoBng+mXwThwb0t7um1cJ487J3x ZSKXl70sea457hsHJOWwyRzTRUM+lO5uitvwyxq4vTgznf6TW4ZarfYryagafpEdkp6OyUWz4 zLhqg/ACXFLeQZJZ5amkpOoHF4g+NE3BAuqWnGuyO0ZxR4/QpNIPDEcTDKUZnF/gvyVHp7uyN mn3JXS+LOKul7+bHzhi+nxkXXAuuXZbcJ/axNWhQzL3aQuh8+0SYuDST2ygn5cSuYTyZOR46Q nfKxXalTdiP3cwr3wSkntaV8yaUTkvOlNodEORMgWosI92RZeqpF7Q4iYEg5Vi4jgiAJLbP6Q HClMbX1qSWLx1EHLO3xVzKCYg83ZjydFrvzJ5yga9wNfGtjhAxRh3DMNai/OvbKZM0W0pInFx JadOQxv7WVzB0dPYPes0CylH91UniZuipwuQbE5nXPuX58gtRkbnrwJyANuua+G07Nexj7K/7 1/ZHUg== Received-SPF: pass client-ip=212.227.17.21; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Make the strace look nicer for those two syscalls. Signed-off-by: Helge Deller Reviewed-by: Richard Henderson --- linux-user/strace.c | 19 +++++++++++++++++++ linux-user/strace.list | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) -- 2.41.0 diff --git a/linux-user/strace.c b/linux-user/strace.c index aad2b62ca4..669200c4a4 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -3999,6 +3999,25 @@ print_tgkill(CPUArchState *cpu_env, const struct syscallname *name, } #endif +#if defined(TARGET_NR_pread64) || defined(TARGET_NR_pwrite64) +static void +print_pread64(CPUArchState *cpu_env, const struct syscallname *name, + abi_long arg0, abi_long arg1, abi_long arg2, + abi_long arg3, abi_long arg4, abi_long arg5) +{ + if (regpairs_aligned(cpu_env, TARGET_NR_pread64)) { + arg3 = arg4; + arg4 = arg5; + } + print_syscall_prologue(name); + print_raw_param("%d", arg0, 0); + print_pointer(arg1, 0); + print_raw_param("%d", arg2, 0); + print_raw_param("%" PRIu64, target_offset64(arg3, arg4), 1); + print_syscall_epilogue(name); +} +#endif + #ifdef TARGET_NR_statx static void print_statx(CPUArchState *cpu_env, const struct syscallname *name, diff --git a/linux-user/strace.list b/linux-user/strace.list index c7808ea118..6655d4f26d 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -1068,7 +1068,7 @@ { TARGET_NR_prctl, "prctl" , NULL, NULL, NULL }, #endif #ifdef TARGET_NR_pread64 -{ TARGET_NR_pread64, "pread64" , NULL, NULL, NULL }, +{ TARGET_NR_pread64, "pread64" , NULL, print_pread64, NULL }, #endif #ifdef TARGET_NR_preadv { TARGET_NR_preadv, "preadv" , NULL, NULL, NULL }, @@ -1099,7 +1099,7 @@ { TARGET_NR_putpmsg, "putpmsg" , NULL, NULL, NULL }, #endif #ifdef TARGET_NR_pwrite64 -{ TARGET_NR_pwrite64, "pwrite64" , NULL, NULL, NULL }, +{ TARGET_NR_pwrite64, "pwrite64" , NULL, print_pread64, NULL }, #endif #ifdef TARGET_NR_pwritev { TARGET_NR_pwritev, "pwritev" , NULL, NULL, NULL },