Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Message type for SYS_UMAP{,_REMOTE}

Browse Source 
Change-Id: Id46df10aee6189a0d3673013b498c7cc79edcc7e
This commit is contained in:
Lionel Sambuc
2014-05-21 17:54:35 +02:00
parent 5735105bc8
commit dc823abec2
6 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/system/do_umap.c
View File

@@ -2,11 +2,11 @@
* m_type: SYS_UMAP
*
* The parameters for this kernel call are:
* m5_i1: CP_SRC_PROC_NR (process number)
* m5_s1: UMAP_SEG (segment where address is: T, D, or S)
* m5_l1: CP_SRC_ADDR (virtual address)
* m5_l2: CP_DST_ADDR (returns physical address)
* m5_l3: CP_NR_BYTES (size of datastructure)
* m_lsys_krn_sys_umap.src_endpt (process number)
* m_lsys_krn_sys_umap.segment (segment where address is: T, D, or S)
* m_lsys_krn_sys_umap.src_addr (virtual address)
* m_krn_lsys_sys_umap.dst_addr (returns physical address)
* m_lsys_krn_sys_umap.nr_bytes (size of datastructure)
*/
#include "kernel/system.h"
@@ -24,15 +24,15 @@
*==========================================================================*/
int do_umap(struct proc * caller, message * m_ptr)
{
int seg_index = m_ptr->UMAP_SEG & SEGMENT_INDEX;
int endpt = (int) m_ptr->CP_SRC_ENDPT;
int seg_index = m_ptr->m_lsys_krn_sys_umap.segment & SEGMENT_INDEX;
int endpt = m_ptr->m_lsys_krn_sys_umap.src_endpt;
/* This call is a subset of umap_remote, it allows mapping virtual addresses
* in the caller's address space and grants where the caller is specified as
* grantee; after the security check we simply invoke do_umap_remote
*/
if (seg_index != MEM_GRANT && endpt != SELF) return EPERM;
m_ptr->CP_DST_ENDPT = SELF;
m_ptr->m_lsys_krn_sys_umap.dst_endpt = SELF;
return do_umap_remote(caller, m_ptr);
}

26
kernel/system/do_umap_remote.c
View File

@@ -2,12 +2,12 @@
* m_type: SYS_UMAP_REMOTE
*
* The parameters for this kernel call are:
* m5_i1: CP_SRC_PROC_NR (process number)
* m5_s1: UMAP_SEG (segment where address is: T, D, or S)
* m5_l1: CP_SRC_ADDR (virtual address)
* m5_i2: CP_DST_ENDPT (process number of grantee to check access for)
* m5_l2: CP_DST_ADDR (returns physical address)
* m5_l3: CP_NR_BYTES (size of datastructure)
* m_lsys_krn_sys_umap.src_endpt (process number)
* m_lsys_krn_sys_umap.segment (segment where address is: T, D, or S)
* m_lsys_krn_sys_umap.src_addr (virtual address)
* m_lsys_krn_sys_umap.dst_endpt (process number of grantee to check access for)
* m_krn_lsys_sys_umap.dst_addr (returns physical address)
* m_lsys_krn_sys_umap.nr_bytes (size of datastructure)
*/
#include "kernel/system.h"
@@ -26,12 +26,12 @@
int do_umap_remote(struct proc * caller, message * m_ptr)
{
/* Map virtual address to physical, for non-kernel processes. */
int seg_type = m_ptr->UMAP_SEG & SEGMENT_TYPE;
int seg_index = m_ptr->UMAP_SEG & SEGMENT_INDEX;
vir_bytes offset = m_ptr->CP_SRC_ADDR;
int count = m_ptr->CP_NR_BYTES;
int endpt = (int) m_ptr->CP_SRC_ENDPT;
endpoint_t grantee = (endpoint_t) m_ptr->CP_DST_ENDPT;
int seg_type = m_ptr->m_lsys_krn_sys_umap.segment & SEGMENT_TYPE;
int seg_index = m_ptr->m_lsys_krn_sys_umap.segment & SEGMENT_INDEX;
vir_bytes offset = m_ptr->m_lsys_krn_sys_umap.src_addr;
int count = m_ptr->m_lsys_krn_sys_umap.nr_bytes;
endpoint_t endpt = m_ptr->m_lsys_krn_sys_umap.src_endpt;
endpoint_t grantee = m_ptr->m_lsys_krn_sys_umap.dst_endpt;
int proc_nr, proc_nr_grantee;
phys_bytes phys_addr = 0, lin_addr = 0;
struct proc *targetpr;
@@ -108,7 +108,7 @@ int do_umap_remote(struct proc * caller, message * m_ptr)
return EFAULT;
}
m_ptr->CP_DST_ADDR = phys_addr;
m_ptr->m_krn_lsys_sys_umap.dst_addr = phys_addr;
if(phys_addr == 0) {
printf("kernel: umap 0x%x done by %d / %s, pc 0x%lx, 0x%lx -> 0x%lx\n",
seg_type, caller->p_endpoint, caller->p_name,