Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 06/06: [HAL] Add APIC hals to setup and livecd
by Timo Kreuzer 17 Jun '21

17 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ee09256de7ff0f57d19f… commit 5ee09256de7ff0f57d19f704e10b49e1485e2580 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jun 3 11:53:07 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jun 17 23:27:44 2021 +0200 [HAL] Add APIC hals to setup and livecd --- boot/bootdata/livecd.ini | 7 +++++++ boot/bootdata/txtsetup.sif | 12 ++++++++++++ hal/halx86/CMakeLists.txt | 1 + hal/halx86/apic/halapic.rc | 5 +++++ 4 files changed, 25 insertions(+) diff --git a/boot/bootdata/livecd.ini b/boot/bootdata/livecd.ini index d4b37b646c9..3c2ddfb9fa1 100644 --- a/boot/bootdata/livecd.ini +++ b/boot/bootdata/livecd.ini @@ -28,6 +28,7 @@ TimeText=Seconds until highlighted choice will be started automatically: LiveCD="LiveCD" LiveCD_Debug="LiveCD (Debug)" LiveCD_VBoxDebug="LiveCD (VBox Debug)" +LiveCD_Aacpi="LiveCD APIC ACPI (Debug)" LiveCD_Screen="LiveCD (Screen)" LiveCD_LogFile="LiveCD (Log file)" @@ -46,6 +47,12 @@ BootType=Windows2003 SystemPath=\reactos Options=/DEBUG /DEBUGPORT=VBOX /SOS /MININT +[LiveCD_Aacpi] +BootType=Windows2003 +SystemPath=\reactos +Hal=HALAACPI.DLL +Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT + [LiveCD_Screen] BootType=Windows2003 SystemPath=\reactos diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 6e2c3f69452..63e0df890cc 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -229,6 +229,8 @@ pci_up = "Standard PC Uniprocessor" ;pci_mp = "Standard PC Multiprocessor" acpi_up = "ACPI PC Uniprocessor" ;acpi_mp = "ACPI PC Multiprocessor" +apic_up = "Standard APIC PC Uniprocessor" +aacpi_up = "ACPI APIC PC Uniprocessor" xbox = "Original Xbox (x86 based)" pc98_up = "NEC PC-98 Uniprocessor" @@ -241,6 +243,8 @@ pci_up = "PC UP" ;pci_mp = "PC MP" acpi_up = "ACPI UP" ;acpi_mp = "ACPI MP" +apic_up = "APIC UP" +aacpi_up = "AAPIC UP" xbox = "Xbox" pc98_up = "NEC PC-98 UP" @@ -263,6 +267,14 @@ halacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 ;ntkrnlmp.exe = 1,,,,,,,2,,,ntoskrnl.exe,1,2 ;halacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 +[Files.apic_up] +ntoskrnl.exe = 1,,,,,,,2,,,,1,2 +halapic.dll = 1,,,,,,,2,,,hal.dll,1,2 + +[Files.aacpi_up] +ntoskrnl.exe = 1,,,,,,,2,,,,1,2 +halaacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 + [Files.xbox] ntoskrnl.exe = 1,,,,,,,2,,,,1,2 halxbox.dll = 1,,,,,,,2,,,hal.dll,1,2 diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index 0b1b18be370..5375b354c7f 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -61,6 +61,7 @@ if(ARCH STREQUAL "i386") add_hal(hal SOURCES pic/halpic.rc COMPONENTS generic legacy up pic) add_hal(halacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up pic) add_hal(halaacpi SOURCES apic/halaacpi.rc COMPONENTS generic acpi up apic) + add_hal(halapic SOURCES apic/halapic.rc COMPONENTS generic legacy up apic) add_hal(halxbox SOURCES xbox/halxbox.rc COMPONENTS xbox up) add_hal(halpc98 SOURCES pc98/halpc98.rc COMPONENTS pc98 up) diff --git a/hal/halx86/apic/halapic.rc b/hal/halx86/apic/halapic.rc new file mode 100644 index 00000000000..a67e13b9b59 --- /dev/null +++ b/hal/halx86/apic/halapic.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "X86 Uniprocessor Hardware Abstraction Layer" +#define REACTOS_STR_INTERNAL_NAME "halapic" +#define REACTOS_STR_ORIGINAL_FILENAME "halapic.dll" +#include <reactos/version.rc>

1 0

[reactos] 05/06: [HAL:APIC] Fix interrupt assignment
by Timo Kreuzer 17 Jun '21

17 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64e52088d1dd73f3540c6… commit 64e52088d1dd73f3540c6f644f63a54e2ded76ca Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jun 5 15:41:49 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jun 17 23:27:44 2021 +0200 [HAL:APIC] Fix interrupt assignment This is probably not how it is supposed to work, but the results are somewhat similar to what Windows has. --- hal/halx86/acpi/busemul.c | 23 ++-------- hal/halx86/apic/apic.c | 100 ++++++++++++++++++++++++++++------------- hal/halx86/apic/apicp.h | 44 ++++++++++++------ hal/halx86/include/bus.h | 12 +++-- hal/halx86/legacy/bus/sysbus.c | 29 ------------ hal/halx86/pic/pic.c | 29 ++++++++++++ 6 files changed, 139 insertions(+), 98 deletions(-) diff --git a/hal/halx86/acpi/busemul.c b/hal/halx86/acpi/busemul.c index e26600a984b..eb45c450e36 100644 --- a/hal/halx86/acpi/busemul.c +++ b/hal/halx86/acpi/busemul.c @@ -85,20 +85,6 @@ HalpTranslateBusAddress(IN INTERFACE_TYPE InterfaceType, return TRUE; } -ULONG -NTAPI -HalpGetSystemInterruptVector_Acpi(IN ULONG BusNumber, - IN ULONG BusInterruptLevel, - IN ULONG BusInterruptVector, - OUT PKIRQL Irql, - OUT PKAFFINITY Affinity) -{ - UCHAR Vector = IRQ2VECTOR((UCHAR)BusInterruptLevel); - *Irql = VECTOR2IRQL(Vector); - *Affinity = 0xFFFFFFFF; - return Vector; -} - BOOLEAN NTAPI HalpFindBusAddressTranslation(IN PHYSICAL_ADDRESS BusAddress, @@ -254,11 +240,10 @@ HalGetInterruptVector(IN INTERFACE_TYPE InterfaceType, OUT PKAFFINITY Affinity) { /* Call the system bus translator */ - return HalpGetSystemInterruptVector_Acpi(BusNumber, - BusInterruptLevel, - BusInterruptVector, - Irql, - Affinity); + return HalpGetRootInterruptVector(BusInterruptLevel, + BusInterruptVector, + Irql, + Affinity); } /* diff --git a/hal/halx86/apic/apic.c b/hal/halx86/apic/apic.c index 25bd4e4b4c3..eae012d61b2 100644 --- a/hal/halx86/apic/apic.c +++ b/hal/halx86/apic/apic.c @@ -4,9 +4,11 @@ * FILE: hal/halx86/apic/apic.c * PURPOSE: HAL APIC Management and Control Code * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) - * REFERENCES: http://www.joseflores.com/docs/ExploringIrql.html + * REFERENCES: https://web.archive.org/web/20190407074221/http://www.joseflores.com/docs/E… * http://www.codeproject.com/KB/system/soviet_kernel_hack.aspx * http://bbs.unixmap.net/thread-2022-1-1.html + * https://www.codemachine.com/article_interruptdispatching.html + * https://www.osronline.com/article.cfm%5Earticle=211.htm */ /* INCLUDES *******************************************************************/ @@ -17,7 +19,7 @@ #include <debug.h> #ifndef _M_AMD64 -//#define APIC_LAZY_IRQL //FIXME: Disabled due to bug. +#define APIC_LAZY_IRQL #endif /* GLOBALS ********************************************************************/ @@ -329,30 +331,13 @@ ApicInitializeLocalApic(ULONG Cpu) UCHAR NTAPI HalpAllocateSystemInterrupt( - IN UCHAR Irq, - IN KIRQL Irql) + _In_ UCHAR Irq, + _In_ UCHAR Vector) { IOAPIC_REDIRECTION_REGISTER ReDirReg; - IN UCHAR Vector; - - /* Start with lowest vector */ - Vector = IrqlToTpr(Irql) & 0xF0; - /* Find an empty vector */ - while (HalpVectorToIndex[Vector] != APIC_FREE_VECTOR) - { - Vector++; - - /* Check if we went over the edge */ - if (TprToIrql(Vector) > Irql) - { - /* Nothing free, return failure */ - return 0; - } - } - - /* Save irq in the table */ - HalpVectorToIndex[Vector] = Irq; + ASSERT(Irq < 24); + ASSERT(HalpVectorToIndex[Vector] == APIC_FREE_VECTOR); /* Setup a redirection entry */ ReDirReg.Vector = Vector; @@ -369,6 +354,68 @@ HalpAllocateSystemInterrupt( /* Initialize entry */ ApicWriteIORedirectionEntry(Irq, ReDirReg); + /* Save irq in the table */ + HalpVectorToIndex[Vector] = Irq; + + return Vector; +} + +ULONG +NTAPI +HalpGetRootInterruptVector( + _In_ ULONG BusInterruptLevel, + _In_ ULONG BusInterruptVector, + _Out_ PKIRQL OutIrql, + _Out_ PKAFFINITY OutAffinity) +{ + UCHAR Vector; + KIRQL Irql; + + /* Get the vector currently registered */ + Vector = HalpIrqToVector(BusInterruptLevel); + + /* Check if it's used */ + if (Vector != 0xFF) + { + /* Calculate IRQL */ + NT_ASSERT(HalpVectorToIndex[Vector] == BusInterruptLevel); + *OutIrql = HalpVectorToIrql(Vector); + } + else + { + ULONG Offset; + + /* Outer loop to find alternative slots, when all IRQLs are in use */ + for (Offset = 0; Offset < 15; Offset++) + { + /* Loop allowed IRQL range */ + for (Irql = CLOCK_LEVEL - 1; Irql >= CMCI_LEVEL; Irql--) + { + /* Calculate the vactor */ + Vector = IrqlToTpr(Irql) + Offset; + + /* Check if the vector is free */ + if (HalpVectorToIrq(Vector) == APIC_FREE_VECTOR) + { + /* Found one, allocate the interrupt */ + Vector = HalpAllocateSystemInterrupt(BusInterruptLevel, Vector); + *OutIrql = Irql; + goto Exit; + } + } + } + + DPRINT1("Failed to get an interrupt vector for IRQ %lu\n", BusInterruptLevel); + *OutAffinity = 0; + *OutIrql = 0; + return 0; + } + +Exit: + + *OutAffinity = HalpDefaultInterruptAffinity; + ASSERT(HalpDefaultInterruptAffinity); + return Vector; } @@ -416,13 +463,6 @@ ApicInitializeIOApic(VOID) HalpVectorToIndex[Vector] = APIC_FREE_VECTOR; } - // HACK: Allocate all IRQs, should rather do that on demand - for (Index = 0; Index <= 15; Index++) - { - /* Map the IRQs to IRQLs like with the PIC */ - HalpAllocateSystemInterrupt(Index, 27 - Index); - } - /* Enable the timer interrupt */ ReDirReg.Vector = APIC_CLOCK_VECTOR; ReDirReg.DeliveryMode = APIC_MT_Fixed; diff --git a/hal/halx86/apic/apicp.h b/hal/halx86/apic/apicp.h index d3e1ece84aa..bd06a3a0cf6 100644 --- a/hal/halx86/apic/apicp.h +++ b/hal/halx86/apic/apicp.h @@ -11,7 +11,23 @@ #ifdef _M_AMD64 #define LOCAL_APIC_BASE 0xFFFFFFFFFFFE0000ULL #define IOAPIC_BASE 0xFFFFFFFFFFFE1000ULL - #define APIC_SPURIOUS_VECTOR 0x3f + + /* Vectors */ + #define APC_VECTOR 0x1F // IRQL 01 (APC_LEVEL) - KiApcInterrupt + #define DISPATCH_VECTOR 0x2F // IRQL 02 (DISPATCH_LEVEL) - KiDpcInterrupt + #define CMCI_VECTOR 0x35 // IRQL 05 (CMCI_LEVEL) - HalpInterruptCmciService + #define APIC_CLOCK_VECTOR 0xD1 // IRQL 13 (CLOCK_LEVEL), IRQ 8 - HalpTimerClockInterrupt + #define CLOCK_IPI_VECTOR 0xD2 // IRQL 13 (CLOCK_LEVEL) - HalpTimerClockIpiRoutine + #define REBOOT_VECTOR 0xD7 // IRQL 15 (PROFILE_LEVEL) - HalpInterruptRebootService + #define STUB_VECTOR 0xD8 // IRQL 15 (PROFILE_LEVEL) - HalpInterruptStubService + #define APIC_SPURIOUS_VECTOR 0xDF // IRQL 13 (CLOCK_LEVEL) - HalpInterruptSpuriousService + #define APIC_IPI_VECTOR 0xE1 // IRQL 14 (IPI_LEVEL) - KiIpiInterrupt + #define APIC_ERROR_VECTOR 0xE2 // IRQL 14 (IPI_LEVEL) - HalpInterruptLocalErrorService + #define POWERFAIL_VECTOR 0xE3 // IRQL 14 (POWER_LEVEL) : HalpInterruptDeferredRecoveryService + #define APIC_PROFILE_VECTOR 0xFD // IRQL 15 (PROFILE_LEVEL) - HalpTimerProfileInterrupt + #define APIC_PERF_VECTOR 0xFE // IRQL 15 (PROFILE_LEVEL) - HalpPerfInterrupt + #define APIC_NMI_VECTOR 0xFF + #define IrqlToTpr(Irql) (Irql << 4) #define IrqlToSoftVector(Irql) ((Irql << 4)|0xf) #define TprToIrql(Tpr) ((KIRQL)(Tpr >> 4)) @@ -19,7 +35,21 @@ #else #define LOCAL_APIC_BASE 0xFFFE0000 #define IOAPIC_BASE 0xFFFE1000 + + /* Vectors */ #define APIC_SPURIOUS_VECTOR 0x1f + #define APC_VECTOR 0x3D // IRQL 01 + #define DISPATCH_VECTOR 0x41 // IRQL 02 + #define APIC_GENERIC_VECTOR 0xC1 // IRQL 27 + #define APIC_CLOCK_VECTOR 0xD1 // IRQL 28 + #define APIC_SYNCH_VECTOR 0xD1 // IRQL 28 + #define APIC_IPI_VECTOR 0xE1 // IRQL 29 + #define APIC_ERROR_VECTOR 0xE3 + #define POWERFAIL_VECTOR 0xEF // IRQL 30 + #define APIC_PROFILE_VECTOR 0xFD // IRQL 31 + #define APIC_PERF_VECTOR 0xFE + #define APIC_NMI_VECTOR 0xFF + #define IrqlToTpr(Irql) (HalpIRQLtoTPR[Irql]) #define IrqlToSoftVector(Irql) IrqlToTpr(Irql) #define TprToIrql(Tpr) (HalVectorToIRQL[Tpr >> 4]) @@ -42,18 +72,6 @@ #define IMCR_PIC_DIRECT 0x00 #define IMCR_PIC_VIA_APIC 0x01 -#define ZERO_VECTOR 0x00 // IRQL 00 -#define APC_VECTOR 0x3D // IRQL 01 -#define DISPATCH_VECTOR 0x41 // IRQL 02 -#define APIC_GENERIC_VECTOR 0xC1 // IRQL 27 -#define APIC_CLOCK_VECTOR 0xD1 // IRQL 28 -#define APIC_SYNCH_VECTOR 0xD1 // IRQL 28 -#define APIC_IPI_VECTOR 0xE1 // IRQL 29 -#define APIC_ERROR_VECTOR 0xE3 -#define POWERFAIL_VECTOR 0xEF // IRQL 30 -#define APIC_PROFILE_VECTOR 0xFD // IRQL 31 -#define APIC_PERF_VECTOR 0xFE -#define APIC_NMI_VECTOR 0xFF /* APIC Register Address Map */ #define APIC_ID 0x0020 /* Local APIC ID Register (R/W) */ diff --git a/hal/halx86/include/bus.h b/hal/halx86/include/bus.h index 443d649fc9c..75a106a4328 100644 --- a/hal/halx86/include/bus.h +++ b/hal/halx86/include/bus.h @@ -400,13 +400,11 @@ HalpAssignPCISlotResources( ULONG NTAPI -HalpGetSystemInterruptVector_Acpi( - ULONG BusNumber, - ULONG BusInterruptLevel, - ULONG BusInterruptVector, - PKIRQL Irql, - PKAFFINITY Affinity -); +HalpGetRootInterruptVector( + _In_ ULONG BusInterruptLevel, + _In_ ULONG BusInterruptVector, + _Out_ PKIRQL Irql, + _Out_ PKAFFINITY Affinity); ULONG NTAPI diff --git a/hal/halx86/legacy/bus/sysbus.c b/hal/halx86/legacy/bus/sysbus.c index baaecee51e8..56d286c3464 100644 --- a/hal/halx86/legacy/bus/sysbus.c +++ b/hal/halx86/legacy/bus/sysbus.c @@ -110,35 +110,6 @@ HalpTranslateSystemBusAddress(IN PBUS_HANDLER BusHandler, return FALSE; } -ULONG -NTAPI -HalpGetRootInterruptVector(IN ULONG BusInterruptLevel, - IN ULONG BusInterruptVector, - OUT PKIRQL Irql, - OUT PKAFFINITY Affinity) -{ - UCHAR SystemVector; - - /* Validate the IRQ */ - if (BusInterruptLevel > 23) - { - /* Invalid vector */ - DPRINT1("IRQ %lx is too high!\n", BusInterruptLevel); - return 0; - } - - /* Get the system vector */ - SystemVector = HalpIrqToVector((UCHAR)BusInterruptLevel); - - /* Return the IRQL and affinity */ - *Irql = HalpVectorToIrql(SystemVector); - *Affinity = HalpDefaultInterruptAffinity; - ASSERT(HalpDefaultInterruptAffinity); - - /* Return the vector */ - return SystemVector; -} - ULONG NTAPI HalpGetSystemInterruptVector(IN PBUS_HANDLER BusHandler, diff --git a/hal/halx86/pic/pic.c b/hal/halx86/pic/pic.c index f46a72bc80f..e0b46ce7056 100644 --- a/hal/halx86/pic/pic.c +++ b/hal/halx86/pic/pic.c @@ -1233,6 +1233,35 @@ HalpDispatchInterrupt2(VOID) return NULL; } +ULONG +NTAPI +HalpGetRootInterruptVector(IN ULONG BusInterruptLevel, + IN ULONG BusInterruptVector, + OUT PKIRQL Irql, + OUT PKAFFINITY Affinity) +{ + UCHAR SystemVector; + + /* Validate the IRQ */ + if (BusInterruptLevel > 23) + { + /* Invalid vector */ + DPRINT1("IRQ %lx is too high!\n", BusInterruptLevel); + return 0; + } + + /* Get the system vector */ + SystemVector = HalpIrqToVector((UCHAR)BusInterruptLevel); + + /* Return the IRQL and affinity */ + *Irql = HalpVectorToIrql(SystemVector); + *Affinity = HalpDefaultInterruptAffinity; + ASSERT(HalpDefaultInterruptAffinity); + + /* Return the vector */ + return SystemVector; +} + #else /* _MINIHAL_ */ KIRQL

1 0

[reactos] 04/06: [HAL:APIC] Remove obsolete hacks
by Timo Kreuzer 17 Jun '21

17 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=235d7472ba424351d2b1e… commit 235d7472ba424351d2b1ea17a0ad7281a1f16b71 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jun 3 19:29:25 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jun 17 23:27:44 2021 +0200 [HAL:APIC] Remove obsolete hacks These hacks were used to work around broken VBox. VBox works fine without the hacks these days. --- hal/halx86/apic/apic.c | 11 +---------- hal/halx86/apic/apictrap.S | 28 ---------------------------- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/hal/halx86/apic/apic.c b/hal/halx86/apic/apic.c index 65a6d2e4d20..25bd4e4b4c3 100644 --- a/hal/halx86/apic/apic.c +++ b/hal/halx86/apic/apic.c @@ -16,8 +16,6 @@ #define NDEBUG #include <debug.h> -void __cdecl HackEoi(void); - #ifndef _M_AMD64 //#define APIC_LAZY_IRQL //FIXME: Disabled due to bug. #endif @@ -155,8 +153,7 @@ FORCEINLINE VOID ApicSendEOI(void) { - //ApicWrite(APIC_EOI, 0); - HackEoi(); + ApicWrite(APIC_EOI, 0); } FORCEINLINE @@ -174,15 +171,9 @@ ApicGetCurrentIrql(VOID) #ifdef _M_AMD64 return (KIRQL)__readcr8(); #elif defined(APIC_LAZY_IRQL) - // HACK: some magic to Sync VBox's APIC registers - ApicRead(APIC_VER); - /* Return the field in the PCR */ return (KIRQL)__readfsbyte(FIELD_OFFSET(KPCR, Irql)); #else - // HACK: some magic to Sync VBox's APIC registers - ApicRead(APIC_VER); - /* Read the TPR and convert it to an IRQL */ return TprToIrql(ApicRead(APIC_TPR)); #endif diff --git a/hal/halx86/apic/apictrap.S b/hal/halx86/apic/apictrap.S index 52f1dabec0f..381f5492023 100644 --- a/hal/halx86/apic/apictrap.S +++ b/hal/halx86/apic/apictrap.S @@ -22,23 +22,6 @@ PUBLIC ApicSpuriousService ApicSpuriousService: iretq -PUBLIC HackEoi -HackEoi: - xor rax, rax - mov ax, ss - push rax - push rsp - pushfq - mov ax, cs - push rax - lea rax, HackEoiReturn[rip] - push rax - mov dword ptr [HEX(0FFFFFFFFFFFE00B0)], 0 - iretq -HackEoiReturn: - add rsp, 8 // esp was changed by the iret to the pushed value - ret - #else #include <ks386.inc> #include <internal/i386/asmmacro.S> @@ -54,17 +37,6 @@ PUBLIC _ApicSpuriousService _ApicSpuriousService: iret -// VBox APIC needs an iret more or less directly following the EOI -PUBLIC _HackEoi -_HackEoi: - pushfd - push cs - push offset OnlyOnePersonKnowsHowToHackAroundVBoxBugsAndThatIsNotYou // !! - mov dword ptr ds:[HEX(0FFFE00B0)], 0 - iretd -OnlyOnePersonKnowsHowToHackAroundVBoxBugsAndThatIsNotYou: - ret - #endif

1 0

[reactos] 03/06: [HAL:APIC] Code fixes
by Timo Kreuzer 17 Jun '21

17 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7a149fcec7f3626e671f… commit b7a149fcec7f3626e671f1da658589f8c219503f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jun 5 15:39:22 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jun 17 23:27:44 2021 +0200 [HAL:APIC] Code fixes * Fix some broken code * Add some ASSERTs * Use ApicWriteIORedirectionEntry where appropriate * Use KeQueryInterruptHandler/KeRegisterInterruptHandler to save/restore the old handler instead of saving the KIDTENTRY * Move HalpProfileInterruptHandler to apictimer.c and implement it * Use READ/WRITE_REGISTER macros * Add some symbolic names --- hal/halx86/apic/apic.c | 40 +++++++++++++++++++++++----------------- hal/halx86/apic/apicp.h | 8 ++++++-- hal/halx86/apic/apictimer.c | 7 +++++++ hal/halx86/apic/rtctimer.c | 7 ------- hal/halx86/apic/tsc.c | 10 ++++------ 5 files changed, 40 insertions(+), 32 deletions(-) diff --git a/hal/halx86/apic/apic.c b/hal/halx86/apic/apic.c index 2811cc45535..65a6d2e4d20 100644 --- a/hal/halx86/apic/apic.c +++ b/hal/halx86/apic/apic.c @@ -94,8 +94,9 @@ ULONG IOApicRead(UCHAR Register) { /* Select the register, then do the read */ - *(volatile UCHAR *)(IOAPIC_BASE + IOAPIC_IOREGSEL) = Register; - return *(volatile ULONG *)(IOAPIC_BASE + IOAPIC_IOWIN); + ASSERT(Register <= 0x3F); + WRITE_REGISTER_ULONG((PULONG)(IOAPIC_BASE + IOAPIC_IOREGSEL), Register); + return READ_REGISTER_ULONG((PULONG)(IOAPIC_BASE + IOAPIC_IOWIN)); } FORCEINLINE @@ -103,8 +104,9 @@ VOID IOApicWrite(UCHAR Register, ULONG Value) { /* Select the register, then do the write */ - *(volatile UCHAR *)(IOAPIC_BASE + IOAPIC_IOREGSEL) = Register; - *(volatile ULONG *)(IOAPIC_BASE + IOAPIC_IOWIN) = Value; + ASSERT(Register <= 0x3F); + WRITE_REGISTER_ULONG((PULONG)(IOAPIC_BASE + IOAPIC_IOREGSEL), Register); + WRITE_REGISTER_ULONG((PULONG)(IOAPIC_BASE + IOAPIC_IOWIN), Value); } FORCEINLINE @@ -113,6 +115,7 @@ ApicWriteIORedirectionEntry( UCHAR Index, IOAPIC_REDIRECTION_REGISTER ReDirReg) { + ASSERT(Index < APIC_MAX_IRQ); IOApicWrite(IOAPIC_REDTBL + 2 * Index, ReDirReg.Long0); IOApicWrite(IOAPIC_REDTBL + 2 * Index + 1, ReDirReg.Long1); } @@ -124,6 +127,7 @@ ApicReadIORedirectionEntry( { IOAPIC_REDIRECTION_REGISTER ReDirReg; + ASSERT(Index < APIC_MAX_IRQ); ReDirReg.Long0 = IOApicRead(IOAPIC_REDTBL + 2 * Index); ReDirReg.Long1 = IOApicRead(IOAPIC_REDTBL + 2 * Index + 1); @@ -344,7 +348,7 @@ HalpAllocateSystemInterrupt( Vector = IrqlToTpr(Irql) & 0xF0; /* Find an empty vector */ - while (HalpVectorToIndex[Vector] != 0xFF) + while (HalpVectorToIndex[Vector] != APIC_FREE_VECTOR) { Vector++; @@ -372,8 +376,7 @@ HalpAllocateSystemInterrupt( ReDirReg.Destination = 0; /* Initialize entry */ - IOApicWrite(IOAPIC_REDTBL + 2 * Irq, ReDirReg.Long0); - IOApicWrite(IOAPIC_REDTBL + 2 * Irq + 1, ReDirReg.Long1); + ApicWriteIORedirectionEntry(Irq, ReDirReg); return Vector; } @@ -410,17 +413,16 @@ ApicInitializeIOApic(VOID) ReDirReg.Destination = 0; /* Loop all table entries */ - for (Index = 0; Index < 24; Index++) + for (Index = 0; Index < APIC_MAX_IRQ; Index++) { /* Initialize entry */ - IOApicWrite(IOAPIC_REDTBL + 2 * Index, ReDirReg.Long0); - IOApicWrite(IOAPIC_REDTBL + 2 * Index + 1, ReDirReg.Long1); + ApicWriteIORedirectionEntry(Index, ReDirReg); } /* Init the vactor to index table */ for (Vector = 0; Vector <= 255; Vector++) { - HalpVectorToIndex[Vector] = 0xFF; + HalpVectorToIndex[Vector] = APIC_FREE_VECTOR; } // HACK: Allocate all IRQs, should rather do that on demand @@ -437,7 +439,7 @@ ApicInitializeIOApic(VOID) ReDirReg.TriggerMode = APIC_TGM_Edge; ReDirReg.Mask = 0; ReDirReg.Destination = ApicRead(APIC_ID); - IOApicWrite(IOAPIC_REDTBL + 2 * APIC_CLOCK_INDEX, ReDirReg.Long0); + ApicWriteIORedirectionEntry(APIC_CLOCK_INDEX, ReDirReg); } VOID @@ -457,9 +459,10 @@ HalpInitializePICs(IN BOOLEAN EnableInterrupts) ApicInitializeIOApic(); /* Manually reserve some vectors */ + HalpVectorToIndex[APC_VECTOR] = APIC_RESERVED_VECTOR; + HalpVectorToIndex[DISPATCH_VECTOR] = APIC_RESERVED_VECTOR; HalpVectorToIndex[APIC_CLOCK_VECTOR] = 8; - HalpVectorToIndex[APC_VECTOR] = 99; - HalpVectorToIndex[DISPATCH_VECTOR] = 99; + HalpVectorToIndex[APIC_SPURIOUS_VECTOR] = APIC_RESERVED_VECTOR; /* Set interrupt handlers in the IDT */ KeRegisterInterruptHandler(APIC_CLOCK_VECTOR, HalpClockInterrupt); @@ -669,7 +672,7 @@ HalDisableSystemInterrupt( ReDirReg.Mask = 1; /* Write back lower dword */ - IOApicWrite(IOAPIC_REDTBL + 2 * Irql, ReDirReg.Long0); + IOApicWrite(IOAPIC_REDTBL + 2 * Index, ReDirReg.Long0); } #ifndef _M_AMD64 @@ -704,8 +707,8 @@ HalBeginSystemInterrupt( /* Get the irq for this vector */ Index = HalpVectorToIndex[Vector]; - /* Check if its valid */ - if (Index != 0xff) + /* Check if it's valid */ + if (Index < APIC_MAX_IRQ) { /* Read the I/O redirection entry */ RedirReg = ApicReadIORedirectionEntry(Index); @@ -715,6 +718,9 @@ HalBeginSystemInterrupt( } else { + /* This should be a reserved vector! */ + ASSERT(Index == APIC_RESERVED_VECTOR); + /* Re-request the interrupt to be handled later */ ApicRequestInterrupt(Vector, APIC_TGM_Edge); } diff --git a/hal/halx86/apic/apicp.h b/hal/halx86/apic/apicp.h index ee8eec3d665..d3e1ece84aa 100644 --- a/hal/halx86/apic/apicp.h +++ b/hal/halx86/apic/apicp.h @@ -25,6 +25,10 @@ #define TprToIrql(Tpr) (HalVectorToIRQL[Tpr >> 4]) #endif +#define APIC_MAX_IRQ 24 +#define APIC_FREE_VECTOR 0xFF +#define APIC_RESERVED_VECTOR 0xFE + /* The IMCR is supported by two read/writable or write-only I/O ports, 22h and 23h, which receive address and data respectively. To access the IMCR, write a value of 70h to I/O port 22h, which selects the IMCR. @@ -284,14 +288,14 @@ FORCEINLINE ULONG ApicRead(ULONG Offset) { - return *(volatile ULONG *)(APIC_BASE + Offset); + return READ_REGISTER_ULONG((PULONG)(APIC_BASE + Offset)); } FORCEINLINE VOID ApicWrite(ULONG Offset, ULONG Value) { - *(volatile ULONG *)(APIC_BASE + Offset) = Value; + WRITE_REGISTER_ULONG((PULONG)(APIC_BASE + Offset), Value); } VOID diff --git a/hal/halx86/apic/apictimer.c b/hal/halx86/apic/apictimer.c index 15f87a58499..ec1e0f1ecef 100644 --- a/hal/halx86/apic/apictimer.c +++ b/hal/halx86/apic/apictimer.c @@ -61,6 +61,13 @@ ApicInitializeTimer(ULONG Cpu) // KeSetTimeIncrement } +VOID +FASTCALL +HalpProfileInterruptHandler(_In_ PKTRAP_FRAME TrapFrame) +{ + KeProfileInterruptWithSource(TrapFrame, ProfileTime); +} + /* PUBLIC FUNCTIONS ***********************************************************/ diff --git a/hal/halx86/apic/rtctimer.c b/hal/halx86/apic/rtctimer.c index 817e6e2de88..2d30ad55c43 100644 --- a/hal/halx86/apic/rtctimer.c +++ b/hal/halx86/apic/rtctimer.c @@ -167,13 +167,6 @@ HalpClockInterruptHandler(IN PKTRAP_FRAME TrapFrame) KeUpdateSystemTime(TrapFrame, LastIncrement, Irql); } -VOID -FASTCALL -HalpProfileInterruptHandler(IN PKTRAP_FRAME TrapFrame) -{ - __debugbreak(); -} - ULONG NTAPI HalSetTimeIncrement(IN ULONG Increment) diff --git a/hal/halx86/apic/tsc.c b/hal/halx86/apic/tsc.c index ce06b2f6d8e..1ff881206fd 100644 --- a/hal/halx86/apic/tsc.c +++ b/hal/halx86/apic/tsc.c @@ -55,8 +55,7 @@ NTAPI HalpInitializeTsc(VOID) { ULONG_PTR Flags; - KIDTENTRY OldIdtEntry, *IdtPointer; - PKPCR Pcr = KeGetPcr(); + PVOID PreviousHandler; UCHAR RegisterA, RegisterB; /* Check if the CPU supports RDTSC */ @@ -79,8 +78,7 @@ HalpInitializeTsc(VOID) HalpWriteCmos(RTC_REGISTER_A, RegisterA); /* Save old IDT entry */ - IdtPointer = KiGetIdtEntry(Pcr, HalpRtcClockVector); - OldIdtEntry = *IdtPointer; + PreviousHandler = KeQueryInterruptHandler(HalpRtcClockVector); /* Set the calibration ISR */ KeRegisterInterruptHandler(HalpRtcClockVector, TscCalibrationISR); @@ -105,8 +103,8 @@ HalpInitializeTsc(VOID) /* Disable the timer interrupt */ HalDisableSystemInterrupt(HalpRtcClockVector, CLOCK_LEVEL); - /* Restore old IDT entry */ - *IdtPointer = OldIdtEntry; + /* Restore the previous handler */ + KeRegisterInterruptHandler(HalpRtcClockVector, PreviousHandler); /* Calculate an average, using simplified linear regression */ HalpCpuClockFrequency.QuadPart = DoLinearRegression(NUM_SAMPLES - 1,

1 0

[reactos] 02/06: [MINIHAL] Compile less stuff
by Timo Kreuzer 17 Jun '21

17 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee514e954ba29dc81e7e1… commit ee514e954ba29dc81e7e1c10482d94d7abca08ac Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jun 3 11:19:30 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jun 17 23:27:44 2021 +0200 [MINIHAL] Compile less stuff --- hal/halx86/legacy/bus/pcibus.c | 5 ++++- hal/halx86/legacy/bussupp.c | 10 ++++++++++ hal/halx86/minihal/CMakeLists.txt | 1 - 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/hal/halx86/legacy/bus/pcibus.c b/hal/halx86/legacy/bus/pcibus.c index b4c0bd070df..f71142626b9 100644 --- a/hal/halx86/legacy/bus/pcibus.c +++ b/hal/halx86/legacy/bus/pcibus.c @@ -519,7 +519,7 @@ HalpSetPCIData(IN PBUS_HANDLER BusHandler, /* Update the total length read */ return Len; } - +#ifndef _MINIHAL_ ULONG NTAPI HalpGetPCIIntOnISABus(IN PBUS_HANDLER BusHandler, @@ -540,6 +540,7 @@ HalpGetPCIIntOnISABus(IN PBUS_HANDLER BusHandler, Irql, Affinity); } +#endif // _MINIHAL_ VOID NTAPI @@ -562,6 +563,7 @@ HalpPCIISALine2Pin(IN PBUS_HANDLER BusHandler, UNIMPLEMENTED_DBGBREAK(); } +#ifndef _MINIHAL_ NTSTATUS NTAPI HalpGetISAFixedPCIIrq(IN PBUS_HANDLER BusHandler, @@ -654,6 +656,7 @@ HalpRegisterPciDebuggingDeviceInfo(VOID) UNIMPLEMENTED_DBGBREAK("You have implemented the KD routines for searching PCI debugger" "devices, but you have forgotten to implement this routine\n"); } +#endif // _MINIHAL_ static ULONG NTAPI PciSize(ULONG Base, ULONG Mask) diff --git a/hal/halx86/legacy/bussupp.c b/hal/halx86/legacy/bussupp.c index 6e291d58479..97b535285d3 100644 --- a/hal/halx86/legacy/bussupp.c +++ b/hal/halx86/legacy/bussupp.c @@ -152,6 +152,7 @@ HalpAllocateBusHandler(IN INTERFACE_TYPE InterfaceType, return Bus; } +#ifndef _MINIHAL_ CODE_SEG("INIT") VOID NTAPI @@ -225,6 +226,7 @@ HalpRegisterInternalBusHandlers(VOID) /* No support for EISA or MCA */ ASSERT(HalpBusType == MACHINE_TYPE_ISA); } +#endif // _MINIHAL_ #ifndef _MINIHAL_ CODE_SEG("INIT") @@ -1230,6 +1232,7 @@ HalpInitializePciBus(VOID) #endif } +#ifndef _MINIHAL_ CODE_SEG("INIT") VOID NTAPI @@ -1262,6 +1265,7 @@ HalpRegisterKdSupportFunctions(VOID) /* Register ACPI stub */ KdCheckPowerButton = HalpCheckPowerButton; } +#endif // _MINIHAL_ NTSTATUS NTAPI @@ -1405,6 +1409,7 @@ HaliTranslateBusAddress(IN INTERFACE_TYPE InterfaceType, /* PUBLIC FUNCTIONS **********************************************************/ +#ifndef _MINIHAL_ /* * @implemented */ @@ -1430,6 +1435,7 @@ HalAdjustResourceList(IN PIO_RESOURCE_REQUIREMENTS_LIST *ResourceList) HalDereferenceBusHandler(Handler); return Status; } +#endif // _MINIHAL_ /* * @implemented @@ -1474,6 +1480,7 @@ HalAssignSlotResources(IN PUNICODE_STRING RegistryPath, } } +#ifndef _MINIHAL_ /* * @implemented */ @@ -1493,6 +1500,7 @@ HalGetBusData(IN BUS_DATA_TYPE BusDataType, 0, Length); } +#endif // _MINIHAL_ /* * @implemented @@ -1526,6 +1534,7 @@ HalGetBusDataByOffset(IN BUS_DATA_TYPE BusDataType, return Status; } +#ifndef _MINIHAL_ /* * @implemented */ @@ -1623,6 +1632,7 @@ HalSetBusDataByOffset(IN BUS_DATA_TYPE BusDataType, HalDereferenceBusHandler(Handler); return Status; } +#endif // _MINIHAL_ /* * @implemented diff --git a/hal/halx86/minihal/CMakeLists.txt b/hal/halx86/minihal/CMakeLists.txt index 94a3e93112f..e8300e7bc56 100644 --- a/hal/halx86/minihal/CMakeLists.txt +++ b/hal/halx86/minihal/CMakeLists.txt @@ -5,7 +5,6 @@ list(APPEND MINI_HAL_SOURCE ../legacy/bus/cmosbus.c ../legacy/bus/isabus.c ../legacy/bus/pcibus.c - ../legacy/bus/sysbus.c ../legacy/bussupp.c ../generic/bios.c ../generic/dma.c

1 0

[reactos] 01/06: [HAL] Rename apic.h to apicp.h and move it back to the apic folder
by Timo Kreuzer 17 Jun '21

17 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7243503916bc0c0201db3… commit 7243503916bc0c0201db3809e67b02c3dc13f516 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon May 24 11:27:12 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jun 17 23:27:44 2021 +0200 [HAL] Rename apic.h to apicp.h and move it back to the apic folder --- hal/halx86/apic/apic.c | 2 +- hal/halx86/{include/apic.h => apic/apicp.h} | 0 hal/halx86/apic/apictimer.c | 2 +- hal/halx86/apic/halinit.c | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hal/halx86/apic/apic.c b/hal/halx86/apic/apic.c index 4c98e13bdf9..2811cc45535 100644 --- a/hal/halx86/apic/apic.c +++ b/hal/halx86/apic/apic.c @@ -12,7 +12,7 @@ /* INCLUDES *******************************************************************/ #include <hal.h> -#include <apic.h> +#include "apicp.h" #define NDEBUG #include <debug.h> diff --git a/hal/halx86/include/apic.h b/hal/halx86/apic/apicp.h similarity index 100% rename from hal/halx86/include/apic.h rename to hal/halx86/apic/apicp.h diff --git a/hal/halx86/apic/apictimer.c b/hal/halx86/apic/apictimer.c index 1a152e2d410..15f87a58499 100644 --- a/hal/halx86/apic/apictimer.c +++ b/hal/halx86/apic/apictimer.c @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ #include <hal.h> -#include <apic.h> +#include "apicp.h" #define NDEBUG #include <debug.h> diff --git a/hal/halx86/apic/halinit.c b/hal/halx86/apic/halinit.c index 504f568dbb1..5223e29b758 100644 --- a/hal/halx86/apic/halinit.c +++ b/hal/halx86/apic/halinit.c @@ -8,7 +8,7 @@ /* INCLUDES *****************************************************************/ #include <hal.h> -#include <apic.h> +#include "apicp.h" #define NDEBUG #include <debug.h>

1 0

[reactos] 03/03: [NTOS:IOPNP] Both PNP_PROPERTY_REMOVAL_POLICY_OVERRIDE and PNP_PROPERTY_LOCATION_PATHS are unimplemented, return such status.
by Hermès Bélusca-Maïto 16 Jun '21

16 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4864c874a28b908c73702… commit 4864c874a28b908c737020d1945cd9812f981ffd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jun 11 02:00:23 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 17 00:35:22 2021 +0200 [NTOS:IOPNP] Both PNP_PROPERTY_REMOVAL_POLICY_OVERRIDE and PNP_PROPERTY_LOCATION_PATHS are unimplemented, return such status. Fixes CID 1441387: Uninitialized scalar variable (UNINIT), in the case of PNP_PROPERTY_LOCATION_PATHS. --- ntoskrnl/io/pnpmgr/plugplay.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ntoskrnl/io/pnpmgr/plugplay.c b/ntoskrnl/io/pnpmgr/plugplay.c index cb7e03976ab..b9551207c33 100644 --- a/ntoskrnl/io/pnpmgr/plugplay.c +++ b/ntoskrnl/io/pnpmgr/plugplay.c @@ -418,6 +418,9 @@ IopGetDeviceProperty(PPLUGPLAY_CONTROL_PROPERTY_DATA PropertyData) } else if (Property == PNP_PROPERTY_REMOVAL_POLICY_OVERRIDE) { + UNIMPLEMENTED; + BufferSize = 0; + Status = STATUS_NOT_IMPLEMENTED; } else if (Property == PNP_PROPERTY_REMOVAL_POLICY_HARDWARE_DEFAULT) { @@ -476,6 +479,9 @@ IopGetDeviceProperty(PPLUGPLAY_CONTROL_PROPERTY_DATA PropertyData) #if (WINVER >= _WIN32_WINNT_WS03) case PNP_PROPERTY_LOCATION_PATHS: + UNIMPLEMENTED; + BufferSize = 0; + Status = STATUS_NOT_IMPLEMENTED; break; #endif

1 0

[reactos] 02/03: [NTOS:IO] Comment out (and explain why it is there) an unused LdrEntry assignment in IopInitializeBootDrivers(). CID 1237114
by Hermès Bélusca-Maïto 16 Jun '21

16 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2645e48b9aabe15642bd… commit f2645e48b9aabe15642bd463a1a706929dc29d73 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jun 11 01:46:50 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 17 00:35:22 2021 +0200 [NTOS:IO] Comment out (and explain why it is there) an unused LdrEntry assignment in IopInitializeBootDrivers(). CID 1237114 --- ntoskrnl/io/iomgr/driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index edb64baef7b..a5ab9904bb4 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -1050,8 +1050,14 @@ IopInitializeBootDrivers(VOID) BOOT_DRIVER_LIST_ENTRY, Link); + // FIXME: TODO: This LdrEntry is to be used in a special handling + // for SETUPLDR (a similar procedure is done on Windows), where + // the loader would, under certain conditions, be loaded in the + // SETUPLDR-specific code block below... +#if 0 /* Get the driver loader entry */ LdrEntry = BootEntry->LdrEntry; +#endif /* Allocate our internal accounting structure */ DriverInfo = ExAllocatePoolWithTag(PagedPool,

1 0

[reactos] 01/03: [NTOS:IO] Revert part of commit a82ff90b2: don't do direct ULONG data access: it might be unaligned.
by Hermès Bélusca-Maïto 16 Jun '21

16 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe416b67dca395e4ad02a… commit fe416b67dca395e4ad02aa9e6eb83733ea3ee63b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 17 00:29:58 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 17 00:35:21 2021 +0200 [NTOS:IO] Revert part of commit a82ff90b2: don't do direct ULONG data access: it might be unaligned. Requested by Victor. --- ntoskrnl/io/iomgr/driver.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 6a42dd30f7a..edb64baef7b 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -213,7 +213,10 @@ IopGetDriverNames( status = STATUS_ILL_FORMED_SERVICE_ENTRY; goto Cleanup; } - driverType = *(PULONG)((ULONG_PTR)kvInfo + kvInfo->DataOffset); + + RtlMoveMemory(&driverType, + (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), + sizeof(ULONG)); ExFreePool(kvInfo); /* Compute the necessary driver name string size */ @@ -913,7 +916,10 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) ExFreePool(kvInfo); goto Cleanup; } - instanceCount = *(PULONG)((ULONG_PTR)kvInfo + kvInfo->DataOffset); + + RtlMoveMemory(&instanceCount, + (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), + sizeof(ULONG)); ExFreePool(kvInfo); DPRINT("Processing %u instances for %wZ module\n", instanceCount, ModuleName);

1 0

[reactos] 02/02: [NTOS:IO] Fix driverName.Buffer leak in some failure paths in IopGetDriverNames().
by Hermès Bélusca-Maïto 16 Jun '21

16 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32a82eb123e75544cf6cd… commit 32a82eb123e75544cf6cd9341589928bed5be89c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 10 23:11:27 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 16 22:18:02 2021 +0200 [NTOS:IO] Fix driverName.Buffer leak in some failure paths in IopGetDriverNames(). driverName.Buffer leaked when the "(!NT_SUCCESS(status) || ServiceName != NULL)" case is taken because ServiceName != NULL, and some of the functions fail. --- ntoskrnl/io/iomgr/driver.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index f48a85a9705..6a42dd30f7a 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -171,21 +171,22 @@ IopGetDriverNames( status = ZwQueryKey(ServiceHandle, KeyBasicInformation, NULL, 0, &infoLength); if (status != STATUS_BUFFER_TOO_SMALL) { - return NT_SUCCESS(status) ? STATUS_UNSUCCESSFUL : status; + status = (NT_SUCCESS(status) ? STATUS_UNSUCCESSFUL : status); + goto Cleanup; } /* Allocate the buffer and retrieve the data */ basicInfo = ExAllocatePoolWithTag(PagedPool, infoLength, TAG_IO); if (!basicInfo) { - return STATUS_INSUFFICIENT_RESOURCES; + status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; } status = ZwQueryKey(ServiceHandle, KeyBasicInformation, basicInfo, infoLength, &infoLength); if (!NT_SUCCESS(status)) { - ExFreePoolWithTag(basicInfo, TAG_IO); - return status; + goto Cleanup; } serviceName.Length = basicInfo->NameLength; @@ -248,7 +249,6 @@ IopGetDriverNames( PWCHAR buf = ExAllocatePoolWithTag(PagedPool, serviceName.Length, TAG_IO); if (!buf) { - ExFreePoolWithTag(driverName.Buffer, TAG_IO); status = STATUS_INSUFFICIENT_RESOURCES; goto Cleanup; } @@ -265,6 +265,9 @@ Cleanup: if (basicInfo) ExFreePoolWithTag(basicInfo, TAG_IO); + if (!NT_SUCCESS(status) && driverName.Buffer) + ExFreePoolWithTag(driverName.Buffer, TAG_IO); + return status; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs