From nobody Fri May 17 21:26:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=silabs.com); dmarc=fail(p=none dis=none) header.from=silabs.com ARC-Seal: i=2; a=rsa-sha256; t=1675868275; cv=pass; d=zohomail.com; s=zohoarc; b=Joq8UKFa8vhyt2CBLugtKDERJIyQN9Facbx9Us+pwYDYDgtHN/vJ6QAqaGyvLzXEGSU0/DdOyrKmRmywMMVROPaf6M/mX1Jn3ldsQrw4IWLSeJXXBYy4Da+F+gsGagqiLRyvhTCtaC5n8lsnfrVrHlqwcWnDFWlT+3Lvn8nSeD0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675868275; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=GRTu4iO3cOWUzbytft7gJEnLrydOhNPFY8IHgCtuoCk=; b=E/6B9hD2E0YlGS/Nz4G/4ZoozTW3p0uD+ay946SxiRHNs9WxTANAasiR1B9f2rvhZeNhVudE4eFaZ4zS90uIRKrYer/u7CyJHcE5HAwIhspB0lBixZPFTODKUt/tER+ajCxnkoW9D9ynMQ7VmzGkmDNr96bFUlGW/lz6ijx1Vjk= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=silabs.com); dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675868275340201.11743174878848; Wed, 8 Feb 2023 06:57:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPlt9-000318-T3; Wed, 08 Feb 2023 09:57:35 -0500 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 1pPlQV-0007VK-4d for qemu-devel@nongnu.org; Wed, 08 Feb 2023 09:27:59 -0500 Received: from mail-mw2nam10on2069.outbound.protection.outlook.com ([40.107.94.69] helo=NAM10-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPlQS-0007Wu-VI for qemu-devel@nongnu.org; Wed, 08 Feb 2023 09:27:58 -0500 Received: from MN2PR11MB4711.namprd11.prod.outlook.com (2603:10b6:208:24e::13) by MW3PR11MB4748.namprd11.prod.outlook.com (2603:10b6:303:2e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.36; Wed, 8 Feb 2023 14:22:46 +0000 Received: from MN2PR11MB4711.namprd11.prod.outlook.com ([fe80::bc75:99b6:488f:fd50]) by MN2PR11MB4711.namprd11.prod.outlook.com ([fe80::bc75:99b6:488f:fd50%9]) with mapi id 15.20.6086.017; Wed, 8 Feb 2023 14:22:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hmkP0sVaCFVfISa0dZByfZIUYP6CrGKD+f2Xk3trjD2C+Ks/DlGW8ZP//Je4EbnO2KPXMmJtyccda6qOLyKpuvGxlObNhq2s8bzIT9J55Hfzed9a447BXmccqOJXRZzrB4TNlRWK6ULaK7w16Q4KA39J+tr1IjqNqR8ET8m8PDwaVinVaRwx51L2dYcPJ2dH0quCQH1XWDF8SQedb5chQOpEeoSQIMqNEsaHUTtOvuy/GsgmaGRuzR5jHfyReTqjDkEst0Iw997FrYOGwGK74M8C4+tokK3XJfEjXs9k5sSugkflwoWKzWSvraSOK9A+bP/8HEOOCoiidtNiyZvoXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=GRTu4iO3cOWUzbytft7gJEnLrydOhNPFY8IHgCtuoCk=; b=Can9thUyWTetqKCtcbcnUjjpNTF0g+2DnuBQuxs1XHQqrDBzAA0yWWuxnVB5xtmKy96niaGIoNKms+Ewwqb/nPns28RNaA+O/ND7alDpBYyN+zV1b2JWsZu6jHsPXpy2b1c4A8eXx2NEYB/Txeo1qChyzXgL/+STOivclU0EogOsA+JUZV5HosrphmlTF2bpKDr6C59sTG53mKu8uvp4mPTIPwpS6pcW8bXIs+b9yekudyk4hkJUS2tC3mQ8Jeps/C67wahg1HrjlqZQaSwjQCMmBK258BkyuKT7k3yUzCdH/CyqMRlULq2OiCz78fC9z1rWYKImSnxeclkwlFuLhQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GRTu4iO3cOWUzbytft7gJEnLrydOhNPFY8IHgCtuoCk=; b=O4IP0V20LEOcYkoIM5R6WkllzJq2OACvT2fquQbkTZRVMeVLe3BYlY/TOJWE2vK4757EXwZR7mz7uFesjs4hm2V6DfqLzgQFFALfdY1mW3hX79GsU/NC4tXbHVbgY29y1PAud/r7HuLbMXUTc7uqy8nP0DlS4ly4mX8GvdPGMm8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=silabs.com; From: Mathis Marion To: Laurent Vivier Cc: qemu-devel@nongnu.org, Mathis Marion Subject: [PATCH] linux-user: fix timerfd read endianness conversion Date: Wed, 8 Feb 2023 15:22:15 +0100 Message-Id: <20230208142215.56314-1-Mathis.Marion@silabs.com> X-Mailer: git-send-email 2.39.1 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: PR0P264CA0110.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::26) To MN2PR11MB4711.namprd11.prod.outlook.com (2603:10b6:208:24e::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR11MB4711:EE_|MW3PR11MB4748:EE_ X-MS-Office365-Filtering-Correlation-Id: 3be5f775-b5eb-406e-7a94-08db09dff31c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Xc3kxO6k2jC+76P8lUTro3F8enNdWx+xBhp6AD5HNYWH+wCkZHw2QPQ6iS6tlxlBy08yjXcUMAehqa8oCnQsqjoy0U+RygibEHSUD3+IFveCOeT+exDDwXk0xutZhxDx2V7151YPpciwJq/hzcnPU8ZVnupJvu+RTjmnIAwqO6rf9jqCVU334Ax5+LsW0mME7H7yRfRD5h7BDZxY0eVHVpSAtsKWm+v4RiOrKvulzHRgjaepqCWygeFXtFWDy4WGvODm4d2jSXPF/9hFo/oyL6I+cfkYWnf8D+r1ncbIlckeLdZsc71YvcPlh584XFykJtJVdywJb5GWUZvyAmQfgBNSRIhXi8++oV/J6qVTT8fLvod6RUe7qNyoklj0EhRMCt8tWZD6M2OeW8MN1o+mKp3Mp0xgCemISpnJ8qaH+f5h5IsIk63B6mkiAjdk5DGDV2hbKGuxO50UQraiQzE5L4Oyrl6QSS2hWor0RFUrbnIcWh6Sf/yo63u2Pgh3sHcTAzhGK7fxwsHALQdTqt1n00ssDuyTDDe2dskBe4ySqk+kiz+OCCrzA1Yh9OBiQ2wLUMM1pY4CqT9h593nvQ2bgnLS5Ym157Eh7BRMB3BsD1UE30Wj2jOAgu+NMSU28n1dIrqkINtLrDDtpu6MXBj6V+aSDGuprLAdaTYD8wb+VFt2UuvRFwA3/oL9DJYlCIFN/zRxaQVl7EIHb4pGx35aFA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR11MB4711.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(39860400002)(366004)(136003)(396003)(376002)(346002)(451199018)(66476007)(66556008)(6486002)(6916009)(66946007)(41300700001)(316002)(478600001)(83380400001)(38100700002)(38350700002)(52116002)(8676002)(186003)(2906002)(86362001)(2616005)(6512007)(26005)(107886003)(8936002)(6666004)(5660300002)(6506007)(36756003)(1076003)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zyszIf1kexW6dpPmieHAYO9uIkTUBVPYFDNMqsT+o5QQ5dmrEA+/XE5A+Il1?= =?us-ascii?Q?SOCbx9LFeVN2fw+7k8N7nbuex6Bg1SjiTjj/ImSLgEA5dBTKzhYni6JuSo2J?= =?us-ascii?Q?G+gzb/yskT2fX7oIFIs0v07ZlDvtkFd74GyYnG/nYuvt03hrpn5FRhSWdgqa?= =?us-ascii?Q?ysEU0/GLw79R8k6NCJIZeFbwIhb4s4d8BJgM5yN6IntjU2cPoeELEOE7wKSB?= =?us-ascii?Q?E8mrH1vLI1mM907kM39ONqFgW0sU/6SwcQUVX3P3Z4ES5P4mgogtInOzfONj?= =?us-ascii?Q?/6Pq9BBzGF7Noo3MSbhDztsLmqoijYWBd0wBgis7S1603k6nPsCcEO8z4kev?= =?us-ascii?Q?e2Xl84op/rCUCHmDMiF8PcAKc7ABmUDaUGRa7sZF/3/23qjCUa+ll9JnXimo?= =?us-ascii?Q?+x66vDUvgSpcSdi0VPRbFVOqpZDKaqDU1MmEBd/N20EoKIZnKFjvuouKR5bj?= =?us-ascii?Q?QJL1FY72+xRQXVUSPND+1uEgXPf73RQ7/MmlyJRNOkoBbmAQTQepWJBUiGCo?= =?us-ascii?Q?9ZBpaVf/r3j7pF+dM9mTElNRqNCKhX+dw74LTcLItqD3n6EjGBdsvuKktTuB?= =?us-ascii?Q?c9RNG05mXaDgISVx5u5Y3gImYXct22soCw3/fXlxfeTKa1xpTsuuw3Shax0U?= =?us-ascii?Q?6oFQBDrAgnxFWVOoc9oeV6MI1EWI3K+VzQJRUirTjsONXiiGNFb8Z9qJZC4f?= =?us-ascii?Q?IO3YCDTii4D8pmOLP3xr8EVBDwDLB1xBW9wr9yD/d01t2hZIpVnIH19l2JMd?= =?us-ascii?Q?BzTFyoE+wNg0piiRMhLjPMVVZEvJJL4dYrK1tVX5Hr1nhoXFByzf4UM0XeTT?= =?us-ascii?Q?B0lnvM7kvalTBblf8u6EFLrcRC+M1YgRTfh8GTb4tAivrbxHG8jgMaiRNzfm?= =?us-ascii?Q?EOVdoLkldQvc5YXQe9SRikpGYZHAQRE0mh8ZZS0LYWeRtKOcnv2lgI+zwuIM?= =?us-ascii?Q?NTrB2imoc6tjLi8HCLh5Elj9QaFIvJdH0xbV82mYgbm0ofaBDFXPDkgl+THd?= =?us-ascii?Q?8Cz7blA0KrZegokIwMR1dNSeBwPSOCKCrQPYItypDenPhLNFeBMoVLq2myS4?= =?us-ascii?Q?KzTRhVo8uUvaQoaTUjAiTmvFyRwi61B3FgBTeRx+QB/5PQKn/UgAKPx3Ddus?= =?us-ascii?Q?58mOUvcp/lRxwAvq4PlCMtoswe/eWOMD5V9fRLV1kLFKx0m3id2Vd10SMkq/?= =?us-ascii?Q?2TWIyIMMK0/23e6QZrdk/jbXBonTkrUXRRInr9UprVmALdvRJOSZ9u2qS/QS?= =?us-ascii?Q?mc8z6XY8gIE1wUbET7RtxfMr4+4ltde8tCKxQS022J1DGJD4nXW6TDTkL81l?= =?us-ascii?Q?hCuj5LO60ETT4WqYK/OeKsMxMxG2rESKfBfNlq97PQY9LqsMtL2NCIK6yR/T?= =?us-ascii?Q?51h7sss1ojO5q0/6GLVV6agy0tylqqD/aj5IbJElFoR9JKgYgI8C9t/Wci9W?= =?us-ascii?Q?PKgo1Gdos8ecIUS6m2kni+IjnHcxEKWTgxdMEQu5JCNlTN/ZrnfWcAGAgoxA?= =?us-ascii?Q?pBCl/BayocoR1KKKLOQXVtqZoQcfU4Y/nBM9jDeoYpI52Vyycl4NxOMRd/bj?= =?us-ascii?Q?dcIoGc/m60ppK88XNRJvl4M48bWMzZVdxYAoz93L/PNjaVEBfXW+wxbcdLTh?= =?us-ascii?Q?jA=3D=3D?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3be5f775-b5eb-406e-7a94-08db09dff31c X-MS-Exchange-CrossTenant-AuthSource: MN2PR11MB4711.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2023 14:22:46.5706 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iY5QODZeJ73VjO/F4itWfdudpTSxSucsTOrEQNSlr95wEr3RwcBhE/Ch35Frg0aw8dqbCehzW081Qyg8P0cZ5w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4748 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.94.69; envelope-from=Mathis.Marion@silabs.com; helo=NAM10-MW2-obe.outbound.protection.outlook.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 08 Feb 2023 09:57:34 -0500 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @silabs.onmicrosoft.com) X-ZM-MESSAGEID: 1675868277194100003 Content-Type: text/plain; charset="utf-8" From: Mathis Marion When reading the expiration count from a timerfd, the endianness of the 64bit value read is the one of the host, just as for eventfds. Signed-off-by: Mathis Marion --- linux-user/fd-trans.c | 10 +++++++--- linux-user/fd-trans.h | 1 + linux-user/syscall.c | 8 ++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c index 7b25468d02..146aaaafaa 100644 --- a/linux-user/fd-trans.c +++ b/linux-user/fd-trans.c @@ -1622,7 +1622,7 @@ TargetFdTrans target_signalfd_trans =3D { .host_to_target_data =3D host_to_target_data_signalfd, }; =20 -static abi_long swap_data_eventfd(void *buf, size_t len) +static abi_long swap_data_u64(void *buf, size_t len) { uint64_t *counter =3D buf; int i; @@ -1640,8 +1640,12 @@ static abi_long swap_data_eventfd(void *buf, size_t = len) } =20 TargetFdTrans target_eventfd_trans =3D { - .host_to_target_data =3D swap_data_eventfd, - .target_to_host_data =3D swap_data_eventfd, + .host_to_target_data =3D swap_data_u64, + .target_to_host_data =3D swap_data_u64, +}; + +TargetFdTrans target_timerfd_trans =3D { + .host_to_target_data =3D swap_data_u64, }; =20 #if defined(CONFIG_INOTIFY) && (defined(TARGET_NR_inotify_init) || \ diff --git a/linux-user/fd-trans.h b/linux-user/fd-trans.h index 1b9fa2041c..910faaf237 100644 --- a/linux-user/fd-trans.h +++ b/linux-user/fd-trans.h @@ -130,6 +130,7 @@ extern TargetFdTrans target_netlink_route_trans; extern TargetFdTrans target_netlink_audit_trans; extern TargetFdTrans target_signalfd_trans; extern TargetFdTrans target_eventfd_trans; +extern TargetFdTrans target_timerfd_trans; #if (defined(TARGET_NR_inotify_init) && defined(__NR_inotify_init)) || \ (defined(CONFIG_INOTIFY1) && defined(TARGET_NR_inotify_init1) && \ defined(__NR_inotify_init1)) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 1e868e9b0e..58549de125 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -13117,8 +13117,12 @@ static abi_long do_syscall1(CPUArchState *cpu_env,= int num, abi_long arg1, =20 #if defined(TARGET_NR_timerfd_create) && defined(CONFIG_TIMERFD) case TARGET_NR_timerfd_create: - return get_errno(timerfd_create(arg1, - target_to_host_bitmask(arg2, fcntl_flags_tbl))); + ret =3D get_errno(timerfd_create(arg1, + target_to_host_bitmask(arg2, fcntl_flags_tbl))); + if (ret >=3D 0) { + fd_trans_register(ret, &target_timerfd_trans); + } + return ret; #endif =20 #if defined(TARGET_NR_timerfd_gettime) && defined(CONFIG_TIMERFD) --=20 2.39.1