Remove unused files (#130)
Signed-off-by: Dave Thaler <dthaler@ntdev.microsoft.com>
This commit is contained in:
Dave Thaler
GitHub
Родитель
0459505439
Коммит
90d0f6971f
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright (c) Microsoft Corporation
|
||||
SPDX-License-Identifier: MIT
|
||||
-->
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<OutputRoot Condition=" '$(OutputRoot)' == ''">$(EnlistmentRoot)\out</OutputRoot>
|
||||
<OutputPath Condition=" '$(OutputPath)' == '' ">$(OutputRoot)\$(Platform)\$(Configuration)\$(AssemblyName)</OutputPath>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.30920.69
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EbpfVerifierEnclaveLib", "ebpf\libs\EbpfVerifierEnclaveLib\EbpfVerifierEnclaveLib.vcxproj", "{669DB1E0-31AF-4487-BF3D-35B2C897EB21}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ebpfenclave", "ebpf\verifierenclave\ebpfenclave.vcxproj", "{BD96C5F6-42E4-43E1-967D-5FADF3E7F156}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{669DB1E0-31AF-4487-BF3D-35B2C897EB21} = {669DB1E0-31AF-4487-BF3D-35B2C897EB21}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enclavetest", "tools\enclavetest\enclavetest.vcxproj", "{726371EE-49B3-4D98-A3B4-779F939A449B}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{BD96C5F6-42E4-43E1-967D-5FADF3E7F156} = {BD96C5F6-42E4-43E1-967D-5FADF3E7F156}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{669DB1E0-31AF-4487-BF3D-35B2C897EB21}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{669DB1E0-31AF-4487-BF3D-35B2C897EB21}.Debug|x64.Build.0 = Debug|x64
|
||||
{669DB1E0-31AF-4487-BF3D-35B2C897EB21}.Debug|x86.ActiveCfg = Debug|x64
|
||||
{669DB1E0-31AF-4487-BF3D-35B2C897EB21}.Release|x64.ActiveCfg = Release|x64
|
||||
{669DB1E0-31AF-4487-BF3D-35B2C897EB21}.Release|x64.Build.0 = Release|x64
|
||||
{669DB1E0-31AF-4487-BF3D-35B2C897EB21}.Release|x86.ActiveCfg = Release|x64
|
||||
{BD96C5F6-42E4-43E1-967D-5FADF3E7F156}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{BD96C5F6-42E4-43E1-967D-5FADF3E7F156}.Debug|x64.Build.0 = Debug|x64
|
||||
{BD96C5F6-42E4-43E1-967D-5FADF3E7F156}.Debug|x86.ActiveCfg = Debug|x64
|
||||
{BD96C5F6-42E4-43E1-967D-5FADF3E7F156}.Release|x64.ActiveCfg = Release|x64
|
||||
{BD96C5F6-42E4-43E1-967D-5FADF3E7F156}.Release|x64.Build.0 = Release|x64
|
||||
{BD96C5F6-42E4-43E1-967D-5FADF3E7F156}.Release|x86.ActiveCfg = Release|x64
|
||||
{726371EE-49B3-4D98-A3B4-779F939A449B}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{726371EE-49B3-4D98-A3B4-779F939A449B}.Debug|x64.Build.0 = Debug|x64
|
||||
{726371EE-49B3-4D98-A3B4-779F939A449B}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{726371EE-49B3-4D98-A3B4-779F939A449B}.Debug|x86.Build.0 = Debug|Win32
|
||||
{726371EE-49B3-4D98-A3B4-779F939A449B}.Release|x64.ActiveCfg = Release|x64
|
||||
{726371EE-49B3-4D98-A3B4-779F939A449B}.Release|x64.Build.0 = Release|x64
|
||||
{726371EE-49B3-4D98-A3B4-779F939A449B}.Release|x86.ActiveCfg = Release|Win32
|
||||
{726371EE-49B3-4D98-A3B4-779F939A449B}.Release|x86.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {E88020F9-F8C4-44AB-9831-243225202B90}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<!--
|
||||
Copyright (c) Microsoft Corporation
|
||||
SPDX-License-Identifier: MIT
|
||||
-->
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="Microsoft.Build.Traversal">
|
||||
<ItemGroup>
|
||||
<ProjectFile Include="ebpf\dirs.proj" />
|
||||
<ProjectFile Include="tools\dirs.proj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<!--
|
||||
Copyright (c) Microsoft Corporation
|
||||
SPDX-License-Identifier: MIT
|
||||
-->
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="Microsoft.Build.Traversal">
|
||||
<ItemGroup>
|
||||
<ProjectFile Include="enclavehost\enclavehost.vcxproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
{
|
||||
"lockfileVersion": 1
|
||||
}
|
||||
|
|
@ -1,186 +0,0 @@
|
|||
// Copyright (c) Prevail Verifier contributors.
|
||||
// SPDX-License-Identifier: MIT
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
|
||||
#include <boost/functional/hash.hpp>
|
||||
|
||||
#include "CLI11.hpp"
|
||||
|
||||
#include "ebpf_verifier.hpp"
|
||||
#ifdef _WIN32
|
||||
#include "memsize_windows.hpp"
|
||||
#else
|
||||
#include "memsize_linux.hpp"
|
||||
#endif
|
||||
#include "linux_verifier.hpp"
|
||||
#include "utils.hpp"
|
||||
#include "windows/windows_platform.hpp"
|
||||
|
||||
using std::string;
|
||||
using std::vector;
|
||||
|
||||
static size_t
|
||||
hash(const raw_program& raw_prog)
|
||||
{
|
||||
char* start = (char*)raw_prog.prog.data();
|
||||
char* end = start + (raw_prog.prog.size() * sizeof(ebpf_inst));
|
||||
return boost::hash_range(start, end);
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
ebpf_verifier_options_t ebpf_verifier_options = ebpf_verifier_default_options;
|
||||
|
||||
// Parse command line arguments:
|
||||
|
||||
crab::CrabEnableWarningMsg(false);
|
||||
|
||||
CLI::App app{"A new eBPF verifier"};
|
||||
|
||||
std::string filename;
|
||||
app.add_option("path", filename, "Elf file to analyze")->required()->type_name("FILE");
|
||||
|
||||
std::string desired_section;
|
||||
|
||||
app.add_option("section", desired_section, "Section to analyze")->type_name("SECTION");
|
||||
bool list = false;
|
||||
app.add_flag("-l", list, "List sections");
|
||||
|
||||
std::string platform_name = "linux";
|
||||
std::set<string> platform_names{"linux", "windows"};
|
||||
app.add_set("-p,--plat,--platform", platform_name, platform_names, "Platform")->type_name("PLATFORM");
|
||||
|
||||
std::string domain = "zoneCrab";
|
||||
std::set<string> doms{"stats", "linux", "zoneCrab", "cfg"};
|
||||
app.add_set("-d,--dom,--domain", domain, doms, "Abstract domain")->type_name("DOMAIN");
|
||||
|
||||
ebpf_verifier_options.check_termination = false;
|
||||
app.add_flag("--termination", ebpf_verifier_options.check_termination, "Verify termination");
|
||||
|
||||
bool verbose = false;
|
||||
app.add_flag("-i", ebpf_verifier_options.print_invariants, "Print invariants");
|
||||
app.add_flag("-f", ebpf_verifier_options.print_failures, "Print verifier's failure logs");
|
||||
app.add_flag("-v", verbose, "Print both invariants and failures");
|
||||
app.add_flag("--no-simplify", ebpf_verifier_options.no_simplify, "Do not simplify");
|
||||
|
||||
bool no_mock_maps{false};
|
||||
app.add_flag("--no-mock-maps", no_mock_maps, "Use actual maps");
|
||||
|
||||
std::string asmfile;
|
||||
app.add_option("--asm", asmfile, "Print disassembly to FILE")->type_name("FILE");
|
||||
std::string dotfile;
|
||||
app.add_option("--dot", dotfile, "Export control-flow graph to dot FILE")->type_name("FILE");
|
||||
|
||||
app.footer("You can use @headers as the path to instead just show the output "
|
||||
"field headers.\n");
|
||||
|
||||
CLI11_PARSE(app, argc, argv);
|
||||
if (verbose)
|
||||
ebpf_verifier_options.print_invariants = ebpf_verifier_options.print_failures = true;
|
||||
|
||||
// Main program
|
||||
|
||||
if (filename == "@headers") {
|
||||
if (domain == "stats") {
|
||||
std::cout << "hash";
|
||||
std::cout << ",instructions";
|
||||
for (const string& h : stats_headers()) {
|
||||
std::cout << "," << h;
|
||||
}
|
||||
} else {
|
||||
std::cout << domain << "?,";
|
||||
std::cout << domain << "_sec,";
|
||||
std::cout << domain << "_kb";
|
||||
}
|
||||
std::cout << "\n";
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if !__linux__
|
||||
if (domain == "linux") {
|
||||
std::cerr << "error: linux domain is unsupported on this machine\n";
|
||||
return 64;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (no_mock_maps || (domain == "linux"))
|
||||
ebpf_verifier_options.mock_map_fds = false;
|
||||
const ebpf_platform_t* platform = (platform_name == "linux") ? &g_ebpf_platform_linux : &g_ebpf_platform_windows;
|
||||
|
||||
// Read a set of raw program sections from an ELF file.
|
||||
vector<raw_program> raw_progs;
|
||||
try {
|
||||
raw_progs = read_elf(filename, desired_section, &ebpf_verifier_options, platform);
|
||||
} catch (std::runtime_error e) {
|
||||
std::cerr << "error: " << e.what() << std::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (list || raw_progs.size() != 1) {
|
||||
if (!list) {
|
||||
std::cout << "please specify a section\n";
|
||||
std::cout << "available sections:\n";
|
||||
}
|
||||
if (!desired_section.empty() && raw_progs.size() == 0) {
|
||||
// We could not find the desired section, so get the full list
|
||||
// of possibilities.
|
||||
raw_progs = read_elf(filename, string(), &ebpf_verifier_options, platform);
|
||||
}
|
||||
for (const raw_program& raw_prog : raw_progs) {
|
||||
std::cout << raw_prog.section << " ";
|
||||
}
|
||||
std::cout << "\n";
|
||||
return list ? 0 : 64;
|
||||
}
|
||||
|
||||
// Select the last program section.
|
||||
raw_program raw_prog = raw_progs.back();
|
||||
|
||||
// Convert the raw program section to a set of instructions.
|
||||
std::variant<InstructionSeq, std::string> prog_or_error = unmarshal(raw_prog, platform);
|
||||
if (std::holds_alternative<string>(prog_or_error)) {
|
||||
std::cout << "unmarshaling error at " << std::get<string>(prog_or_error) << "\n";
|
||||
return 1;
|
||||
}
|
||||
|
||||
auto& prog = std::get<InstructionSeq>(prog_or_error);
|
||||
if (!asmfile.empty()) {
|
||||
print(prog, asmfile);
|
||||
}
|
||||
|
||||
if (domain == "zoneCrab") {
|
||||
const auto [res, seconds] = timed_execution(
|
||||
[&] { return ebpf_verify_program(std::cout, prog, raw_prog.info, &ebpf_verifier_options); });
|
||||
std::cout << res << "," << seconds << "," << resident_set_size_kb() << "\n";
|
||||
return !res;
|
||||
} else if (domain == "linux") {
|
||||
// Pass the intruction sequence to the Linux kernel verifier.
|
||||
const auto [res, seconds] = bpf_verify_program(raw_prog.info.type, raw_prog.prog, &ebpf_verifier_options);
|
||||
std::cout << res << "," << seconds << "," << resident_set_size_kb() << "\n";
|
||||
return !res;
|
||||
} else if (domain == "stats") {
|
||||
// Convert the instruction sequence to a control-flow graph.
|
||||
cfg_t cfg = prepare_cfg(prog, raw_prog.info, !ebpf_verifier_options.no_simplify);
|
||||
|
||||
// Just print eBPF program stats.
|
||||
auto stats = collect_stats(cfg);
|
||||
if (!dotfile.empty()) {
|
||||
print_dot(cfg, dotfile);
|
||||
}
|
||||
std::cout << std::hex << hash(raw_prog) << std::dec << "," << prog.size();
|
||||
for (const string& h : stats_headers()) {
|
||||
std::cout << "," << stats.at(h);
|
||||
}
|
||||
std::cout << "\n";
|
||||
} else if (domain == "cfg") {
|
||||
// Convert the instruction sequence to a control-flow graph.
|
||||
cfg_t cfg = prepare_cfg(prog, raw_prog.info, !ebpf_verifier_options.no_simplify);
|
||||
std::cout << cfg;
|
||||
std::cout << "\n";
|
||||
} else {
|
||||
assert(false);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="Microsoft.Build.Traversal">
|
||||
<ItemGroup>
|
||||
<ProjectFile Include="elfhelper\elfhelper.vcxproj" />
|
||||
<ProjectFile Include="netsh\ebpfnetsh.vcxproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
Загрузка…
Ссылка в новой задаче