Ros-diffs June 2021

ros-diffs@reactos.org

19 participants
228 discussions

[reactos] 05/09: [NTOS:KE] Fix usage of KTHREAD::SwapBusy

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4d47faeb7407936f1254… commit f4d47faeb7407936f125490841ea29cc77eb782d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jun 7 13:57:32 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jun 19 12:17:18 2021 +0200 [NTOS:KE] Fix usage of KTHREAD::SwapBusy --- ntoskrnl/ke/amd64/ctxswitch.S | 8 ++++++++ ntoskrnl/ke/amd64/thrdini.c | 3 +++ sdk/include/asm/ksx.template.h | 1 + 3 files changed, 12 insertions(+) diff --git a/ntoskrnl/ke/amd64/ctxswitch.S b/ntoskrnl/ke/amd64/ctxswitch.S index 94c726aa486..17a87e7c023 100644 --- a/ntoskrnl/ke/amd64/ctxswitch.S +++ b/ntoskrnl/ke/amd64/ctxswitch.S @@ -149,6 +149,14 @@ PUBLIC KiThreadStartup .allocstack (6 * 8) .endprolog + /* Wait for SwapBusy */ +.SwapBusySet: + cmp byte ptr [r8 + ThSwapBusy], 0 + je .SwapBusyClear + pause + jmp .SwapBusySet +.SwapBusyClear: + /* Save WaitIrql as KSWITCH_FRAME::ApcBypass */ mov [rsp + SwApcBypass], cl diff --git a/ntoskrnl/ke/amd64/thrdini.c b/ntoskrnl/ke/amd64/thrdini.c index 71d4179843a..044ac7c6396 100644 --- a/ntoskrnl/ke/amd64/thrdini.c +++ b/ntoskrnl/ke/amd64/thrdini.c @@ -184,6 +184,9 @@ KiSwapContextResume( 0); } + /* Old thread os no longer busy */ + OldThread->SwapBusy = FALSE; + /* Kernel APCs may be pending */ if (NewThread->ApcState.KernelApcPending) { diff --git a/sdk/include/asm/ksx.template.h b/sdk/include/asm/ksx.template.h index 232ad290dca..9cf895d3fd2 100644 --- a/sdk/include/asm/ksx.template.h +++ b/sdk/include/asm/ksx.template.h @@ -762,6 +762,7 @@ OFFSET(ThSystemCallNumber, KTHREAD, SystemCallNumber), OFFSET(ThTrapFrame, KTHREAD, TrapFrame), OFFSET(ThApcState, KTHREAD, ApcState), OFFSET(ThPriority, KTHREAD, Priority), // obsolete +OFFSET(ThSwapBusy, KTHREAD, SwapBusy), OFFSET(ThContextSwitches, KTHREAD, ContextSwitches), OFFSET(ThState, KTHREAD, State), OFFSET(ThProcess, KTHREAD, Process), // thProcess in native headers

3 years, 4 months

[reactos] 04/09: [NTOS:KE] Fix some locking issues

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a011d19ed2ae2345fbfcd… commit a011d19ed2ae2345fbfcd429590e1bec9194fa6e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jun 7 10:23:01 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jun 19 12:17:18 2021 +0200 [NTOS:KE] Fix some locking issues --- ntoskrnl/include/internal/ke_x.h | 2 ++ ntoskrnl/ke/amd64/stubs.c | 4 ++++ ntoskrnl/ke/dpc.c | 1 + ntoskrnl/ke/procobj.c | 3 +++ 4 files changed, 10 insertions(+) diff --git a/ntoskrnl/include/internal/ke_x.h b/ntoskrnl/include/internal/ke_x.h index 5bd084d0e14..7a00fba8f9c 100644 --- a/ntoskrnl/include/internal/ke_x.h +++ b/ntoskrnl/include/internal/ke_x.h @@ -1347,6 +1347,8 @@ KxUnwaitThreadForEvent(IN PKEVENT Event, // This routine must be entered with the PRCB lock held and it will exit // with the PRCB lock released! // +_Requires_lock_held_(Prcb->PrcbLock) +_Releases_lock_(Prcb->PrcbLock) FORCEINLINE VOID KxQueueReadyThread(IN PKTHREAD Thread, diff --git a/ntoskrnl/ke/amd64/stubs.c b/ntoskrnl/ke/amd64/stubs.c index 2f7c2c5ef2c..21d9b20b920 100644 --- a/ntoskrnl/ke/amd64/stubs.c +++ b/ntoskrnl/ke/amd64/stubs.c @@ -26,6 +26,7 @@ NTSTATUS KiConvertToGuiThread( VOID); +_Requires_lock_not_held_(Prcb->PrcbLock) VOID NTAPI KiDpcInterruptHandler(VOID) @@ -61,6 +62,9 @@ KiDpcInterruptHandler(VOID) } else if (Prcb->NextThread) { + /* Acquire the PRCB lock */ + KiAcquirePrcbLock(Prcb); + /* Capture current thread data */ OldThread = Prcb->CurrentThread; NewThread = Prcb->NextThread; diff --git a/ntoskrnl/ke/dpc.c b/ntoskrnl/ke/dpc.c index 07c64303fe5..5ef845ffbdf 100644 --- a/ntoskrnl/ke/dpc.c +++ b/ntoskrnl/ke/dpc.c @@ -460,6 +460,7 @@ KiTimerListExpire(IN PLIST_ENTRY ExpiredListHead, } } +_Requires_lock_not_held_(Prcb->PrcbLock) VOID NTAPI KiQuantumEnd(VOID) diff --git a/ntoskrnl/ke/procobj.c b/ntoskrnl/ke/procobj.c index f2095545a13..1d639ea6e71 100644 --- a/ntoskrnl/ke/procobj.c +++ b/ntoskrnl/ke/procobj.c @@ -367,6 +367,9 @@ KeSetPriorityAndQuantumProcess(IN PKPROCESS Process, /* Lock the process */ KiAcquireProcessLockRaiseToSynch(Process, &ProcessLock); + /* Acquire the dispatcher lock */ + KiAcquireDispatcherLockAtSynchLevel(); + /* Check if we are modifying the quantum too */ if (Quantum) Process->QuantumReset = Quantum;

3 years, 4 months

[reactos] 03/09: [NTOS:KE] Fix KxReleaseSpinLock for 64 bit SMP builds

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62f62da8ba79eb6745501… commit 62f62da8ba79eb6745501da726d88526c6036ae6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jun 6 14:46:38 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jun 19 12:17:18 2021 +0200 [NTOS:KE] Fix KxReleaseSpinLock for 64 bit SMP builds --- ntoskrnl/include/internal/spinlock.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ntoskrnl/include/internal/spinlock.h b/ntoskrnl/include/internal/spinlock.h index a5dd8c502d5..e126dbe0b03 100644 --- a/ntoskrnl/include/internal/spinlock.h +++ b/ntoskrnl/include/internal/spinlock.h @@ -97,7 +97,11 @@ KxReleaseSpinLock(IN PKSPIN_LOCK SpinLock) } #endif /* Clear the lock */ +#ifdef _WIN64 + InterlockedAnd64((PLONG64)SpinLock, 0); +#else InterlockedAnd((PLONG)SpinLock, 0); +#endif } #endif

3 years, 4 months

[reactos] 02/09: [NTOS] Fix build with CONFIG_SMP

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ed56fa79449ada4b1ccb… commit 2ed56fa79449ada4b1ccb8a2fcfa8c088928ed9f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Jun 9 22:15:12 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jun 19 12:17:18 2021 +0200 [NTOS] Fix build with CONFIG_SMP --- ntoskrnl/ex/lookas.c | 2 +- ntoskrnl/ke/amd64/spinlock.c | 23 ++++++++++++----------- ntoskrnl/ke/ipi.c | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/ex/lookas.c b/ntoskrnl/ex/lookas.c index 89cdc49e554..9b1d456f563 100644 --- a/ntoskrnl/ex/lookas.c +++ b/ntoskrnl/ex/lookas.c @@ -63,7 +63,7 @@ ExInitPoolLookasidePointers(VOID) PGENERAL_LOOKASIDE Entry; /* Loop for all pool lists */ - for (i = 0; i < MAXIMUM_PROCESSORS; i++) + for (i = 0; i < NUMBER_POOL_LOOKASIDE_LISTS; i++) { /* Initialize the non-paged list */ Entry = &ExpSmallNPagedPoolLookasideLists[i]; diff --git a/ntoskrnl/ke/amd64/spinlock.c b/ntoskrnl/ke/amd64/spinlock.c index 47a01b9e609..bf383958921 100644 --- a/ntoskrnl/ke/amd64/spinlock.c +++ b/ntoskrnl/ke/amd64/spinlock.c @@ -167,19 +167,19 @@ BOOLEAN KeTryToAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, IN PKIRQL OldIrql) { -#ifndef CONFIG_SMP - /* Simply raise to dispatch */ - KeRaiseIrql(DISPATCH_LEVEL, OldIrql); + /* Raise to synch level */ + KeRaiseIrql(SYNCH_LEVEL, OldIrql); +#ifdef CONFIG_SMP + // HACK + return KeTryToAcquireSpinLockAtDpcLevel(KeGetCurrentPrcb()->LockQueue[LockNumber].Lock); +#else /* Add an explicit memory barrier to prevent the compiler from reordering memory accesses across the borders of spinlocks */ KeMemoryBarrierWithoutFence(); /* Always return true on UP Machines */ return TRUE; -#else - UNIMPLEMENTED; - ASSERT(FALSE); #endif } @@ -190,19 +190,20 @@ LOGICAL KeTryToAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, OUT PKIRQL OldIrql) { -#ifndef CONFIG_SMP - /* Simply raise to dispatch */ + /* Raise to dispatch level */ KeRaiseIrql(DISPATCH_LEVEL, OldIrql); +#ifdef CONFIG_SMP + // HACK + return KeTryToAcquireSpinLockAtDpcLevel(KeGetCurrentPrcb()->LockQueue[LockNumber].Lock); +#else + /* Add an explicit memory barrier to prevent the compiler from reordering memory accesses across the borders of spinlocks */ KeMemoryBarrierWithoutFence(); /* Always return true on UP Machines */ return TRUE; -#else - UNIMPLEMENTED; - ASSERT(FALSE); #endif } diff --git a/ntoskrnl/ke/ipi.c b/ntoskrnl/ke/ipi.c index 76f1b7388f5..841087d1daa 100644 --- a/ntoskrnl/ke/ipi.c +++ b/ntoskrnl/ke/ipi.c @@ -167,7 +167,7 @@ KiIpiServiceRoutine(IN PKTRAP_FRAME TrapFrame, if (InterlockedBitTestAndReset((PLONG)&Prcb->IpiFrozen, IPI_SYNCH_REQUEST)) { -#ifdef _M_ARM +#if defined(_M_ARM) || defined(_M_AMD64) DbgBreakPoint(); #else (void)InterlockedDecrementUL(&Prcb->SignalDone->CurrentPacket[1]);

3 years, 4 months

[reactos] 01/09: [HAL] Fix build with CONFIG_SMP

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0fb02f7f3463ddfd5fdb… commit a0fb02f7f3463ddfd5fdbb0afa3ba354f0c152fc Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jun 6 15:37:47 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jun 19 12:17:18 2021 +0200 [HAL] Fix build with CONFIG_SMP --- boot/freeldr/freeldr/arch/i386/ntoskrnl.c | 11 ++--------- hal/halx86/include/hal.h | 2 +- hal/halx86/include/halp.h | 7 ------- hal/halx86/legacy/bus/pcibus.c | 26 ++++++++++++-------------- 4 files changed, 15 insertions(+), 31 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/ntoskrnl.c b/boot/freeldr/freeldr/arch/i386/ntoskrnl.c index 4a846f0eaf3..e44fa770771 100644 --- a/boot/freeldr/freeldr/arch/i386/ntoskrnl.c +++ b/boot/freeldr/freeldr/arch/i386/ntoskrnl.c @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: boot/freeldr/freeldr/arch/i386/ntoskrnl.c * PURPOSE: NTOS glue routines for the MINIHAL library - * PROGRAMMERS: Herv� Poussineau <hpoussin(a)reactos.org> + * PROGRAMMERS: Hervé Poussineau <hpoussin(a)reactos.org> */ /* INCLUDES ******************************************************************/ @@ -25,14 +25,7 @@ KeInitializeEvent( VOID FASTCALL -KiAcquireSpinLock( - IN PKSPIN_LOCK SpinLock) -{ -} - -VOID -FASTCALL -KiReleaseSpinLock( +KefAcquireSpinLockAtDpcLevel( IN PKSPIN_LOCK SpinLock) { } diff --git a/hal/halx86/include/hal.h b/hal/halx86/include/hal.h index a5a9ddb755c..0775dda1ab2 100644 --- a/hal/halx86/include/hal.h +++ b/hal/halx86/include/hal.h @@ -47,12 +47,12 @@ #include <drivers/acpi/acpi.h> /* Internal kernel headers */ -#define KeGetCurrentThread _KeGetCurrentThread #ifdef _M_AMD64 #include <internal/amd64/ke.h> #include <internal/amd64/mm.h> #include "internal/amd64/intrin_i.h" #else +#define KeGetCurrentThread _KeGetCurrentThread #include <internal/i386/ke.h> #include <internal/i386/mm.h> #include "internal/i386/intrin_i.h" diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h index c8fc2715798..62d0254773e 100644 --- a/hal/halx86/include/halp.h +++ b/hal/halx86/include/halp.h @@ -566,13 +566,6 @@ HalInitializeBios( #define KiEnterInterruptTrap(TrapFrame) /* We do all neccessary in asm code */ #define KiEoiHelper(TrapFrame) return /* Just return to the caller */ #define HalBeginSystemInterrupt(Irql, Vector, OldIrql) ((*(OldIrql) = PASSIVE_LEVEL), TRUE) -#ifndef CONFIG_SMP -/* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ -#define KiAcquireSpinLock(SpinLock) -#define KiReleaseSpinLock(SpinLock) -#define KfAcquireSpinLock(SpinLock) KfRaiseIrql(DISPATCH_LEVEL); -#define KfReleaseSpinLock(SpinLock, OldIrql) KeLowerIrql(OldIrql); -#endif // !CONFIG_SMP #endif // _M_AMD64 extern BOOLEAN HalpNMIInProgress; diff --git a/hal/halx86/legacy/bus/pcibus.c b/hal/halx86/legacy/bus/pcibus.c index f71142626b9..402f60b66d9 100644 --- a/hal/halx86/legacy/bus/pcibus.c +++ b/hal/halx86/legacy/bus/pcibus.c @@ -119,8 +119,8 @@ VOID NTAPI HalpPCISynchronizeType1(IN PBUS_HANDLER BusHandler, IN PCI_SLOT_NUMBER Slot, - IN PKIRQL Irql, - IN PPCI_TYPE1_CFG_BITS PciCfg1) + OUT PKIRQL OldIrql, + OUT PPCI_TYPE1_CFG_BITS PciCfg1) { /* Setup the PCI Configuration Register */ PciCfg1->u.AsULONG = 0; @@ -130,14 +130,14 @@ HalpPCISynchronizeType1(IN PBUS_HANDLER BusHandler, PciCfg1->u.bits.Enable = TRUE; /* Acquire the lock */ - KeRaiseIrql(HIGH_LEVEL, Irql); - KiAcquireSpinLock(&HalpPCIConfigLock); + KeRaiseIrql(HIGH_LEVEL, OldIrql); + KeAcquireSpinLockAtDpcLevel(&HalpPCIConfigLock); } VOID NTAPI HalpPCIReleaseSynchronzationType1(IN PBUS_HANDLER BusHandler, - IN KIRQL Irql) + IN KIRQL OldIrql) { PCI_TYPE1_CFG_BITS PciCfg1; @@ -147,8 +147,7 @@ HalpPCIReleaseSynchronzationType1(IN PBUS_HANDLER BusHandler, PciCfg1.u.AsULONG); /* Release the lock */ - KiReleaseSpinLock(&HalpPCIConfigLock); - KeLowerIrql(Irql); + KeReleaseSpinLock(&HalpPCIConfigLock, OldIrql); } TYPE1_READ(HalpPCIReadUcharType1, UCHAR) @@ -164,8 +163,8 @@ VOID NTAPI HalpPCISynchronizeType2(IN PBUS_HANDLER BusHandler, IN PCI_SLOT_NUMBER Slot, - IN PKIRQL Irql, - IN PPCI_TYPE2_ADDRESS_BITS PciCfg) + OUT PKIRQL OldIrql, + OUT PPCI_TYPE2_ADDRESS_BITS PciCfg) { PCI_TYPE2_CSE_BITS PciCfg2Cse; PPCIPBUSDATA BusData = (PPCIPBUSDATA)BusHandler->BusData; @@ -176,8 +175,8 @@ HalpPCISynchronizeType2(IN PBUS_HANDLER BusHandler, PciCfg->u.bits.AddressBase = (USHORT)BusData->Config.Type2.Base; /* Acquire the lock */ - KeRaiseIrql(HIGH_LEVEL, Irql); - KiAcquireSpinLock(&HalpPCIConfigLock); + KeRaiseIrql(HIGH_LEVEL, OldIrql); + KeAcquireSpinLockAtDpcLevel(&HalpPCIConfigLock); /* Setup the CSE Register */ PciCfg2Cse.u.AsUCHAR = 0; @@ -194,7 +193,7 @@ HalpPCISynchronizeType2(IN PBUS_HANDLER BusHandler, VOID NTAPI HalpPCIReleaseSynchronizationType2(IN PBUS_HANDLER BusHandler, - IN KIRQL Irql) + IN KIRQL OldIrql) { PCI_TYPE2_CSE_BITS PciCfg2Cse; PPCIPBUSDATA BusData = (PPCIPBUSDATA)BusHandler->BusData; @@ -205,8 +204,7 @@ HalpPCIReleaseSynchronizationType2(IN PBUS_HANDLER BusHandler, WRITE_PORT_UCHAR(BusData->Config.Type2.Forward, 0); /* Release the lock */ - KiReleaseSpinLock(&HalpPCIConfigLock); - KeLowerIrql(Irql); + KeReleaseSpinLock(&HalpPCIConfigLock, OldIrql); } TYPE2_READ(HalpPCIReadUcharType2, UCHAR)

3 years, 4 months

[reactos] 02/02: [FREELDR/x64] Allow using memory above 4GB on x64

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0f6d2cf6eb781b188103… commit d0f6d2cf6eb781b188103ae5157f67fa6040a493 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jun 13 11:26:06 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jun 19 12:01:24 2021 +0200 [FREELDR/x64] Allow using memory above 4GB on x64 This splits MM_MAX_PAGE into the maximum addressable PFN (which is 2^20-1 on x86, 2^26-1 on x86PAE and 2^36-1 on x64) and the maximum mapped/accessible virtual memory MM_MAX_PAGE_LOADER (which is 4 GB on x86, since paging is disabled, but only 1 GB on x64, since only that much is identity-mapped). --- boot/freeldr/freeldr/include/mm.h | 10 ++++++++-- boot/freeldr/freeldr/lib/mm/meminit.c | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/boot/freeldr/freeldr/include/mm.h b/boot/freeldr/freeldr/include/mm.h index dd1bb195633..a3f34a55f78 100644 --- a/boot/freeldr/freeldr/include/mm.h +++ b/boot/freeldr/freeldr/include/mm.h @@ -51,7 +51,12 @@ typedef struct _FREELDR_MEMORY_DESCRIPTOR #define MM_PAGE_SIZE 4096 #define MM_PAGE_MASK 0xFFF #define MM_PAGE_SHIFT 12 -#define MM_MAX_PAGE 0xFFFFF +#if defined(_X86PAE_) +#define MM_MAX_PAGE 0x3FFFFFF /* 26 bits for the PFN */ +#else +#define MM_MAX_PAGE 0xFFFFF /* 20 bits for the PFN */ +#endif +#define MM_MAX_PAGE_LOADER 0xFFFFF /* 4 GB flat address range */ #define MM_SIZE_TO_PAGES(a) \ ( ((a) >> MM_PAGE_SHIFT) + ((a) & MM_PAGE_MASK ? 1 : 0) ) @@ -63,7 +68,8 @@ typedef struct _FREELDR_MEMORY_DESCRIPTOR #define MM_PAGE_SIZE 4096 #define MM_PAGE_MASK 0xFFF #define MM_PAGE_SHIFT 12 -#define MM_MAX_PAGE 0x3FFFF /* freeldr only maps 1 GB */ +#define MM_MAX_PAGE 0xFFFFFFFFF /* 36 bits for the PFN */ +#define MM_MAX_PAGE_LOADER 0x3FFFF /* on x64 freeldr only maps 1 GB */ #define MM_SIZE_TO_PAGES(a) \ ( ((a) >> MM_PAGE_SHIFT) + ((a) & MM_PAGE_MASK ? 1 : 0) ) diff --git a/boot/freeldr/freeldr/lib/mm/meminit.c b/boot/freeldr/freeldr/lib/mm/meminit.c index 8276cb8ca57..37a705a0c68 100644 --- a/boot/freeldr/freeldr/lib/mm/meminit.c +++ b/boot/freeldr/freeldr/lib/mm/meminit.c @@ -1,7 +1,7 @@ /* * FreeLoader * Copyright (C) 2006-2008 Aleksey Bragin <aleksey(a)reactos.org> - * Copyright (C) 2006-2009 Herv� Poussineau <hpoussin(a)reactos.org> + * Copyright (C) 2006-2009 Hervé Poussineau <hpoussin(a)reactos.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -438,7 +438,7 @@ PVOID MmFindLocationForPageLookupTable(PFN_NUMBER TotalPageCount) if (MemoryDescriptor->BasePage < CandidateBasePage) continue; // Continue, if the address is too high - if (MemoryDescriptor->BasePage + RequiredPages >= MM_MAX_PAGE) continue; + if (MemoryDescriptor->BasePage + RequiredPages >= MM_MAX_PAGE_LOADER) continue; // Memory block is more suitable than the previous one CandidateBasePage = MemoryDescriptor->BasePage; @@ -447,7 +447,7 @@ PVOID MmFindLocationForPageLookupTable(PFN_NUMBER TotalPageCount) // Calculate the end address for the lookup table PageLookupTableEndPage = min(CandidateBasePage + CandidatePageCount, - MM_MAX_PAGE); + MM_MAX_PAGE_LOADER); // Calculate the virtual address PageLookupTableMemAddress = (PVOID)((PageLookupTableEndPage * PAGE_SIZE)

3 years, 4 months

[reactos] 01/02: [NTOS:MM/x64] Fix Interlocked(Compare)ExchangePte and PAGE_FROM_SSE for x64

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6fa62a8d2fff999e6c92… commit e6fa62a8d2fff999e6c9205fc46926962d66b1e2 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jun 13 11:12:57 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jun 19 12:01:24 2021 +0200 [NTOS:MM/x64] Fix Interlocked(Compare)ExchangePte and PAGE_FROM_SSE for x64 This fixes using PFNs with more than 20 bits. --- ntoskrnl/include/internal/mm.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index a68359da713..a3a382cbcfc 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -159,11 +159,19 @@ typedef ULONG_PTR SWAPENTRY; #error Unsupported architecture! #endif +#ifdef _M_AMD64 +#define InterlockedCompareExchangePte(PointerPte, Exchange, Comperand) \ + InterlockedCompareExchange64((PLONG64)(PointerPte), Exchange, Comperand) + +#define InterlockedExchangePte(PointerPte, Value) \ + InterlockedExchange64((PLONG64)(PointerPte), Value) +#else #define InterlockedCompareExchangePte(PointerPte, Exchange, Comperand) \ InterlockedCompareExchange((PLONG)(PointerPte), Exchange, Comperand) #define InterlockedExchangePte(PointerPte, Value) \ InterlockedExchange((PLONG)(PointerPte), Value) +#endif typedef struct _MM_SECTION_SEGMENT { @@ -1282,7 +1290,11 @@ MmFindRegion( #define IS_DIRTY_SSE(E) ((E) & 2) #define WRITE_SSE(E) ((E) | 4) #define IS_WRITE_SSE(E) ((E) & 4) +#ifdef _WIN64 +#define PAGE_FROM_SSE(E) ((E) & 0xFFFFFFF000ULL) +#else #define PAGE_FROM_SSE(E) ((E) & 0xFFFFF000) +#endif #define SHARE_COUNT_FROM_SSE(E) (((E) & 0x00000FFC) >> 3) #define MAX_SHARE_COUNT 0x1FF #define MAKE_SSE(P, C) ((ULONG_PTR)((P) | ((C) << 3)))

3 years, 4 months

[reactos] 01/01: [NTOS:SE] Minor refactor on NtOpenThreadTokenEx

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5912c1165073b8d1015ad… commit 5912c1165073b8d1015ad1e0f0d229a7c50a181d Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Fri Jun 18 18:38:12 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Fri Jun 18 18:38:12 2021 +0200 [NTOS:SE] Minor refactor on NtOpenThreadTokenEx - Remove a redundant call of ObReferenceObjectByHandle. Not only it didn't make much sense (we reference the object from thread handle and the new thread object referencing the same handle!), specifying a request access of THREAD_ALL_ACCESS for the thread object is kind of suspicious and all of these access rights are unwanted. - Add some failure checks involving the CopyOnOpen code paths - Add some DPRINT1 debug prints (concerning the CopyOnOpen code paths as usual) --- ntoskrnl/se/token.c | 75 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index 74ec4142917..507a8d73bad 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -4233,7 +4233,7 @@ NtOpenThreadTokenEx(IN HANDLE ThreadHandle, IN ULONG HandleAttributes, OUT PHANDLE TokenHandle) { - PETHREAD Thread, NewThread; + PETHREAD Thread; HANDLE hToken; PTOKEN Token, NewToken = NULL, PrimaryToken; BOOLEAN CopyOnOpen, EffectiveOnly; @@ -4307,40 +4307,53 @@ NtOpenThreadTokenEx(IN HANDLE ThreadHandle, if (CopyOnOpen) { - Status = ObReferenceObjectByHandle(ThreadHandle, THREAD_ALL_ACCESS, - PsThreadType, KernelMode, - (PVOID*)&NewThread, NULL); - if (NT_SUCCESS(Status)) - { - PrimaryToken = PsReferencePrimaryToken(NewThread->ThreadsProcess); + PrimaryToken = PsReferencePrimaryToken(Thread->ThreadsProcess); - Status = SepCreateImpersonationTokenDacl(Token, PrimaryToken, &Dacl); + Status = SepCreateImpersonationTokenDacl(Token, PrimaryToken, &Dacl); - ObFastDereferenceObject(&NewThread->ThreadsProcess->Token, PrimaryToken); + ObFastDereferenceObject(&Thread->ThreadsProcess->Token, PrimaryToken); - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) + { + if (Dacl) { - if (Dacl) + Status = RtlCreateSecurityDescriptor(&SecurityDescriptor, + SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) { - RtlCreateSecurityDescriptor(&SecurityDescriptor, - SECURITY_DESCRIPTOR_REVISION); - RtlSetDaclSecurityDescriptor(&SecurityDescriptor, TRUE, Dacl, - FALSE); + DPRINT1("NtOpenThreadTokenEx(): Failed to create a security descriptor (Status 0x%lx)\n", Status); } - InitializeObjectAttributes(&ObjectAttributes, NULL, HandleAttributes, - NULL, Dacl ? &SecurityDescriptor : NULL); - - Status = SepDuplicateToken(Token, &ObjectAttributes, EffectiveOnly, - TokenImpersonation, ImpersonationLevel, - KernelMode, &NewToken); - if (NT_SUCCESS(Status)) + Status = RtlSetDaclSecurityDescriptor(&SecurityDescriptor, TRUE, Dacl, + FALSE); + if (!NT_SUCCESS(Status)) { - ObReferenceObject(NewToken); - Status = ObInsertObject(NewToken, NULL, DesiredAccess, 0, NULL, - &hToken); + DPRINT1("NtOpenThreadTokenEx(): Failed to set a DACL to the security descriptor (Status 0x%lx)\n", Status); } } + + InitializeObjectAttributes(&ObjectAttributes, NULL, HandleAttributes, + NULL, Dacl ? &SecurityDescriptor : NULL); + + Status = SepDuplicateToken(Token, &ObjectAttributes, EffectiveOnly, + TokenImpersonation, ImpersonationLevel, + KernelMode, &NewToken); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenThreadTokenEx(): Failed to duplicate the token (Status 0x%lx)\n"); + } + + ObReferenceObject(NewToken); + Status = ObInsertObject(NewToken, NULL, DesiredAccess, 0, NULL, + &hToken); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenThreadTokenEx(): Failed to insert the token object (Status 0x%lx)\n", Status); + } + } + else + { + DPRINT1("NtOpenThreadTokenEx(): Failed to impersonate token from DACL (Status 0x%lx)\n", Status); } } else @@ -4348,6 +4361,10 @@ NtOpenThreadTokenEx(IN HANDLE ThreadHandle, Status = ObOpenObjectByPointer(Token, HandleAttributes, NULL, DesiredAccess, SeTokenObjectType, PreviousMode, &hToken); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenThreadTokenEx(): Failed to open the object (Status 0x%lx)\n", Status); + } } if (Dacl) ExFreePoolWithTag(Dacl, TAG_ACL); @@ -4361,13 +4378,15 @@ NtOpenThreadTokenEx(IN HANDLE ThreadHandle, if (NT_SUCCESS(Status) && CopyOnOpen) { - PsImpersonateClient(Thread, NewToken, FALSE, EffectiveOnly, ImpersonationLevel); + Status = PsImpersonateClient(Thread, NewToken, FALSE, EffectiveOnly, ImpersonationLevel); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenThreadTokenEx(): Failed to impersonate the client (Status 0x%lx)\n"); + } } if (NewToken) ObDereferenceObject(NewToken); - if (CopyOnOpen && NewThread) ObDereferenceObject(NewThread); - ObDereferenceObject(Thread); if (NT_SUCCESS(Status))

3 years, 4 months

[reactos] 06/06: [HAL] Add APIC hals to setup and livecd

by Timo Kreuzer

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>

3 years, 4 months

[reactos] 05/06: [HAL:APIC] Fix interrupt assignment

by Timo Kreuzer

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

3 years, 4 months

← Newer
1
...
10
11
12
13
14
15
16
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2021