mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-03 10:21:05 +00:00
d44a052c49
In my powerpc32 testing I've observed misc/test-gettimebasefreq failing. This is a glibc build (soft-float, though that's not relevant here) without any --with-cpu and without any special configuration of the default CPU for GCC either. In particular, it's one not using sysdeps/powerpc/powerpc32/power4/hp-timing.h (although in fact the processor I'm using for testing is POWER4-based), so hp_timing_t is 32-bit not 64-bit. But the VDSO call being used by INTERNAL_VSYSCALL_NO_SYSCALL_FALLBACK is generating a 64-bit result (high part in r3, low part in r4). The code extracting that result, however, expects a result of the type hp_timing_t as passed to INTERNAL_VSYSCALL_NO_SYSCALL_FALLBACK, meaning that only r3 (= 0) is used and the value in r4 is ignored. This patch fixes this by always using uint64_t as the type in INTERNAL_VSYSCALL_NO_SYSCALL_FALLBACK - reflecting the actual ABI (unconditional in the kernel) of that VDSO call. This is the minimal change for this issue - no check for overflow, no change of the type of the timebase_freq variable or the return type of __get_clockfreq to something other than hp_timing_t (such a change would simply move the implicit conversions to the over callers of that function), no change to hp_timing_t itself. Tested for powerpc32 soft float. [BZ #17263] * sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c: Include <stdint.h>. (__get_clockfreq): Use uint64_t instead of hp_timing_t in INTERNAL_VSYSCALL_NO_SYSCALL_FALLBACK call.
119 lines
3.7 KiB
C
119 lines
3.7 KiB
C
/* Get frequency of the system processor. powerpc/Linux version.
|
|
Copyright (C) 2000-2014 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <ctype.h>
|
|
#include <fcntl.h>
|
|
#include <stdint.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <libc-internal.h>
|
|
#include <sysdep.h>
|
|
#include <bits/libc-vdso.h>
|
|
|
|
hp_timing_t
|
|
__get_clockfreq (void)
|
|
{
|
|
/* We read the information from the /proc filesystem. /proc/cpuinfo
|
|
contains at least one line like:
|
|
timebase : 33333333
|
|
We search for this line and convert the number into an integer. */
|
|
static hp_timing_t timebase_freq;
|
|
hp_timing_t result = 0L;
|
|
|
|
/* If this function was called before, we know the result. */
|
|
if (timebase_freq != 0)
|
|
return timebase_freq;
|
|
|
|
/* If we can use the vDSO to obtain the timebase even better. */
|
|
#ifdef SHARED
|
|
INTERNAL_SYSCALL_DECL (err);
|
|
timebase_freq =
|
|
INTERNAL_VSYSCALL_NO_SYSCALL_FALLBACK (get_tbfreq, err, uint64_t, 0);
|
|
if (INTERNAL_SYSCALL_ERROR_P (timebase_freq, err)
|
|
&& INTERNAL_SYSCALL_ERRNO (timebase_freq, err) == ENOSYS)
|
|
#endif
|
|
{
|
|
int fd = __open ("/proc/cpuinfo", O_RDONLY);
|
|
|
|
if (__glibc_likely (fd != -1))
|
|
{
|
|
/* The timebase will be in the 1st 1024 bytes for systems with up
|
|
to 8 processors. If the first read returns less then 1024
|
|
bytes read, we have the whole cpuinfo and can start the scan.
|
|
Otherwise we will have to read more to insure we have the
|
|
timebase value in the scan. */
|
|
char buf[1024];
|
|
ssize_t n;
|
|
|
|
n = __read (fd, buf, sizeof (buf));
|
|
if (n == sizeof (buf))
|
|
{
|
|
/* We are here because the 1st read returned exactly sizeof
|
|
(buf) bytes. This implies that we are not at EOF and may
|
|
not have read the timebase value yet. So we need to read
|
|
more bytes until we know we have EOF. We copy the lower
|
|
half of buf to the upper half and read sizeof (buf)/2
|
|
bytes into the lower half of buf and repeat until we
|
|
reach EOF. We can assume that the timebase will be in
|
|
the last 512 bytes of cpuinfo, so two 512 byte half_bufs
|
|
will be sufficient to contain the timebase and will
|
|
handle the case where the timebase spans the half_buf
|
|
boundry. */
|
|
const ssize_t half_buf = sizeof (buf) / 2;
|
|
while (n >= half_buf)
|
|
{
|
|
memcpy (buf, buf + half_buf, half_buf);
|
|
n = __read (fd, buf + half_buf, half_buf);
|
|
}
|
|
if (n >= 0)
|
|
n += half_buf;
|
|
}
|
|
|
|
if (__builtin_expect (n, 1) > 0)
|
|
{
|
|
char *mhz = memmem (buf, n, "timebase", 7);
|
|
|
|
if (__glibc_likely (mhz != NULL))
|
|
{
|
|
char *endp = buf + n;
|
|
|
|
/* Search for the beginning of the string. */
|
|
while (mhz < endp && (*mhz < '0' || *mhz > '9')
|
|
&& *mhz != '\n')
|
|
++mhz;
|
|
|
|
while (mhz < endp && *mhz != '\n')
|
|
{
|
|
if (*mhz >= '0' && *mhz <= '9')
|
|
{
|
|
result *= 10;
|
|
result += *mhz - '0';
|
|
}
|
|
|
|
++mhz;
|
|
}
|
|
}
|
|
timebase_freq = result;
|
|
}
|
|
__close (fd);
|
|
}
|
|
}
|
|
|
|
return timebase_freq;
|
|
}
|