From b143f00b1605f588e02349914b6fcb0fd3bab55e Mon Sep 17 00:00:00 2001 From: sigsegv7 Date: Mon, 25 Sep 2023 05:28:54 -0400 Subject: kernel/amd64: Add spectre mitigation support Add spectre mitigation support for AMD64 hosts which may be enabled via the --enable-spectre-mitigation configure flag. This commit currently only adds IBRS support but more techniques may be added later on. Signed-off-by: sigsegv7 --- sys/include/arch/amd64/msr.h | 2 ++ sys/include/arch/amd64/spectre.h | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 sys/include/arch/amd64/spectre.h (limited to 'sys/include') diff --git a/sys/include/arch/amd64/msr.h b/sys/include/arch/amd64/msr.h index 9d3a8bf..ebd2776 100644 --- a/sys/include/arch/amd64/msr.h +++ b/sys/include/arch/amd64/msr.h @@ -33,6 +33,8 @@ #include #include +#define IA32_SPEC_CTL 0x00000048 + static inline uint64_t rdmsr(uint32_t msr_addr) { diff --git a/sys/include/arch/amd64/spectre.h b/sys/include/arch/amd64/spectre.h new file mode 100644 index 0000000..a4c01fb --- /dev/null +++ b/sys/include/arch/amd64/spectre.h @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2023 Ian Marco Moffett and the VegaOS team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of VegaOS nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _AMD64_SPECTRE_H_ +#define _AMD64_SPECTRE_H_ + +#include +#include + +__weak int try_spectre_mitigate(void); + +#endif -- cgit v1.2.3