[yellowstone] Add a way to retrieve to denali client from yellowstone

This commit is contained in:
Drew Galbraith 2023-07-05 16:03:20 -07:00
parent b83385dfa6
commit 29d9923f5a
10 changed files with 99 additions and 7 deletions

View File

@ -16,3 +16,22 @@ class DenaliClient {
private:
glcr::UniquePtr<EndpointClient> endpoint_;
};
class ScopedDenaliClient : protected DenaliClient {
public:
ScopedDenaliClient(glcr::UniquePtr<EndpointClient> endpoint,
uint64_t device_id, uint64_t lba_offset)
: DenaliClient(glcr::Move(endpoint)),
device_id_(device_id),
lba_offset_(lba_offset) {}
glcr::ErrorOr<MappedMemoryRegion> ReadSectors(uint64_t lba,
uint64_t num_sectors) {
return DenaliClient::ReadSectors(device_id_, lba_offset_ + lba,
num_sectors);
}
private:
uint64_t device_id_;
uint64_t lba_offset_;
};

View File

@ -29,6 +29,7 @@ target_include_directories(yellowstone_stub
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
target_link_libraries(yellowstone_stub
denali_stub
mammoth
)

View File

@ -9,6 +9,9 @@ const uint64_t kSectorSize = 512;
const uint64_t kGptPartitionSignature = 0x54524150'20494645;
const uint64_t kLfsDataLow = 0x477284830fc63daf;
const uint64_t kLfsDataHigh = 0xe47d47d8693d798e;
struct MbrPartition {
uint8_t boot_indicator;
uint8_t starting_chs[3];
@ -99,6 +102,13 @@ glcr::ErrorCode GptReader::ParsePartitionTables() {
dbgln("P Guid: %lx-%lx", entry->part_guid_high, entry->part_guid_low);
dbgln("LBA: %lx, %lx", entry->lba_start, entry->lba_end);
dbgln("Attrs: %lx", entry->attributes);
// For now we hardcode these values to the type that is created in our
// setup script.
// FIXME: Set up our own root partition type guid at some point.
if (entry->type_guid_low == kLfsDataLow &&
entry->type_guid_high == kLfsDataHigh) {
primary_partition_lba_ = entry->lba_start;
}
}
}

View File

@ -10,6 +10,9 @@ class GptReader {
glcr::ErrorCode ParsePartitionTables();
uint64_t GetPrimaryPartitionLba() { return primary_partition_lba_; }
private:
glcr::UniquePtr<DenaliClient> denali_;
uint64_t primary_partition_lba_;
};

View File

@ -4,6 +4,7 @@
const uint64_t kYellowstoneGetRegistration = 0x01;
const uint64_t kYellowstoneGetAhci = 0x02;
const uint64_t kYellowstoneGetDenali = 0x03;
struct YellowstoneGetReq {
uint64_t type;
@ -14,3 +15,10 @@ struct YellowstoneGetAhciResp {
uint64_t type;
uint64_t ahci_phys_offset;
};
// Has a denali cap attached.
struct YellowstoneGetDenaliResp {
uint64_t type;
uint64_t device_id;
uint64_t lba_offset;
};

View File

@ -1,5 +1,6 @@
#pragma once
#include <denali/denali_client.h>
#include <mammoth/endpoint_client.h>
#include <mammoth/memory_region.h>
#include <mammoth/port_client.h>
@ -10,6 +11,7 @@ class YellowstoneStub {
explicit YellowstoneStub(z_cap_t yellowstone_cap);
glcr::ErrorOr<MappedMemoryRegion> GetAhciConfig();
glcr::ErrorOr<ScopedDenaliClient> GetDenali();
[[nodiscard]] glcr::ErrorCode Register(glcr::String name,
const EndpointClient& client);

View File

@ -1,5 +1,7 @@
#include "include/yellowstone_stub.h"
#include <denali/denali_client.h>
#include "include/yellowstone.h"
namespace {
@ -22,6 +24,19 @@ glcr::ErrorOr<MappedMemoryRegion> YellowstoneStub::GetAhciConfig() {
return MappedMemoryRegion::DirectPhysical(resp.ahci_phys_offset, kPciSize);
}
glcr::ErrorOr<ScopedDenaliClient> YellowstoneStub::GetDenali() {
YellowstoneGetReq req{
.type = kYellowstoneGetDenali,
};
ASSIGN_OR_RETURN(
auto resp_and_cap,
(yellowstone_stub_->CallEndpointGetCap<YellowstoneGetReq,
YellowstoneGetDenaliResp>(req)));
return ScopedDenaliClient(
EndpointClient::AdoptEndpoint(resp_and_cap.second()), 0,
resp_and_cap.first().lba_offset);
}
glcr::ErrorCode YellowstoneStub::Register(glcr::String name,
const EndpointClient& client) {
if (register_port_.empty()) {

View File

@ -22,10 +22,6 @@ uint64_t main(uint64_t port_cap) {
server->GetServerClient());
check(SpawnProcessFromElfRegion(vaddr, glcr::Move(client)));
check(ZAddressSpaceMap(gSelfVmasCap, 0, gBootVictoriaFallsVmmoCap, &vaddr));
ASSIGN_OR_RETURN(client, server->GetServerClient());
check(SpawnProcessFromElfRegion(vaddr, glcr::Move(client)));
check(server_thread.Join());
check(registration_thread.Join());
dbgln("Yellowstone Finished Successfully.");

View File

@ -3,6 +3,8 @@
#include <denali/denali.h>
#include <glacier/string/string.h>
#include <mammoth/debug.h>
#include <mammoth/init.h>
#include <mammoth/process.h>
#include <stdlib.h>
#include "hw/gpt.h"
@ -20,11 +22,19 @@ void RegistrationThreadBootstrap(void* yellowstone) {
static_cast<YellowstoneServer*>(yellowstone)->RegistrationThread();
}
glcr::ErrorCode HandleDenaliRegistration(z_cap_t endpoint_cap) {
struct PartitionInfo {
uint64_t device_id;
uint64_t partition_lba;
};
glcr::ErrorOr<PartitionInfo> HandleDenaliRegistration(z_cap_t endpoint_cap) {
GptReader reader(glcr::UniquePtr<DenaliClient>(
new DenaliClient(EndpointClient::AdoptEndpoint(endpoint_cap))));
return reader.ParsePartitionTables();
RET_ERR(reader.ParsePartitionTables());
return PartitionInfo{.device_id = 0,
.partition_lba = reader.GetPrimaryPartitionLba()};
}
} // namespace
@ -77,6 +87,18 @@ void YellowstoneServer::ServerThread() {
check(ZReplyPortSend(reply_port_cap, sizeof(resp), &resp, 1, &reg_cap));
break;
}
case kYellowstoneGetDenali: {
dbgln("Yellowstone::GetDenali");
z_cap_t new_denali;
check(ZCapDuplicate(denali_cap_, &new_denali));
YellowstoneGetDenaliResp resp{
.type = kYellowstoneGetDenali,
.device_id = device_id_,
.lba_offset = lba_offset_,
};
check(ZReplyPortSend(reply_port_cap, sizeof(resp), &resp, 1,
&new_denali));
}
default:
dbgln("Unknown request type: %x", req->type);
break;
@ -94,7 +116,21 @@ void YellowstoneServer::RegistrationThread() {
glcr::String name(registration_buffer_);
if (name == "denali") {
denali_cap_ = endpoint_cap;
check(HandleDenaliRegistration(denali_cap_));
auto part_info_or = HandleDenaliRegistration(denali_cap_);
if (!part_info_or.ok()) {
check(part_info_or.error());
}
device_id_ = part_info_or.value().device_id;
lba_offset_ = part_info_or.value().partition_lba;
uint64_t vaddr;
check(
ZAddressSpaceMap(gSelfVmasCap, 0, gBootVictoriaFallsVmmoCap, &vaddr));
auto client_or = GetServerClient();
if (!client_or.ok()) {
check(client_or.error());
}
check(SpawnProcessFromElfRegion(vaddr, glcr::Move(client_or.value())));
continue;
}

View File

@ -30,6 +30,8 @@ class YellowstoneServer {
// TODO: Store these in a data structure.
z_cap_t denali_cap_ = 0;
uint64_t device_id_ = 0;
uint64_t lba_offset_ = 0;
z_cap_t victoria_falls_cap_ = 0;
PciReader pci_reader_;