raeofsunshine
/
KimisOS
mirror of https://github.com/raeofsunshinedev/KimisOS.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add locking and fix race condition for ata_read()

This commit is contained in:
notsomeidiot123 2026-02-28 21:48:45 -05:00
parent 1062bd43c7
commit 3a9e7889ae
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefile
View File

@ -19,7 +19,7 @@ all: bootloader tools kernel
# sudo mkdir mount/sys # for system files # sudo mkdir mount/sys # for system files
# ./diskwrite -v -o image.bin # ./diskwrite -v -o image.bin
# ./diskwrite -v -l kernel.elf idm.elf -o image.bin # ./diskwrite -v -l kernel.elf idm.elf -o image.bin
qemu-system-i386 -hda image.bin -hdc test.bin --no-reboot --no-shutdown -m 32m -smp 2 -serial mon:stdio -D intlog.txt -d int qemu-system-i386 -hda image.bin -hdb test.bin --no-reboot --no-shutdown -m 32m -smp 2 -serial mon:stdio -D intlog.txt -d int
sudo umount mount sudo umount mount
tools: tools:

22
src/kmodules/disk_driver.c
View File

@ -142,6 +142,7 @@ uint32_t recieved_ints = 0;
uint32_t volatile transferring_pid = 0; uint32_t volatile transferring_pid = 0;
uint8_t volatile locked = 0; uint8_t volatile locked = 0;
typedef struct drive_desc{ typedef struct drive_desc{
uint32_t BARs[8]; uint32_t BARs[8];
enum DRIVE_TYPE type; enum DRIVE_TYPE type;
@ -293,6 +294,17 @@ int ata_read(vfile_t *file, uint8_t *ptr, uint32_t offset, uint32_t count) {
uint16_t ctrl_base = drive.BARs[1] &0xfffe; uint16_t ctrl_base = drive.BARs[1] &0xfffe;
uint16_t bm_base = drive.BARs[4] & ~3; uint16_t bm_base = drive.BARs[4] & ~3;
if(!is_interrupt(api)){
asm("cli");
while(locked){
asm("sti");
puts(api, "KIDM", "Locked\n");
asm("int $32");
asm("cli");
}
locked = 1;
asm("sti");
}
PRD_T *prdt = drive.PRDT; PRD_T *prdt = drive.PRDT;
api(MODULE_API_PRINT, MODULE_NAME, "%x, %x, %x, %x\n", io_base, ctrl_base, bm_base, api(MODULE_API_PADDR, prdt)); api(MODULE_API_PRINT, MODULE_NAME, "%x, %x, %x, %x\n", io_base, ctrl_base, bm_base, api(MODULE_API_PADDR, prdt));
@ -353,10 +365,14 @@ int ata_read(vfile_t *file, uint8_t *ptr, uint32_t offset, uint32_t count) {
expected_ints = pages; expected_ints = pages;
recieved_ints = 0; recieved_ints = 0;
transferring_disk_index = file->mount_id;
uint32_t cpid = api(MODULE_API_GET_CPID);
// api(MODULE_API_PRINT, MODULE_NAME, "Cpid: %x", cpid);
api(MODULE_API_BLOCK_PID, cpid);
transferring_pid = cpid;
outb(bm_base, 0x09); outb(bm_base, 0x09);
transferring_disk_index = file->mount_id;
uint8_t status = inb(ctrl_base); uint8_t status = inb(ctrl_base);
uint8_t bm_status = inb(bm_base + 2); uint8_t bm_status = inb(bm_base + 2);
@ -371,10 +387,6 @@ int ata_read(vfile_t *file, uint8_t *ptr, uint32_t offset, uint32_t count) {
// status = inb(io_base + ATA_STATUS); // status = inb(io_base + ATA_STATUS);
// } // }
// outb(bm_base, 0x00); // outb(bm_base, 0x00);
uint32_t cpid = api(MODULE_API_GET_CPID);
// api(MODULE_API_PRINT, MODULE_NAME, "Cpid: %x", cpid);
api(MODULE_API_BLOCK_PID, cpid);
transferring_pid = cpid;
if(!is_interrupt){ if(!is_interrupt){
asm("int $32\n"); asm("int $32\n");
} }