Skip to content

remove ptrace support #223

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 18, 2025
Merged

remove ptrace support #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion so3/arch/arm32/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
obj-y += head.o
obj-y += setup.o exception.o context.o fault.o
obj-y += cache_v7_asm.o cache_v7.o cache-cp15.o
obj-y += thread.o ptrace.o
obj-y += thread.o
obj-y += vfp.o
obj-y += backtrace.o backtrace_asm.o
obj-y += smccc-call.o
Expand Down
1 change: 0 additions & 1 deletion so3/arch/arm32/context.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@

#ifdef CONFIG_MMU

.extern __check_ptrace_traceme
.extern pre_launch_proc

#endif
Expand Down
16 changes: 0 additions & 16 deletions so3/arch/arm32/exception.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
.extern __data_abort
.extern __undefined_instruction

.extern __check_ptrace_syscall
.extern sig_check
.extern __stack_alignment_fault

Expand Down Expand Up @@ -221,13 +220,6 @@ __after_push_sp_usr:
@ Restore r0-r2
ldmia sp, {r0-r2}

#ifdef CONFIG_MMU
@ Give a chance to a ptrace tracer to monitor us (before the syscall)
stmfd sp!, {r0-r4}
bl __check_ptrace_syscall
ldmfd sp!, {r0-r4}
#endif

mov r0, sp

cpsie i @ Re-enable interrupts
Expand All @@ -243,14 +235,6 @@ __after_push_sp_usr:
add sp, sp, #SVC_STACK_FRAME_SIZE

__no_sigreturn:

#ifdef CONFIG_MMU
@ Give a chance to a ptrace tracer to monitor us (after the syscall)
stmfd sp!, {r0-r4}
bl __check_ptrace_syscall
ldmfd sp!, {r0-r4}
#endif

__ret_from_fork:

@ Store the return value on the stack frame
Expand Down
123 changes: 0 additions & 123 deletions so3/arch/arm32/ptrace.c
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions so3/arch/arm64/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ endif

obj-y += head.o exception.o traps.o

obj-y += fault.o backtrace.o
obj-y += fault.o backtrace.o
obj-y += backtrace.o backtrace_asm.o
obj-y += cache_v8.o cache.o context.o
obj-y += semihosting.o semicall.o
Expand All @@ -14,7 +14,7 @@ obj-$(CONFIG_AVZ) += domain.o mmio.o

obj-y += smccc-call.o

obj-y += thread.o ptrace.o
obj-y += thread.o

obj-$(CONFIG_MMU) += mmu.o

Expand All @@ -23,4 +23,4 @@ obj-$(CONFIG_ARM64VT) += #smmu.o
obj-y += lib/

obj-y += $(TARGET)/

2 changes: 0 additions & 2 deletions so3/arch/arm64/context.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@

.global __enable_vfp

.extern __check_ptrace_traceme

#ifdef CONFIG_AVZ

// Switch from a domain to another
Expand Down
12 changes: 0 additions & 12 deletions so3/arch/arm64/exception.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
.extern current_thread
.extern __sync_serror
.extern do_exit
.extern __check_ptrace_syscall
.extern sig_check

.global __vectors
Expand Down Expand Up @@ -610,17 +609,6 @@ ret_from_fork:
str xzr, [sp, #OFFSET_X0]
b __ret_from_fork


#if 0
#ifdef CONFIG_MMU
// Give a chance to a ptrace tracer to monitor us (after the syscall)
stmfd sp!, {r0-r4}
bl __check_ptrace_syscall
ldmfd sp!, {r0-r4}
#endif
#endif


#if !defined(CONFIG_AVZ) && defined(CONFIG_SOO)

.align 5
Expand Down
50 changes: 0 additions & 50 deletions so3/arch/arm64/ptrace.c
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion so3/avz/kernel/injector.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include <memory.h>
#include <crc.h>
#include <softirq.h>
#include <ptrace.h>
#include <log.h>

#include <avz/memslot.h>
Expand Down
9 changes: 0 additions & 9 deletions so3/include/process.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include <completion.h>
#include <memory.h>
#include <signal.h>
#include <ptrace.h>
#include <spinlock.h>
#include <futex.h>
#include <mutex.h>
Expand Down Expand Up @@ -81,11 +80,6 @@ typedef struct {
page_t *page;
} page_list_t;

typedef struct {
bool tracee;
enum __ptrace_request req_in_progress;
} ptrace_info_t;

struct pcb {
int pid;
char name[PROC_NAME_LEN];
Expand Down Expand Up @@ -150,9 +144,6 @@ struct pcb {
/* Bitmap of the signals set for this process */
sigset_t sigset_map;

/* The process might be under a ptrace activity, and hence becoming a tracer (parent) or tracee (child) */
enum __ptrace_request ptrace_pending_req;

/* Mutex lock to be used in conjunction with the user space (very temporary) */
mutex_t *lock;
};
Expand Down
Loading