Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177852695
D57264.1795433608.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None
D57264.1795433608.diff
View Options
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -1834,29 +1834,39 @@
{
struct region_descriptor efi_idt;
struct gate_descriptor *gpf_descr;
+ int i;
sidt(&wrmsr_early_safe_orig_efi_idt);
efi_idt.rd_limit = 32 * sizeof(idt0[0]);
efi_idt.rd_base = (uintptr_t)idt0;
lidt(&efi_idt);
- gpf_descr = &idt0[IDT_GP];
- gpf_descr->gd_looffset = (uintptr_t)wrmsr_early_safe_gp_handler;
- gpf_descr->gd_hioffset = (uintptr_t)wrmsr_early_safe_gp_handler >> 16;
- gpf_descr->gd_selector = rcs();
- gpf_descr->gd_type = SDT_SYSTGT;
- gpf_descr->gd_p = 1;
+ /*
+ * Setup handler for all possible exceptions. This is
+ * somewhat rough because some exceptions do not push error
+ * code, but the only documented one (#GP) does.
+ */
+ for (i = 0; i < 32; i++) {
+ gpf_descr = &idt0[i];
+ gpf_descr->gd_looffset =
+ (uintptr_t)wrmsr_early_safe_gp_handler;
+ gpf_descr->gd_hioffset =
+ (uintptr_t)wrmsr_early_safe_gp_handler >> 16;
+ gpf_descr->gd_selector = rcs();
+ gpf_descr->gd_type = SDT_SYSTGT;
+ gpf_descr->gd_p = 1;
+ }
}
void
wrmsr_early_safe_end(void)
{
- struct gate_descriptor *gpf_descr;
+ int i;
lidt(&wrmsr_early_safe_orig_efi_idt);
- gpf_descr = &idt0[IDT_GP];
- memset_early(gpf_descr, 0, sizeof(*gpf_descr));
+ for (i = 0; i < 32; i++)
+ memset_early(&idt0[i], 0, sizeof(idt0[0]));
}
#ifdef KDB
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Nov 23, 11:33 AM (22 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41929477
Default Alt Text
D57264.1795433608.diff (1 KB)
Attached To
Mode
D57264: x86: for wrmsr_early_safe(), catch all exceptions, not only #GP
Attached
Detach File
Event Timeline