Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build warnings #561

Merged
merged 4 commits into from
Feb 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 0 additions & 43 deletions arch/lkl/include/asm/Kbuild
Original file line number Diff line number Diff line change
@@ -1,78 +1,35 @@
generic-y += atomic.h
generic-y += barrier.h
generic-y += bitops.h
generic-y += bug.h
generic-y += bugs.h
generic-y += cache.h
generic-y += cacheflush.h
generic-y += checksum.h
generic-y += cmpxchg-local.h
generic-y += cmpxchg.h
generic-y += compat.h
generic-y += cputime.h
generic-y += current.h
generic-y += delay.h
generic-y += device.h
generic-y += div64.h
generic-y += emergency-restart.h
generic-y += errno.h
generic-y += extable.h
generic-y += exec.h
generic-y += ftrace.h
generic-y += futex.h
generic-y += hardirq.h
generic-y += hw_irq.h
generic-y += ioctl.h
generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += irqflags.h
generic-y += irq_work.h
generic-y += kdebug.h
generic-y += kmap_types.h
generic-y += linkage.h
generic-y += local.h
generic-y += local64.h
generic-y += mcs_spinlock.h
generic-y += mmiowb.h
generic-y += mmu.h
generic-y += module.h
generic-y += msgbuf.h
generic-y += param.h
generic-y += parport.h
generic-y += pci_iomap.h
generic-y += percpu.h
generic-y += pgalloc.h
generic-y += poll.h
generic-y += preempt.h
generic-y += resource.h
generic-y += rwsem.h
generic-y += scatterlist.h
generic-y += seccomp.h
generic-y += sections.h
generic-y += segment.h
generic-y += sembuf.h
generic-y += serial.h
generic-y += shmbuf.h
generic-y += signal.h
generic-y += simd.h
generic-y += sizes.h
generic-y += socket.h
generic-y += sockios.h
generic-y += stat.h
generic-y += statfs.h
generic-y += swab.h
generic-y += switch_to.h
generic-y += termbits.h
generic-y += termios.h
generic-y += time.h
generic-y += timex.h
generic-y += tlbflush.h
generic-y += topology.h
generic-y += trace_clock.h
generic-y += unaligned.h
generic-y += user.h
generic-y += vga.h
generic-y += word-at-a-time.h
generic-y += kprobes.h
generic-y += uaccess.h
generic-y += mman.h
1 change: 0 additions & 1 deletion arch/lkl/include/uapi/asm/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
generic-y += elf.h
generic-y += kvm_para.h
generic-y += shmparam.h
generic-y += siginfo.h
generic-y += timex.h

generated-y += config.h
Expand Down
11 changes: 6 additions & 5 deletions arch/lkl/kernel/syscalls.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ static asmlinkage long sys_new_thread_group_leader(void);
typedef long (*syscall_handler_t)(long arg1, ...);

#undef __SYSCALL
#define __SYSCALL(nr, sym) [nr] = (syscall_handler_t)sym,
#define __SYSCALL(nr, sym)[nr] = sym,

syscall_handler_t syscall_table[__NR_syscalls] = {
[0 ... __NR_syscalls - 1] = (syscall_handler_t)sys_ni_syscall,
void *syscall_table[__NR_syscalls] = {
[0 ... __NR_syscalls - 1] = sys_ni_syscall,
#include <asm/unistd.h>

#if __BITS_PER_LONG == 32
Expand All @@ -38,12 +38,13 @@ syscall_handler_t syscall_table[__NR_syscalls] = {
static long run_syscall(long no, long *params)
{
long ret;
syscall_handler_t handler = (syscall_handler_t)syscall_table[no];

if (no < 0 || no >= __NR_syscalls)
return -ENOSYS;

ret = syscall_table[no](params[0], params[1], params[2], params[3],
params[4], params[5]);
ret = handler(params[0], params[1], params[2], params[3], params[4],
params[5]);

task_work_run();

Expand Down
74 changes: 59 additions & 15 deletions tools/lkl/lib/posix-host.c
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,36 @@ static void mutex_free(struct lkl_mutex *_mutex)
free(_mutex);
}

struct lkl_thread_wrapper_arg {
void (*fn)(void *arg);
void *arg;
};

void *lkl_thread_wrapper(void *arg)
{
struct lkl_thread_wrapper_arg *lt = arg;
void (*fn)(void *) = lt->fn;
void *fn_arg = lt->arg;

free(lt);

fn(fn_arg);
return NULL;
}

static lkl_thread_t thread_create(void (*fn)(void *), void *arg)
{
pthread_t thread;
if (WARN_PTHREAD(pthread_create(&thread, NULL, (void* (*)(void *))fn, arg)))
struct lkl_thread_wrapper_arg *wrapper_arg;

wrapper_arg = malloc(sizeof(*wrapper_arg));
if (!wrapper_arg)
return 0;
wrapper_arg->fn = fn;
wrapper_arg->arg = arg;

if (WARN_PTHREAD(pthread_create(&thread, NULL, lkl_thread_wrapper,
wrapper_arg)))
return 0;
else
return (lkl_thread_t) thread;
Expand Down Expand Up @@ -361,7 +387,6 @@ static void *tls_get(struct lkl_tls_key *key)
return __tls_keys[idx].data;
}


static unsigned long long time_ns(void)
{
struct timespec ts;
Expand All @@ -371,43 +396,62 @@ static unsigned long long time_ns(void)
return 1e9*ts.tv_sec + ts.tv_nsec;
}

struct lkl_timer {
timer_t timer;
void (*fn)(void *arg);
void *arg;
};

static void lkl_timer_callback(union sigval sv)
{
struct lkl_timer *lt = (struct lkl_timer *)sv.sival_ptr;

lt->fn(lt->arg);
}

static void *timer_alloc(void (*fn)(void *), void *arg)
{
int err;
timer_t timer;
struct sigevent se = {
.sigev_notify = SIGEV_THREAD,
.sigev_value = {
.sival_ptr = arg,
},
.sigev_notify_function = (void (*)(union sigval))fn,
.sigev_notify_function = lkl_timer_callback,
};
struct lkl_timer *pt;


pt = malloc(sizeof(*pt));
if (!pt)
return NULL;

err = timer_create(CLOCK_REALTIME, &se, &timer);
pt->fn = fn;
pt->arg = arg;
se.sigev_value.sival_ptr = pt;
err = timer_create(CLOCK_REALTIME, &se, &pt->timer);
if (err)
return NULL;

return (void *)(long)timer;
return pt;
}

static int timer_set_oneshot(void *_timer, unsigned long ns)
static int timer_set_oneshot(void *timer, unsigned long ns)
{
timer_t timer = (timer_t)(long)_timer;
struct lkl_timer *lt = timer;
struct itimerspec ts = {
.it_value = {
.tv_sec = ns / 1000000000,
.tv_nsec = ns % 1000000000,
},
};

return timer_settime(timer, 0, &ts, NULL);
return timer_settime(lt->timer, 0, &ts, NULL);
}

static void timer_free(void *_timer)
static void timer_free(void *timer)
{
timer_t timer = (timer_t)(long)_timer;
struct lkl_timer *lt = timer;

timer_delete(timer);
timer_delete(lt->timer);
free(lt);
}

static void panic(void)
Expand Down
Loading