X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fsim%2Fsystem.cc;h=74bc94ee848b78f49bd10c54b722c60c1779bd9c;hb=4c35b42d2fb6f7588dbd56f0dde64b32ce1adafb;hp=9cd79cac0b1be7f8e20f4458c13b5b33774eb1dd;hpb=74a4926fe0a92502ca98ca7656dca478d88eb2f1;p=gem5.git diff --git a/src/sim/system.cc b/src/sim/system.cc index 9cd79cac0..74bc94ee8 100644 --- a/src/sim/system.cc +++ b/src/sim/system.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2014 ARM Limited + * Copyright (c) 2011-2014,2017-2018 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -45,25 +45,40 @@ * Rick Strong */ -#include "arch/isa_traits.hh" +#include "sim/system.hh" + +#include + #include "arch/remote_gdb.hh" #include "arch/utility.hh" #include "base/loader/object_file.hh" #include "base/loader/symtab.hh" #include "base/str.hh" #include "base/trace.hh" -#include "config/the_isa.hh" +#include "config/use_kvm.hh" +#if USE_KVM +#include "cpu/kvm/base.hh" +#include "cpu/kvm/vm.hh" +#endif +#include "cpu/base.hh" #include "cpu/thread_context.hh" #include "debug/Loader.hh" #include "debug/WorkItems.hh" -#include "kern/kernel_stats.hh" #include "mem/abstract_mem.hh" #include "mem/physical.hh" #include "params/System.hh" #include "sim/byteswap.hh" #include "sim/debug.hh" #include "sim/full_system.hh" -#include "sim/system.hh" + +/** + * To avoid linking errors with LTO, only include the header if we + * actually have a definition. + */ +#if THE_ISA != NULL_ISA +#include "kern/kernel_stats.hh" + +#endif using namespace std; using namespace TheISA; @@ -74,19 +89,26 @@ int System::numSystemsRunning = 0; System::System(Params *p) : MemObject(p), _systemPort("system_port", this), - _numContexts(0), + multiThread(p->multi_thread), pagePtr(0), init_param(p->init_param), physProxy(_systemPort, p->cache_line_size), + kernelSymtab(nullptr), + kernel(nullptr), loadAddrMask(p->load_addr_mask), loadAddrOffset(p->load_offset), - nextPID(0), - physmem(name() + ".physmem", p->memories), +#if USE_KVM + kvmVM(p->kvm_vm), +#else + kvmVM(nullptr), +#endif + physmem(name() + ".physmem", p->memories, p->mmap_using_noreserve), memoryMode(p->mem_mode), _cacheLineSize(p->cache_line_size), workItemsBegin(0), workItemsEnd(0), numWorkIds(p->num_work_ids), + thermalModel(p->thermal_model), _params(p), totalNumInsts(0), instEventQueue("system instruction-based event queue") @@ -94,6 +116,12 @@ System::System(Params *p) // add self to global system list systemList.push_back(this); +#if USE_KVM + if (kvmVM) { + kvmVM->setSystem(this); + } +#endif + if (FullSystem) { kernelSymtab = new SymbolTable; if (!debugSymbolTable) @@ -107,19 +135,17 @@ System::System(Params *p) // Get the generic system master IDs MasterID tmp_id M5_VAR_USED; - tmp_id = getMasterId("writebacks"); + tmp_id = getMasterId(this, "writebacks"); assert(tmp_id == Request::wbMasterId); - tmp_id = getMasterId("functional"); + tmp_id = getMasterId(this, "functional"); assert(tmp_id == Request::funcMasterId); - tmp_id = getMasterId("interrupt"); + tmp_id = getMasterId(this, "interrupt"); assert(tmp_id == Request::intMasterId); if (FullSystem) { if (params()->kernel == "") { inform("No kernel set for full system simulation. " "Assuming you know what you're doing\n"); - - kernel = NULL; } else { // Get the kernel code kernel = createObjectFile(params()->kernel); @@ -133,6 +159,14 @@ System::System(Params *p) kernelEnd = kernel->bssBase() + kernel->bssSize(); kernelEntry = kernel->entryPoint(); + // If load_addr_mask is set to 0x0, then auto-calculate + // the smallest mask to cover all kernel addresses so gem5 + // can relocate the kernel to a new offset. + if (loadAddrMask == 0) { + Addr shift_amt = findMsbSet(kernelEnd - kernelStart) + 1; + loadAddrMask = ((Addr)1 << shift_amt) - 1; + } + // load symbols if (!kernel->loadGlobalSymbols(kernelSymtab)) fatal("could not load kernel symbols\n"); @@ -149,9 +183,17 @@ System::System(Params *p) // Loading only needs to happen once and after memory system is // connected so it will happen in initState() } + + for (const auto &obj_name : p->kernel_extras) { + inform("Loading additional kernel object: %s", obj_name); + ObjectFile *obj = createObjectFile(obj_name); + fatal_if(!obj, "Failed to additional kernel object '%s'.\n", + obj_name); + kernelExtras.push_back(obj); + } } - // increment the number of running systms + // increment the number of running systems numSystemsRunning++; // Set back pointers to the system in all memories @@ -186,7 +228,7 @@ System::getMasterPort(const std::string &if_name, PortID idx) void System::setMemoryMode(Enums::MemoryMode mode) { - assert(getDrainState() == Drainable::Drained); + assert(drainState() == DrainState::Drained); memoryMode = mode; } @@ -197,47 +239,38 @@ bool System::breakpoint() return false; } -/** - * Setting rgdb_wait to a positive integer waits for a remote debugger to - * connect to that context ID before continuing. This should really - be a parameter on the CPU object or something... - */ -int rgdb_wait = -1; - -int -System::registerThreadContext(ThreadContext *tc, int assigned) +ContextID +System::registerThreadContext(ThreadContext *tc, ContextID assigned) { - int id; - if (assigned == -1) { - for (id = 0; id < threadContexts.size(); id++) { - if (!threadContexts[id]) - break; - } - - if (threadContexts.size() <= id) - threadContexts.resize(id + 1); - } else { - if (threadContexts.size() <= assigned) - threadContexts.resize(assigned + 1); - id = assigned; + int id = assigned; + if (id == InvalidContextID) { + // Find an unused context ID for this thread. + id = 0; + while (id < threadContexts.size() && threadContexts[id]) + id++; } - if (threadContexts[id]) - fatal("Cannot have two CPUs with the same id (%d)\n", id); + if (threadContexts.size() <= id) + threadContexts.resize(id + 1); + + fatal_if(threadContexts[id], + "Cannot have two CPUs with the same id (%d)\n", id); threadContexts[id] = tc; - _numContexts++; #if THE_ISA != NULL_ISA int port = getRemoteGDBPort(); if (port) { - RemoteGDB *rgdb = new RemoteGDB(this, tc); - GDBListener *gdbl = new GDBListener(rgdb, port + id); - gdbl->listen(); + RemoteGDB *rgdb = new RemoteGDB(this, tc, port + id); + rgdb->listen(); - if (rgdb_wait != -1 && rgdb_wait == id) - gdbl->accept(); + BaseCPU *cpu = tc->getCpuPtr(); + if (cpu->waitForRemoteGDB()) { + inform("%s: Waiting for a remote GDB connection on port %d.\n", + cpu->name(), rgdb->port()); + rgdb->connect(); + } if (remoteGDB.size() <= id) { remoteGDB.resize(id + 1); } @@ -254,12 +287,13 @@ System::registerThreadContext(ThreadContext *tc, int assigned) int System::numRunningContexts() { - int running = 0; - for (int i = 0; i < _numContexts; ++i) { - if (threadContexts[i]->status() != ThreadContext::Halted) - ++running; - } - return running; + return std::count_if( + threadContexts.cbegin(), + threadContexts.cend(), + [] (ThreadContext* tc) { + return tc->status() != ThreadContext::Halted; + } + ); } void @@ -290,6 +324,10 @@ System::initState() } // Load program sections into memory kernel->loadSections(physProxy, loadAddrMask, loadAddrOffset); + for (const auto &extra_kernel : kernelExtras) { + extra_kernel->loadSections(physProxy, loadAddrMask, + loadAddrOffset); + } DPRINTF(Loader, "Kernel start = %#x\n", kernelStart); DPRINTF(Loader, "Kernel end = %#x\n", kernelEnd); @@ -297,12 +335,10 @@ System::initState() DPRINTF(Loader, "Kernel loaded...\n"); } } - - activeCpus.clear(); } void -System::replaceThreadContext(ThreadContext *tc, int context_id) +System::replaceThreadContext(ThreadContext *tc, ContextID context_id) { if (context_id >= threadContexts.size()) { panic("replaceThreadContext: bad id, %d >= %d\n", @@ -314,12 +350,40 @@ System::replaceThreadContext(ThreadContext *tc, int context_id) remoteGDB[context_id]->replaceThreadContext(tc); } +bool +System::validKvmEnvironment() const +{ +#if USE_KVM + if (threadContexts.empty()) + return false; + + for (auto tc : threadContexts) { + if (dynamic_cast(tc->getCpuPtr()) == nullptr) { + return false; + } + } + return true; +#else + return false; +#endif +} + Addr System::allocPhysPages(int npages) { - Addr return_addr = pagePtr << LogVMPageSize; + Addr return_addr = pagePtr << PageShift; pagePtr += npages; - if ((pagePtr << LogVMPageSize) > physmem.totalSize()) + + Addr next_return_addr = pagePtr << PageShift; + + AddrRange m5opRange(0xffff0000, 0xffffffff); + if (m5opRange.contains(next_return_addr)) { + warn("Reached m5ops MMIO region\n"); + return_addr = 0xffffffff; + pagePtr = 0xffffffff >> PageShift; + } + + if ((pagePtr << PageShift) > physmem.totalSize()) fatal("Out of memory, please increase size of physical memory."); return return_addr; } @@ -333,7 +397,7 @@ System::memSize() const Addr System::freeMemSize() const { - return physmem.totalSize() - (pagePtr << LogVMPageSize); + return physmem.totalSize() - (pagePtr << PageShift); } bool @@ -342,51 +406,42 @@ System::isMemAddr(Addr addr) const return physmem.isMemAddr(addr); } -unsigned int -System::drain(DrainManager *dm) -{ - setDrainState(Drainable::Drained); - return 0; -} - void System::drainResume() { - Drainable::drainResume(); totalNumInsts = 0; } void -System::serialize(ostream &os) +System::serialize(CheckpointOut &cp) const { if (FullSystem) - kernelSymtab->serialize("kernel_symtab", os); + kernelSymtab->serialize("kernel_symtab", cp); SERIALIZE_SCALAR(pagePtr); - SERIALIZE_SCALAR(nextPID); - serializeSymtab(os); + serializeSymtab(cp); // also serialize the memories in the system - nameOut(os, csprintf("%s.physmem", name())); - physmem.serialize(os); + physmem.serializeSection(cp, "physmem"); } void -System::unserialize(Checkpoint *cp, const string §ion) +System::unserialize(CheckpointIn &cp) { if (FullSystem) - kernelSymtab->unserialize("kernel_symtab", cp, section); + kernelSymtab->unserialize("kernel_symtab", cp); UNSERIALIZE_SCALAR(pagePtr); - UNSERIALIZE_SCALAR(nextPID); - unserializeSymtab(cp, section); + unserializeSymtab(cp); // also unserialize the memories in the system - physmem.unserialize(cp, csprintf("%s.physmem", name())); + physmem.unserializeSection(cp, "physmem"); } void System::regStats() { + MemObject::regStats(); + for (uint32_t j = 0; j < numWorkIds ; j++) { workItemStats[j] = new Stats::Histogram(); stringstream namestr; @@ -418,12 +473,16 @@ System::workItemEnd(uint32_t tid, uint32_t workid) void System::printSystems() { + ios::fmtflags flags(cerr.flags()); + vector::iterator i = systemList.begin(); vector::iterator end = systemList.end(); for (; i != end; ++i) { System *sys = *i; cerr << "System " << sys->name() << ": " << hex << sys << endl; } + + cerr.flags(flags); } void @@ -433,15 +492,27 @@ printSystems() } MasterID -System::getMasterId(std::string master_name) +System::getGlobalMasterId(std::string master_name) +{ + return _getMasterId(nullptr, master_name); +} + +MasterID +System::getMasterId(const SimObject* master, std::string submaster) +{ + auto master_name = leafMasterName(master, submaster); + return _getMasterId(master, master_name); +} + +MasterID +System::_getMasterId(const SimObject* master, std::string master_name) { - // strip off system name if the string starts with it if (startswith(master_name, name())) master_name = master_name.erase(0, name().size() + 1); // CPUs in switch_cpus ask for ids again after switching - for (int i = 0; i < masterIds.size(); i++) { - if (masterIds[i] == master_name) { + for (int i = 0; i < masters.size(); i++) { + if (masters[i].masterName == master_name) { return i; } } @@ -450,22 +521,40 @@ System::getMasterId(std::string master_name) // Otherwise objects will have sized their stat buckets and // they will be too small - if (Stats::enabled()) - fatal("Can't request a masterId after regStats(). \ - You must do so in init().\n"); + if (Stats::enabled()) { + fatal("Can't request a masterId after regStats(). " + "You must do so in init().\n"); + } + + // Generate a new MasterID incrementally + MasterID master_id = masters.size(); - masterIds.push_back(master_name); + // Append the new Master metadata to the group of system Masters. + masters.emplace_back(master, master_name, master_id); + + return masters.back().masterId; +} - return masterIds.size() - 1; +std::string +System::leafMasterName(const SimObject* master, const std::string& submaster) +{ + if (submaster.empty()) { + return master->name(); + } else { + // Get the full master name by appending the submaster name to + // the root SimObject master name + return master->name() + "." + submaster; + } } std::string System::getMasterName(MasterID master_id) { - if (master_id >= masterIds.size()) + if (master_id >= masters.size()) fatal("Invalid master_id passed to getMasterName()\n"); - return masterIds[master_id]; + const auto& master_info = masters[master_id]; + return master_info.masterName; } System *