Lightemerald/windows-user-space-emulator
2
0
Fork 0
mirror of https://github.com/momo5502/emulator.git synced 2026-01-11 16:46:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of explicit NtQuerySystemInformationEx syscall

Browse Source
This commit is contained in:
momo5502
2025-01-06 18:38:05 +01:00
parent 0585978157
commit 73eb7d659c
5 changed files with 168 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/platform/platform.hpp
View File

@@ -25,15 +25,6 @@
#include "threading.hpp"
#ifdef OS_WINDOWS
#pragma comment(lib, "ntdll")
extern "C"
{
NTSYSCALLAPI NTSTATUS NTAPI NtQuerySystemInformationEx(
_In_ SYSTEM_INFORMATION_CLASS SystemInformationClass, _In_reads_bytes_(InputBufferLength) PVOID InputBuffer,
_In_ ULONG InputBufferLength, _Out_writes_bytes_opt_(SystemInformationLength) PVOID SystemInformation,
_In_ ULONG SystemInformationLength, _Out_opt_ PULONG ReturnLength);
}
#pragma warning(pop)
#else
#pragma GCC diagnostic pop

7
src/common/platform/primitives.hpp
View File

@@ -11,6 +11,11 @@
#else
#define _Field_size_(...)
#define _Struct_size_bytes_(...)
#define ANYSIZE_ARRAY 1
#define DWORD std::uint32_t
using LONG = std::int32_t;
using ULONG = DWORD;
@@ -47,8 +52,8 @@ using BYTE = std::uint8_t;
using WORD = std::uint16_t;
#define UCHAR unsigned char
#define BOOLEAN bool
using CSHORT = short;
using USHORT = WORD;

89
src/common/platform/process.hpp
View File

@@ -905,3 +905,92 @@ struct EMU_RTL_SRWLOCK
{
typename Traits::PVOID Ptr;
};
#ifndef OS_WINDOWS
typedef enum _PROCESSOR_CACHE_TYPE
{
CacheUnified,
CacheInstruction,
CacheData,
CacheTrace
} PROCESSOR_CACHE_TYPE;
typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP
{
RelationProcessorCore,
RelationNumaNode,
RelationCache,
RelationProcessorPackage,
RelationGroup,
RelationProcessorDie,
RelationNumaNodeEx,
RelationProcessorModule,
RelationAll = 0xffff
} LOGICAL_PROCESSOR_RELATIONSHIP;
#endif
struct EMU_NUMA_NODE_RELATIONSHIP64
{
DWORD NodeNumber;
BYTE Reserved[18];
WORD GroupCount;
union
{
EMU_GROUP_AFFINITY64 GroupMask;
_Field_size_(GroupCount) EMU_GROUP_AFFINITY64 GroupMasks[ANYSIZE_ARRAY];
};
};
struct EMU_CACHE_RELATIONSHIP64
{
BYTE Level;
BYTE Associativity;
WORD LineSize;
DWORD CacheSize;
PROCESSOR_CACHE_TYPE Type;
BYTE Reserved[18];
WORD GroupCount;
union
{
EMU_GROUP_AFFINITY64 GroupMask;
_Field_size_(GroupCount) EMU_GROUP_AFFINITY64 GroupMasks[ANYSIZE_ARRAY];
};
};
struct EMU_PROCESSOR_GROUP_INFO64
{
BYTE MaximumProcessorCount;
BYTE ActiveProcessorCount;
BYTE Reserved[38];
EMULATOR_CAST(std::uint64_t, KAFFINITY) ActiveProcessorMask;
};
struct EMU_GROUP_RELATIONSHIP64
{
WORD MaximumGroupCount;
WORD ActiveGroupCount;
BYTE Reserved[20];
_Field_size_(ActiveGroupCount) EMU_PROCESSOR_GROUP_INFO64 GroupInfo[ANYSIZE_ARRAY];
};
struct EMU_PROCESSOR_RELATIONSHIP64
{
BYTE Flags;
BYTE EfficiencyClass;
BYTE Reserved[20];
WORD GroupCount;
_Field_size_(GroupCount) EMU_GROUP_AFFINITY64 GroupMask[ANYSIZE_ARRAY];
};
_Struct_size_bytes_(Size) struct EMU_SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX64
{
LOGICAL_PROCESSOR_RELATIONSHIP Relationship;
DWORD Size;
union
{
EMU_PROCESSOR_RELATIONSHIP64 Processor;
EMU_NUMA_NODE_RELATIONSHIP64 NumaNode;
EMU_CACHE_RELATIONSHIP64 Cache;
EMU_GROUP_RELATIONSHIP64 Group;
};
};

1
src/common/platform/status.hpp
View File

@@ -26,6 +26,7 @@ using NTSTATUS = std::uint32_t;
#define STATUS_NO_MORE_FILES ((NTSTATUS)0x80000006L)
#define STATUS_INFO_LENGTH_MISMATCH ((NTSTATUS)0xC0000004L)
#define STATUS_ACCESS_DENIED ((NTSTATUS)0xC0000022L)
#define STATUS_BUFFER_TOO_SMALL ((NTSTATUS)0xC0000023L)
#define STATUS_OBJECT_NAME_NOT_FOUND ((NTSTATUS)0xC0000034L)

96
src/windows-emulator/syscalls.cpp
View File

@@ -1067,39 +1067,83 @@ namespace
info_class == SystemSupportedProcessorArchitectures2 ||
info_class == SystemFeatureConfigurationSectionInformation)
{
// printf("Unsupported, but allowed system info class: %X\n", info_class);
return STATUS_NOT_SUPPORTED;
}
if (info_class == SystemLogicalProcessorAndGroupInformation)
{
void* buffer = calloc(1, input_buffer_length);
void* res_buff = calloc(1, system_information_length);
c.emu.read_memory(input_buffer, buffer, input_buffer_length);
NTSTATUS code = STATUS_SUCCESS;
return_length.access([&](uint32_t& len) {
(void)len;
#ifdef OS_WINDOWS
code = NtQuerySystemInformationEx(static_cast<SYSTEM_INFORMATION_CLASS>(info_class), buffer,
input_buffer_length, res_buff, system_information_length,
reinterpret_cast<ULONG*>(&len));
#else
// TODO: unsupported
code = STATUS_SUCCESS;
#endif
});
if (code == 0)
if (input_buffer_length != sizeof(LOGICAL_PROCESSOR_RELATIONSHIP))
{
c.emu.write_memory(system_information, res_buff, return_length.read());
return STATUS_INVALID_PARAMETER;
}
free(buffer);
free(res_buff);
const auto request = c.emu.read_memory<LOGICAL_PROCESSOR_RELATIONSHIP>(input_buffer);
return code;
if (request == RelationGroup)
{
constexpr auto root_size = offsetof(EMU_SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX64, Group);
constexpr auto required_size = root_size + sizeof(EMU_GROUP_RELATIONSHIP64);
if (return_length)
{
return_length.write(required_size);
}
if (system_information_length < required_size)
{
return STATUS_INFO_LENGTH_MISMATCH;
}
EMU_SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX64 proc_info{};
proc_info.Size = required_size;
proc_info.Relationship = RelationGroup;
c.emu.write_memory(system_information, &proc_info, root_size);
EMU_GROUP_RELATIONSHIP64 group{};
group.ActiveGroupCount = 1;
group.MaximumGroupCount = 1;
auto& group_info = group.GroupInfo[0];
group_info.ActiveProcessorCount = static_cast<uint8_t>(c.proc.kusd.get().ActiveProcessorCount);
group_info.ActiveProcessorMask = (1 << group_info.ActiveProcessorCount) - 1;
group_info.MaximumProcessorCount = group_info.ActiveProcessorCount;
c.emu.write_memory(system_information + root_size, group);
return STATUS_SUCCESS;
}
if (request == RelationNumaNode || request == RelationNumaNodeEx)
{
constexpr auto root_size = offsetof(EMU_SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX64, NumaNode);
constexpr auto required_size = root_size + sizeof(EMU_NUMA_NODE_RELATIONSHIP64);
if (return_length)
{
return_length.write(required_size);
}
if (system_information_length < required_size)
{
return STATUS_INFO_LENGTH_MISMATCH;
}
EMU_SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX64 proc_info{};
proc_info.Size = required_size;
proc_info.Relationship = RelationNumaNode;
c.emu.write_memory(system_information, &proc_info, root_size);
EMU_NUMA_NODE_RELATIONSHIP64 numa_node{};
memset(&numa_node, 0, sizeof(numa_node));
c.emu.write_memory(system_information + root_size, numa_node);
return STATUS_SUCCESS;
}
printf("Unsupported processor relationship: %X\n", request);
c.emu.stop();
return STATUS_NOT_SUPPORTED;
}
if (info_class != SystemBasicInformation && info_class != SystemEmulationBasicInformation)
@@ -1114,9 +1158,9 @@ namespace
return_length.write(sizeof(SYSTEM_BASIC_INFORMATION64));
}
if (system_information_length != sizeof(SYSTEM_BASIC_INFORMATION64))
if (system_information_length < sizeof(SYSTEM_BASIC_INFORMATION64))
{
return STATUS_BUFFER_TOO_SMALL;
return STATUS_INFO_LENGTH_MISMATCH;
}
const emulator_object<SYSTEM_BASIC_INFORMATION64> info{c.emu, system_information};