mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-30 05:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

scheduler: continue rework

Browse Source
This commit is contained in:
Matheus
2025-08-20 22:00:25 -03:00
parent 5098c09f26
commit 136c86354c
26 changed files with 348 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/arch/x86-64/apic.c
+3 -3
View File
@@ -168,13 +168,13 @@ void arch_apic_initap() {
interrupt_register(0xff, spurious, NULL, IPL_IGNORE);
writelapic(APIC_REG_SPURIOUS, 0x1FF);
current_cpu()->id = readlapic(APIC_REG_ID) >> 24;
current_cpu()->hardware_id = readlapic(APIC_REG_ID) >> 24;
// get the acpi id for the local nmi sources
for (size_t i = 0; i < lapic_count; ++i) {
struct acpi_madt_lapic *current = getentry(ACPI_MADT_ENTRY_TYPE_LAPIC, i);
if (current_cpu()->id == current->id) {
if (current_cpu()->hardware_id == current->id) {
current_cpu()->acpiid = current->uid;
break;
}
@@ -233,7 +233,7 @@ void arch_apic_timerinit() {
writelapic(APIC_TIMER_INITIAL_COUNT, 0);
printf("cpu%lu: local apic timer calibrated at %lu ticks per us. ISR vector %lu\n", current_cpu()->id, ticksperus, vec);
printf("cpu%lu: local apic timer calibrated at %lu ticks per us. ISR vector %lu\n", current_cpu()->internal_id, ticksperus, vec);
writelapic(APIC_LVT_TIMER, vec);
kernel-src/arch/x86-64/cpu.c
+1 -1
View File
@@ -211,7 +211,7 @@ void arch_cpu_init() {
char str_buf[128];
size_t done = 0;
done += snprintf(str_buf, 128, "cpu%d: %s@", current_cpu()->id, current_cpu()->vendor);
done += snprintf(str_buf, 128, "cpu%d: %s@", current_cpu()->internal_id, current_cpu()->vendor);
for (int i = 0; i < topology_depth; ++i)
done += snprintf(str_buf + done, 128 - done, "%d%c", topology_ids[i], i == topology_depth - 1 ? 0 : ':');
str_buf[done] = '\n';
kernel-src/arch/x86-64/smp.c
+23 -3
View File
@@ -22,9 +22,13 @@ static void cpuwakeuphalt(struct limine_smp_info *info) {
for (;;) CPU_HALT();
}
static long next_id = 1;
static void cpuwakeup(struct limine_smp_info *info) {
cpu_set((cpu_t *)info->extra_argument);
current_cpu()->internal_id = __atomic_fetch_add(&next_id, 1, __ATOMIC_SEQ_CST);
arch_gdt_reload();
arch_idt_reload();
interrupt_register(0xfd, (void *)cpuwakeuphalt, NULL, IPL_IGNORE);
@@ -46,16 +50,32 @@ static void cpuwakeup(struct limine_smp_info *info) {
}
void arch_smp_sendipi(cpu_t *targcpu, isr_t *isr, int target, bool nmi) {
arch_apic_sendipi(targcpu ? targcpu->id : 0, INTERRUPT_IDTOVECTOR(isr->id), target, nmi ? APIC_MODE_NMI : 0, 0);
arch_apic_sendipi(targcpu ? targcpu->hardware_id : 0, INTERRUPT_IDTOVECTOR(isr->id), target, nmi ? APIC_MODE_NMI : 0, 0);
}
void arch_smp_haltallothers() {
void arch_smp_haltallothers(void) {
arch_smp_sendipi(NULL, &current_cpu()->isr[0xfd], ARCH_SMP_IPI_OTHERCPUS, true);
}
size_t arch_smp_get_cpu_count(void) {
if (cmdline_get("nosmp"))
return 1;
struct limine_smp_response *response = smprequest.response;
if (response == NULL)
return 1;
return response->cpu_count;
}
cpu_t **smp_cpus;
void arch_smp_wakeup() {
cpu_t *arch_smp_get_cpu_by_internal_id(long id) {
__assert(smp_cpus && id < arch_smp_get_cpu_count());
return smp_cpus[id];
}
void arch_smp_wakeup(void) {
struct limine_smp_response *response = smprequest.response;
if (response == NULL) {
// TODO try to detect the other processors manually