added introduction section
This commit is contained in:
@@ -31,6 +31,27 @@ __FBSDID("$FreeBSD$");
|
||||
#include <vm/vm_pager.h>
|
||||
#include <vm/vm_phys.h>
|
||||
|
||||
#include <cheriintrin.h>
|
||||
#include <cheri/cheric.h>
|
||||
|
||||
#include <sys/mman.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/errno.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
// added to print uint
|
||||
// 64
|
||||
// #include <inttypes.h>
|
||||
@@ -78,6 +99,11 @@ static SYSCTL_NODE(_hw_contigmem, OID_AUTO, physaddr, CTLFLAG_RD, 0,
|
||||
|
||||
MALLOC_DEFINE(M_CONTIGMEM, "customcontigmem", "customcontigmem(4) allocations");
|
||||
|
||||
void *ptr;
|
||||
int MallocCounter;
|
||||
|
||||
#define MAXPAGESIZES 2
|
||||
|
||||
|
||||
/*
|
||||
* The offset in sysent where the syscall is allocated.
|
||||
@@ -120,79 +146,80 @@ static struct cdevsw contigmem_ops = {
|
||||
.d_close = contigmem_close,
|
||||
};
|
||||
|
||||
static int
|
||||
pagesizes(size_t ps[MAXPAGESIZES])
|
||||
{
|
||||
int pscnt;
|
||||
|
||||
pscnt = getpagesizes(ps, MAXPAGESIZES);
|
||||
// ATF_REQUIRE_MSG(pscnt != -1, "getpagesizes failed; errno=%d", errno);
|
||||
// ATF_REQUIRE_MSG(ps[0] != 0, "psind 0 is %zu", ps[0]);
|
||||
// ATF_REQUIRE_MSG(pscnt <= MAXPAGESIZES, "invalid pscnt %d", pscnt);
|
||||
// if (pscnt == 1){
|
||||
// printf("pscnt is 1");
|
||||
// }
|
||||
|
||||
// atf_tc_skip("no large page support");
|
||||
return (pscnt);
|
||||
}
|
||||
|
||||
static int
|
||||
contigmem_load()
|
||||
{
|
||||
|
||||
// get page size
|
||||
printf("%d FreeBSD page size \n",PAGE_SIZE);
|
||||
size_t sz;
|
||||
// Pre Allocate 1GB huge page
|
||||
sz = 1073741824;
|
||||
|
||||
char index_string[8], description[32];
|
||||
int i, error = 0;
|
||||
void *addr;
|
||||
int error, fd, pscnt, pn;
|
||||
|
||||
if (contigmem_num_buffers > RTE_CONTIGMEM_MAX_NUM_BUFS) {
|
||||
printf("%d buffers requested is greater than %d allowed\n",
|
||||
contigmem_num_buffers, RTE_CONTIGMEM_MAX_NUM_BUFS);
|
||||
error = EINVAL;
|
||||
goto error;
|
||||
}
|
||||
size_t ps[MAXPAGESIZES];
|
||||
|
||||
if (contigmem_buffer_size < PAGE_SIZE ||
|
||||
(contigmem_buffer_size & (contigmem_buffer_size - 1)) != 0) {
|
||||
printf("buffer size 0x%lx is not greater than PAGE_SIZE and "
|
||||
"power of two\n", contigmem_buffer_size);
|
||||
error = EINVAL;
|
||||
goto error;
|
||||
}
|
||||
size_t size[3];
|
||||
|
||||
for (i = 0; i < contigmem_num_buffers; i++) {
|
||||
addr = contigmalloc(contigmem_buffer_size, M_CONTIGMEM, M_ZERO,
|
||||
0, BUS_SPACE_MAXADDR, contigmem_buffer_size, 0);
|
||||
if (addr == NULL) {
|
||||
printf("contigmalloc failed for buffer %d\n", i);
|
||||
error = ENOMEM;
|
||||
goto error;
|
||||
}
|
||||
pn = getpagesizes(size, 3);
|
||||
printf("page size is [%d]", size[2]);
|
||||
|
||||
#ifndef RTE_ARCH_ARM_PURECAP_HACK
|
||||
printf("%2u: virt=%p phys=%p\n", i, addr,
|
||||
(void *)pmap_kextract((vm_offset_t)addr));
|
||||
#endif
|
||||
pscnt = pagesizes(ps);
|
||||
|
||||
mtx_init(&contigmem_buffers[i].mtx, "contigmem", NULL, MTX_DEF);
|
||||
contigmem_buffers[i].addr = addr;
|
||||
contigmem_buffers[i].refcnt = 0;
|
||||
fd = shm_create_largepage(SHM_ANON, O_CREAT | O_RDWR, 1, SHM_LARGEPAGE_ALLOC_DEFAULT, 0);
|
||||
|
||||
snprintf(index_string, sizeof(index_string), "%d", i);
|
||||
snprintf(description, sizeof(description),
|
||||
"phys addr for buffer %d", i);
|
||||
SYSCTL_ADD_PROC(NULL,
|
||||
&SYSCTL_NODE_CHILDREN(_hw_contigmem, physaddr), OID_AUTO,
|
||||
index_string, CTLTYPE_U64 | CTLFLAG_RD,
|
||||
(void *)(uintptr_t)i, 0, contigmem_physaddr, "LU",
|
||||
description);
|
||||
}
|
||||
if (fd < 0 && errno == ENOTTY) {
|
||||
perror("sh_create_largepages");
|
||||
close(fd);
|
||||
}
|
||||
// if (fd < 0)
|
||||
// perror("no large page supported");
|
||||
// exit(EXIT_FAILURE);
|
||||
// if (fd < 0 && errno == ENOTTY)
|
||||
// atf_tc_skip("no large page support");
|
||||
// ATF_REQUIRE_MSG(fd >= 0, "shm_create_largepage failed; errno=%d", errno);
|
||||
|
||||
contigmem_cdev = make_dev_credf(0, &contigmem_ops, 0, NULL, UID_ROOT,
|
||||
GID_WHEEL, 0600, "contigmem");
|
||||
if (ftruncate(fd, sz) < 0) {
|
||||
perror("ftruncate");
|
||||
close(fd);
|
||||
}
|
||||
// if (error != 0 && errno == ENOMEM)
|
||||
// /*
|
||||
// * The test system might not have enough memory to accommodate
|
||||
// * the request.
|
||||
// */
|
||||
// atf_tc_skip("failed to allocate %zu-byte superpage", sz);
|
||||
// ATF_REQUIRE_MSG(error == 0, "ftruncate failed; errno=%d", errno);
|
||||
|
||||
ptr = mmap(NULL, sz,
|
||||
PROT_READ|PROT_WRITE, MAP_SHARED,fd,0);
|
||||
|
||||
// Added error handling
|
||||
if(ptr == MAP_FAILED)
|
||||
{
|
||||
perror("mmap");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
MallocCounter = (int)sz;
|
||||
|
||||
return 0;
|
||||
|
||||
error:
|
||||
for (i = 0; i < contigmem_num_buffers; i++) {
|
||||
if (contigmem_buffers[i].addr != NULL) {
|
||||
contigfree(contigmem_buffers[i].addr,
|
||||
contigmem_buffer_size, M_CONTIGMEM);
|
||||
contigmem_buffers[i].addr = NULL;
|
||||
}
|
||||
if (mtx_initialized(&contigmem_buffers[i].mtx))
|
||||
mtx_destroy(&contigmem_buffers[i].mtx);
|
||||
}
|
||||
|
||||
return error;
|
||||
|
||||
// Want to design contig load to do nothing
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -350,36 +377,45 @@ static struct cdev_pager_ops contigmem_cdev_pager_ops = {
|
||||
};
|
||||
|
||||
static int
|
||||
contigmem_mmap_single(struct cdev *cdev, vm_ooffset_t *offset, vm_size_t size,
|
||||
(struct cdev *cdev, vm_ooffset_t *offset, vm_size_t size,
|
||||
struct vm_object **obj, int nprot)
|
||||
{
|
||||
|
||||
// Testing if this is called when file is opened
|
||||
printf("contigmem_mmap_single called \n");
|
||||
|
||||
struct contigmem_vm_handle *vmh;
|
||||
uint64_t buffer_index;
|
||||
// struct contigmem_vm_handle *vmh;
|
||||
// uint64_t buffer_index;
|
||||
|
||||
/*
|
||||
* The buffer index is encoded in the offset. Divide the offset by
|
||||
* PAGE_SIZE to get the index of the buffer requested by the user
|
||||
* app.
|
||||
*/
|
||||
buffer_index = *offset / PAGE_SIZE;
|
||||
if (buffer_index >= contigmem_num_buffers)
|
||||
return EINVAL;
|
||||
// /*
|
||||
// * The buffer index is encoded in the offset. Divide the offset by
|
||||
// * PAGE_SIZE to get the index of the buffer requested by the user
|
||||
// * app.
|
||||
// */
|
||||
// buffer_index = *offset / PAGE_SIZE;
|
||||
// if (buffer_index >= contigmem_num_buffers)
|
||||
// return EINVAL;
|
||||
|
||||
if (size > contigmem_buffer_size)
|
||||
return EINVAL;
|
||||
// if (size > contigmem_buffer_size)
|
||||
// return EINVAL;
|
||||
|
||||
vmh = malloc(sizeof(*vmh), M_CONTIGMEM, M_NOWAIT | M_ZERO);
|
||||
if (vmh == NULL)
|
||||
return ENOMEM;
|
||||
vmh->buffer_index = buffer_index;
|
||||
// vmh = malloc(sizeof(*vmh), M_CONTIGMEM, M_NOWAIT | M_ZERO);
|
||||
// if (vmh == NULL)
|
||||
// return ENOMEM;
|
||||
// vmh->buffer_index = buffer_index;
|
||||
|
||||
*offset = (vm_ooffset_t)vtophys(contigmem_buffers[buffer_index].addr);
|
||||
*obj = cdev_pager_allocate(vmh, OBJT_DEVICE, &contigmem_cdev_pager_ops,
|
||||
size, nprot, *offset, curthread->td_ucred);
|
||||
// *offset = (vm_ooffset_t)vtophys(contigmem_buffers[buffer_index].addr);
|
||||
// *obj = cdev_pager_allocate(vmh, OBJT_DEVICE, &contigmem_cdev_pager_ops,
|
||||
// size, nprot, *offset, curthread->td_ucred);
|
||||
|
||||
size = __builtin_align_up(size, _Alignof(max_align_t));
|
||||
|
||||
// printf("%d \n", sz);
|
||||
// printf("%d Malloc counter\n", MallocCounter);
|
||||
|
||||
MallocCounter -= size;
|
||||
obj = &ptr[MallocCounter];
|
||||
obj = cheri_setbounds(obj, sz);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user