support configurable page size on mips, powerpc and microblaze

PAGE_SIZE was hardcoded to 4096, which is historically what most
systems use, but on several archs it is a kernel config parameter,
user space can only know it at execution time from the aux vector.

PAGE_SIZE and PAGESIZE are not defined on archs where page size is
a runtime parameter, applications should use sysconf(_SC_PAGE_SIZE)
to query it. Internally libc code defines PAGE_SIZE to libc.page_size,
which is set to aux[AT_PAGESZ] in __init_libc and early in __dynlink
as well. (Note that libc.page_size can be accessed without GOT, ie.
before relocations are done)

Some fpathconf settings are hardcoded to 4096, these should be actually
queried from the filesystem using statfs.
This commit is contained in:
Szabolcs Nagy 2013-09-15 02:00:32 +00:00
parent 7a34dd3495
commit b20760c023
19 changed files with 29 additions and 17 deletions

View File

@ -1,6 +1,5 @@
#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
#define PAGE_SIZE 4096
#define LONG_BIT 32 #define LONG_BIT 32
#endif #endif

View File

@ -49,7 +49,7 @@ void __reloc_self(int c, size_t *a, size_t *dynv)
for (a+=c+1; *a; a++); for (a+=c+1; *a; a++);
for (a++; *a; a+=2) if (*a<20) t[*a] = a[1]; for (a++; *a; a+=2) if (*a<20) t[*a] = a[1];
base = (char *)t[AT_BASE]; base = (char *)t[AT_BASE];
if (!base) base = (char *)(t[AT_PHDR] & -4096); if (!base) base = (char *)(t[AT_PHDR] & -t[AT_PAGESZ]);
for (a=dynv; *a; a+=2) if (*a<20) t[*a] = a[1]; for (a=dynv; *a; a+=2) if (*a<20) t[*a] = a[1];
n = t[DT_RELASZ]; n = t[DT_RELASZ];
for (a=(void *)(base+t[DT_RELA]); n; a+=3, n-=12) for (a=(void *)(base+t[DT_RELA]); n; a+=3, n-=12)

View File

@ -1,6 +1,5 @@
#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
#define PAGE_SIZE 4096
#define LONG_BIT 32 #define LONG_BIT 32
#endif #endif

View File

@ -51,7 +51,7 @@ void __reloc_self(int c, size_t *a, size_t *dynv, size_t *got)
for (a+=c+1; *a; a++); for (a+=c+1; *a; a++);
for (a++; *a; a+=2) if (*a<20) t[*a] = a[1]; for (a++; *a; a+=2) if (*a<20) t[*a] = a[1];
base = (char *)t[AT_BASE]; base = (char *)t[AT_BASE];
if (!base) base = (char *)(t[AT_PHDR] & -4096); if (!base) base = (char *)(t[AT_PHDR] & -t[AT_PAGESZ]);
for (a=dynv; *a; a+=2) if (*a-0x70000000UL<20) t[*a&31] = a[1]; for (a=dynv; *a; a+=2) if (*a-0x70000000UL<20) t[*a&31] = a[1];
n = t[DT_MIPS_LOCAL_GOTNO - 0x70000000]; n = t[DT_MIPS_LOCAL_GOTNO - 0x70000000];
for (a=got; n; a++, n--) *a += (size_t)base; for (a=got; n; a++, n--) *a += (size_t)base;

View File

@ -1,6 +1,5 @@
#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
#define PAGE_SIZE 4096
#define LONG_BIT 32 #define LONG_BIT 32
#endif #endif

View File

@ -46,7 +46,7 @@ void __reloc_self(int c, size_t *a, size_t *dynv)
for (a+=c+1; *a; a++); for (a+=c+1; *a; a++);
for (a++; *a; a+=2) if (*a<20) t[*a] = a[1]; for (a++; *a; a+=2) if (*a<20) t[*a] = a[1];
base = (char *)t[AT_BASE]; base = (char *)t[AT_BASE];
if (!base) base = (char *)(t[AT_PHDR] & -4096); if (!base) base = (char *)(t[AT_PHDR] & -t[AT_PAGESZ]);
for (a=dynv; *a; a+=2) if (*a<20) t[*a] = a[1]; for (a=dynv; *a; a+=2) if (*a<20) t[*a] = a[1];
n = t[DT_RELASZ]; n = t[DT_RELASZ];
for (a=(void *)(base+t[DT_RELA]); n; a+=3, n-=12) for (a=(void *)(base+t[DT_RELA]); n; a+=3, n-=12)

View File

@ -40,7 +40,9 @@
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
#define PIPE_BUF 4096 #define PIPE_BUF 4096
#ifdef PAGE_SIZE
#define PAGESIZE PAGE_SIZE #define PAGESIZE PAGE_SIZE
#endif
#define FILESIZEBITS 64 #define FILESIZEBITS 64
#define NAME_MAX 255 #define NAME_MAX 255
#define SYMLINK_MAX 255 #define SYMLINK_MAX 255

View File

@ -2,8 +2,8 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <limits.h>
#include "pthread_impl.h" #include "pthread_impl.h"
#include "libc.h"
static void dummy(void) static void dummy(void)
{ {

View File

@ -1,9 +1,9 @@
#include <aio.h> #include <aio.h>
#include <errno.h> #include <errno.h>
#include <limits.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include "pthread_impl.h" #include "pthread_impl.h"
#include "libc.h"
struct lio_state { struct lio_state {
struct sigevent *sev; struct sigevent *sev;

View File

@ -19,11 +19,11 @@ long fpathconf(int fd, int name)
[_PC_PRIO_IO] = -1, [_PC_PRIO_IO] = -1,
[_PC_SOCK_MAXBUF] = -1, [_PC_SOCK_MAXBUF] = -1,
[_PC_FILESIZEBITS] = FILESIZEBITS, [_PC_FILESIZEBITS] = FILESIZEBITS,
[_PC_REC_INCR_XFER_SIZE] = PAGE_SIZE, [_PC_REC_INCR_XFER_SIZE] = 4096,
[_PC_REC_MAX_XFER_SIZE] = PAGE_SIZE, [_PC_REC_MAX_XFER_SIZE] = 4096,
[_PC_REC_MIN_XFER_SIZE] = PAGE_SIZE, [_PC_REC_MIN_XFER_SIZE] = 4096,
[_PC_REC_XFER_ALIGN] = PAGE_SIZE, [_PC_REC_XFER_ALIGN] = 4096,
[_PC_ALLOC_SIZE_MIN] = PAGE_SIZE, [_PC_ALLOC_SIZE_MIN] = 4096,
[_PC_SYMLINK_MAX] = SYMLINK_MAX, [_PC_SYMLINK_MAX] = SYMLINK_MAX,
[_PC_2_SYMLINKS] = 1 [_PC_2_SYMLINKS] = 1
}; };

View File

@ -3,6 +3,7 @@
#include <errno.h> #include <errno.h>
#include <sys/resource.h> #include <sys/resource.h>
#include "syscall.h" #include "syscall.h"
#include "libc.h"
#define VER (-2) #define VER (-2)
#define OFLOW (-3) #define OFLOW (-3)
@ -42,7 +43,7 @@ long sysconf(int name)
[_SC_MQ_OPEN_MAX] = -1, [_SC_MQ_OPEN_MAX] = -1,
[_SC_MQ_PRIO_MAX] = OFLOW, [_SC_MQ_PRIO_MAX] = OFLOW,
[_SC_VERSION] = VER, [_SC_VERSION] = VER,
[_SC_PAGE_SIZE] = PAGE_SIZE, [_SC_PAGE_SIZE] = OFLOW,
[_SC_RTSIG_MAX] = 63, /* ?? */ [_SC_RTSIG_MAX] = 63, /* ?? */
[_SC_SEM_NSEMS_MAX] = SEM_NSEMS_MAX, [_SC_SEM_NSEMS_MAX] = SEM_NSEMS_MAX,
[_SC_SEM_VALUE_MAX] = OFLOW, [_SC_SEM_VALUE_MAX] = OFLOW,
@ -222,6 +223,8 @@ long sysconf(int name)
if (name == _SC_ARG_MAX) return ARG_MAX; if (name == _SC_ARG_MAX) return ARG_MAX;
if (name == _SC_SEM_VALUE_MAX) return SEM_VALUE_MAX; if (name == _SC_SEM_VALUE_MAX) return SEM_VALUE_MAX;
if (name == _SC_MQ_PRIO_MAX) return MQ_PRIO_MAX; if (name == _SC_MQ_PRIO_MAX) return MQ_PRIO_MAX;
/* name == _SC_PAGE_SIZE */
return PAGE_SIZE;
} else if (values[name] == CPUCNT) { } else if (values[name] == CPUCNT) {
unsigned char set[128] = {1}; unsigned char set[128] = {1};
int i, cnt; int i, cnt;

View File

@ -26,6 +26,7 @@ void __init_libc(char **envp, char *pn)
for (i=0; auxv[i]; i+=2) if (auxv[i]<AUX_CNT) aux[auxv[i]] = auxv[i+1]; for (i=0; auxv[i]; i+=2) if (auxv[i]<AUX_CNT) aux[auxv[i]] = auxv[i+1];
__hwcap = aux[AT_HWCAP]; __hwcap = aux[AT_HWCAP];
__sysinfo = aux[AT_SYSINFO]; __sysinfo = aux[AT_SYSINFO];
libc.page_size = aux[AT_PAGESZ];
if (pn) { if (pn) {
__progname = __progname_full = pn; __progname = __progname_full = pn;

View File

@ -3,6 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <limits.h>
struct __libc { struct __libc {
void *main_thread; void *main_thread;
@ -14,10 +15,15 @@ struct __libc {
FILE *ofl_head; FILE *ofl_head;
int ofl_lock[2]; int ofl_lock[2];
size_t tls_size; size_t tls_size;
size_t page_size;
}; };
extern size_t __hwcap; extern size_t __hwcap;
#ifndef PAGE_SIZE
#define PAGE_SIZE libc.page_size
#endif
#if !defined(__PIC__) || (100*__GNUC__+__GNUC_MINOR__ >= 303 && !defined(__PCC__)) #if !defined(__PIC__) || (100*__GNUC__+__GNUC_MINOR__ >= 303 && !defined(__PCC__))
#ifdef __PIC__ #ifdef __PIC__

View File

@ -980,6 +980,7 @@ void *__dynlink(int argc, char **argv)
env_preload = 0; env_preload = 0;
libc.secure = 1; libc.secure = 1;
} }
libc.page_size = aux[AT_PAGESZ];
/* If the dynamic linker was invoked as a program itself, AT_BASE /* If the dynamic linker was invoked as a program itself, AT_BASE
* will not be set. In that case, we assume the base address is * will not be set. In that case, we assume the base address is

View File

@ -1,5 +1,5 @@
#include <unistd.h> #include <unistd.h>
#include <limits.h> #include "libc.h"
int getpagesize(void) int getpagesize(void)
{ {

View File

@ -1,6 +1,6 @@
#define _BSD_SOURCE #define _BSD_SOURCE
#include <stdlib.h> #include <stdlib.h>
#include <limits.h> #include "libc.h"
void *valloc(size_t size) void *valloc(size_t size)
{ {

View File

@ -1,5 +1,5 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <limits.h> #include "libc.h"
#include "syscall.h" #include "syscall.h"
int mprotect(void *addr, size_t len, int prot) int mprotect(void *addr, size_t len, int prot)

View File

@ -1,5 +1,6 @@
#include "pthread_impl.h" #include "pthread_impl.h"
#include "stdio_impl.h" #include "stdio_impl.h"
#include "libc.h"
#include <sys/mman.h> #include <sys/mman.h>
static void dummy_0() static void dummy_0()

View File

@ -1,5 +1,6 @@
#define _GNU_SOURCE #define _GNU_SOURCE
#include "pthread_impl.h" #include "pthread_impl.h"
#include "libc.h"
#include <sys/mman.h> #include <sys/mman.h>
int pthread_getattr_np(pthread_t t, pthread_attr_t *a) int pthread_getattr_np(pthread_t t, pthread_attr_t *a)