Two bugs reported from actual use, plus a test harness that had stopped testing. init could be killed by Ctrl-C, taking the machine with it. SIGINT goes to the foreground process group, init is pgid 1, and any window where tty_fg_pgrp is 1 -- before a shell claims the terminal, after one exits, or between the two while the key is held -- lands it on init. init has no handler, so killed was set, exit() ran, and exit() panics outright on initproc. Spamming Ctrl-C at a frozen program is exactly the input that finds that window. POSIX and Linux both discard a default-action signal for pid 1; init_ignores() now does the same, SIGKILL included, because init is not killable from userspace on any Unix. Everything was slow because BSIZE was 1024 while a SchFS block is 4096, so every block cost four IDE requests, each with its own interrupt and sleep/wakeup. exec() of the 800 KB toybox binary meant ~800 round trips. The giveaway: `seq 1 200`, which touches no file and prints nothing, cost the same 2.0s as `cat /bin/toybox`, and `ls | wc -l` cost exactly double -- both dominated by loading the same binary twice. BSIZE is 4096 now, one request per SchFS block, and NBUF is 256 blocks (1 MB) rather than 90 KB -- smaller than the binary every command execs, so nothing was ever still resident. ideinit() issues SET MULTIPLE MODE, which is what makes a 4096-byte transfer legal: READ/WRITE MULTIPLE move the drive's multiple count per interrupt and nothing had ever set it, which is the real reason idestart() carried a sector_per_block > 7 panic. seq 1 200 2.02s -> 0.06s ls /bin 2.76s -> 0.68s ls /bin | wc -l 4.68s -> 0.73s And the harness. bootcheck called Find-Qemu from a param() default, which is bound before any function in the body exists -- so it died on its first line and printed an error containing neither "FAIL" nor "Exception", the two things being grepped for. It had not run since it was made host-portable. Worse, an earlier index-based edit had deleted the Expect blocks for -Tty, -Usb, -Sock, -Ps and -Evdev, so five of the seven modes asserted nothing at all. Restored, and the USB run gets its own 16 MB build/usbstick.img: it had been pointed at build/fs.img, which nothing builds since SchFS became root, so QEMU refused to start. 242 checks across seven modes, all passing, and make schfs-check green.
251 lines
6.9 KiB
C
251 lines
6.9 KiB
C
// Simple PIO-based (non-DMA) IDE driver code.
|
|
|
|
#include "types.h"
|
|
#include "defs.h"
|
|
#include "irq.h"
|
|
#include "param.h"
|
|
#include "memlayout.h"
|
|
#include "mmu.h"
|
|
#include "proc.h"
|
|
#include "x86.h"
|
|
#include "traps.h"
|
|
#include "spinlock.h"
|
|
#include "sleeplock.h"
|
|
#include "fs.h"
|
|
#include "buf.h"
|
|
|
|
#define SECTOR_SIZE 512
|
|
#define IDE_BSY 0x80
|
|
#define IDE_DRDY 0x40
|
|
#define IDE_DF 0x20
|
|
#define IDE_ERR 0x01
|
|
|
|
#define IDE_CMD_READ 0x20
|
|
#define IDE_CMD_WRITE 0x30
|
|
#define IDE_CMD_RDMUL 0xc4
|
|
#define IDE_CMD_SETMULT 0xc6
|
|
#define IDE_CMD_WRMUL 0xc5
|
|
|
|
// idequeue points to the buf now being read/written to the disk.
|
|
// idequeue->qnext points to the next buf to be processed.
|
|
// You must hold idelock while manipulating queue.
|
|
|
|
static struct spinlock idelock;
|
|
static struct buf *idequeue;
|
|
|
|
static int havedisk0;
|
|
static int havedisk1;
|
|
static void idestart(struct buf*);
|
|
|
|
// Wait for the drive to become ready, or give up.
|
|
//
|
|
// This used to be an unbounded `while`. On a machine with nothing attached to
|
|
// the primary channel the status register reads 0xFF forever, so the very
|
|
// first call from ideinit() hung the kernel -- no panic, no message, just a
|
|
// dead machine right after the VGA banner. That is not an exotic
|
|
// configuration: it is every CD boot, and most hardware newer than IDE.
|
|
//
|
|
// The bound is deliberately enormous. A real drive answers in microseconds;
|
|
// this only expires when there is nothing there at all.
|
|
static int
|
|
idewait(int checkerr)
|
|
{
|
|
int r = 0;
|
|
|
|
for(int i = 0; i < 20000000; i++){
|
|
r = inb(0x1f7);
|
|
if((r & (IDE_BSY|IDE_DRDY)) == IDE_DRDY){
|
|
if(checkerr && (r & (IDE_DF|IDE_ERR)) != 0)
|
|
return -1;
|
|
return 0;
|
|
}
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
static void
|
|
ide_irq(void *arg)
|
|
{
|
|
(void)arg;
|
|
ideintr();
|
|
}
|
|
|
|
// SET MULTIPLE MODE: how many sectors the drive moves per interrupt during
|
|
// READ/WRITE MULTIPLE. Must equal BSIZE/SECTOR_SIZE or idestart()'s single
|
|
// insl/outsl of a whole block does not line up with the drive's bursts.
|
|
//
|
|
// A drive may refuse a count it cannot do (IDENTIFY word 47 carries its
|
|
// maximum; QEMU allows 16). If it does, say so rather than continue: the
|
|
// transfers would silently desynchronise, which reads as filesystem
|
|
// corruption rather than as a driver problem.
|
|
static void
|
|
ide_set_multiple(int dev)
|
|
{
|
|
int spb = BSIZE / SECTOR_SIZE;
|
|
|
|
outb(0x1f6, 0xe0 | ((dev & 1) << 4));
|
|
if(idewait(0) < 0)
|
|
return;
|
|
outb(0x1f2, spb);
|
|
outb(0x1f7, IDE_CMD_SETMULT);
|
|
if(idewait(1) < 0)
|
|
cprintf("ide%d: SET MULTIPLE MODE %d rejected; expect trouble\n", dev, spb);
|
|
}
|
|
|
|
void
|
|
ideinit(void)
|
|
{
|
|
initlock(&idelock, "ide");
|
|
// ISA signalling: edge-triggered, active high. Everything at a fixed
|
|
// legacy port is wired this way; PCI devices are not.
|
|
irq_register(IRQ_IDE, ide_irq, 0, "ide", 0);
|
|
|
|
// A timeout here means there is no drive on this channel. Say so and leave
|
|
// havedisk0/1 clear: with a ramdisk root there is nothing else the system
|
|
// needs from IDE, and booting on is strictly better than stopping.
|
|
if(idewait(0) < 0){
|
|
cprintf("ide: no drive on the primary channel\n");
|
|
return;
|
|
}
|
|
havedisk0 = 1;
|
|
|
|
// Check if disk 1 is present
|
|
outb(0x1f6, 0xe0 | (1<<4));
|
|
for(int i=0; i<1000; i++){
|
|
if(inb(0x1f7) != 0){
|
|
havedisk1 = 1;
|
|
break;
|
|
}
|
|
}
|
|
|
|
// Tell each drive how many sectors to move per interrupt.
|
|
//
|
|
// READ/WRITE MULTIPLE transfer the drive's *multiple count* of sectors
|
|
// between interrupts, and that count is whatever SET MULTIPLE MODE last
|
|
// established -- it is not taken from the sector-count register. Nothing
|
|
// ever issued it here, so the count was undefined, which is the real reason
|
|
// idestart() carried a `sector_per_block > 7` panic: BSIZE was 1024, two
|
|
// sectors, and nobody had tested further.
|
|
//
|
|
// Establishing it explicitly is what lets BSIZE be a whole SchFS block. At
|
|
// 1024 every 4096-byte SchFS block cost four IDE requests, each with its own
|
|
// interrupt and sleep/wakeup, and exec() of the 800 KB toybox binary meant
|
|
// ~800 round trips -- about two seconds, on every command.
|
|
ide_set_multiple(0);
|
|
if(havedisk1)
|
|
ide_set_multiple(1);
|
|
|
|
// Switch back to disk 0.
|
|
outb(0x1f6, 0xe0 | (0<<4));
|
|
}
|
|
|
|
// Is there actually a drive there? Callers that probe -- rather than callers
|
|
// that know what they are looking for -- have to ask, because reading an
|
|
// absent drive is a bug and iderw() treats it as one.
|
|
int
|
|
ide_disk_present(int dev)
|
|
{
|
|
return dev == 0 ? havedisk0 : havedisk1;
|
|
}
|
|
|
|
// Start the request for b. Caller must hold idelock.
|
|
static void
|
|
idestart(struct buf *b)
|
|
{
|
|
if(b == 0)
|
|
panic("idestart");
|
|
if(b->blockno >= FSSIZE)
|
|
panic("incorrect blockno");
|
|
int sector_per_block = BSIZE/SECTOR_SIZE;
|
|
int sector = b->blockno * sector_per_block;
|
|
int read_cmd = (sector_per_block == 1) ? IDE_CMD_READ : IDE_CMD_RDMUL;
|
|
int write_cmd = (sector_per_block == 1) ? IDE_CMD_WRITE : IDE_CMD_WRMUL;
|
|
|
|
// No `sector_per_block > 7` panic here any more. That limit existed because
|
|
// nothing had set the drive's multiple count, so anything past the tested
|
|
// two sectors was a guess; ideinit() issues SET MULTIPLE MODE now, and the
|
|
// count is whatever BSIZE says.
|
|
|
|
idewait(0);
|
|
outb(0x3f6, 0); // generate interrupt
|
|
outb(0x1f2, sector_per_block); // number of sectors
|
|
outb(0x1f3, sector & 0xff);
|
|
outb(0x1f4, (sector >> 8) & 0xff);
|
|
outb(0x1f5, (sector >> 16) & 0xff);
|
|
outb(0x1f6, 0xe0 | ((b->dev&1)<<4) | ((sector>>24)&0x0f));
|
|
if(b->flags & B_DIRTY){
|
|
outb(0x1f7, write_cmd);
|
|
outsl(0x1f0, b->data, BSIZE/4);
|
|
} else {
|
|
outb(0x1f7, read_cmd);
|
|
}
|
|
}
|
|
|
|
// Interrupt handler.
|
|
void
|
|
ideintr(void)
|
|
{
|
|
struct buf *b;
|
|
|
|
// First queued buffer is the active request.
|
|
acquire(&idelock);
|
|
if((b = idequeue) == 0){
|
|
release(&idelock);
|
|
// cprintf("spurious IDE interrupt\n");
|
|
return;
|
|
}
|
|
idequeue = b->qnext;
|
|
|
|
// Read data if needed.
|
|
if(!(b->flags & B_DIRTY) && idewait(1) >= 0)
|
|
insl(0x1f0, b->data, BSIZE/4);
|
|
|
|
// Wake process waiting for this buf.
|
|
b->flags |= B_VALID;
|
|
b->flags &= ~B_DIRTY;
|
|
wakeup(b);
|
|
|
|
// Start disk on next buf in queue.
|
|
if(idequeue != 0)
|
|
idestart(idequeue);
|
|
|
|
release(&idelock);
|
|
}
|
|
|
|
//PAGEBREAK!
|
|
// Sync buf with disk.
|
|
// If B_DIRTY is set, write buf to disk, clear B_DIRTY, set B_VALID.
|
|
// Else if B_VALID is not set, read buf from disk, set B_VALID.
|
|
void
|
|
iderw(struct buf *b)
|
|
{
|
|
struct buf **pp;
|
|
|
|
if(!holdingsleep(&b->lock))
|
|
panic("iderw: buf not locked");
|
|
if((b->flags & (B_VALID|B_DIRTY)) == B_VALID)
|
|
panic("iderw: nothing to do");
|
|
if(b->dev != 0 && !havedisk1)
|
|
panic("iderw: ide disk 1 not present");
|
|
if(b->dev == 0 && !havedisk0)
|
|
panic("iderw: ide disk 0 not present");
|
|
|
|
acquire(&idelock); //DOC:acquire-lock
|
|
|
|
// Append b to idequeue.
|
|
b->qnext = 0;
|
|
for(pp=&idequeue; *pp; pp=&(*pp)->qnext) //DOC:insert-queue
|
|
;
|
|
*pp = b;
|
|
|
|
// Start disk if necessary.
|
|
if(idequeue == b)
|
|
idestart(b);
|
|
|
|
// Wait for request to finish.
|
|
while((b->flags & (B_VALID|B_DIRTY)) != B_VALID){
|
|
sleep(b, &idelock);
|
|
}
|
|
|
|
release(&idelock);
|
|
}
|