Skip to content

Commit 2a03975

Browse files
committed
add user token
1 parent 7c9c0db commit 2a03975

3 files changed

Lines changed: 26 additions & 38 deletions

File tree

‎src/windows/service/exe/IVirtualMachineBackend.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ enum class BackendKind
4040
struct VmInstanceId
4141
{
4242
GUID VmId{};
43+
wil::shared_handle UserToken{};
4344
};
4445

4546
template <typename Tag>
@@ -221,9 +222,7 @@ struct VmLinuxBootRequest
221222
std::filesystem::path KernelPath;
222223
std::filesystem::path InitrdPath;
223224
VmBootMethod Method = VmBootMethod::Automatic;
224-
std::wstring GuestCommandLine;
225-
std::wstring UserCommandLine;
226-
std::optional<std::uint64_t> RequestedDmaBounceBufferBytes;
225+
std::wstring KernelCommandLine;
227226
};
228227

229228
enum class VmConsoleRole
@@ -334,7 +333,6 @@ struct VmEffectiveBoot
334333
{
335334
VmBootMethod Method = VmBootMethod::Automatic;
336335
std::wstring KernelCommandLine;
337-
std::optional<std::uint32_t> PageReportingOrder;
338336
std::vector<VmConsoleRequest> Consoles;
339337
};
340338

@@ -390,7 +388,7 @@ struct VmNetworkAttachment
390388

391389
struct VmCreateRequest
392390
{
393-
GUID VmId{};
391+
VmInstanceId Identity;
394392
VmProcessorRequest Processor;
395393
VmMemoryRequest Memory;
396394
VmLinuxBootRequest Boot;

‎src/windows/service/exe/OpenVmmVirtualMachineBackend.cpp‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -115,23 +115,22 @@ OpenVmmVirtualMachineBackend::GuestListener::~GuestListener() noexcept
115115

116116
VmDescription wsl::windows::common::vm::openvmm::ValidateCreateRequest(const VmCreateRequest& Request)
117117
{
118-
THROW_HR_IF(E_INVALIDARG, IsEqualGUID(Request.VmId, GUID_NULL));
118+
THROW_HR_IF(E_INVALIDARG, IsEqualGUID(Request.Identity.VmId, GUID_NULL));
119119
THROW_HR_IF(E_INVALIDARG, Request.Processor.Count == 0 || Request.Memory.SizeBytes == 0);
120120
THROW_HR_IF_MSG(c_notSupported, wsl::shared::Arm64, "OpenVMM direct boot is currently supported only on x64");
121121
validation::ValidatePath(Request.Boot.KernelPath, L"OpenVMM Kernel Path");
122122
validation::ValidatePath(Request.Boot.InitrdPath, L"OpenVMM Initrd Path");
123123
THROW_HR_IF(
124124
E_INVALIDARG,
125-
Request.Boot.GuestCommandLine.find(L'\0') != std::wstring::npos || Request.Boot.UserCommandLine.find(L'\0') != std::wstring::npos);
125+
Request.Boot.KernelCommandLine.find(L'\0') != std::wstring::npos);
126126
THROW_HR_IF(
127127
E_INVALIDARG,
128128
Request.Boot.Method != VmBootMethod::Automatic && Request.Boot.Method != VmBootMethod::LinuxDirect &&
129129
Request.Boot.Method != VmBootMethod::Uefi);
130130
THROW_HR_IF(c_notSupported, Request.Boot.Method == VmBootMethod::Uefi);
131-
THROW_HR_IF(c_notSupported, Request.Boot.RequestedDmaBounceBufferBytes.has_value());
132131

133132
VmDescription description;
134-
description.Identity.VmId = Request.VmId;
133+
description.Identity = Request.Identity;
135134
description.Backend = BackendKind::OpenVmm;
136135
description.Processor.Count = Request.Processor.Count;
137136
description.Memory.SizeBytes = Request.Memory.SizeBytes;
@@ -155,15 +154,7 @@ VmDescription wsl::windows::common::vm::openvmm::ValidateCreateRequest(const VmC
155154
}
156155

157156
description.Boot.Method = VmBootMethod::LinuxDirect;
158-
description.Boot.KernelCommandLine = Request.Boot.GuestCommandLine;
159-
if (!Request.Boot.UserCommandLine.empty())
160-
{
161-
if (!description.Boot.KernelCommandLine.empty())
162-
{
163-
description.Boot.KernelCommandLine += L" ";
164-
}
165-
description.Boot.KernelCommandLine += Request.Boot.UserCommandLine;
166-
}
157+
description.Boot.KernelCommandLine = Request.Boot.KernelCommandLine;
167158

168159
bool serialConfigured = false;
169160
bool virtioConfigured = false;
@@ -288,7 +279,7 @@ std::unique_ptr<OpenVmmVirtualMachineBackend> OpenVmmVirtualMachineBackend::Crea
288279
const auto startTimeMs = GetTickCount64();
289280
WSL_LOG(
290281
"OpenVmmCreateVmBegin",
291-
TraceLoggingValue(Request.VmId, "vmId"),
282+
TraceLoggingValue(Request.Identity.VmId, "vmId"),
292283
TraceLoggingValue(Request.Processor.Count, "processorCount"),
293284
TraceLoggingValue(Request.Memory.SizeBytes, "memoryBytes"),
294285
TraceLoggingValue(Request.BootDisks.size(), "bootDiskCount"),
@@ -303,15 +294,15 @@ std::unique_ptr<OpenVmmVirtualMachineBackend> OpenVmmVirtualMachineBackend::Crea
303294
backend->Initialize(Request);
304295
WSL_LOG(
305296
"OpenVmmCreateVmEnd",
306-
TraceLoggingValue(Request.VmId, "vmId"),
297+
TraceLoggingValue(Request.Identity.VmId, "vmId"),
307298
TraceLoggingValue(GetTickCount64() - startTimeMs, "durationMs"));
308299
}
309300
catch (...)
310301
{
311302
const auto result = wil::ResultFromCaughtException();
312303
WSL_LOG(
313304
"OpenVmmCreateVmFailed",
314-
TraceLoggingValue(Request.VmId, "vmId"),
305+
TraceLoggingValue(Request.Identity.VmId, "vmId"),
315306
TraceLoggingHResult(result, "result"),
316307
TraceLoggingValue(GetTickCount64() - startTimeMs, "durationMs"));
317308
throw;
@@ -330,7 +321,7 @@ void OpenVmmVirtualMachineBackend::Initialize(const VmCreateRequest& Request)
330321
"openvmm.exe not found at: %ls",
331322
executable.c_str());
332323

333-
auto id = wsl::shared::string::GuidToString<wchar_t>(Request.VmId, wsl::shared::string::GuidToStringFlags::None);
324+
auto id = wsl::shared::string::GuidToString<wchar_t>(Request.Identity.VmId, wsl::shared::string::GuidToStringFlags::None);
334325
std::erase(id, L'-');
335326
// An exclusive directory creation prevents shortened path IDs from aliasing another VM.
336327
m_socketDirectory = filesystem::GetTempFolderPath(GetCurrentProcessToken()) / (L"ov-" + id.substr(0, 16));

‎test/windows/OpenVmmVirtualMachineBackendTests.cpp‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ constexpr HRESULT c_notSupported = HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
1414
VmCreateRequest CreateRequest()
1515
{
1616
VmCreateRequest request;
17-
THROW_IF_FAILED(CoCreateGuid(&request.VmId));
17+
THROW_IF_FAILED(CoCreateGuid(&request.Identity.VmId));
1818
request.Processor.Count = 2;
1919
request.Memory.SizeBytes = 512 * c_mib;
2020
request.Boot.KernelPath = L"C:\\images\\kernel";
@@ -28,7 +28,7 @@ VmCreateRequest CreateRunnableRequest()
2828
const auto basePath = wsl::windows::common::wslutil::GetBasePath();
2929
request.Boot.KernelPath = basePath / L"kernel";
3030
request.Boot.InitrdPath = basePath / LXSS_VM_MODE_INITRD_NAME;
31-
request.Boot.GuestCommandLine = L"panic=-1";
31+
request.Boot.KernelCommandLine = L"panic=-1";
3232
return request;
3333
}
3434

@@ -91,20 +91,19 @@ class OpenVmmVirtualMachineBackendTests
9191
{
9292
SKIP_TEST_ARM64();
9393
auto request = CreateRequest();
94-
request.Boot.GuestCommandLine = L"personality=caller console=hvc0";
95-
request.Boot.UserCommandLine = L"console=ttyS0 custom=value";
94+
request.Boot.KernelCommandLine = L"personality=caller console=hvc0 console=ttyS0 custom=value";
9695
request.BootDisks.push_back(CreateDisk(L"arbitrary-key"));
9796
request.BootDisks[0].Disk.ReadOnly = false;
9897
const auto description = ValidateCreateRequest(request);
9998

100-
VERIFY_IS_TRUE(IsEqualGUID(request.VmId, description.Identity.VmId));
99+
VERIFY_IS_TRUE(IsEqualGUID(request.Identity.VmId, description.Identity.VmId));
101100
VERIFY_ARE_EQUAL(request.Processor.Count, description.Processor.Count);
102101
VERIFY_ARE_EQUAL(request.Memory.SizeBytes, description.Memory.SizeBytes);
103102
VERIFY_ARE_EQUAL(VmBootMethod::LinuxDirect, description.Boot.Method);
104-
VERIFY_ARE_EQUAL(request.Boot.GuestCommandLine + L" " + request.Boot.UserCommandLine, description.Boot.KernelCommandLine);
103+
VERIFY_ARE_EQUAL(request.Boot.KernelCommandLine, description.Boot.KernelCommandLine);
105104
VERIFY_ARE_EQUAL(size_t{1}, description.BootDisks.size());
106105
const auto& disk = description.BootDisks.at(L"arbitrary-key");
107-
VERIFY_IS_TRUE(IsEqualGUID(request.VmId, disk.Id.Owner.VmId));
106+
VERIFY_IS_TRUE(IsEqualGUID(request.Identity.VmId, disk.Id.Owner.VmId));
108107
VERIFY_ARE_EQUAL(UINT64{1}, disk.Id.Value);
109108
VERIFY_ARE_EQUAL(UINT32{0}, disk.GuestAddress.Lun);
110109
VERIFY_IS_FALSE(disk.ReadOnly);
@@ -153,13 +152,13 @@ class OpenVmmVirtualMachineBackendTests
153152
const auto description = ValidateCreateRequest(request);
154153
VERIFY_ARE_EQUAL(size_t{1}, description.NetworkAdapters.size());
155154
const auto& adapter = description.NetworkAdapters.at(L"eth0");
156-
VERIFY_IS_TRUE(IsEqualGUID(request.VmId, adapter.Id.Owner.VmId));
155+
VERIFY_IS_TRUE(IsEqualGUID(request.Identity.VmId, adapter.Id.Owner.VmId));
157156
VERIFY_ARE_EQUAL(UINT64{1}, adapter.Id.Value);
158157
VERIFY_IS_TRUE(adapter.GuestInstanceId.has_value());
159158
VERIFY_IS_FALSE(IsEqualGUID(GUID_NULL, adapter.GuestInstanceId.value()));
160159
VERIFY_IS_TRUE(adapter.EffectiveConfiguration.ClientMac.Bytes == request.NetworkAdapters[0].Configuration.ClientMac.Bytes);
161160

162-
THROW_IF_FAILED(CoCreateGuid(&request.VmId));
161+
THROW_IF_FAILED(CoCreateGuid(&request.Identity.VmId));
163162
const auto other = ValidateCreateRequest(request).NetworkAdapters.at(L"eth0");
164163
VERIFY_ARE_EQUAL(adapter.Id.Value, other.Id.Value);
165164
VERIFY_IS_FALSE(IsEqualGUID(adapter.Id.Owner.VmId, other.Id.Owner.VmId));
@@ -225,7 +224,7 @@ class OpenVmmVirtualMachineBackendTests
225224
}
226225
const auto first = ValidateCreateRequest(request);
227226
VERIFY_ARE_EQUAL(UINT32{253}, first.BootDisks.at(L"253").GuestAddress.Lun);
228-
THROW_IF_FAILED(CoCreateGuid(&request.VmId));
227+
THROW_IF_FAILED(CoCreateGuid(&request.Identity.VmId));
229228
const auto second = ValidateCreateRequest(request);
230229
VERIFY_ARE_EQUAL(first.BootDisks.at(L"0").Id.Value, second.BootDisks.at(L"0").Id.Value);
231230
VERIFY_IS_FALSE(IsEqualGUID(first.BootDisks.at(L"0").Id.Owner.VmId, second.BootDisks.at(L"0").Id.Owner.VmId));
@@ -271,9 +270,9 @@ class OpenVmmVirtualMachineBackendTests
271270
{
272271
SKIP_TEST_ARM64();
273272
auto request = CreateRequest();
274-
request.VmId = GUID_NULL;
273+
request.Identity.VmId = GUID_NULL;
275274
VERIFY_ARE_EQUAL(E_INVALIDARG, DescribeResult(request));
276-
THROW_IF_FAILED(CoCreateGuid(&request.VmId));
275+
THROW_IF_FAILED(CoCreateGuid(&request.Identity.VmId));
277276
request.Boot.KernelPath = L"relative-kernel";
278277
VERIFY_ARE_EQUAL(E_INVALIDARG, DescribeResult(request));
279278
request.Boot.KernelPath = L"C:\\images\\kernel";
@@ -318,7 +317,7 @@ class OpenVmmVirtualMachineBackendTests
318317
VERIFY_ARE_EQUAL(c_notSupported, OperationResult([&] { backend->CreateFileSystemDevice(fileSystemRequest); }));
319318
fileSystemRequest.Transport.Layout = VmVirtioFsLayout::SingleShare;
320319
const auto fileSystemDevice = backend->CreateFileSystemDevice(fileSystemRequest);
321-
VERIFY_IS_TRUE(IsEqualGUID(request.VmId, fileSystemDevice.Id.Owner.VmId));
320+
VERIFY_IS_TRUE(IsEqualGUID(request.Identity.VmId, fileSystemDevice.Id.Owner.VmId));
322321
VERIFY_ARE_EQUAL(VmFileSystemDeviceState::Prepared, fileSystemDevice.State);
323322
VERIFY_ARE_EQUAL(
324323
HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), OperationResult([&] { backend->CreateFileSystemDevice(fileSystemRequest); }));
@@ -329,7 +328,7 @@ class OpenVmmVirtualMachineBackendTests
329328
VERIFY_ARE_EQUAL(c_notSupported, OperationResult([&] { backend->AddFileSystemShare(fileSystemDevice.Id, shareRequest); }));
330329
shareRequest.Options.MountOptions.clear();
331330
const auto share = backend->AddFileSystemShare(fileSystemDevice.Id, shareRequest);
332-
VERIFY_IS_TRUE(IsEqualGUID(request.VmId, share.Id.Owner.VmId));
331+
VERIFY_IS_TRUE(IsEqualGUID(request.Identity.VmId, share.Id.Owner.VmId));
333332
VERIFY_ARE_EQUAL(fileSystemDevice.Id.Value, share.Device.Value);
334333
VERIFY_ARE_EQUAL(fileSystemRequest.Transport.Tag, share.GuestAddress.Tag);
335334
VERIFY_ARE_EQUAL(HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), OperationResult([&] {
@@ -345,7 +344,7 @@ class OpenVmmVirtualMachineBackendTests
345344
backend->RemoveFileSystemShare(replacementShare.Id);
346345

347346
const auto network = backend->GetDescription().NetworkAdapters.at(networkRequest.Tag);
348-
VERIFY_IS_TRUE(IsEqualGUID(request.VmId, network.Id.Owner.VmId));
347+
VERIFY_IS_TRUE(IsEqualGUID(request.Identity.VmId, network.Id.Owner.VmId));
349348
VERIFY_IS_TRUE(network.GuestInstanceId.has_value());
350349
VERIFY_ARE_EQUAL(networkRequest.Tag, network.Tag);
351350
VERIFY_ARE_NOT_EQUAL(network.Id.Value, fileSystemDevice.Id.Value);
@@ -364,7 +363,7 @@ class OpenVmmVirtualMachineBackendTests
364363
THROW_IF_FAILED(CoCreateGuid(&invalidNetwork.Owner.VmId));
365364
VERIFY_ARE_EQUAL(E_INVALIDARG, OperationResult([&] { backend->BindPort(invalidNetwork, bindingRequest); }));
366365
const auto binding = backend->BindPort(network.Id, bindingRequest);
367-
VERIFY_IS_TRUE(IsEqualGUID(request.VmId, binding.Id.Owner.VmId));
366+
VERIFY_IS_TRUE(IsEqualGUID(request.Identity.VmId, binding.Id.Owner.VmId));
368367
VERIFY_ARE_EQUAL(network.Id.Value, binding.Device.Value);
369368
VERIFY_ARE_EQUAL(bindingRequest.Listen.Port, binding.EffectiveListen.Port);
370369
VERIFY_ARE_EQUAL(

0 commit comments

Comments
 (0)