mirror of
https://git.musl-libc.org/git/musl
synced 2025-01-09 16:23:23 +03:00
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:
parent
7a34dd3495
commit
b20760c023
@ -1,6 +1,5 @@
|
||||
#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
|
||||
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
|
||||
#define PAGE_SIZE 4096
|
||||
#define LONG_BIT 32
|
||||
#endif
|
||||
|
||||
|
@ -49,7 +49,7 @@ void __reloc_self(int c, size_t *a, size_t *dynv)
|
||||
for (a+=c+1; *a; a++);
|
||||
for (a++; *a; a+=2) if (*a<20) t[*a] = a[1];
|
||||
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];
|
||||
n = t[DT_RELASZ];
|
||||
for (a=(void *)(base+t[DT_RELA]); n; a+=3, n-=12)
|
||||
|
@ -1,6 +1,5 @@
|
||||
#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
|
||||
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
|
||||
#define PAGE_SIZE 4096
|
||||
#define LONG_BIT 32
|
||||
#endif
|
||||
|
||||
|
@ -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++; *a; a+=2) if (*a<20) t[*a] = a[1];
|
||||
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];
|
||||
n = t[DT_MIPS_LOCAL_GOTNO - 0x70000000];
|
||||
for (a=got; n; a++, n--) *a += (size_t)base;
|
||||
|
@ -1,6 +1,5 @@
|
||||
#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
|
||||
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
|
||||
#define PAGE_SIZE 4096
|
||||
#define LONG_BIT 32
|
||||
#endif
|
||||
|
||||
|
@ -46,7 +46,7 @@ void __reloc_self(int c, size_t *a, size_t *dynv)
|
||||
for (a+=c+1; *a; a++);
|
||||
for (a++; *a; a+=2) if (*a<20) t[*a] = a[1];
|
||||
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];
|
||||
n = t[DT_RELASZ];
|
||||
for (a=(void *)(base+t[DT_RELA]); n; a+=3, n-=12)
|
||||
|
@ -40,7 +40,9 @@
|
||||
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
|
||||
|
||||
#define PIPE_BUF 4096
|
||||
#ifdef PAGE_SIZE
|
||||
#define PAGESIZE PAGE_SIZE
|
||||
#endif
|
||||
#define FILESIZEBITS 64
|
||||
#define NAME_MAX 255
|
||||
#define SYMLINK_MAX 255
|
||||
|
@ -2,8 +2,8 @@
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
#include <limits.h>
|
||||
#include "pthread_impl.h"
|
||||
#include "libc.h"
|
||||
|
||||
static void dummy(void)
|
||||
{
|
||||
|
@ -1,9 +1,9 @@
|
||||
#include <aio.h>
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include "pthread_impl.h"
|
||||
#include "libc.h"
|
||||
|
||||
struct lio_state {
|
||||
struct sigevent *sev;
|
||||
|
@ -19,11 +19,11 @@ long fpathconf(int fd, int name)
|
||||
[_PC_PRIO_IO] = -1,
|
||||
[_PC_SOCK_MAXBUF] = -1,
|
||||
[_PC_FILESIZEBITS] = FILESIZEBITS,
|
||||
[_PC_REC_INCR_XFER_SIZE] = PAGE_SIZE,
|
||||
[_PC_REC_MAX_XFER_SIZE] = PAGE_SIZE,
|
||||
[_PC_REC_MIN_XFER_SIZE] = PAGE_SIZE,
|
||||
[_PC_REC_XFER_ALIGN] = PAGE_SIZE,
|
||||
[_PC_ALLOC_SIZE_MIN] = PAGE_SIZE,
|
||||
[_PC_REC_INCR_XFER_SIZE] = 4096,
|
||||
[_PC_REC_MAX_XFER_SIZE] = 4096,
|
||||
[_PC_REC_MIN_XFER_SIZE] = 4096,
|
||||
[_PC_REC_XFER_ALIGN] = 4096,
|
||||
[_PC_ALLOC_SIZE_MIN] = 4096,
|
||||
[_PC_SYMLINK_MAX] = SYMLINK_MAX,
|
||||
[_PC_2_SYMLINKS] = 1
|
||||
};
|
||||
|
@ -3,6 +3,7 @@
|
||||
#include <errno.h>
|
||||
#include <sys/resource.h>
|
||||
#include "syscall.h"
|
||||
#include "libc.h"
|
||||
|
||||
#define VER (-2)
|
||||
#define OFLOW (-3)
|
||||
@ -42,7 +43,7 @@ long sysconf(int name)
|
||||
[_SC_MQ_OPEN_MAX] = -1,
|
||||
[_SC_MQ_PRIO_MAX] = OFLOW,
|
||||
[_SC_VERSION] = VER,
|
||||
[_SC_PAGE_SIZE] = PAGE_SIZE,
|
||||
[_SC_PAGE_SIZE] = OFLOW,
|
||||
[_SC_RTSIG_MAX] = 63, /* ?? */
|
||||
[_SC_SEM_NSEMS_MAX] = SEM_NSEMS_MAX,
|
||||
[_SC_SEM_VALUE_MAX] = OFLOW,
|
||||
@ -222,6 +223,8 @@ long sysconf(int name)
|
||||
if (name == _SC_ARG_MAX) return ARG_MAX;
|
||||
if (name == _SC_SEM_VALUE_MAX) return SEM_VALUE_MAX;
|
||||
if (name == _SC_MQ_PRIO_MAX) return MQ_PRIO_MAX;
|
||||
/* name == _SC_PAGE_SIZE */
|
||||
return PAGE_SIZE;
|
||||
} else if (values[name] == CPUCNT) {
|
||||
unsigned char set[128] = {1};
|
||||
int i, cnt;
|
||||
|
1
src/env/__libc_start_main.c
vendored
1
src/env/__libc_start_main.c
vendored
@ -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];
|
||||
__hwcap = aux[AT_HWCAP];
|
||||
__sysinfo = aux[AT_SYSINFO];
|
||||
libc.page_size = aux[AT_PAGESZ];
|
||||
|
||||
if (pn) {
|
||||
__progname = __progname_full = pn;
|
||||
|
@ -3,6 +3,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <limits.h>
|
||||
|
||||
struct __libc {
|
||||
void *main_thread;
|
||||
@ -14,10 +15,15 @@ struct __libc {
|
||||
FILE *ofl_head;
|
||||
int ofl_lock[2];
|
||||
size_t tls_size;
|
||||
size_t page_size;
|
||||
};
|
||||
|
||||
extern size_t __hwcap;
|
||||
|
||||
#ifndef PAGE_SIZE
|
||||
#define PAGE_SIZE libc.page_size
|
||||
#endif
|
||||
|
||||
#if !defined(__PIC__) || (100*__GNUC__+__GNUC_MINOR__ >= 303 && !defined(__PCC__))
|
||||
|
||||
#ifdef __PIC__
|
||||
|
@ -980,6 +980,7 @@ void *__dynlink(int argc, char **argv)
|
||||
env_preload = 0;
|
||||
libc.secure = 1;
|
||||
}
|
||||
libc.page_size = aux[AT_PAGESZ];
|
||||
|
||||
/* 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
|
||||
|
@ -1,5 +1,5 @@
|
||||
#include <unistd.h>
|
||||
#include <limits.h>
|
||||
#include "libc.h"
|
||||
|
||||
int getpagesize(void)
|
||||
{
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define _BSD_SOURCE
|
||||
#include <stdlib.h>
|
||||
#include <limits.h>
|
||||
#include "libc.h"
|
||||
|
||||
void *valloc(size_t size)
|
||||
{
|
||||
|
@ -1,5 +1,5 @@
|
||||
#include <sys/mman.h>
|
||||
#include <limits.h>
|
||||
#include "libc.h"
|
||||
#include "syscall.h"
|
||||
|
||||
int mprotect(void *addr, size_t len, int prot)
|
||||
|
@ -1,5 +1,6 @@
|
||||
#include "pthread_impl.h"
|
||||
#include "stdio_impl.h"
|
||||
#include "libc.h"
|
||||
#include <sys/mman.h>
|
||||
|
||||
static void dummy_0()
|
||||
|
@ -1,5 +1,6 @@
|
||||
#define _GNU_SOURCE
|
||||
#include "pthread_impl.h"
|
||||
#include "libc.h"
|
||||
#include <sys/mman.h>
|
||||
|
||||
int pthread_getattr_np(pthread_t t, pthread_attr_t *a)
|
||||
|
Loading…
Reference in New Issue
Block a user