denuvo-ref/bareflank-hypervisor
1
0
Fork 0
mirror of https://github.com/Bareflank/hypervisor synced 2026-08-17 06:23:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add clear() to init on Intel

Browse source 
This patch clears the VMCS on init for Intel, which is needed because
the memory that is given to the the VMCS might have come from an old
VMCS that was still cached in hardware.
This commit is contained in:
Rian Quinn 2021-09-24 08:05:26 -06:00
parent df09a4434d
commit 112f2bed57
4 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/src/dispatch_syscall_vs_op.hpp
View file

@ -384,7 +384,7 @@ namespace mk
return syscall::BF_STATUS_INVALID_INPUT_REG1;
}
auto const ret{mut_vs_pool.clear(intrinsic, vsid)};
auto const ret{mut_vs_pool.clear(mut_tls, intrinsic, vsid)};
if (bsl::unlikely(!ret)) {
bsl::print<bsl::V>() << bsl::here();
return syscall::BF_STATUS_FAILURE_UNKNOWN;
@ -430,7 +430,7 @@ namespace mk
return syscall::BF_STATUS_FAILURE_UNKNOWN;
}
auto const ret{mut_vs_pool.migrate(mut_intrinsic, ppid, vsid)};
auto const ret{mut_vs_pool.migrate(mut_tls, mut_intrinsic, ppid, vsid)};
if (bsl::unlikely(!ret)) {
bsl::print<bsl::V>() << bsl::here();
return syscall::BF_STATUS_FAILURE_UNKNOWN;

10
kernel/src/vs_pool_t.hpp
View file

@ -263,6 +263,7 @@ namespace mk
/// @brief Migrates the requested vs_t from one PP to another
///
/// <!-- inputs/outputs -->
/// @param mut_tls the current TLS block
/// @param mut_intrinsic the intrinsic_t to use
/// @param ppid the ID of the PP to migrate to
/// @param vsid the ID of the vs_t to migrate
@ -271,11 +272,12 @@ namespace mk
///
[[nodiscard]] constexpr auto
migrate(
tls_t &mut_tls,
intrinsic_t &mut_intrinsic,
bsl::safe_u16 const &ppid,
bsl::safe_u16 const &vsid) noexcept -> bsl::errc_type
{
return this->get_vs(vsid)->migrate(mut_intrinsic, ppid);
return this->get_vs(vsid)->migrate(mut_tls, mut_intrinsic, ppid);
}
/// <!-- description -->
@ -458,15 +460,17 @@ namespace mk
/// values stored in the vs_t.
///
/// <!-- inputs/outputs -->
/// @param mut_tls the current TLS block
/// @param intrinsic the intrinsic_t to use
/// @param vsid the ID of the vs_t to clear
/// @return Returns bsl::errc_success on success, bsl::errc_failure
/// and friends otherwise
///
[[nodiscard]] constexpr auto
clear(intrinsic_t const &intrinsic, bsl::safe_u16 const &vsid) noexcept -> bsl::errc_type
clear(tls_t &mut_tls, intrinsic_t const &intrinsic, bsl::safe_u16 const &vsid) noexcept
-> bsl::errc_type
{
return this->get_vs(vsid)->clear(intrinsic);
return this->get_vs(vsid)->clear(mut_tls, intrinsic);
}
/// <!-- description -->

10
kernel/src/x64/amd/vs_t.hpp
View file

@ -452,19 +452,21 @@ namespace mk
/// @brief Migrates this vs_t from one PP to another
///
/// <!-- inputs/outputs -->
/// @param tls the current TLS block
/// @param intrinsic the intrinsic_t to use
/// @param ppid the ID of the PP to migrate to
/// @return Returns bsl::errc_success on success, bsl::errc_failure
/// and friends otherwise
///
[[nodiscard]] constexpr auto
migrate(intrinsic_t const &intrinsic, bsl::safe_u16 const &ppid) noexcept -> bsl::errc_type
migrate(tls_t const &tls, intrinsic_t const &intrinsic, bsl::safe_u16 const &ppid) noexcept
-> bsl::errc_type
{
bsl::expects(allocated_status_t::allocated == m_allocated);
bsl::expects(ppid.is_valid_and_checked());
bsl::expects(ppid != syscall::BF_INVALID_ID);
auto const ret{this->clear(intrinsic)};
auto const ret{this->clear(tls, intrinsic)};
if (bsl::unlikely(!ret)) {
bsl::print<bsl::V>() << bsl::here();
return ret;
@ -2367,13 +2369,15 @@ namespace mk
/// values stored in the vs_t.
///
/// <!-- inputs/outputs -->
/// @param tls the current TLS block
/// @param intrinsic the intrinsic_t to use
/// @return Returns bsl::errc_success on success, bsl::errc_failure
/// and friends otherwise
///
[[nodiscard]] constexpr auto
clear(intrinsic_t const &intrinsic) noexcept -> bsl::errc_type
clear(tls_t const &tls, intrinsic_t const &intrinsic) noexcept -> bsl::errc_type
{
bsl::discard(tls);
bsl::discard(intrinsic);
bsl::expects(allocated_status_t::allocated == m_allocated);

16
kernel/src/x64/intel/vs_t.hpp
View file

@ -481,6 +481,9 @@ namespace mk
m_vmcs->revision_id = bsl::to_u32_unsafe(revision_id).get();
this->ensure_this_vs_is_loaded(mut_tls, mut_intrinsic);
bsl::expects(mut_intrinsic.vmcl(&m_vmcs_phys));
bsl::expects(mut_intrinsic.vmld(&m_vmcs_phys));
auto const es{mut_intrinsic.es_selector()};
bsl::expects(mut_intrinsic.vmwr16(VMCS_HOST_ES_SELECTOR, es));
auto const cs{mut_intrinsic.cs_selector()};
@ -831,19 +834,21 @@ namespace mk
/// @brief Migrates this vs_t from one PP to another
///
/// <!-- inputs/outputs -->
/// @param mut_tls the current TLS block
/// @param intrinsic the intrinsic_t to use
/// @param ppid the ID of the PP to migrate to
/// @return Returns bsl::errc_success on success, bsl::errc_failure
/// and friends otherwise
///
[[nodiscard]] constexpr auto
migrate(intrinsic_t const &intrinsic, bsl::safe_u16 const &ppid) noexcept -> bsl::errc_type
migrate(tls_t &mut_tls, intrinsic_t const &intrinsic, bsl::safe_u16 const &ppid) noexcept
-> bsl::errc_type
{
bsl::expects(allocated_status_t::allocated == m_allocated);
bsl::expects(ppid.is_valid_and_checked());
bsl::expects(ppid != syscall::BF_INVALID_ID);
auto const ret{this->clear(intrinsic)};
auto const ret{this->clear(mut_tls, intrinsic)};
if (bsl::unlikely(!ret)) {
bsl::print<bsl::V>() << bsl::here();
return ret;
@ -3137,12 +3142,13 @@ namespace mk
/// values stored in the vs_t.
///
/// <!-- inputs/outputs -->
/// @param mut_tls the current TLS block
/// @param intrinsic the intrinsic_t to use
/// @return Returns bsl::errc_success on success, bsl::errc_failure
/// and friends otherwise
///
[[nodiscard]] constexpr auto
clear(intrinsic_t const &intrinsic) noexcept -> bsl::errc_type
clear(tls_t &mut_tls, intrinsic_t const &intrinsic) noexcept -> bsl::errc_type
{
bsl::discard(intrinsic);
bsl::expects(allocated_status_t::allocated == m_allocated);
@ -3160,6 +3166,10 @@ namespace mk
bsl::expects(intrinsic.vmcl(&m_vmcs_phys));
m_vmcs_missing_registers.launched = {};
if (this->id() == mut_tls.loaded_vsid) {
mut_tls.loaded_vsid = syscall::BF_INVALID_ID.get();
}
return bsl::errc_success;
}