[PATCH 3/4] UML - remove page_size()

From: Jeff Dike
Date: Mon Apr 02 2007 - 12:55:44 EST

Next message: Andi Kleen: "Re: [PATCH 1/3] Introduce cpuid_on_cpu() and cpuid_eax_on_cpu()"
Previous message: Jeff Dike: "[PATCH 4/4] UML - kernel_thread shouldn't panic"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

userspace code used to have to call the kernelspace function
page_size() in order to determine the value of the kernel's PAGE_SIZE.
Since this is now available directly from kern_constants.h as
UM_KERN_PAGE_SIZE, page_size() can be deleted and calls changed to use
the constant.

Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxxxxxx>
--
arch/um/drivers/net_user.c | 3 ++-
arch/um/drivers/slip_user.c | 3 ++-
arch/um/include/kern_util.h | 1 -
arch/um/kernel/process.c | 5 -----
arch/um/os-Linux/drivers/ethertap_user.c | 7 ++++---
arch/um/os-Linux/helper.c | 5 +++--
arch/um/os-Linux/process.c | 2 +-
arch/um/os-Linux/skas/process.c | 9 +++++----
arch/um/os-Linux/tt.c | 3 ++-
arch/um/os-Linux/util.c | 11 ++++++-----
10 files changed, 25 insertions(+), 24 deletions(-)

Index: linux-2.6.21-mm/arch/um/drivers/net_user.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/drivers/net_user.c 2007-04-02 12:18:59.000000000 -0400
+++ linux-2.6.21-mm/arch/um/drivers/net_user.c 2007-04-02 12:19:01.000000000 -0400
@@ -18,6 +18,7 @@
#include "net_user.h"
#include "os.h"
#include "um_malloc.h"
+#include "kern_constants.h"

int tap_open_common(void *dev, char *gate_addr)
{
@@ -215,7 +216,7 @@ static void change(char *dev, char *what
sprintf(netmask_buf, "%d.%d.%d.%d", netmask[0], netmask[1],
netmask[2], netmask[3]);

- output_len = page_size();
+ output_len = UM_KERN_PAGE_SIZE;
output = um_kmalloc(output_len);
if(output == NULL)
printk("change : failed to allocate output buffer\n");
Index: linux-2.6.21-mm/arch/um/drivers/slip_user.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/drivers/slip_user.c 2007-04-02 12:18:59.000000000 -0400
+++ linux-2.6.21-mm/arch/um/drivers/slip_user.c 2007-04-02 12:19:01.000000000 -0400
@@ -15,6 +15,7 @@
#include "slip_common.h"
#include "os.h"
#include "um_malloc.h"
+#include "kern_constants.h"

static int slip_user_init(void *data, void *dev)
{
@@ -89,7 +90,7 @@ static int slip_tramp(char **argv, int f
goto out_close;
pid = err;

- output_len = page_size();
+ output_len = UM_KERN_PAGE_SIZE;
output = um_kmalloc(output_len);
if(output == NULL){
printk("slip_tramp : failed to allocate output buffer\n");
Index: linux-2.6.21-mm/arch/um/include/kern_util.h
===================================================================
--- linux-2.6.21-mm.orig/arch/um/include/kern_util.h 2007-04-02 12:18:59.000000000 -0400
+++ linux-2.6.21-mm/arch/um/include/kern_util.h 2007-04-02 12:19:01.000000000 -0400
@@ -51,7 +51,6 @@ extern void set_tracing(void *t, int tra
extern int is_tracing(void *task);
extern int segv_syscall(void);
extern void kern_finish_exec(void *task, int new_pid, unsigned long stack);
-extern int page_size(void);
extern unsigned long page_mask(void);
extern int need_finish_fork(void);
extern void free_stack(unsigned long stack, int order);
Index: linux-2.6.21-mm/arch/um/kernel/process.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/kernel/process.c 2007-04-02 12:18:59.000000000 -0400
+++ linux-2.6.21-mm/arch/um/kernel/process.c 2007-04-02 12:19:01.000000000 -0400
@@ -217,11 +217,6 @@ void cpu_idle(void)
CHOOSE_MODE(init_idle_tt(), init_idle_skas());
}

-int page_size(void)
-{
- return PAGE_SIZE;
-}
-
void *um_virt_to_phys(struct task_struct *task, unsigned long addr,
pte_t *pte_out)
{
Index: linux-2.6.21-mm/arch/um/os-Linux/drivers/ethertap_user.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/os-Linux/drivers/ethertap_user.c 2007-04-02 12:18:59.000000000 -0400
+++ linux-2.6.21-mm/arch/um/os-Linux/drivers/ethertap_user.c 2007-04-02 12:19:01.000000000 -0400
@@ -20,6 +20,7 @@
#include "etap.h"
#include "os.h"
#include "um_malloc.h"
+#include "kern_constants.h"

#define MAX_PACKET ETH_MAX_PACKET

@@ -50,10 +51,10 @@ static void etap_change(int op, unsigned
n = os_write_file(fd, &change, sizeof(change));
if(n != sizeof(change))
printk("etap_change - request failed, err = %d\n", -n);
- output = um_kmalloc(page_size());
+ output = um_kmalloc(UM_KERN_PAGE_SIZE);
if(output == NULL)
printk("etap_change : Failed to allocate output buffer\n");
- read_output(fd, output, page_size());
+ read_output(fd, output, UM_KERN_PAGE_SIZE);
if(output != NULL){
printk("%s", output);
kfree(output);
@@ -159,7 +160,7 @@ static int etap_open(void *data)

err = etap_tramp(pri->dev_name, pri->gate_addr, control_fds[0],
control_fds[1], data_fds[0], data_fds[1]);
- output_len = page_size();
+ output_len = UM_KERN_PAGE_SIZE;
output = um_kmalloc(output_len);
read_output(control_fds[0], output, output_len);

Index: linux-2.6.21-mm/arch/um/os-Linux/helper.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/os-Linux/helper.c 2007-04-02 12:18:59.000000000 -0400
+++ linux-2.6.21-mm/arch/um/os-Linux/helper.c 2007-04-02 12:19:01.000000000 -0400
@@ -15,6 +15,7 @@
#include "kern_util.h"
#include "os.h"
#include "um_malloc.h"
+#include "kern_constants.h"

struct helper_data {
void (*pre_exec)(void*);
@@ -69,7 +70,7 @@ int run_helper(void (*pre_exec)(void *),
goto out_close;
}

- sp = stack + page_size() - sizeof(void *);
+ sp = stack + UM_KERN_PAGE_SIZE - sizeof(void *);
data.pre_exec = pre_exec;
data.pre_data = pre_data;
data.argv = argv;
@@ -123,7 +124,7 @@ int run_helper_thread(int (*proc)(void *
if (stack == 0)
return -ENOMEM;

- sp = stack + (page_size() << stack_order) - sizeof(void *);
+ sp = stack + (UM_KERN_PAGE_SIZE << stack_order) - sizeof(void *);
pid = clone(proc, (void *) sp, flags | SIGCHLD, arg);
if (pid < 0) {
err = -errno;
Index: linux-2.6.21-mm/arch/um/os-Linux/process.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/os-Linux/process.c 2007-04-02 12:18:59.000000000 -0400
+++ linux-2.6.21-mm/arch/um/os-Linux/process.c 2007-04-02 12:19:01.000000000 -0400
@@ -244,7 +244,7 @@ void init_new_thread_stack(void *sig_sta

if(sig_stack != NULL){
pages = (1 << UML_CONFIG_KERNEL_STACK_ORDER);
- set_sigstack(sig_stack, pages * page_size());
+ set_sigstack(sig_stack, pages * UM_KERN_PAGE_SIZE);
flags = SA_ONSTACK;
}
if(usr1_handler){
Index: linux-2.6.21-mm/arch/um/os-Linux/skas/process.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/os-Linux/skas/process.c 2007-04-02 12:18:59.000000000 -0400
+++ linux-2.6.21-mm/arch/um/os-Linux/skas/process.c 2007-04-02 12:19:01.000000000 -0400
@@ -33,6 +33,7 @@
#include "uml-config.h"
#include "process.h"
#include "longjmp.h"
+#include "kern_constants.h"

int is_skas_winch(int pid, int fd, void *data)
{
@@ -171,7 +172,7 @@ static int userspace_tramp(void *stack)
int fd;
__u64 offset;
fd = phys_mapping(to_phys(&__syscall_stub_start), &offset);
- addr = mmap64((void *) UML_CONFIG_STUB_CODE, page_size(),
+ addr = mmap64((void *) UML_CONFIG_STUB_CODE, UM_KERN_PAGE_SIZE,
PROT_EXEC, MAP_FIXED | MAP_PRIVATE, fd, offset);
if(addr == MAP_FAILED){
printk("mapping mmap stub failed, errno = %d\n",
@@ -181,8 +182,8 @@ static int userspace_tramp(void *stack)

if(stack != NULL){
fd = phys_mapping(to_phys(stack), &offset);
- addr = mmap((void *) UML_CONFIG_STUB_DATA, page_size(),
- PROT_READ | PROT_WRITE,
+ addr = mmap((void *) UML_CONFIG_STUB_DATA,
+ UM_KERN_PAGE_SIZE, PROT_READ | PROT_WRITE,
MAP_FIXED | MAP_SHARED, fd, offset);
if(addr == MAP_FAILED){
printk("mapping segfault stack failed, "
@@ -198,7 +199,7 @@ static int userspace_tramp(void *stack)
(unsigned long) stub_segv_handler -
(unsigned long) &__syscall_stub_start;

- set_sigstack((void *) UML_CONFIG_STUB_DATA, page_size());
+ set_sigstack((void *) UML_CONFIG_STUB_DATA, UM_KERN_PAGE_SIZE);
sigemptyset(&sa.sa_mask);
sigaddset(&sa.sa_mask, SIGIO);
sigaddset(&sa.sa_mask, SIGWINCH);
Index: linux-2.6.21-mm/arch/um/os-Linux/tt.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/os-Linux/tt.c 2007-04-02 12:18:59.000000000 -0400
+++ linux-2.6.21-mm/arch/um/os-Linux/tt.c 2007-04-02 12:19:01.000000000 -0400
@@ -31,6 +31,7 @@
#include "choose-mode.h"
#include "mode.h"
#include "tempfile.h"
+#include "kern_constants.h"

int protect_memory(unsigned long addr, unsigned long len, int r, int w, int x,
int must_succeed)
@@ -142,7 +143,7 @@ int outer_tramp(void *arg)
int sig = sigkill;

t = arg;
- t->pid = clone(t->tramp, (void *) t->temp_stack + page_size()/2,
+ t->pid = clone(t->tramp, (void *) t->temp_stack + UM_KERN_PAGE_SIZE/2,
t->flags, t->tramp_data);
if(t->pid > 0) wait_for_stop(t->pid, SIGSTOP, PTRACE_CONT, NULL);
kill(os_getpid(), sig);
Index: linux-2.6.21-mm/arch/um/os-Linux/util.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/os-Linux/util.c 2007-04-02 12:18:59.000000000 -0400
+++ linux-2.6.21-mm/arch/um/os-Linux/util.c 2007-04-02 12:19:01.000000000 -0400
@@ -30,28 +30,29 @@
#include "uml-config.h"
#include "os.h"
#include "longjmp.h"
+#include "kern_constants.h"

void stack_protections(unsigned long address)
{
int prot = PROT_READ | PROT_WRITE | PROT_EXEC;

- if(mprotect((void *) address, page_size(), prot) < 0)
+ if(mprotect((void *) address, UM_KERN_PAGE_SIZE, prot) < 0)
panic("protecting stack failed, errno = %d", errno);
}

void task_protections(unsigned long address)
{
- unsigned long guard = address + page_size();
- unsigned long stack = guard + page_size();
+ unsigned long guard = address + UM_KERN_PAGE_SIZE;
+ unsigned long stack = guard + UM_KERN_PAGE_SIZE;
int prot = 0, pages;

#ifdef notdef
- if(mprotect((void *) stack, page_size(), prot) < 0)
+ if(mprotect((void *) stack, UM_KERN_PAGE_SIZE, prot) < 0)
panic("protecting guard page failed, errno = %d", errno);
#endif
pages = (1 << UML_CONFIG_KERNEL_STACK_ORDER) - 2;
prot = PROT_READ | PROT_WRITE | PROT_EXEC;
- if(mprotect((void *) stack, pages * page_size(), prot) < 0)
+ if(mprotect((void *) stack, pages * UM_KERN_PAGE_SIZE, prot) < 0)
panic("protecting stack failed, errno = %d", errno);
}

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Next message: Andi Kleen: "Re: [PATCH 1/3] Introduce cpuid_on_cpu() and cpuid_eax_on_cpu()"
Previous message: Jeff Dike: "[PATCH 4/4] UML - kernel_thread shouldn't panic"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]