AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[Blackfin] arch: This allows XIP to work with FD-PIC.

Browse Source 
Previously, init failed to do anything meaningful;
it turns out that the reason is that FD-PIC has a readonly data
section which can be located in the XIP filesystem, and various address checks
in the kernel reject such addresses for syscall arguments.  Hence, init's
  execve ("/bin/sh", ...)
failed with error code EFAULT.

There's room for improvement here: in case people want to have filesystems
on flash rather than in main memory, _access_ok should be modified to
allow this.

This bug fix is also dedicated to Michael Hennerich.

Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
This commit is contained in:
Bernd Schmidt 2008-04-24 03:06:15 +08:00 committed by Bryan Wu
parent 1ebc723cf0
commit d5adb029ef
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/blackfin/kernel/process.c
View File

@ -324,6 +324,12 @@ int _access_ok(unsigned long addr, unsigned long size)
return 1; return 1;
if (addr >= memory_mtd_end && (addr + size) <= physical_mem_end) if (addr >= memory_mtd_end && (addr + size) <= physical_mem_end)
return 1; return 1;
#ifdef CONFIG_ROMFS_MTD_FS
/* For XIP, allow user space to use pointers within the ROMFS. */
if (addr >= memory_mtd_start && (addr + size) <= memory_mtd_end)
return 1;
#endif
#else #else
if (addr >= memory_start && (addr + size) <= physical_mem_end) if (addr >= memory_start && (addr + size) <= physical_mem_end)
return 1; return 1;

5
include/asm-blackfin/processor.h
View File

@ -26,9 +26,10 @@ static inline void wrusp(unsigned long usp)
/* /*
* User space process size: 1st byte beyond user address space. * User space process size: 1st byte beyond user address space.
* Fairly meaningless on nommu. Parts of user programs can be scattered
* in a lot of places, so just disable this by setting it to 0xFFFFFFFF.
*/ */
extern unsigned long memory_end; #define TASK_SIZE 0xFFFFFFFF
#define TASK_SIZE (memory_end)
#ifdef __KERNEL__ #ifdef __KERNEL__
#define STACK_TOP TASK_SIZE #define STACK_TOP TASK_SIZE