From nobody Mon May 6 19:12:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1566376029; cv=none; d=zoho.com; s=zohoarc; b=SCJKygpnn+gvpgpB7Wi2rTBWKeDL7p5Zjn9saR2VJ6/NAcObGc9J+fSdGaRzAyJoJ1EcYjhSrJ5m+8M1AzKI38zEMjtgNWczye/PLzEQaQT0XEnGiYSo67edPup6+2yIhf7+LfLvDWK1ht/QqS1a6fH891bMweV1QcP0pbVvcyg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566376029; 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:ARC-Authentication-Results; bh=DfRSzRFhQtMEluLiibV66/8nsaI/PhgdX7vG0VRTUsc=; b=NqANKnBkKUDTYhoiYRgG2RtpUbzKQTqDuGORVUj2Vv6q49O+mgtUunIQ/JrbAQAh+lq0TumLvEe3URsaJnuwGeaqyT0FF5s178MKy8SU/25Ummo6tC5eDz5qL+k1k6OR4Ctnhhq9rICM+2Pnzgm9tqwB5CEEeNMvL/66nxAfIhg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15663760289821007.5649525412443; Wed, 21 Aug 2019 01:27:08 -0700 (PDT) Received: from localhost ([::1]:45246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0LxR-0001jh-UA for importer@patchew.org; Wed, 21 Aug 2019 04:27:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52197) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0LwH-0000PG-DY for qemu-devel@nongnu.org; Wed, 21 Aug 2019 04:25:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0LwG-0007YG-C9 for qemu-devel@nongnu.org; Wed, 21 Aug 2019 04:25:53 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:37351) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0LwG-0007X2-2i for qemu-devel@nongnu.org; Wed, 21 Aug 2019 04:25:52 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MekGB-1iYJqL1oFZ-00amI7; Wed, 21 Aug 2019 10:25:48 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 21 Aug 2019 10:25:46 +0200 Message-Id: <20190821082546.5252-2-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190821082546.5252-1-laurent@vivier.eu> References: <20190821082546.5252-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:FPDr0L5pH7NCfwta3oN+Eh7y2+C+Mfd/ZDKpoKYoUT5fWOM28Fd Lvfg43yjJM4mdQQG78fyBY79rVDFzVXFhqUbFnMsx1HVB2OI8o5ZHtVvfxibeOPDjKw3fMW 7GQiymnbPFx83btEPZ+dU+YQSR/T5tjlTV3FK5rPDi+wWC5tNp92ThbAbIfplav6VDLJl0V j3uKQNP7Wy1N/SES3yPtg== X-UI-Out-Filterresults: notjunk:1;V03:K0:IJhO7bWI1Hw=:J0tmZr+DzwAnzUCg947MV/ bzWtxGys7TzpeLTl1zRHqKU4Maz3KtP7XmVKunT5i90UfCNCD2Jxy4tBbZ2Hi3AW2+icWPtub aQmAgPgsyrgL217s8UrUWyPwQl1djWtLLVyomenWY7FIBj+heHrsdMVLgEoDVVB/sAPq6AKrb 9ANZ555VQbIWEQiAl136hby8wtwBJw2qvxJ6NVMNE0tFXY1QzL6ohvmcGYQmp5/51hd0J4ZTG IyC3g3dm3SjRvSFjuTGMqLnTNOWg8ZxszLrk7pYrVScYijWYmVrneO3zGgxFl+DOuLOzcZbpz rXnXel6IAiXMXn23Nimn0b9TrB+5uJUTJUN6GrgDku8A93EUq4A5bBUSIofWTQiMtf2N3tCBe GHg7yhqralhJM5CrW6aXdr0iMKXUQvfUthzZxTriBdPtPJZAEnOQw9Rz0BR4V/ak9aSPHgSsz MLmUy+nefP69UwpalvZNqfBxN/UrhrO1VRVYtIL+3qrIn+4+92tkQcQiH7Ws6uiqfzUX844v+ GUercvjATHw2obTSK8kpiWs7pwhkKpg9mGtCvGFF8GG2MC3V2NSFzUuIMVatWs4xcWi07fXdt Ko83yeidSvG9No0jfNwkbtcyBbPF7Zc/XbbJvV8U+VNRrjVXgdiuNYEaTSeK6S+7GySLLugEV 7QX0b1PTA21hrGKlekun65YQWgiMWxX+L0QHAQD6VDh8FMcdyhF+L6VWJLyKQF2fzamHRg5W0 Q7SD+2bQOHgRGwb/E2MN3SPAthXe/hiZhfdizQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PATCH 1/1] Fix cacheline detection on FreeBSD/powerpc. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Justin Hibbits , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Justin Hibbits machdep.cacheline_size is an integer, not a long. Since PowerPC is big-endian this causes sysctlbyname() to fill in the upper bits of the argument, rather than the correct 'lower bits' of the word. Specify the correct type to fix this. Fixes: b255b2c8a548 ("util: add cacheinfo") Signed-off-by: Justin Hibbits Signed-off-by: Laurent Vivier --- util/cacheinfo.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/util/cacheinfo.c b/util/cacheinfo.c index eebe1ce9c5d2..ea6f3e99bf4a 100644 --- a/util/cacheinfo.c +++ b/util/cacheinfo.c @@ -65,25 +65,28 @@ static void sys_cache_info(int *isize, int *dsize) g_free(buf); } =20 -#elif defined(__APPLE__) \ - || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#elif defined(__APPLE__) # include -# if defined(__APPLE__) -# define SYSCTL_CACHELINE_NAME "hw.cachelinesize" -# else -# define SYSCTL_CACHELINE_NAME "machdep.cacheline_size" -# endif - static void sys_cache_info(int *isize, int *dsize) { /* There's only a single sysctl for both I/D cache line sizes. */ long size; size_t len =3D sizeof(size); - if (!sysctlbyname(SYSCTL_CACHELINE_NAME, &size, &len, NULL, 0)) { + if (!sysctlbyname("hw.cachelinesize", &size, &len, NULL, 0)) { + *isize =3D *dsize =3D size; + } +} +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +# include +static void sys_cache_info(int *isize, int *dsize) +{ + /* There's only a single sysctl for both I/D cache line sizes. */ + int size; + size_t len =3D sizeof(size); + if (!sysctlbyname("machdep.cacheline_size", &size, &len, NULL, 0)) { *isize =3D *dsize =3D size; } } - #else /* POSIX */ =20 --=20 2.21.0