From: Jack Lange Date: Mon, 6 Apr 2009 16:42:10 +0000 (-0500) Subject: huge update for merge X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=c535b3199977444c3aa2c44b852cc82ce659c5ff huge update for merge --- diff --git a/palacios/src/devices/ata.h b/palacios/src/devices/ata.h index b759f0b..7f79e8c 100644 --- a/palacios/src/devices/ata.h +++ b/palacios/src/devices/ata.h @@ -17,6 +17,8 @@ * redistribute, and modify it as specified in the file "V3VEE_LICENSE". */ +#define MAX_MULT_SECTORS 255 + static void ata_identify_device(struct ide_drive * drive) { struct ide_drive_id * drive_id = (struct ide_drive_id *)(drive->data_buf); @@ -66,7 +68,8 @@ static void ata_identify_device(struct ide_drive * drive) { // Drive Capacity (48 bit LBA) drive_id->lba_capacity_2 = drive->hd_ops->get_capacity(drive->private_data); - drive_id->rw_multiples = 0x80ff; + // lower byte is the maximum multiple sector size... + drive_id->rw_multiples = 0x8000 | MAX_MULT_SECTORS; // words 64-70, 54-58 valid drive_id->field_valid = 0x0007; // DMA + pkg cmd valid @@ -94,7 +97,7 @@ static void ata_identify_device(struct ide_drive * drive) { } -static int ata_read(struct vm_device * dev, struct ide_channel * channel) { +static int ata_read(struct vm_device * dev, struct ide_channel * channel, uint8_t * dst, uint_t sect_cnt) { struct ide_drive * drive = get_selected_drive(channel); if (drive->hd_state.accessed == 0) { @@ -102,7 +105,7 @@ static int ata_read(struct vm_device * dev, struct ide_channel * channel) { drive->hd_state.accessed = 1; } - int ret = drive->hd_ops->read(drive->data_buf, 1, drive->current_lba, drive->private_data); + int ret = drive->hd_ops->read(dst, sect_cnt, drive->current_lba, drive->private_data); if (ret == -1) { PrintError("IDE: Error reading HD block (LBA=%p)\n", (void *)(addr_t)(drive->current_lba)); @@ -137,9 +140,6 @@ static int ata_read_sectors(struct vm_device * dev, struct ide_channel * channel lba_addr.buf[2] = drive->lba2; lba_addr.buf[3] = channel->drive_head.lba3; - PrintDebug("LBA Address %d\n", drive->lba0); - PrintDebug("sector_num %d\n", drive->sector_num); - if (lba_addr.addr + (sect_cnt * IDE_SECTOR_SIZE) > drive->hd_ops->get_capacity(drive->private_data)) { @@ -153,7 +153,7 @@ static int ata_read_sectors(struct vm_device * dev, struct ide_channel * channel drive->current_lba = lba_addr.addr; - if (ata_read(dev, channel) == -1) { + if (ata_read(dev, channel, drive->data_buf, 1) == -1) { PrintError("Could not read disk sector\n"); return -1; } diff --git a/palacios/src/devices/ide.c b/palacios/src/devices/ide.c index 197d903..1c48164 100644 --- a/palacios/src/devices/ide.c +++ b/palacios/src/devices/ide.c @@ -54,7 +54,6 @@ #define PRI_DEFAULT_DMA_PORT 0xc000 #define SEC_DEFAULT_DMA_PORT 0xc008 - #define DATA_BUFFER_SIZE 2048 static const char * ide_pri_port_strs[] = {"PRI_DATA", "PRI_FEATURES", "PRI_SECT_CNT", "PRI_SECT_NUM", @@ -112,6 +111,15 @@ struct ide_cd_state { struct ide_hd_state { int accessed; + + /* this is the multiple sector transfer size as configured for read/write multiple sectors*/ + uint_t mult_sector_num; + + /* This is the current op sector size: + * for multiple sector ops this equals mult_sector_num + * for standard ops this equals 1 + */ + uint_t cur_sector_num; }; struct ide_drive { @@ -353,7 +361,6 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) { uint32_t prd_entry_addr = channel->dma_prd_addr + (sizeof(struct ide_dma_prd) * channel->dma_tbl_index); int ret; - PrintDebug("PRD table address = %x\n", channel->dma_prd_addr); ret = read_guest_pa_memory(dev->vm, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry); @@ -372,11 +379,7 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) { return -1; } - channel->status.busy = 0; - channel->status.ready = 1; - channel->status.data_req = 0; - channel->status.error = 0; - channel->status.seek_complete = 1; + /* drive->irq_flags.io_dir = 1; @@ -386,9 +389,18 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) { // set DMA status - channel->dma_status.active = 0; - channel->dma_status.err = 1; - channel->dma_status.int_gen = 1; + + if (prd_entry.end_of_table) { + channel->dma_status.active = 0; + channel->dma_status.err = 0; + channel->dma_status.int_gen = 1; + + channel->status.busy = 0; + channel->status.ready = 1; + channel->status.data_req = 0; + channel->status.error = 0; + channel->status.seek_complete = 1; + } ide_raise_irq(dev, channel); @@ -470,6 +482,8 @@ static int write_dma_port(ushort_t port_offset, void * src, uint_t length, return -1; } } + + channel->dma_cmd.val &= 0x09; } break; @@ -629,6 +643,8 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de case 0x20: // Read Sectors with Retry case 0x21: // Read Sectors without Retry + drive->hd_state.cur_sector_num = 1; + if (ata_read_sectors(dev, channel) == -1) { PrintError("Error reading sectors\n"); return -1; @@ -636,11 +652,19 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de break; case 0x24: // Read Sectors Extended + drive->hd_state.cur_sector_num = 1; + if (ata_read_sectors_ext(dev, channel) == -1) { PrintError("Error reading extended sectors\n"); return -1; } break; + + case 0xc8: // Read DMA with retry + case 0xc9: // Read DMA + drive->hd_state.cur_sector_num = 1; + + break; case 0xef: // Set Features // Prior to this the features register has been written to. // This command tells the drive to check if the new value is supported (the value is drive specific) @@ -658,6 +682,37 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de ide_raise_irq(dev, channel); break; + case 0x91: // Initialize Drive Parameters + case 0x10: // recalibrate? + channel->status.error = 0; + channel->status.ready = 1; + channel->status.seek_complete = 1; + ide_raise_irq(dev, channel); + break; + case 0xc6: { // Set multiple mode (IDE Block mode) + // This makes the drive transfer multiple sectors before generating an interrupt + uint32_t tmp_sect_num = drive->sector_num; // GCC SUCKS + + if (tmp_sect_num > MAX_MULT_SECTORS) { + ide_abort_command(dev, channel); + break; + } + + if (drive->sector_count == 0) { + drive->hd_state.mult_sector_num= 1; + } else { + drive->hd_state.mult_sector_num = drive->sector_count; + } + + channel->status.ready = 1; + channel->status.error = 0; + + ide_raise_irq(dev, channel); + + break; + } + case 0xc4: // read multiple sectors + drive->hd_state.cur_sector_num = drive->hd_state.mult_sector_num; default: PrintError("Unimplemented IDE command (%x)\n", channel->cmd_reg); return -1; @@ -718,7 +773,7 @@ static int read_hd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st if ((data_offset == 0) && (drive->transfer_index > 0)) { drive->current_lba++; - if (ata_read(dev, channel) == -1) { + if (ata_read(dev, channel, drive->data_buf, 1) == -1) { PrintError("Could not read next disk sector\n"); return -1; } @@ -733,7 +788,15 @@ static int read_hd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st drive->transfer_index += length; - if ((drive->transfer_index % IDE_SECTOR_SIZE) == 0) { + + /* This is the trigger for interrupt injection. + * For read single sector commands we interrupt after every sector + * For multi sector reads we interrupt only at end of the cluster size (mult_sector_num) + * cur_sector_num is configured depending on the operation we are currently running + * We also trigger an interrupt if this is the last byte to transfer, regardless of sector count + */ + if (((drive->transfer_index % (IDE_SECTOR_SIZE * drive->hd_state.cur_sector_num)) == 0) || + (drive->transfer_index == drive->transfer_length)) { if (drive->transfer_index < drive->transfer_length) { // An increment is complete, but there is still more data to be transferred... PrintDebug("Integral Complete, still transferring more sectors\n"); @@ -1088,7 +1151,8 @@ static void init_channel(struct ide_channel * channel) { static int pci_config_update(struct pci_device * pci_dev, uint_t reg_num, int length) { - PrintDebug("Interupt register (Dev=%s), irq=%d\n", pci_dev->name, pci_dev->config_header.intr_line); + PrintDebug("PCI Config Update\n"); + PrintDebug("\t\tInterupt register (Dev=%s), irq=%d\n", pci_dev->name, pci_dev->config_header.intr_line); return 0; } @@ -1327,6 +1391,7 @@ int v3_ide_register_harddisk(struct vm_device * ide_dev, drive->drive_type = IDE_DISK; drive->hd_state.accessed = 0; + drive->hd_state.mult_sector_num = 1; drive->hd_ops = ops; diff --git a/palacios/src/devices/os_debug.c b/palacios/src/devices/os_debug.c index adf9b06..de30961 100644 --- a/palacios/src/devices/os_debug.c +++ b/palacios/src/devices/os_debug.c @@ -20,11 +20,12 @@ #include #include +#include #define BUF_SIZE 1024 #define DEBUG_PORT1 0xc0c0 - +#define DEBUG_HCALL 0xc0c0 struct debug_state { char debug_buf[BUF_SIZE]; @@ -47,11 +48,36 @@ static int handle_gen_write(ushort_t port, void * src, uint_t length, struct vm_ return length; } +static int handle_hcall(struct guest_info * info, uint_t hcall_id, void * priv_data) { + struct vm_device * dev = (struct vm_device *)priv_data; + struct debug_state * state = (struct debug_state *)dev->private_data; + + int msg_len = info->vm_regs.rcx; + addr_t msg_gpa = info->vm_regs.rbx; + + if (msg_len >= BUF_SIZE) { + PrintError("Console message too large for buffer (len=%d)\n", msg_len); + return -1; + } + + if (read_guest_pa_memory(info, msg_gpa, msg_len, (uchar_t *)state->debug_buf) != msg_len) { + PrintError("Could not read debug message\n"); + return -1; + } + + state->debug_buf[msg_len] = 0; + + PrintDebug("VM_CONSOLE>%s\n", state->debug_buf); + + return 0; +} + static int debug_init(struct vm_device * dev) { struct debug_state * state = (struct debug_state *)dev->private_data; v3_dev_hook_io(dev, DEBUG_PORT1, NULL, &handle_gen_write); + v3_register_hypercall(dev->vm, DEBUG_HCALL, handle_hcall, dev); state->debug_offset = 0; memset(state->debug_buf, 0, BUF_SIZE); diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c index 931bb99..f4311cb 100644 --- a/palacios/src/palacios/svm_handler.c +++ b/palacios/src/palacios/svm_handler.c @@ -73,10 +73,16 @@ int v3_handle_svm_exit(struct guest_info * info) { if ((info->intr_state.irq_pending == 1) && (guest_ctrl->guest_ctrl.V_IRQ == 0)) { // Interrupt was taken in the guest + if (exit_code == VMEXIT_EXCP14) { + PrintError("Page fault immeidately after interrupt injection (%d)\n", info->intr_state.irq_vector); + } + #ifdef DEBUG_INTERRUPTS PrintDebug("Interrupt %d taken by guest\n", info->intr_state.irq_vector); #endif if (!guest_ctrl->exit_int_info.valid) { + info->intr_state.irq_pending = 0; + // PrintDebug("Injecting Interrupt %d\n", info->intr_state.irq_vector); v3_injecting_intr(info, info->intr_state.irq_vector, EXTERNAL_IRQ); } else { #ifdef DEBUG_INTERRUPTS @@ -85,7 +91,7 @@ int v3_handle_svm_exit(struct guest_info * info) { } } - info->intr_state.irq_pending = 0; + // Disable printing io exits due to bochs debug messages @@ -360,8 +366,14 @@ int v3_handle_svm_exit(struct guest_info * info) { // Update the low level state + if (info->intr_state.irq_pending == 1) { + + guest_ctrl->guest_ctrl.V_IRQ = 1; + guest_ctrl->guest_ctrl.V_INTR_VECTOR = info->intr_state.irq_vector; + guest_ctrl->guest_ctrl.V_IGN_TPR = 1; + guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf; - if (v3_excp_pending(info)) { + } else if (v3_excp_pending(info)) { uint_t excp = v3_get_excp_number(info); guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION; diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index 75e7834..01fcaf7 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -281,7 +281,7 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) { struct vm_device * ide = NULL; - // struct vm_device * ram_cd = NULL; + //struct vm_device * ram_cd = NULL; struct vm_device * ram_hd = NULL; struct vm_device * pci = v3_create_pci(); struct vm_device * nvram = v3_create_nvram(); @@ -305,9 +305,9 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ if (use_ramdisk) { PrintDebug("Creating Ramdisk\n"); - // ram_cd = v3_create_ram_cd(ide, 0, 0, - // (addr_t)(config_ptr->ramdisk), - // config_ptr->ramdisk_size); + //ram_cd = v3_create_ram_cd(ide, 0, 0, + // (addr_t)(config_ptr->ramdisk), + // config_ptr->ramdisk_size); ram_hd = v3_create_ram_hd(ide, 0, 0, (addr_t)(config_ptr->ramdisk), config_ptr->ramdisk_size); @@ -338,7 +338,7 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ v3_attach_device(info, ide); if (use_ramdisk) { - // v3_attach_device(info, ram_cd); + // v3_attach_device(info, ram_cd); v3_attach_device(info, ram_hd); }