Skip to content

Detect apic mode when entering arceos during type 1.5 process. #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
aarkegz wants to merge 1 commit into
base: vmm_type15_hw
Choose a base branch
from
Draft

Detect apic mode when entering arceos during type 1.5 process. #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 7 additions & 20 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/axhal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spin = "0.9"
[target.'cfg(target_arch = "x86_64")'.dependencies]
x86 = "0.52"
x86_64 = "0.15"
x2apic = "0.4"
x2apic = { git = "https://github.com/arceos-hypervisor/x2apic-rs.git", branch = "manual_apic_mod_selection" }
raw-cpuid = "11.1"
x86_rtc = { version = "0.1", optional = true }
x86_vcpu = { git = "https://github.com/arceos-hypervisor/x86_vcpu.git", optional = true }
Expand Down
25 changes: 17 additions & 8 deletions modules/axhal/src/platform/x86_linux/apic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ use kspin::SpinNoIrq;
use lazyinit::LazyInit;
use memory_addr::PhysAddr;
use x2apic::ioapic::IoApic;
use x2apic::lapic::{LocalApic, LocalApicBuilder, xapic_base};
use x2apic::lapic::{cpu_has_x2apic, xapic_base, LocalApic, LocalApicBuilder, LocalApicMode};
use x86_64::instructions::port::Port;
use x86_64::registers::model_specific::Msr;

use self::vectors::*;
use crate::mem::phys_to_virt;
Expand Down Expand Up @@ -84,11 +85,13 @@ pub(super) fn raw_apic_id(id_u8: u8) -> u32 {
}
}

fn cpu_has_x2apic() -> bool {
match raw_cpuid::CpuId::new().get_feature_info() {
Some(finfo) => finfo.has_x2apic(),
None => false,
}
fn x2apic_enabled() -> bool {
const XAPIC_ENABLE: u64 = 1 << 11;
const X2APIC_ENABLE: u64 = 1 << 10;
const IA32_APIC_BASE: u32 = 0x1B;

let ia32_apic_base = unsafe { Msr::new(IA32_APIC_BASE).read() };
ia32_apic_base & XAPIC_ENABLE != 0 && ia32_apic_base & X2APIC_ENABLE != 0
}

pub(super) fn init_primary(enabled: bool, core_id: usize) {
Expand All @@ -108,13 +111,19 @@ pub(super) fn init_primary(enabled: bool, core_id: usize) {
.error_vector(APIC_ERROR_VECTOR as _)
.spurious_vector(APIC_SPURIOUS_VECTOR as _);

if cpu_has_x2apic() {
let use_x2apic = if enabled {
cpu_has_x2apic()
} else {
x2apic_enabled()
};

if use_x2apic {
info!("Using x2APIC.");
unsafe { IS_X2APIC = true };
} else {
info!("Using xAPIC.");
let base_vaddr = phys_to_virt(PhysAddr::from(unsafe { xapic_base() } as usize));
builder.set_xapic_base(base_vaddr.as_usize() as u64);
builder.apic_mode(LocalApicMode::XApic { xapic_base: base_vaddr.as_usize() as _ });
}

let mut lapic = builder.build().unwrap();
Expand Down
Loading