From nobody Fri May 17 06:07:46 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=deller@gmx.de; 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; dmarc=pass(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1690931424; cv=none; d=zohomail.com; s=zohoarc; b=F16KHb5quRcz9YzN6BFPtCq2ra1FrbhBzH965B8HBgm4W8kvBH37riKOzgvNS+N7MImMFJ7TMULM8Pqdxn94Vn+DjFsPSk0B0FmTTLn3SGz7MAijNkuoaVq1IhTjQmGoqZIoPzXv1mimO1I00jgqqA/82nUADpSUa217pMYAZWI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690931424; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZPGGHbSS4icm1ZfCA9cPZxyRTNyya4+y+pZuyrRJ1MA=; b=MJGhw91AKp08mFluH8+1bSAzqsLELKY8b7ph19r9UMkokEZYaS1MQ7yTGKlY5zc3P+rwZXL6JSv+wzG4Xhhv8fC+rQ0e2wi+8RjsTjiUufbONEgxIM54frDzFHXTBfB8JPvb350PaoJDg4svt5rBkFTm2IFcX0R65dS4cgh2IkQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=deller@gmx.de; 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; dmarc=pass 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 1690931424904940.504633628667; Tue, 1 Aug 2023 16:10:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qQyU5-0007KO-UQ; Tue, 01 Aug 2023 19:08:57 -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 1qQyU4-0007FC-My; Tue, 01 Aug 2023 19:08:56 -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 1qQyU3-0004eL-0O; Tue, 01 Aug 2023 19:08:56 -0400 Received: from p100.fritz.box ([94.134.150.247]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MuUnK-1paf4o2o8Q-00rXn2; Wed, 02 Aug 2023 01:08:44 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1690931324; x=1691536124; i=deller@gmx.de; bh=xwz6aMde3YBdcmDS3z738t66mXpAPMuyqhPYVzFaalo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=cFfux6IdstsTRooKiUchoRQhgOxoCkji0CymdRW57dkgTU+T3ov587uVmkHxcL4NqCEH8N2 WE/u6UsOJl4pTWjwDw1QpS3mnWgrMXTJKKtdkLCznEv3aSV+1PN+XkWiE/4087wuAa3Alp/sG uvoCqDwXr6SsrS7rFOZlFOe9VrYDCdXaZ0oxlEzB1yH+9Fe3spC8KTjl0KZc5E1YIrYumgwI9 Wg1Y56HUb++6ATSGdQBoXj2hunBRYp1y7XKpPHtzCCe2wE4grWuAqAoW2uy6ruzmrjSaMnf7g s/pnlVJdJ9I8HAJLIBVD9cf04pObLuZ4IV6Ng2dqfkxitoWhI7aQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a From: Helge Deller To: qemu-devel@nongnu.org Cc: Laurent Vivier , Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Helge Deller Subject: [PATCH v2 1/3] linux-user: Fix openat() emulation to correctly detect accesses to /proc Date: Wed, 2 Aug 2023 01:08:40 +0200 Message-ID: <20230801230842.414421-2-deller@gmx.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230801230842.414421-1-deller@gmx.de> References: <20230801230842.414421-1-deller@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:tl2lG5EEICYtpWPx52BODKo1D8Zt1ezxWfqBQQNp5EmWajBCH7V IXB+Heam/vRRSXKvfe73CE9j9vj6IWAt6Eb1ap4fC43Zc6SToZpL/J36ikzQMFnTjIog2tC g+dyDXfnYOxFnmWw6GxEhXqaj+YfgC8zQQROqZtN1ZmDuMzvmD88JmUrQiJgWINW9oDe1gO /k+pzNvX7F85KlSxoxl6A== UI-OutboundReport: notjunk:1;M01:P0:32g3wDeELXg=;iIiO4tkyMzdKB5slio/2FwK/sAG BnV/iMjgE4zRYod4eBkMz34dTZ+dwYCYh/jWBmEEC8J0osp0/eIQH10L4ADMCx1NW0AK/ohxE N7hpmyNhL62Eb2GJqU7CRFYLrSguiYC+0cq52hlFpIv4pgmrM8BWD12raApcUDkhcz3eEEDil 9NxFsPg3sexJalejTbdHbUa+8tDOsH0XWTtg9WKVUnm1hfskOCwSv+Ev/qVedJmOBQau0pGZM z3MkydDwC3+nxUTxissP+xrqG5x0paKy/nBTnadYoixCm4THjqA2s/ylN7peMSSwHwumppvyD PKDtIVE91J1hfcWQwOnwbLCq2wdgX6IJTAOMTXUkRAcyJ9mM/hZUFL7bTBnNrLWpLkbHG2+6+ X4AQRKI2eUhNvUSvI2roeT1DHrWkn4SusJ39etFTy+bAKgCbrAWkKBX7LuZjBEe+IMkqNVQUW DCxE4SumjD7YhQS2Htg7PYPV4jnYMpeY5phcbQsRgIIfq0OFEYDxqtuE0AONZDS3l48XdI5Xb GDFsCYtVPmtLztrFR/hNmcpjbL58h1Oag/OTRi7qA+5yWyLuXGK057oZgw/yA2Z29QYeXa3Ch 7V3BnlUFzDAN4B8z98nvNfbtIOGzQ+PnIdlMpC9r1rZWWVhngtXAoFK4rntEhBQDJoIQdJaan HGDtr3hFlTHkSlcTjJrNTsdAsNEJVmjM/fd0mMkNgO8mE1e3lJlOFH5/F0HBz5uJPg9saV/Z7 8R6JxkTbIWXZJtPUqu1f85qIAogmW2xmq9DRAf8hH3w3AF19IzPRs1LKiQstEhurOJAQgHB8q WKod2N79BvxYfINMwsH+EaBelf2vDPR3NsCHSiDtcwwp2R4jwOmm7+8/5LbGRtyXhnYKQDSxV aphFw/rSdai6MzYYiVlBDGzCuuOtQKFAl/c04QoI7z/Ee0AZuZXM96d4Y35/3hj7o4lDstGAF qqJrfYETt05bPIO/ePIs46lqd+4= 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=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, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity deller@gmx.de) X-ZM-MESSAGEID: 1690931426022100007 Content-Type: text/plain; charset="utf-8" In qemu we catch accesses to files like /proc/cpuinfo or /proc/net/route and return to the guest contents which would be visible on a real system (instead what the host would show). This patch fixes a bug, where for example the accesses cat /proc////cpuinfo or cd /proc && cat cpuinfo will not be recognized by qemu and where qemu will wrongly show the contents of the host's /proc/cpuinfo file. Signed-off-by: Helge Deller -- v3: - use g_autofree on returned value from realpath v2: - use g_autofree instead of pathname on stack Daniel P. Berrang=C3=A9 requested to not put buffers on stack. Using g_autofree keeps code much cleaner than using extended semantics of realpath(), unless I can use g_autofree on malloced area from realpath(). Reviewed-by: Daniel P. Berrang=C3=A9 --- linux-user/syscall.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 95727a816a..1ec7d27e37 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8539,9 +8539,12 @@ static int open_hardware(CPUArchState *cpu_env, int = fd) } #endif -int do_guest_openat(CPUArchState *cpu_env, int dirfd, const char *pathname, + +int do_guest_openat(CPUArchState *cpu_env, int dirfd, const char *fname, int flags, mode_t mode, bool safe) { + g_autofree char *proc_name =3D NULL; + const char *pathname; struct fake_open { const char *filename; int (*fill)(CPUArchState *cpu_env, int fd); @@ -8567,6 +8570,14 @@ int do_guest_openat(CPUArchState *cpu_env, int dirfd= , const char *pathname, { NULL, NULL, NULL } }; + /* if this is a file from /proc/ filesystem, expand full name */ + proc_name =3D realpath(fname, NULL); + if (proc_name && strncmp(proc_name, "/proc/", 6) =3D=3D 0) { + pathname =3D proc_name; + } else { + pathname =3D fname; + } + if (is_proc_myself(pathname, "exe")) { if (safe) { return safe_openat(dirfd, exec_path, flags, mode); -- 2.41.0 From nobody Fri May 17 06:07:46 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=deller@gmx.de; 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; dmarc=pass(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1690931425; cv=none; d=zohomail.com; s=zohoarc; b=bPpRreDRGbRnxR5SX0i/OMykO3kxJx4Oane7/EzqTQ5XE/kHOi7GgdKCwHBqanBBNLdT296IAteOQEGuKHCyXoQMDBmYhENxXl7PWJI9dbY6IWIW4GgvFsBfxjkrVBwzYpnqzCSbrMrZwmyk5inu5//ZoAca2tm9WhR9XcO1VIs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690931425; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5T7osQbKUcy4aHCFpHSS+6+pZvN5D320T4Cy/F4MgNY=; b=YTNk37MUCuayXWWWDuZTNReZ2/bUMg7+4r6JTDj8v+mcAjX9vy8YPWeNkVcyWO8xXgytct4HhkwmM6u/DDU2Dmbf24DEeb6QsgeUzmXAt8ITHt4IA1ouxnz0EXkjCUM43P4IhSKCxPgELpESqL00CauN1mtv2rCzPk72a9FPDko= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=deller@gmx.de; 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; dmarc=pass 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 1690931425296227.7552874605717; Tue, 1 Aug 2023 16:10:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qQyU6-0007Li-NX; Tue, 01 Aug 2023 19:08:58 -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 1qQyU5-0007Io-CG; Tue, 01 Aug 2023 19:08:57 -0400 Received: from mout.gmx.net ([212.227.17.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qQyU3-0004eM-0g; Tue, 01 Aug 2023 19:08:57 -0400 Received: from p100.fritz.box ([94.134.150.247]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MBDnC-1qZH063yow-00Cjrc; Wed, 02 Aug 2023 01:08:45 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1690931325; x=1691536125; i=deller@gmx.de; bh=CLBuhiY26Hae4yHJHgzL4EblVVc/pDWcYka5+oCl8+I=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=l+2tVrZHQpbvEy8khn2yV5ir7xsoDTz+yu3cS5ECfacHRwmEUAbUqAchQRZgf4mzgUeMpYQ pA70MLttXIZeWgbTdNff+35nlOk/kS+SS0VNIqLu5YIeocwTOiIJr4byN9izEYv00T82EErmH +KQEw59fZvCzlUUQ1bZKBSfX3jHYzUbkEijuM1hbGHzScklmoxik1iTelf3Cvn8PZre3gyYnj 0XTwusFXBA2kLMloXVJrPiad9EQFII6LtI1U3bj+hRDQdbdn4eTevfd5jvpZgqdwAt+yLDHTE vqj+IL1iR+IrRcNy3RwR8bJuuqFgid0RraUJz+xZIBZOwOkFgCdw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a From: Helge Deller To: qemu-devel@nongnu.org Cc: Laurent Vivier , Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Helge Deller Subject: [PATCH v2 2/3] linux-user: Emulate /proc/cpuinfo on aarch64 and arm Date: Wed, 2 Aug 2023 01:08:41 +0200 Message-ID: <20230801230842.414421-3-deller@gmx.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230801230842.414421-1-deller@gmx.de> References: <20230801230842.414421-1-deller@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:+VuY8oQ1py8U6x73aQHS9aNf9Zqgr90V6g/DAQXJ3QXQaoVe7Md CGJY17hbhmyOy64Pm+t7m9D7RM76HxGDsJtLbBzlO2BfXDEjimvBA48PNp5n/WdnVJpZxA3 WjzBruilx6axyOarax9yVVAHz/QtmphhnUYyHRr1TovgnLh18y2TkgLHCqwG1Abgc1ZN259 3R2NvpTJhU6ZsGYXyyRIA== UI-OutboundReport: notjunk:1;M01:P0:+GfYl8Ls7MM=;TzjKVpjjueWIBBbAUa8S2wVfCvl LFW9LRPahg5Fs1IAJhsIz4yJn+dT+rmQfKqkE5OGoDhHhjRY5MCs95B9JpYc2UsJnrIHbB0eQ lLunXVy1yipzqmwARNJec0LKkGAr2CiPr7IS/K3ZZU8dpXGx+egiDqTRhoyMkKx5zsrpinw93 ZtBiBMNkPJgi2Ozi6cLYexweZBGX8YBkJRRC/lR2vJ/YG+cDn69VIbZTNUCSRcawP30P8Rany VGID5qzoGegGPKkRN11EkAnQ8M7kKHkVmWWdFm/LhQDql6HAs48+nYdlNjZY49Ksy684eVSjH 3EIPpD2M1fg2FfWI0T3dEwh3C6CtfcYwSW6pH4yXf7iHtHPicYbxftGXnaSZ3fTx5ePF2gy+o 4xpdivOdDBn8cFCa0h81IYTFWz0blSdoUFLwk1O6shRlixy3AsM2pk8DwVOpYO4PCHR6nLYvd h5Hj8zg49WNN4+yjQb4Qemgm9pVCxd3SCICTTVd5gyfSURnAVy2CwnWrA8FmLtQTIhRiAaT+y b8P485QezVVGtDAmRunJwm0CJ1CzG5s17ZKEOnEjBQd0fxoUYStVuoc4FApMQyIDcsE7li7Eo PzuMN+DXWtbLMx/k5sZ27e+aa1Jn08I/ZWBGvMWT4fKLEdB3fhjXp+0DbYNNn3ar6iHK8loiX KJFy6AGwLz1M3zf2gttNfJWHeh99lDazyKVPLAOhXBHJJsxbw7G3uLAiPl5xwZUbLoGrqSaQh tfAjiaFZgwzTU0Jn7L7eNUciIZMy7/j/I8iI7ElFfA4no1gjGgkf0RO8AjMRWdWOsOWmdjQtA vXmKpvKzcCthv6dtK/4GzunzMn9aE4IsbR9LnL6lm2B+nAMskjtWVkFcl1e4fkzzm3XWJJaeg XT5SisXH8q39hHLJCqrwB6yEx8cdgB9khEJZFFHJHWWyj+9rJhefppsRD9ltf5sh2lS3vYkGg x4j3nqApS56byJULsT6oKbJx/r0= 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=212.227.17.22; 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_H4=0.001, RCVD_IN_MSPIKE_WL=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity deller@gmx.de) X-ZM-MESSAGEID: 1690931427448100011 Content-Type: text/plain; charset="utf-8" Add emulation for /proc/cpuinfo for arm architecture. The output below mimics output as seen on debian porterboxes. aarch64 output example: processor : 0 model name : ARMv8 Processor rev 0 (v8l) BogoMIPS : 100.00 Features : fp asimd aes pmull sha1 sha2 crc32 atomics fphp asimdhp c= puid asimdrdm jscvt fcma lrcpc dcpop sha3 sm3 sm4 asimddp sha512 sve asimdf= hm ilrcpc flagm sb paca pacg dcpodp sve2 sveaes svepmull svebitperm svesha3= svesm4 flagm2 frint svei8mm svef32mm svef64mm svebf16 i8mm bf16 rng bti mt= e sme sme_i16i64 sme_f64f64 sme_i8i32 sme_f16f32 sme_b16f32 sme_f32f32 sme_= fa64 CPU implementer : 00 CPU architecture: 8 CPU variant : 0 CPU part : 0x51 CPU revision : 0 arm output example: processor : 0 model name : ARMv7 Processor rev 0 (armv7l) BogoMIPS : 50.00 Features : swp half thumb fast_mult vfp edsp neon vfpv3 tls vfpv4 id= iva idivt vfpd32 lpae aes pmull sha1 sha2 crc32 CPU implementer : 0x41 CPU architecture: 7 CPU variant : 0x1 CPU part : 0xd07 CPU revision : 0 Hardware : arm,cortex-a57 Revision : 0000 Serial : 0000000000000000 Signed-off-by: Helge Deller v3: - show variant, part, revision and implementor based on midr value (suggested by Richard Henderson) v2: - show features of CPU which is actually being emulated by qemu (suggested by Peter Maydell) --- linux-user/elfload.c | 130 +++++++++++++++++++++++++++++++++++++++++-- linux-user/loader.h | 6 +- linux-user/syscall.c | 67 +++++++++++++++++++++- 3 files changed, 196 insertions(+), 7 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 861ec07abc..99804e477d 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -466,7 +466,7 @@ static bool init_guest_commpage(void) #define ELF_HWCAP get_elf_hwcap() #define ELF_HWCAP2 get_elf_hwcap2() -static uint32_t get_elf_hwcap(void) +uint32_t get_elf_hwcap(void) { ARMCPU *cpu =3D ARM_CPU(thread_cpu); uint32_t hwcaps =3D 0; @@ -508,7 +508,7 @@ static uint32_t get_elf_hwcap(void) return hwcaps; } -static uint32_t get_elf_hwcap2(void) +uint32_t get_elf_hwcap2(void) { ARMCPU *cpu =3D ARM_CPU(thread_cpu); uint32_t hwcaps =3D 0; @@ -521,6 +521,49 @@ static uint32_t get_elf_hwcap2(void) return hwcaps; } +const char *elf_hwcap_str(uint32_t bit) +{ + static const char *hwcap_str[] =3D { + [__builtin_ctz(ARM_HWCAP_ARM_SWP )] =3D "swp", + [__builtin_ctz(ARM_HWCAP_ARM_HALF )] =3D "half", + [__builtin_ctz(ARM_HWCAP_ARM_THUMB )] =3D "thumb", + [__builtin_ctz(ARM_HWCAP_ARM_26BIT )] =3D "26bit", + [__builtin_ctz(ARM_HWCAP_ARM_FAST_MULT)] =3D "fast_mult", + [__builtin_ctz(ARM_HWCAP_ARM_FPA )] =3D "fpa", + [__builtin_ctz(ARM_HWCAP_ARM_VFP )] =3D "vfp", + [__builtin_ctz(ARM_HWCAP_ARM_EDSP )] =3D "edsp", + [__builtin_ctz(ARM_HWCAP_ARM_JAVA )] =3D "java", + [__builtin_ctz(ARM_HWCAP_ARM_IWMMXT )] =3D "iwmmxt", + [__builtin_ctz(ARM_HWCAP_ARM_CRUNCH )] =3D "crunch", + [__builtin_ctz(ARM_HWCAP_ARM_THUMBEE )] =3D "thumbee", + [__builtin_ctz(ARM_HWCAP_ARM_NEON )] =3D "neon", + [__builtin_ctz(ARM_HWCAP_ARM_VFPv3 )] =3D "vfpv3", + [__builtin_ctz(ARM_HWCAP_ARM_VFPv3D16 )] =3D "vfpv3d16", + [__builtin_ctz(ARM_HWCAP_ARM_TLS )] =3D "tls", + [__builtin_ctz(ARM_HWCAP_ARM_VFPv4 )] =3D "vfpv4", + [__builtin_ctz(ARM_HWCAP_ARM_IDIVA )] =3D "idiva", + [__builtin_ctz(ARM_HWCAP_ARM_IDIVT )] =3D "idivt", + [__builtin_ctz(ARM_HWCAP_ARM_VFPD32 )] =3D "vfpd32", + [__builtin_ctz(ARM_HWCAP_ARM_LPAE )] =3D "lpae", + [__builtin_ctz(ARM_HWCAP_ARM_EVTSTRM )] =3D "evtstrm", + }; + + return bit < ARRAY_SIZE(hwcap_str) ? hwcap_str[bit] : NULL; +} + +const char *elf_hwcap2_str(uint32_t bit) +{ + static const char *hwcap_str[] =3D { + [__builtin_ctz(ARM_HWCAP2_ARM_AES )] =3D "aes", + [__builtin_ctz(ARM_HWCAP2_ARM_PMULL)] =3D "pmull", + [__builtin_ctz(ARM_HWCAP2_ARM_SHA1 )] =3D "sha1", + [__builtin_ctz(ARM_HWCAP2_ARM_SHA2 )] =3D "sha2", + [__builtin_ctz(ARM_HWCAP2_ARM_CRC32)] =3D "crc32", + }; + + return bit < ARRAY_SIZE(hwcap_str) ? hwcap_str[bit] : NULL; +} + #undef GET_FEATURE #undef GET_FEATURE_ID @@ -668,7 +711,7 @@ enum { #define GET_FEATURE_ID(feat, hwcap) \ do { if (cpu_isar_feature(feat, cpu)) { hwcaps |=3D hwcap; } } while (= 0) -static uint32_t get_elf_hwcap(void) +uint32_t get_elf_hwcap(void) { ARMCPU *cpu =3D ARM_CPU(thread_cpu); uint32_t hwcaps =3D 0; @@ -706,7 +749,7 @@ static uint32_t get_elf_hwcap(void) return hwcaps; } -static uint32_t get_elf_hwcap2(void) +uint32_t get_elf_hwcap2(void) { ARMCPU *cpu =3D ARM_CPU(thread_cpu); uint32_t hwcaps =3D 0; @@ -741,6 +784,85 @@ static uint32_t get_elf_hwcap2(void) return hwcaps; } +const char *elf_hwcap_str(uint32_t bit) +{ + static const char *hwcap_str[] =3D { + [__builtin_ctz(ARM_HWCAP_A64_FP )] =3D "fp", + [__builtin_ctz(ARM_HWCAP_A64_ASIMD )] =3D "asimd", + [__builtin_ctz(ARM_HWCAP_A64_EVTSTRM )] =3D "evtstrm", + [__builtin_ctz(ARM_HWCAP_A64_AES )] =3D "aes", + [__builtin_ctz(ARM_HWCAP_A64_PMULL )] =3D "pmull", + [__builtin_ctz(ARM_HWCAP_A64_SHA1 )] =3D "sha1", + [__builtin_ctz(ARM_HWCAP_A64_SHA2 )] =3D "sha2", + [__builtin_ctz(ARM_HWCAP_A64_CRC32 )] =3D "crc32", + [__builtin_ctz(ARM_HWCAP_A64_ATOMICS )] =3D "atomics", + [__builtin_ctz(ARM_HWCAP_A64_FPHP )] =3D "fphp", + [__builtin_ctz(ARM_HWCAP_A64_ASIMDHP )] =3D "asimdhp", + [__builtin_ctz(ARM_HWCAP_A64_CPUID )] =3D "cpuid", + [__builtin_ctz(ARM_HWCAP_A64_ASIMDRDM)] =3D "asimdrdm", + [__builtin_ctz(ARM_HWCAP_A64_JSCVT )] =3D "jscvt", + [__builtin_ctz(ARM_HWCAP_A64_FCMA )] =3D "fcma", + [__builtin_ctz(ARM_HWCAP_A64_LRCPC )] =3D "lrcpc", + [__builtin_ctz(ARM_HWCAP_A64_DCPOP )] =3D "dcpop", + [__builtin_ctz(ARM_HWCAP_A64_SHA3 )] =3D "sha3", + [__builtin_ctz(ARM_HWCAP_A64_SM3 )] =3D "sm3", + [__builtin_ctz(ARM_HWCAP_A64_SM4 )] =3D "sm4", + [__builtin_ctz(ARM_HWCAP_A64_ASIMDDP )] =3D "asimddp", + [__builtin_ctz(ARM_HWCAP_A64_SHA512 )] =3D "sha512", + [__builtin_ctz(ARM_HWCAP_A64_SVE )] =3D "sve", + [__builtin_ctz(ARM_HWCAP_A64_ASIMDFHM)] =3D "asimdfhm", + [__builtin_ctz(ARM_HWCAP_A64_DIT )] =3D "dit", + [__builtin_ctz(ARM_HWCAP_A64_USCAT )] =3D "uscat", + [__builtin_ctz(ARM_HWCAP_A64_ILRCPC )] =3D "ilrcpc", + [__builtin_ctz(ARM_HWCAP_A64_FLAGM )] =3D "flagm", + [__builtin_ctz(ARM_HWCAP_A64_SSBS )] =3D "ssbs", + [__builtin_ctz(ARM_HWCAP_A64_SB )] =3D "sb", + [__builtin_ctz(ARM_HWCAP_A64_PACA )] =3D "paca", + [__builtin_ctz(ARM_HWCAP_A64_PACG )] =3D "pacg", + }; + + return bit < ARRAY_SIZE(hwcap_str) ? hwcap_str[bit] : NULL; +} + +const char *elf_hwcap2_str(uint32_t bit) +{ + static const char *hwcap_str[] =3D { + [__builtin_ctz(ARM_HWCAP2_A64_DCPODP )] =3D "dcpodp", + [__builtin_ctz(ARM_HWCAP2_A64_SVE2 )] =3D "sve2", + [__builtin_ctz(ARM_HWCAP2_A64_SVEAES )] =3D "sveaes", + [__builtin_ctz(ARM_HWCAP2_A64_SVEPMULL )] =3D "svepmull", + [__builtin_ctz(ARM_HWCAP2_A64_SVEBITPERM )] =3D "svebitperm", + [__builtin_ctz(ARM_HWCAP2_A64_SVESHA3 )] =3D "svesha3", + [__builtin_ctz(ARM_HWCAP2_A64_SVESM4 )] =3D "svesm4", + [__builtin_ctz(ARM_HWCAP2_A64_FLAGM2 )] =3D "flagm2", + [__builtin_ctz(ARM_HWCAP2_A64_FRINT )] =3D "frint", + [__builtin_ctz(ARM_HWCAP2_A64_SVEI8MM )] =3D "svei8mm", + [__builtin_ctz(ARM_HWCAP2_A64_SVEF32MM )] =3D "svef32mm", + [__builtin_ctz(ARM_HWCAP2_A64_SVEF64MM )] =3D "svef64mm", + [__builtin_ctz(ARM_HWCAP2_A64_SVEBF16 )] =3D "svebf16", + [__builtin_ctz(ARM_HWCAP2_A64_I8MM )] =3D "i8mm", + [__builtin_ctz(ARM_HWCAP2_A64_BF16 )] =3D "bf16", + [__builtin_ctz(ARM_HWCAP2_A64_DGH )] =3D "dgh", + [__builtin_ctz(ARM_HWCAP2_A64_RNG )] =3D "rng", + [__builtin_ctz(ARM_HWCAP2_A64_BTI )] =3D "bti", + [__builtin_ctz(ARM_HWCAP2_A64_MTE )] =3D "mte", + [__builtin_ctz(ARM_HWCAP2_A64_ECV )] =3D "ecv", + [__builtin_ctz(ARM_HWCAP2_A64_AFP )] =3D "afp", + [__builtin_ctz(ARM_HWCAP2_A64_RPRES )] =3D "rpres", + [__builtin_ctz(ARM_HWCAP2_A64_MTE3 )] =3D "mte3", + [__builtin_ctz(ARM_HWCAP2_A64_SME )] =3D "sme", + [__builtin_ctz(ARM_HWCAP2_A64_SME_I16I64 )] =3D "sme_i16i64", + [__builtin_ctz(ARM_HWCAP2_A64_SME_F64F64 )] =3D "sme_f64f64", + [__builtin_ctz(ARM_HWCAP2_A64_SME_I8I32 )] =3D "sme_i8i32", + [__builtin_ctz(ARM_HWCAP2_A64_SME_F16F32 )] =3D "sme_f16f32", + [__builtin_ctz(ARM_HWCAP2_A64_SME_B16F32 )] =3D "sme_b16f32", + [__builtin_ctz(ARM_HWCAP2_A64_SME_F32F32 )] =3D "sme_f32f32", + [__builtin_ctz(ARM_HWCAP2_A64_SME_FA64 )] =3D "sme_fa64", + }; + + return bit < ARRAY_SIZE(hwcap_str) ? hwcap_str[bit] : NULL; +} + #undef GET_FEATURE_ID #endif /* not TARGET_AARCH64 */ diff --git a/linux-user/loader.h b/linux-user/loader.h index 59cbeacf24..324e5c872a 100644 --- a/linux-user/loader.h +++ b/linux-user/loader.h @@ -56,9 +56,13 @@ abi_long memcpy_to_target(abi_ulong dest, const void *sr= c, extern unsigned long guest_stack_size; -#ifdef TARGET_S390X +#if defined(TARGET_S390X) || defined(TARGET_AARCH64) || defined(TARGET_ARM) uint32_t get_elf_hwcap(void); const char *elf_hwcap_str(uint32_t bit); #endif +#if defined(TARGET_AARCH64) || defined(TARGET_ARM) +uint32_t get_elf_hwcap2(void); +const char *elf_hwcap2_str(uint32_t bit); +#endif #endif /* LINUX_USER_LOADER_H */ diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 1ec7d27e37..51ce81cefb 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8323,7 +8323,8 @@ void target_exception_dump(CPUArchState *env, const c= har *fmt, int code) #if HOST_BIG_ENDIAN !=3D TARGET_BIG_ENDIAN || \ defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA) = || \ - defined(TARGET_RISCV) || defined(TARGET_S390X) + defined(TARGET_RISCV) || defined(TARGET_S390X) || defined(TARGET_ARM) = || \ + defined(TARGET_AARCH64) static int is_proc(const char *filename, const char *entry) { return strcmp(filename, entry) =3D=3D 0; @@ -8539,6 +8540,67 @@ static int open_hardware(CPUArchState *cpu_env, int = fd) } #endif +#if defined(TARGET_AARCH64) || defined(TARGET_ARM) +static int open_cpuinfo(CPUArchState *cpu_env, int fd) +{ + const int is64 =3D TARGET_ABI_BITS =3D=3D 64; + ARMCPU *cpu =3D ARM_CPU(thread_cpu); + uint64_t midr =3D cpu->midr; + const int rev =3D (midr & 0xf); + const int arch =3D is64 ? 8 : 7; + uint32_t elf_hwcap =3D get_elf_hwcap(); + uint32_t elf_hwcap2 =3D get_elf_hwcap2(); + const char *hwcap_str; + int i, j, num_cpus; + + num_cpus =3D sysconf(_SC_NPROCESSORS_ONLN); + for (i =3D 0; i < num_cpus; i++) { + dprintf(fd, "processor\t: %d\n", i); + dprintf(fd, "model name\t: ARMv%d Processor rev %d (%s%c)\n", + arch, rev, is64 ? "v8" : "armv7", +#if TARGET_BIG_ENDIAN + 'b' +#else + 'l' +#endif + ); + dprintf(fd, "BogoMIPS\t: %d.00\n", is64 ? 100 : 50); + dprintf(fd, "Features\t:"); + for (j =3D 0; j < sizeof(elf_hwcap) * 8; j++) { + if (!(elf_hwcap & (1 << j))) { + continue; + } + hwcap_str =3D elf_hwcap_str(j); + if (hwcap_str) { + dprintf(fd, " %s", hwcap_str); + } + } + for (j =3D 0; j < sizeof(elf_hwcap2) * 8; j++) { + if (!(elf_hwcap2 & (1 << j))) { + continue; + } + hwcap_str =3D elf_hwcap2_str(j); + if (hwcap_str) { + dprintf(fd, " %s", hwcap_str); + } + } + dprintf(fd, "\n"); + dprintf(fd, "CPU implementer\t: %#02x\n", (int)(midr >> 24) & 0xff= ); + dprintf(fd, "CPU architecture: %d\n", arch); + dprintf(fd, "CPU variant\t: %#x\n", (int)(midr >> 20) & 0xf = ); + dprintf(fd, "CPU part\t: %#03x\n", (int)(midr >> 4) & 0xfff= ); + dprintf(fd, "CPU revision\t: %d\n\n", rev); + } + + dprintf(fd, "Hardware\t: %s\n", cpu->dtb_compatible ? : ""); + if (!is64) { + dprintf(fd, "Revision\t: 0000\n"); + dprintf(fd, "Serial\t\t: 0000000000000000\n"); + } + + return 0; +} +#endif int do_guest_openat(CPUArchState *cpu_env, int dirfd, const char *fname, int flags, mode_t mode, bool safe) @@ -8561,7 +8623,8 @@ int do_guest_openat(CPUArchState *cpu_env, int dirfd,= const char *fname, { "/proc/net/route", open_net_route, is_proc }, #endif #if defined(TARGET_SPARC) || defined(TARGET_HPPA) || \ - defined(TARGET_RISCV) || defined(TARGET_S390X) + defined(TARGET_RISCV) || defined(TARGET_S390X) || \ + defined(TARGET_ARM) || defined(TARGET_AARCH64) { "/proc/cpuinfo", open_cpuinfo, is_proc }, #endif #if defined(TARGET_M68K) -- 2.41.0 From nobody Fri May 17 06:07:46 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=deller@gmx.de; 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; dmarc=pass(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1690931424; cv=none; d=zohomail.com; s=zohoarc; b=I16+ntMf64TJNN1eNGe/uBY6mDENRp1Fl4vHB1DJladLhBkj4hTdU+z9vpgi/iZshIUCVWIF09qnec1+J9xMeppTw1CC2xWko6VuEAxTy8TJMyK5ZsNWAGH4+Vo108GzbCCnS8qmJ7KzVvvUciyBAWffPEWDJKItQ2YoLYBfuIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690931424; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NQFeWKX36X8OUVfzCZnxZJ+DGOC/GSM7e3j0+0CvUP0=; b=Hs8QA6snhCCrSt+2dBKP2I7jp/0ff3kp6C8JZUToUY/i/8pXzEsSdm3vwEhhEQkQRV8BlJjc1lqhq8WLYlHsslTO7yTURBsbi4k4X5uRtlMa3liv09k6JK44+Cg6JYelXbTWbMv7xyDudeuj8eLNTyM7XydEoyQ6u0ez/LtwFK0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=deller@gmx.de; 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; dmarc=pass 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 169093142402921.302567957999486; Tue, 1 Aug 2023 16:10:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qQyUD-0007OE-Gb; Tue, 01 Aug 2023 19:09:05 -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 1qQyUB-0007Nh-Hv; Tue, 01 Aug 2023 19:09:03 -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 1qQyU9-0004fV-Mj; Tue, 01 Aug 2023 19:09:03 -0400 Received: from p100.fritz.box ([94.134.150.247]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MCbEp-1qa5Py1KaZ-009if7; Wed, 02 Aug 2023 01:08:45 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1690931325; x=1691536125; i=deller@gmx.de; bh=79i+wprPSHPx+eDP6ZoZRFZesYV7H7obdHrhMufFAds=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=WES2DBnRIGYQj4XMF3hHDi4lUdWN/pt4ZHhtwCiNmKgnj21OGQ2DjRqyUIC0ci5msmDQaYO 4siWc+upvlW4YyBjqiCi0buojahgA1vuYJzEse609Ej+VrDlEEoQ2m2NSwNu6GAnBhSXm8ckQ iWVcqdil7NSk97WJ8wV5kJGf5WvlRCKnl/9cldR/DTkqiYj3OAzasXWEPTb/6VGZb1oXaaUrt byOIlZEZWJasHDwLLGOR7xnBid2Rr61IhrlCxnbRNlBXlaCXwzcQg3ozVrjfgSYafNCUy+Jzp 2DaH53eZ7NzEYgBi/yDLiaRoQoe17z5j9UyRijkAGEElbnZCOp2Q== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a From: Helge Deller To: qemu-devel@nongnu.org Cc: Laurent Vivier , Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Helge Deller , Michael Cree Subject: [PATCH v2 3/3] linux-user: Emulate /proc/cpuinfo for Alpha Date: Wed, 2 Aug 2023 01:08:42 +0200 Message-ID: <20230801230842.414421-4-deller@gmx.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230801230842.414421-1-deller@gmx.de> References: <20230801230842.414421-1-deller@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:ykCZzbY1WXwIXpwMJS4jaUsYO1X9wMpRwqDdQCXl3vp1QMHAwso vAzdaXNO82XA0pwXdslJaxrFaTbXC1xzXVvGAVBvRDUR6K/P2y4ZSQvuoOdUsxmGY1L6QLh gasFSbbLbSi5WHD142xP8Td7Gi52sW4chaUTBaf2TUBpWH4cSHvhgmdbqTudgaTt3WHZMnN oasXVrKh66nO4dMZEJRBA== UI-OutboundReport: notjunk:1;M01:P0:PR1i6An27x4=;05OY9rE5eTotGZjYhktvERObmKr 1uqgmEh5JcAfDfckhpkYUeI7s/wQFMNAm2z3svuF5Og+IDAAYrbNgDYSZt67P1LlJxoX23b+3 tGSPrKy6W1S+kPJvqbqFDWEsoJNp6yBtUVMKu3m2/no28zevurvwH5QqBS4PbZeum6gYVagFE jdTjIKHOmbX+dXFe5dvXHT6EOlZ/1qAMifBE3juOR3/L6odCNw/brz9llM5SzZHxkRBAI+L6m JopNAAcJmKEGYAAnev/4b5y/+AboeEf1Iaiebho3Q+MnN0C3bXwKtITs/8NqVAv08KBSCeUub jnj0XJzQfZsvFu/EpGtJ/wvxNquvLyt6ya4t1bL3AclcuZKl9ZL0nJUIh/Cn1PQrK4mrc276P ekfPmyjybg9wqMYrgC6bsFskQRiV0d22H3SfizP3I2traBtFdD6uvyKRCS5/MmbTtLD6CTcsX T5/kBGFzu4qUZzJevYVBzpjJdoWDP/A70qDPALx8ZnFPzTU/HSWboQlrYNPLMy8NESO6F3PaP Q+8zyLEwSJl35Tsbi4IDtNY+ZDNs+NQnay6deGpvS6rnB6l3WK1sU3jpzG9tlpMDuAXuSoy3c Nu5ySGiWBsjlsAx0KKBh0svu99sCgZHNGm3iiqtGIvk/DhuWpEVzKPX24MnZvfC01lzfcOSn4 LDgs5wtCujWtIB0d/XfJG1CGy1MFpimHGh5+v7pgqmzq0Abv8fslvunzUrk/Tg18kgbSDpm5e GKY9ekJlPy4HeIBgtLywqYp6UwidFL/LqbF5t7GNbJKqfSJKWcvgvlZQPUljJLnOCSwSxgUbJ 62Ix1j/a1D7EnUsGLQqXBf4B61OKBiEETxNLu08fgqsXz39d3VrdfsDBH3CqwLqwERO6fvThR Vgi6SFgf743RIHufBkNdNuJfMst7ZT0FiDce3KWwKk4NWZza9d2RFTJ5yS4rhxo5pYR2aI0ot 0cWMSw== 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=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, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity deller@gmx.de) X-ZM-MESSAGEID: 1690931425759100001 Content-Type: text/plain; charset="utf-8" Add emulation for /proc/cpuinfo for the alpha architecture. alpha output example: (alpha-chroot)root@p100:/# cat /proc/cpuinfo cpu : Alpha cpu model : ev67 cpu variation : 7 cpu revision : 0 cpu serial number : JA00000000 system type : QEMU system variation : 8.0.91 system revision : 0 system serial number : AY00000000 cycle frequency [Hz] : 250000000 timer frequency [Hz] : 250.00 page size [bytes] : 8192 phys. address bits : 44 max. addr. space # : 255 BogoMIPS : 2500.00 platform string : AlphaServer QEMU virtual machine cpus detected : 8 cpus active : 8 cpu active mask : 00000000000000ff L1 Icache : n/a L1 Dcache : n/a L2 cache : n/a L3 cache : n/a Signed-off-by: Helge Deller Cc: Michael Cree --- linux-user/syscall.c | 50 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 51ce81cefb..548eaea3a0 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8324,7 +8324,7 @@ void target_exception_dump(CPUArchState *env, const c= har *fmt, int code) #if HOST_BIG_ENDIAN !=3D TARGET_BIG_ENDIAN || \ defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA) = || \ defined(TARGET_RISCV) || defined(TARGET_S390X) || defined(TARGET_ARM) = || \ - defined(TARGET_AARCH64) + defined(TARGET_AARCH64) || defined(TARGET_ALPHA) static int is_proc(const char *filename, const char *entry) { return strcmp(filename, entry) =3D=3D 0; @@ -8376,6 +8376,51 @@ static int open_net_route(CPUArchState *cpu_env, int= fd) } #endif +#if defined(TARGET_ALPHA) +static int open_cpuinfo(CPUArchState *cpu_env, int fd) +{ + int num_cpus =3D sysconf(_SC_NPROCESSORS_ONLN); + char model[32]; + char *p; + AlphaCPU *cpu =3D env_archcpu(cpu_env); + CPUAlphaState *env =3D &cpu->env; + + g_strlcpy(model, object_class_get_name( + OBJECT_CLASS(CPU_GET_CLASS(env_cpu(cpu_env)))), + sizeof(model)); + p =3D strchr(model, '-'); + if (p) { + *p =3D '\0'; + } + + dprintf(fd, "cpu\t\t\t: Alpha\n"); + dprintf(fd, "cpu model\t\t: %s\n", model); + // object_class_get_name(OBJECT_CLASS(CPU_GET_CLASS(env_cpu(cpu_env)))= )); + dprintf(fd, "cpu variation\t\t: %d\n", env->implver + 5); + dprintf(fd, "cpu revision\t\t: 0\n"); + dprintf(fd, "cpu serial number\t: JA00000000\n"); + dprintf(fd, "system type\t\t: QEMU\n"); + dprintf(fd, "system variation\t: %s\n", QEMU_VERSION); + dprintf(fd, "system revision\t\t: 0\n"); + dprintf(fd, "system serial number\t: AY00000000\n"); + dprintf(fd, "cycle frequency [Hz]\t: 250000000\n"); + dprintf(fd, "timer frequency [Hz]\t: 250.00\n"); + dprintf(fd, "page size [bytes]\t: %d\n", TARGET_PAGE_SIZE); + dprintf(fd, "phys. address bits\t: %d\n", TARGET_PHYS_ADDR_SPACE_BITS); + dprintf(fd, "max. addr. space #\t: 255\n"); + dprintf(fd, "BogoMIPS\t\t: 2500.00\n"); + dprintf(fd, "platform string\t\t: AlphaServer QEMU virtual machine\n"); + dprintf(fd, "cpus detected\t\t: %d\n", num_cpus); + dprintf(fd, "cpus active\t\t: %d\n", num_cpus); + dprintf(fd, "cpu active mask\t\t: %016llx\n", (1ULL << num_cpus) - 1); + dprintf(fd, "L1 Icache\t\t: n/a\n"); + dprintf(fd, "L1 Dcache\t\t: n/a\n"); + dprintf(fd, "L2 cache\t\t: n/a\n"); + dprintf(fd, "L3 cache\t\t: n/a\n"); + return 0; +} +#endif + #if defined(TARGET_SPARC) static int open_cpuinfo(CPUArchState *cpu_env, int fd) { @@ -8624,7 +8669,8 @@ int do_guest_openat(CPUArchState *cpu_env, int dirfd,= const char *fname, #endif #if defined(TARGET_SPARC) || defined(TARGET_HPPA) || \ defined(TARGET_RISCV) || defined(TARGET_S390X) || \ - defined(TARGET_ARM) || defined(TARGET_AARCH64) + defined(TARGET_ARM) || defined(TARGET_AARCH64) || \ + defined(TARGET_ALPHA) { "/proc/cpuinfo", open_cpuinfo, is_proc }, #endif #if defined(TARGET_M68K) -- 2.41.0