delete some file
This commit is contained in:
Jiangcuo
parent
1b9185777a
commit
51e7606bef
32 changed files with 47 additions and 3417 deletions
BIN
crack.bundle
BIN
crack.bundle
Binary file not shown.
123
debian/changelog
vendored
123
debian/changelog
vendored
|
|
@ -1,121 +1,6 @@
|
||||||
pve-kernel (6.1.0-1) edge; urgency=medium
|
pve-kernel (5.10.167) edge; urgency=medium
|
||||||
|
|
||||||
* Update to Linux 6.1
|
* Update to Linux 5.10.167
|
||||||
* Update to ZFS 2.1.7
|
* Update to ZFS 2.1.9
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Sat, 17 Dec 2022 17:00:00 +0000
|
-- Jiangcuo <jiangcuo@bingsin.com> Tue, 7 Feb 2023 19:00:00 +0000
|
||||||
|
|
||||||
pve-kernel (6.0.0-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* Update to Linux 6.0
|
|
||||||
* Update to ZFS 2.1.6
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Mon, 03 Oct 2022 16:00:00 +0000
|
|
||||||
|
|
||||||
pve-kernel (5.19.0-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* Update to Linux 5.19
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Wed, 03 Aug 2022 16:00:00 +0000
|
|
||||||
|
|
||||||
pve-kernel (5.18.0-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* Update to Linux 5.18
|
|
||||||
* Update to ZFS 2.1.5
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Mon, 26 Mar 2022 20:00:00 +0000
|
|
||||||
|
|
||||||
pve-kernel (5.17.0-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* Update to Linux 5.17
|
|
||||||
* Update to ZFS 2.1.3
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Mon, 21 Mar 2022 13:00:00 +0000
|
|
||||||
|
|
||||||
pve-kernel (5.16.0-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* Disable UBNSAN (see issue #164 and #200).
|
|
||||||
* Update to ZFS 2.1.2
|
|
||||||
* Fix AppArmor incompatibilities
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Mon, 10 Jan 2022 11:00:00 +0000
|
|
||||||
|
|
||||||
pve-kernel (5.15.0-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* Update to Linux 5.15.
|
|
||||||
* Update to OpenZFS 2.1.1
|
|
||||||
* Drop kernel release from version
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Tue, 2 Nov 2021 10:00:00 +0000
|
|
||||||
|
|
||||||
pve-kernel (5.14.0-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* Update to Linux 5.14.
|
|
||||||
* Update to OpenZFS 2.1.0.
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Mon, 30 Aug 2021 11:00:00 +0000
|
|
||||||
|
|
||||||
pve-kernel (5.13.0-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* Update to Linux 5.13.
|
|
||||||
* Update to OpenZFS 2.1.0-rc7.
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Mon, 28 Jun 2021 17:00:00 +0000
|
|
||||||
|
|
||||||
pve-kernel (5.12.0-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* Update to Linux 5.12.
|
|
||||||
* Update to OpenZFS 2.1.0-rc5.
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Thu, 18 Feb 2021 10:49:30 +0000
|
|
||||||
|
|
||||||
pve-kernel (5.11.0-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* Update to Linux 5.11.
|
|
||||||
* Properly add module.lds to headers package.
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Thu, 18 Feb 2021 10:49:30 +0000
|
|
||||||
|
|
||||||
pve-kernel (5.10.0-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* Update to Linux 5.10.
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Sun, 24 Jan 2021 12:53:48 +0000
|
|
||||||
|
|
||||||
pve-kernel (5.9.0-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* Update to Linux 5.9.
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Thu, 12 Nov 2020 16:49:51 +0000
|
|
||||||
|
|
||||||
pve-kernel (5.8.0-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* update to Linux 5.8 based on Ubuntu 5.8.0-12.13
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Sun, 9 Aug 2020 14:58:00 +0200
|
|
||||||
|
|
||||||
pve-kernel (5.7.0-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* update to Linux 5.7 based on Ubuntu 5.7.0-5.6
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Mon, 1 Jun 2020 19:57:12 +0200
|
|
||||||
|
|
||||||
pve-kernel (5.6.0-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* update to Linux 5.6.
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Sat, 2 May 2020 21:07:10 +0200
|
|
||||||
|
|
||||||
pve-kernel (5.5.0-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* update to Linux 5.5.
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Thu, 30 Apr 2020 18:30:30 +0200
|
|
||||||
|
|
||||||
pve-kernel (5.4.30-1) edge; urgency=medium
|
|
||||||
|
|
||||||
* update to Ubuntu-5.4.0-24.28
|
|
||||||
|
|
||||||
* bump ABI to 5.4.30-1
|
|
||||||
|
|
||||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Tue, 28 Apr 2020 14:11:30 +0200
|
|
||||||
|
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ben Hutchings <ben@decadent.org.uk>
|
|
||||||
Date: Tue, 12 May 2015 19:29:22 +0100
|
|
||||||
Subject: [PATCH] Make mkcompile_h accept an alternate timestamp string
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
We want to include the Debian version in the utsname::version string
|
|
||||||
instead of a full timestamp string. However, we still need to provide
|
|
||||||
a standard timestamp string for gen_initramfs_list.sh to make the
|
|
||||||
kernel image reproducible.
|
|
||||||
|
|
||||||
Make mkcompile_h use $KBUILD_BUILD_VERSION_TIMESTAMP in preference to
|
|
||||||
$KBUILD_BUILD_TIMESTAMP.
|
|
||||||
|
|
||||||
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
init/Makefile | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/init/Makefile b/init/Makefile
|
|
||||||
index 8316c23bead2..e99b8de4a93a 100644
|
|
||||||
--- a/init/Makefile
|
|
||||||
+++ b/init/Makefile
|
|
||||||
@@ -29,7 +29,7 @@ preempt-flag-$(CONFIG_PREEMPT_DYNAMIC) := PREEMPT_DYNAMIC
|
|
||||||
preempt-flag-$(CONFIG_PREEMPT_RT) := PREEMPT_RT
|
|
||||||
|
|
||||||
build-version = $(or $(KBUILD_BUILD_VERSION), $(build-version-auto))
|
|
||||||
-build-timestamp = $(or $(KBUILD_BUILD_TIMESTAMP), $(build-timestamp-auto))
|
|
||||||
+build-timestamp = $(or $(KBUILD_BUILD_VERSION_TIMESTAMP), $(KBUILD_BUILD_TIMESTAMP), $(build-timestamp-auto))
|
|
||||||
|
|
||||||
# Maximum length of UTS_VERSION is 64 chars
|
|
||||||
filechk_uts_version = \
|
|
||||||
|
|
@ -1,196 +0,0 @@
|
||||||
From 1e30ab2525d8a9ad1fe9a76bef64ff54c2d95e0d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mark Weiman <mark.weiman@markzz.com>
|
|
||||||
Date: Sun, 12 Aug 2018 11:36:21 -0400
|
|
||||||
Subject: [PATCH 09/14] pci: Enable overrides for missing ACS capabilities
|
|
||||||
|
|
||||||
This an updated version of Alex Williamson's patch from:
|
|
||||||
https://lkml.org/lkml/2013/5/30/513
|
|
||||||
|
|
||||||
Original commit message follows:
|
|
||||||
|
|
||||||
PCIe ACS (Access Control Services) is the PCIe 2.0+ feature that
|
|
||||||
allows us to control whether transactions are allowed to be redirected
|
|
||||||
in various subnodes of a PCIe topology. For instance, if two
|
|
||||||
endpoints are below a root port or downsteam switch port, the
|
|
||||||
downstream port may optionally redirect transactions between the
|
|
||||||
devices, bypassing upstream devices. The same can happen internally
|
|
||||||
on multifunction devices. The transaction may never be visible to the
|
|
||||||
upstream devices.
|
|
||||||
|
|
||||||
One upstream device that we particularly care about is the IOMMU. If
|
|
||||||
a redirection occurs in the topology below the IOMMU, then the IOMMU
|
|
||||||
cannot provide isolation between devices. This is why the PCIe spec
|
|
||||||
encourages topologies to include ACS support. Without it, we have to
|
|
||||||
assume peer-to-peer DMA within a hierarchy can bypass IOMMU isolation.
|
|
||||||
|
|
||||||
Unfortunately, far too many topologies do not support ACS to make this
|
|
||||||
a steadfast requirement. Even the latest chipsets from Intel are only
|
|
||||||
sporadically supporting ACS. We have trouble getting interconnect
|
|
||||||
vendors to include the PCIe spec required PCIe capability, let alone
|
|
||||||
suggested features.
|
|
||||||
|
|
||||||
Therefore, we need to add some flexibility. The pcie_acs_override=
|
|
||||||
boot option lets users opt-in specific devices or sets of devices to
|
|
||||||
assume ACS support. The "downstream" option assumes full ACS support
|
|
||||||
on root ports and downstream switch ports. The "multifunction"
|
|
||||||
option assumes the subset of ACS features available on multifunction
|
|
||||||
endpoints and upstream switch ports are supported. The "id:nnnn:nnnn"
|
|
||||||
option enables ACS support on devices matching the provided vendor
|
|
||||||
and device IDs, allowing more strategic ACS overrides. These options
|
|
||||||
may be combined in any order. A maximum of 16 id specific overrides
|
|
||||||
are available. It's suggested to use the most limited set of options
|
|
||||||
necessary to avoid completely disabling ACS across the topology.
|
|
||||||
Note to hardware vendors, we have facilities to permanently quirk
|
|
||||||
specific devices which enforce isolation but not provide an ACS
|
|
||||||
capability. Please contact me to have your devices added and save
|
|
||||||
your customers the hassle of this boot option.
|
|
||||||
|
|
||||||
Signed-off-by: Mark Weiman <mark.weiman@markzz.com>
|
|
||||||
Signed-off-by: Alexandre Frade <admfrade@gmail.com>
|
|
||||||
---
|
|
||||||
.../admin-guide/kernel-parameters.txt | 9 ++
|
|
||||||
drivers/pci/quirks.c | 101 ++++++++++++++++++
|
|
||||||
2 files changed, 110 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
|
|
||||||
index 8dee8f68fe15..8aa1f5c6c042 100644
|
|
||||||
--- a/Documentation/admin-guide/kernel-parameters.txt
|
|
||||||
+++ b/Documentation/admin-guide/kernel-parameters.txt
|
|
||||||
@@ -3402,6 +3402,15 @@
|
|
||||||
nomsi [MSI] If the PCI_MSI kernel config parameter is
|
|
||||||
enabled, this kernel boot option can be used to
|
|
||||||
disable the use of MSI interrupts system-wide.
|
|
||||||
+ pcie_acs_override =
|
|
||||||
+ [PCIE] Override missing PCIe ACS support for:
|
|
||||||
+ downstream
|
|
||||||
+ All downstream ports - full ACS capabilities
|
|
||||||
+ multifunction
|
|
||||||
+ All multifunction devices - multifunction ACS subset
|
|
||||||
+ id:nnnn:nnnn
|
|
||||||
+ Specific device - full ACS capabilities
|
|
||||||
+ Specified as vid:did (vendor/device ID) in hex
|
|
||||||
noioapicquirk [APIC] Disable all boot interrupt quirks.
|
|
||||||
Safety option to keep boot IRQs enabled. This
|
|
||||||
should never be necessary.
|
|
||||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
|
||||||
index 320255e5e8f8..8d5808de9071 100644
|
|
||||||
--- a/drivers/pci/quirks.c
|
|
||||||
+++ b/drivers/pci/quirks.c
|
|
||||||
@@ -3483,6 +3483,106 @@ static void quirk_no_bus_reset(struct pci_dev *dev)
|
|
||||||
dev->dev_flags |= PCI_DEV_FLAGS_NO_BUS_RESET;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static bool acs_on_downstream;
|
|
||||||
+static bool acs_on_multifunction;
|
|
||||||
+
|
|
||||||
+#define NUM_ACS_IDS 16
|
|
||||||
+struct acs_on_id {
|
|
||||||
+ unsigned short vendor;
|
|
||||||
+ unsigned short device;
|
|
||||||
+};
|
|
||||||
+static struct acs_on_id acs_on_ids[NUM_ACS_IDS];
|
|
||||||
+static u8 max_acs_id;
|
|
||||||
+
|
|
||||||
+static __init int pcie_acs_override_setup(char *p)
|
|
||||||
+{
|
|
||||||
+ if (!p)
|
|
||||||
+ return -EINVAL;
|
|
||||||
+
|
|
||||||
+ while (*p) {
|
|
||||||
+ if (!strncmp(p, "downstream", 10))
|
|
||||||
+ acs_on_downstream = true;
|
|
||||||
+ if (!strncmp(p, "multifunction", 13))
|
|
||||||
+ acs_on_multifunction = true;
|
|
||||||
+ if (!strncmp(p, "id:", 3)) {
|
|
||||||
+ char opt[5];
|
|
||||||
+ int ret;
|
|
||||||
+ long val;
|
|
||||||
+
|
|
||||||
+ if (max_acs_id >= NUM_ACS_IDS - 1) {
|
|
||||||
+ pr_warn("Out of PCIe ACS override slots (%d)\n",
|
|
||||||
+ NUM_ACS_IDS);
|
|
||||||
+ goto next;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ p += 3;
|
|
||||||
+ snprintf(opt, 5, "%s", p);
|
|
||||||
+ ret = kstrtol(opt, 16, &val);
|
|
||||||
+ if (ret) {
|
|
||||||
+ pr_warn("PCIe ACS ID parse error %d\n", ret);
|
|
||||||
+ goto next;
|
|
||||||
+ }
|
|
||||||
+ acs_on_ids[max_acs_id].vendor = val;
|
|
||||||
+
|
|
||||||
+ p += strcspn(p, ":");
|
|
||||||
+ if (*p != ':') {
|
|
||||||
+ pr_warn("PCIe ACS invalid ID\n");
|
|
||||||
+ goto next;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ p++;
|
|
||||||
+ snprintf(opt, 5, "%s", p);
|
|
||||||
+ ret = kstrtol(opt, 16, &val);
|
|
||||||
+ if (ret) {
|
|
||||||
+ pr_warn("PCIe ACS ID parse error %d\n", ret);
|
|
||||||
+ goto next;
|
|
||||||
+ }
|
|
||||||
+ acs_on_ids[max_acs_id].device = val;
|
|
||||||
+ max_acs_id++;
|
|
||||||
+ }
|
|
||||||
+next:
|
|
||||||
+ p += strcspn(p, ",");
|
|
||||||
+ if (*p == ',')
|
|
||||||
+ p++;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (acs_on_downstream || acs_on_multifunction || max_acs_id)
|
|
||||||
+ pr_warn("Warning: PCIe ACS overrides enabled; This may allow non-IOMMU protected peer-to-peer DMA\n");
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+early_param("pcie_acs_override", pcie_acs_override_setup);
|
|
||||||
+
|
|
||||||
+static int pcie_acs_overrides(struct pci_dev *dev, u16 acs_flags)
|
|
||||||
+{
|
|
||||||
+ int i;
|
|
||||||
+
|
|
||||||
+ /* Never override ACS for legacy devices or devices with ACS caps */
|
|
||||||
+ if (!pci_is_pcie(dev) ||
|
|
||||||
+ pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ACS))
|
|
||||||
+ return -ENOTTY;
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < max_acs_id; i++)
|
|
||||||
+ if (acs_on_ids[i].vendor == dev->vendor &&
|
|
||||||
+ acs_on_ids[i].device == dev->device)
|
|
||||||
+ return 1;
|
|
||||||
+
|
|
||||||
+ switch (pci_pcie_type(dev)) {
|
|
||||||
+ case PCI_EXP_TYPE_DOWNSTREAM:
|
|
||||||
+ case PCI_EXP_TYPE_ROOT_PORT:
|
|
||||||
+ if (acs_on_downstream)
|
|
||||||
+ return 1;
|
|
||||||
+ break;
|
|
||||||
+ case PCI_EXP_TYPE_ENDPOINT:
|
|
||||||
+ case PCI_EXP_TYPE_UPSTREAM:
|
|
||||||
+ case PCI_EXP_TYPE_LEG_END:
|
|
||||||
+ case PCI_EXP_TYPE_RC_END:
|
|
||||||
+ if (acs_on_multifunction && dev->multifunction)
|
|
||||||
+ return 1;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return -ENOTTY;
|
|
||||||
+}
|
|
||||||
/*
|
|
||||||
* Some Atheros AR9xxx and QCA988x chips do not behave after a bus reset.
|
|
||||||
* The device will throw a Link Down error on AER-capable systems and
|
|
||||||
@@ -4796,6 +4896,8 @@ static const struct pci_dev_acs_enabled {
|
|
||||||
{ PCI_VENDOR_ID_ZHAOXIN, 0x9083, pci_quirk_mf_endpoint_acs },
|
|
||||||
/* Zhaoxin Root/Downstream Ports */
|
|
||||||
{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
|
|
||||||
+ /* PCIe ACS overrides */
|
|
||||||
+ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
|
|
||||||
{ 0 }
|
|
||||||
};
|
|
||||||
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
|
||||||
Date: Thu, 14 Sep 2017 11:09:58 +0200
|
|
||||||
Subject: [PATCH] do not generate split BTF type info per default
|
|
||||||
|
|
||||||
This reverts commit a8ed1a0607cfa5478ff6009539f44790c4d0956d.
|
|
||||||
|
|
||||||
It breaks ZFS sometimes:
|
|
||||||
https://github.com/openzfs/zfs/issues/12301#issuecomment-873303739
|
|
||||||
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
lib/Kconfig.debug | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
|
|
||||||
index 3638b3424be5..43172078db03 100644
|
|
||||||
--- a/lib/Kconfig.debug
|
|
||||||
+++ b/lib/Kconfig.debug
|
|
||||||
@@ -365,7 +365,7 @@ config PAHOLE_HAS_BTF_TAG
|
|
||||||
these attributes, so make the config depend on CC_IS_CLANG.
|
|
||||||
|
|
||||||
config DEBUG_INFO_BTF_MODULES
|
|
||||||
- def_bool y
|
|
||||||
+ def_bool n
|
|
||||||
depends on DEBUG_INFO_BTF && MODULES && PAHOLE_HAS_SPLIT_BTF
|
|
||||||
help
|
|
||||||
Generate compact split BTF type information for kernel modules.
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
Date: Sat, 12 Mar 2022 16:19:10 +0100
|
|
||||||
Subject: [PATCH] Ubuntu: remove leftover reference to ubuntu/hio driver
|
|
||||||
|
|
||||||
A single reference to the hio driver was forgotten when it was removed
|
|
||||||
recently. While this reference is not a problem for the build itself, it
|
|
||||||
breaks the __clean target from 'scripts/Makefile.clean' here, as make
|
|
||||||
cannot enter the "ubuntu/hio" folder for cleaning due to ENOENT.
|
|
||||||
|
|
||||||
Fixes: 4ea6dd9afa0a0d ("UBUNTU: Remove ubuntu/hio driver")
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
ubuntu/Makefile | 4 ----
|
|
||||||
1 file changed, 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/ubuntu/Makefile b/ubuntu/Makefile
|
|
||||||
index 27fa95ba242a..3bfc4494c069 100644
|
|
||||||
--- a/ubuntu/Makefile
|
|
||||||
+++ b/ubuntu/Makefile
|
|
||||||
@@ -15,10 +15,6 @@
|
|
||||||
##
|
|
||||||
##
|
|
||||||
##
|
|
||||||
-obj-$(CONFIG_HIO) += hio/
|
|
||||||
-##
|
|
||||||
-##
|
|
||||||
-##
|
|
||||||
obj-$(CONFIG_UBUNTU_HOST) += ubuntu-host/
|
|
||||||
##
|
|
||||||
##
|
|
||||||
|
|
@ -1,53 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Date: Wed, 3 Aug 2022 18:49:59 +0300
|
|
||||||
Subject: [PATCH] bug: introduce ASSERT_STRUCT_OFFSET
|
|
||||||
|
|
||||||
ASSERT_STRUCT_OFFSET allows to assert during the build of
|
|
||||||
the kernel that a field in a struct have an expected offset.
|
|
||||||
|
|
||||||
KVM used to have such macro, but there is almost nothing KVM specific
|
|
||||||
in it so move it to build_bug.h, so that it can be used in other
|
|
||||||
places in KVM.
|
|
||||||
|
|
||||||
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
arch/x86/kvm/vmx/vmcs12.h | 5 ++---
|
|
||||||
include/linux/build_bug.h | 9 +++++++++
|
|
||||||
2 files changed, 11 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/x86/kvm/vmx/vmcs12.h b/arch/x86/kvm/vmx/vmcs12.h
|
|
||||||
index 746129ddd5ae..01936013428b 100644
|
|
||||||
--- a/arch/x86/kvm/vmx/vmcs12.h
|
|
||||||
+++ b/arch/x86/kvm/vmx/vmcs12.h
|
|
||||||
@@ -208,9 +208,8 @@ struct __packed vmcs12 {
|
|
||||||
/*
|
|
||||||
* For save/restore compatibility, the vmcs12 field offsets must not change.
|
|
||||||
*/
|
|
||||||
-#define CHECK_OFFSET(field, loc) \
|
|
||||||
- BUILD_BUG_ON_MSG(offsetof(struct vmcs12, field) != (loc), \
|
|
||||||
- "Offset of " #field " in struct vmcs12 has changed.")
|
|
||||||
+#define CHECK_OFFSET(field, loc) \
|
|
||||||
+ ASSERT_STRUCT_OFFSET(struct vmcs12, field, loc)
|
|
||||||
|
|
||||||
static inline void vmx_check_vmcs12_offsets(void)
|
|
||||||
{
|
|
||||||
diff --git a/include/linux/build_bug.h b/include/linux/build_bug.h
|
|
||||||
index e3a0be2c90ad..3aa3640f8c18 100644
|
|
||||||
--- a/include/linux/build_bug.h
|
|
||||||
+++ b/include/linux/build_bug.h
|
|
||||||
@@ -77,4 +77,13 @@
|
|
||||||
#define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr)
|
|
||||||
#define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
|
|
||||||
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Compile time check that field has an expected offset
|
|
||||||
+ */
|
|
||||||
+#define ASSERT_STRUCT_OFFSET(type, field, expected_offset) \
|
|
||||||
+ BUILD_BUG_ON_MSG(offsetof(type, field) != (expected_offset), \
|
|
||||||
+ "Offset of " #field " in " #type " has changed.")
|
|
||||||
+
|
|
||||||
+
|
|
||||||
#endif /* _LINUX_BUILD_BUG_H */
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Date: Wed, 3 Aug 2022 18:50:02 +0300
|
|
||||||
Subject: [PATCH] KVM: x86: emulator: update the emulation mode after rsm
|
|
||||||
|
|
||||||
This ensures that RIP will be correctly written back,
|
|
||||||
because the RSM instruction can switch the CPU mode from
|
|
||||||
32 bit (or less) to 64 bit.
|
|
||||||
|
|
||||||
This fixes a guest crash in case the #SMI is received
|
|
||||||
while the guest runs a code from an address > 32 bit.
|
|
||||||
|
|
||||||
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
arch/x86/kvm/emulate.c | 5 +++++
|
|
||||||
1 file changed, 5 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
|
|
||||||
index 4a43261d25a2..4f7f5117ec7a 100644
|
|
||||||
--- a/arch/x86/kvm/emulate.c
|
|
||||||
+++ b/arch/x86/kvm/emulate.c
|
|
||||||
@@ -2654,6 +2654,11 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt)
|
|
||||||
if (ret != X86EMUL_CONTINUE)
|
|
||||||
goto emulate_shutdown;
|
|
||||||
|
|
||||||
+
|
|
||||||
+ ret = emulator_recalc_and_set_mode(ctxt);
|
|
||||||
+ if (ret != X86EMUL_CONTINUE)
|
|
||||||
+ goto emulate_shutdown;
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* Note, the ctxt->ops callbacks are responsible for handling side
|
|
||||||
* effects when writing MSRs and CRs, e.g. MMU context resets, CPUID
|
|
||||||
|
|
@ -1,280 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Date: Wed, 3 Aug 2022 18:50:05 +0300
|
|
||||||
Subject: [PATCH] KVM: x86: emulator/smm: add structs for KVM's smram layout
|
|
||||||
|
|
||||||
Those structs will be used to read/write the smram state image.
|
|
||||||
|
|
||||||
Also document the differences between KVM's SMRAM layout and SMRAM
|
|
||||||
layout that is used by real Intel/AMD cpus.
|
|
||||||
|
|
||||||
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
arch/x86/kvm/emulate.c | 6 +
|
|
||||||
arch/x86/kvm/kvm_emulate.h | 218 +++++++++++++++++++++++++++++++++++++
|
|
||||||
arch/x86/kvm/x86.c | 1 +
|
|
||||||
3 files changed, 225 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
|
|
||||||
index 4f7f5117ec7a..470dd4453b01 100644
|
|
||||||
--- a/arch/x86/kvm/emulate.c
|
|
||||||
+++ b/arch/x86/kvm/emulate.c
|
|
||||||
@@ -5856,3 +5856,9 @@ bool emulator_can_use_gpa(struct x86_emulate_ctxt *ctxt)
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+void __init kvm_emulator_init(void)
|
|
||||||
+{
|
|
||||||
+ __check_smram32_offsets();
|
|
||||||
+ __check_smram64_offsets();
|
|
||||||
+}
|
|
||||||
diff --git a/arch/x86/kvm/kvm_emulate.h b/arch/x86/kvm/kvm_emulate.h
|
|
||||||
index 89246446d6aa..dd0ae61e44a1 100644
|
|
||||||
--- a/arch/x86/kvm/kvm_emulate.h
|
|
||||||
+++ b/arch/x86/kvm/kvm_emulate.h
|
|
||||||
@@ -13,6 +13,7 @@
|
|
||||||
#define _ASM_X86_KVM_X86_EMULATE_H
|
|
||||||
|
|
||||||
#include <asm/desc_defs.h>
|
|
||||||
+#include <linux/build_bug.h>
|
|
||||||
#include "fpu.h"
|
|
||||||
|
|
||||||
struct x86_emulate_ctxt;
|
|
||||||
@@ -503,6 +504,223 @@ enum x86_intercept {
|
|
||||||
nr_x86_intercepts
|
|
||||||
};
|
|
||||||
|
|
||||||
+
|
|
||||||
+/* 32 bit KVM's emulated SMM layout. Loosely based on Intel's layout */
|
|
||||||
+
|
|
||||||
+struct kvm_smm_seg_state_32 {
|
|
||||||
+ u32 flags;
|
|
||||||
+ u32 limit;
|
|
||||||
+ u32 base;
|
|
||||||
+} __packed;
|
|
||||||
+
|
|
||||||
+struct kvm_smram_state_32 {
|
|
||||||
+ u32 reserved1[62];
|
|
||||||
+ u32 smbase;
|
|
||||||
+ u32 smm_revision;
|
|
||||||
+ u32 reserved2[5];
|
|
||||||
+ u32 cr4; /* CR4 is not present in Intel/AMD SMRAM image */
|
|
||||||
+ u32 reserved3[5];
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Segment state is not present/documented in the Intel/AMD SMRAM image
|
|
||||||
+ * Instead this area on Intel/AMD contains IO/HLT restart flags.
|
|
||||||
+ */
|
|
||||||
+ struct kvm_smm_seg_state_32 ds;
|
|
||||||
+ struct kvm_smm_seg_state_32 fs;
|
|
||||||
+ struct kvm_smm_seg_state_32 gs;
|
|
||||||
+ struct kvm_smm_seg_state_32 idtr; /* IDTR has only base and limit */
|
|
||||||
+ struct kvm_smm_seg_state_32 tr;
|
|
||||||
+ u32 reserved;
|
|
||||||
+ struct kvm_smm_seg_state_32 gdtr; /* GDTR has only base and limit */
|
|
||||||
+ struct kvm_smm_seg_state_32 ldtr;
|
|
||||||
+ struct kvm_smm_seg_state_32 es;
|
|
||||||
+ struct kvm_smm_seg_state_32 cs;
|
|
||||||
+ struct kvm_smm_seg_state_32 ss;
|
|
||||||
+
|
|
||||||
+ u32 es_sel;
|
|
||||||
+ u32 cs_sel;
|
|
||||||
+ u32 ss_sel;
|
|
||||||
+ u32 ds_sel;
|
|
||||||
+ u32 fs_sel;
|
|
||||||
+ u32 gs_sel;
|
|
||||||
+ u32 ldtr_sel;
|
|
||||||
+ u32 tr_sel;
|
|
||||||
+
|
|
||||||
+ u32 dr7;
|
|
||||||
+ u32 dr6;
|
|
||||||
+ u32 gprs[8]; /* GPRS in the "natural" X86 order (EAX/ECX/EDX.../EDI) */
|
|
||||||
+ u32 eip;
|
|
||||||
+ u32 eflags;
|
|
||||||
+ u32 cr3;
|
|
||||||
+ u32 cr0;
|
|
||||||
+} __packed;
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+static inline void __check_smram32_offsets(void)
|
|
||||||
+{
|
|
||||||
+#define __CHECK_SMRAM32_OFFSET(field, offset) \
|
|
||||||
+ ASSERT_STRUCT_OFFSET(struct kvm_smram_state_32, field, offset - 0xFE00)
|
|
||||||
+
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(reserved1, 0xFE00);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(smbase, 0xFEF8);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(smm_revision, 0xFEFC);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(reserved2, 0xFF00);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(cr4, 0xFF14);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(reserved3, 0xFF18);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(ds, 0xFF2C);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(fs, 0xFF38);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(gs, 0xFF44);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(idtr, 0xFF50);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(tr, 0xFF5C);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(gdtr, 0xFF6C);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(ldtr, 0xFF78);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(es, 0xFF84);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(cs, 0xFF90);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(ss, 0xFF9C);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(es_sel, 0xFFA8);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(cs_sel, 0xFFAC);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(ss_sel, 0xFFB0);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(ds_sel, 0xFFB4);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(fs_sel, 0xFFB8);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(gs_sel, 0xFFBC);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(ldtr_sel, 0xFFC0);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(tr_sel, 0xFFC4);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(dr7, 0xFFC8);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(dr6, 0xFFCC);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(gprs, 0xFFD0);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(eip, 0xFFF0);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(eflags, 0xFFF4);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(cr3, 0xFFF8);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(cr0, 0xFFFC);
|
|
||||||
+#undef __CHECK_SMRAM32_OFFSET
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/* 64 bit KVM's emulated SMM layout. Based on AMD64 layout */
|
|
||||||
+
|
|
||||||
+struct kvm_smm_seg_state_64 {
|
|
||||||
+ u16 selector;
|
|
||||||
+ u16 attributes;
|
|
||||||
+ u32 limit;
|
|
||||||
+ u64 base;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+struct kvm_smram_state_64 {
|
|
||||||
+
|
|
||||||
+ struct kvm_smm_seg_state_64 es;
|
|
||||||
+ struct kvm_smm_seg_state_64 cs;
|
|
||||||
+ struct kvm_smm_seg_state_64 ss;
|
|
||||||
+ struct kvm_smm_seg_state_64 ds;
|
|
||||||
+ struct kvm_smm_seg_state_64 fs;
|
|
||||||
+ struct kvm_smm_seg_state_64 gs;
|
|
||||||
+ struct kvm_smm_seg_state_64 gdtr; /* GDTR has only base and limit*/
|
|
||||||
+ struct kvm_smm_seg_state_64 ldtr;
|
|
||||||
+ struct kvm_smm_seg_state_64 idtr; /* IDTR has only base and limit*/
|
|
||||||
+ struct kvm_smm_seg_state_64 tr;
|
|
||||||
+
|
|
||||||
+ /* I/O restart and auto halt restart are not implemented by KVM */
|
|
||||||
+ u64 io_restart_rip;
|
|
||||||
+ u64 io_restart_rcx;
|
|
||||||
+ u64 io_restart_rsi;
|
|
||||||
+ u64 io_restart_rdi;
|
|
||||||
+ u32 io_restart_dword;
|
|
||||||
+ u32 reserved1;
|
|
||||||
+ u8 io_inst_restart;
|
|
||||||
+ u8 auto_hlt_restart;
|
|
||||||
+ u8 reserved2[6];
|
|
||||||
+
|
|
||||||
+ u64 efer;
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Two fields below are implemented on AMD only, to store
|
|
||||||
+ * SVM guest vmcb address if the #SMI was received while in the guest mode.
|
|
||||||
+ */
|
|
||||||
+ u64 svm_guest_flag;
|
|
||||||
+ u64 svm_guest_vmcb_gpa;
|
|
||||||
+ u64 svm_guest_virtual_int; /* unknown purpose, not implemented */
|
|
||||||
+
|
|
||||||
+ u32 reserved3[3];
|
|
||||||
+ u32 smm_revison;
|
|
||||||
+ u32 smbase;
|
|
||||||
+ u32 reserved4[5];
|
|
||||||
+
|
|
||||||
+ /* ssp and svm_* fields below are not implemented by KVM */
|
|
||||||
+ u64 ssp;
|
|
||||||
+ u64 svm_guest_pat;
|
|
||||||
+ u64 svm_host_efer;
|
|
||||||
+ u64 svm_host_cr4;
|
|
||||||
+ u64 svm_host_cr3;
|
|
||||||
+ u64 svm_host_cr0;
|
|
||||||
+
|
|
||||||
+ u64 cr4;
|
|
||||||
+ u64 cr3;
|
|
||||||
+ u64 cr0;
|
|
||||||
+ u64 dr7;
|
|
||||||
+ u64 dr6;
|
|
||||||
+ u64 rflags;
|
|
||||||
+ u64 rip;
|
|
||||||
+ u64 gprs[16]; /* GPRS in a reversed "natural" X86 order (R15/R14/../RCX/RAX.) */
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+static inline void __check_smram64_offsets(void)
|
|
||||||
+{
|
|
||||||
+#define __CHECK_SMRAM64_OFFSET(field, offset) \
|
|
||||||
+ ASSERT_STRUCT_OFFSET(struct kvm_smram_state_64, field, offset - 0xFE00)
|
|
||||||
+
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(es, 0xFE00);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(cs, 0xFE10);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(ss, 0xFE20);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(ds, 0xFE30);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(fs, 0xFE40);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(gs, 0xFE50);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(gdtr, 0xFE60);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(ldtr, 0xFE70);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(idtr, 0xFE80);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(tr, 0xFE90);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(io_restart_rip, 0xFEA0);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(io_restart_rcx, 0xFEA8);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(io_restart_rsi, 0xFEB0);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(io_restart_rdi, 0xFEB8);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(io_restart_dword, 0xFEC0);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(reserved1, 0xFEC4);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(io_inst_restart, 0xFEC8);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(auto_hlt_restart, 0xFEC9);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(reserved2, 0xFECA);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(efer, 0xFED0);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(svm_guest_flag, 0xFED8);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(svm_guest_vmcb_gpa, 0xFEE0);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(svm_guest_virtual_int, 0xFEE8);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(reserved3, 0xFEF0);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(smm_revison, 0xFEFC);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(smbase, 0xFF00);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(reserved4, 0xFF04);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(ssp, 0xFF18);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(svm_guest_pat, 0xFF20);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(svm_host_efer, 0xFF28);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(svm_host_cr4, 0xFF30);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(svm_host_cr3, 0xFF38);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(svm_host_cr0, 0xFF40);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(cr4, 0xFF48);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(cr3, 0xFF50);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(cr0, 0xFF58);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(dr7, 0xFF60);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(dr6, 0xFF68);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(rflags, 0xFF70);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(rip, 0xFF78);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(gprs, 0xFF80);
|
|
||||||
+#undef __CHECK_SMRAM64_OFFSET
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+union kvm_smram {
|
|
||||||
+ struct kvm_smram_state_64 smram64;
|
|
||||||
+ struct kvm_smram_state_32 smram32;
|
|
||||||
+ u8 bytes[512];
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+void __init kvm_emulator_init(void);
|
|
||||||
+
|
|
||||||
+
|
|
||||||
/* Host execution mode. */
|
|
||||||
#if defined(CONFIG_X86_32)
|
|
||||||
#define X86EMUL_MODE_HOST X86EMUL_MODE_PROT32
|
|
||||||
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
|
|
||||||
index acca85b10545..20aec64e3521 100644
|
|
||||||
--- a/arch/x86/kvm/x86.c
|
|
||||||
+++ b/arch/x86/kvm/x86.c
|
|
||||||
@@ -13730,6 +13730,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_vmgexit_msr_protocol_exit);
|
|
||||||
static int __init kvm_x86_init(void)
|
|
||||||
{
|
|
||||||
kvm_mmu_x86_module_init();
|
|
||||||
+ kvm_emulator_init();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
module_init(kvm_x86_init);
|
|
||||||
|
|
@ -1,214 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Date: Wed, 3 Aug 2022 18:50:06 +0300
|
|
||||||
Subject: [PATCH] KVM: x86: emulator/smm: use smram structs in the common code
|
|
||||||
|
|
||||||
Switch from using a raw array to 'union kvm_smram'.
|
|
||||||
|
|
||||||
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
arch/x86/include/asm/kvm_host.h | 5 +++--
|
|
||||||
arch/x86/kvm/emulate.c | 12 +++++++-----
|
|
||||||
arch/x86/kvm/kvm_emulate.h | 3 ++-
|
|
||||||
arch/x86/kvm/svm/svm.c | 8 ++++++--
|
|
||||||
arch/x86/kvm/vmx/vmx.c | 4 ++--
|
|
||||||
arch/x86/kvm/x86.c | 16 ++++++++--------
|
|
||||||
6 files changed, 28 insertions(+), 20 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
|
|
||||||
index f05ebaa26f0f..6885f3839e25 100644
|
|
||||||
--- a/arch/x86/include/asm/kvm_host.h
|
|
||||||
+++ b/arch/x86/include/asm/kvm_host.h
|
|
||||||
@@ -204,6 +204,7 @@ typedef enum exit_fastpath_completion fastpath_t;
|
|
||||||
|
|
||||||
struct x86_emulate_ctxt;
|
|
||||||
struct x86_exception;
|
|
||||||
+union kvm_smram;
|
|
||||||
enum x86_intercept;
|
|
||||||
enum x86_intercept_stage;
|
|
||||||
|
|
||||||
@@ -1613,8 +1614,8 @@ struct kvm_x86_ops {
|
|
||||||
void (*setup_mce)(struct kvm_vcpu *vcpu);
|
|
||||||
|
|
||||||
int (*smi_allowed)(struct kvm_vcpu *vcpu, bool for_injection);
|
|
||||||
- int (*enter_smm)(struct kvm_vcpu *vcpu, char *smstate);
|
|
||||||
- int (*leave_smm)(struct kvm_vcpu *vcpu, const char *smstate);
|
|
||||||
+ int (*enter_smm)(struct kvm_vcpu *vcpu, union kvm_smram *smram);
|
|
||||||
+ int (*leave_smm)(struct kvm_vcpu *vcpu, const union kvm_smram *smram);
|
|
||||||
void (*enable_smi_window)(struct kvm_vcpu *vcpu);
|
|
||||||
|
|
||||||
int (*mem_enc_ioctl)(struct kvm *kvm, void __user *argp);
|
|
||||||
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
|
|
||||||
index 470dd4453b01..7294dffa794a 100644
|
|
||||||
--- a/arch/x86/kvm/emulate.c
|
|
||||||
+++ b/arch/x86/kvm/emulate.c
|
|
||||||
@@ -2582,16 +2582,18 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt,
|
|
||||||
static int em_rsm(struct x86_emulate_ctxt *ctxt)
|
|
||||||
{
|
|
||||||
unsigned long cr0, cr4, efer;
|
|
||||||
- char buf[512];
|
|
||||||
+ const union kvm_smram smram;
|
|
||||||
u64 smbase;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
+ BUILD_BUG_ON(sizeof(smram) != 512);
|
|
||||||
+
|
|
||||||
if ((ctxt->ops->get_hflags(ctxt) & X86EMUL_SMM_MASK) == 0)
|
|
||||||
return emulate_ud(ctxt);
|
|
||||||
|
|
||||||
smbase = ctxt->ops->get_smbase(ctxt);
|
|
||||||
|
|
||||||
- ret = ctxt->ops->read_phys(ctxt, smbase + 0xfe00, buf, sizeof(buf));
|
|
||||||
+ ret = ctxt->ops->read_phys(ctxt, smbase + 0xfe00, (void *)&smram, sizeof(smram));
|
|
||||||
if (ret != X86EMUL_CONTINUE)
|
|
||||||
return X86EMUL_UNHANDLEABLE;
|
|
||||||
|
|
||||||
@@ -2641,15 +2643,15 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt)
|
|
||||||
* state (e.g. enter guest mode) before loading state from the SMM
|
|
||||||
* state-save area.
|
|
||||||
*/
|
|
||||||
- if (ctxt->ops->leave_smm(ctxt, buf))
|
|
||||||
+ if (ctxt->ops->leave_smm(ctxt, &smram))
|
|
||||||
goto emulate_shutdown;
|
|
||||||
|
|
||||||
#ifdef CONFIG_X86_64
|
|
||||||
if (emulator_has_longmode(ctxt))
|
|
||||||
- ret = rsm_load_state_64(ctxt, buf);
|
|
||||||
+ ret = rsm_load_state_64(ctxt, (const char *)&smram);
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
- ret = rsm_load_state_32(ctxt, buf);
|
|
||||||
+ ret = rsm_load_state_32(ctxt, (const char *)&smram);
|
|
||||||
|
|
||||||
if (ret != X86EMUL_CONTINUE)
|
|
||||||
goto emulate_shutdown;
|
|
||||||
diff --git a/arch/x86/kvm/kvm_emulate.h b/arch/x86/kvm/kvm_emulate.h
|
|
||||||
index dd0ae61e44a1..76c0b8e7890b 100644
|
|
||||||
--- a/arch/x86/kvm/kvm_emulate.h
|
|
||||||
+++ b/arch/x86/kvm/kvm_emulate.h
|
|
||||||
@@ -19,6 +19,7 @@
|
|
||||||
struct x86_emulate_ctxt;
|
|
||||||
enum x86_intercept;
|
|
||||||
enum x86_intercept_stage;
|
|
||||||
+union kvm_smram;
|
|
||||||
|
|
||||||
struct x86_exception {
|
|
||||||
u8 vector;
|
|
||||||
@@ -236,7 +237,7 @@ struct x86_emulate_ops {
|
|
||||||
|
|
||||||
unsigned (*get_hflags)(struct x86_emulate_ctxt *ctxt);
|
|
||||||
void (*exiting_smm)(struct x86_emulate_ctxt *ctxt);
|
|
||||||
- int (*leave_smm)(struct x86_emulate_ctxt *ctxt, const char *smstate);
|
|
||||||
+ int (*leave_smm)(struct x86_emulate_ctxt *ctxt, const union kvm_smram *smram);
|
|
||||||
void (*triple_fault)(struct x86_emulate_ctxt *ctxt);
|
|
||||||
int (*set_xcr)(struct x86_emulate_ctxt *ctxt, u32 index, u64 xcr);
|
|
||||||
};
|
|
||||||
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
|
|
||||||
index ce362e88a567..45c4def86cd3 100644
|
|
||||||
--- a/arch/x86/kvm/svm/svm.c
|
|
||||||
+++ b/arch/x86/kvm/svm/svm.c
|
|
||||||
@@ -4385,12 +4385,14 @@ static int svm_smi_allowed(struct kvm_vcpu *vcpu, bool for_injection)
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int svm_enter_smm(struct kvm_vcpu *vcpu, char *smstate)
|
|
||||||
+static int svm_enter_smm(struct kvm_vcpu *vcpu, union kvm_smram *smram)
|
|
||||||
{
|
|
||||||
struct vcpu_svm *svm = to_svm(vcpu);
|
|
||||||
struct kvm_host_map map_save;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
+ char *smstate = (char *)smram;
|
|
||||||
+
|
|
||||||
if (!is_guest_mode(vcpu))
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
@@ -4432,7 +4434,7 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, char *smstate)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int svm_leave_smm(struct kvm_vcpu *vcpu, const char *smstate)
|
|
||||||
+static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram)
|
|
||||||
{
|
|
||||||
struct vcpu_svm *svm = to_svm(vcpu);
|
|
||||||
struct kvm_host_map map, map_save;
|
|
||||||
@@ -4440,6 +4442,8 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const char *smstate)
|
|
||||||
struct vmcb *vmcb12;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
+ const char *smstate = (const char *)smram;
|
|
||||||
+
|
|
||||||
if (!guest_cpuid_has(vcpu, X86_FEATURE_LM))
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
|
|
||||||
index 63247c57c72c..4319f65181f7 100644
|
|
||||||
--- a/arch/x86/kvm/vmx/vmx.c
|
|
||||||
+++ b/arch/x86/kvm/vmx/vmx.c
|
|
||||||
@@ -7914,7 +7914,7 @@ static int vmx_smi_allowed(struct kvm_vcpu *vcpu, bool for_injection)
|
|
||||||
return !is_smm(vcpu);
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int vmx_enter_smm(struct kvm_vcpu *vcpu, char *smstate)
|
|
||||||
+static int vmx_enter_smm(struct kvm_vcpu *vcpu, union kvm_smram *smram)
|
|
||||||
{
|
|
||||||
struct vcpu_vmx *vmx = to_vmx(vcpu);
|
|
||||||
|
|
||||||
@@ -7935,7 +7935,7 @@ static int vmx_enter_smm(struct kvm_vcpu *vcpu, char *smstate)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int vmx_leave_smm(struct kvm_vcpu *vcpu, const char *smstate)
|
|
||||||
+static int vmx_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram)
|
|
||||||
{
|
|
||||||
struct vcpu_vmx *vmx = to_vmx(vcpu);
|
|
||||||
int ret;
|
|
||||||
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
|
|
||||||
index 20aec64e3521..94c29391b065 100644
|
|
||||||
--- a/arch/x86/kvm/x86.c
|
|
||||||
+++ b/arch/x86/kvm/x86.c
|
|
||||||
@@ -8186,9 +8186,9 @@ static void emulator_exiting_smm(struct x86_emulate_ctxt *ctxt)
|
|
||||||
}
|
|
||||||
|
|
||||||
static int emulator_leave_smm(struct x86_emulate_ctxt *ctxt,
|
|
||||||
- const char *smstate)
|
|
||||||
+ const union kvm_smram *smram)
|
|
||||||
{
|
|
||||||
- return static_call(kvm_x86_leave_smm)(emul_to_vcpu(ctxt), smstate);
|
|
||||||
+ return static_call(kvm_x86_leave_smm)(emul_to_vcpu(ctxt), smram);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void emulator_triple_fault(struct x86_emulate_ctxt *ctxt)
|
|
||||||
@@ -10246,25 +10246,25 @@ static void enter_smm(struct kvm_vcpu *vcpu)
|
|
||||||
struct kvm_segment cs, ds;
|
|
||||||
struct desc_ptr dt;
|
|
||||||
unsigned long cr0;
|
|
||||||
- char buf[512];
|
|
||||||
+ union kvm_smram smram;
|
|
||||||
|
|
||||||
- memset(buf, 0, 512);
|
|
||||||
+ memset(smram.bytes, 0, sizeof(smram.bytes));
|
|
||||||
#ifdef CONFIG_X86_64
|
|
||||||
if (guest_cpuid_has(vcpu, X86_FEATURE_LM))
|
|
||||||
- enter_smm_save_state_64(vcpu, buf);
|
|
||||||
+ enter_smm_save_state_64(vcpu, (char *)&smram);
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
- enter_smm_save_state_32(vcpu, buf);
|
|
||||||
+ enter_smm_save_state_32(vcpu, (char *)&smram);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Give enter_smm() a chance to make ISA-specific changes to the vCPU
|
|
||||||
* state (e.g. leave guest mode) after we've saved the state into the
|
|
||||||
* SMM state-save area.
|
|
||||||
*/
|
|
||||||
- static_call(kvm_x86_enter_smm)(vcpu, buf);
|
|
||||||
+ static_call(kvm_x86_enter_smm)(vcpu, &smram);
|
|
||||||
|
|
||||||
kvm_smm_changed(vcpu, true);
|
|
||||||
- kvm_vcpu_write_guest(vcpu, vcpu->arch.smbase + 0xfe00, buf, sizeof(buf));
|
|
||||||
+ kvm_vcpu_write_guest(vcpu, vcpu->arch.smbase + 0xfe00, &smram, sizeof(smram));
|
|
||||||
|
|
||||||
if (static_call(kvm_x86_get_nmi_mask)(vcpu))
|
|
||||||
vcpu->arch.hflags |= HF_SMM_INSIDE_NMI_MASK;
|
|
||||||
|
|
@ -1,268 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Date: Wed, 3 Aug 2022 18:50:07 +0300
|
|
||||||
Subject: [PATCH] KVM: x86: emulator/smm: use smram struct for 32 bit smram
|
|
||||||
load/restore
|
|
||||||
|
|
||||||
Use kvm_smram_state_32 struct to save/restore 32 bit SMM state
|
|
||||||
(used when X86_FEATURE_LM is not present in the guest CPUID).
|
|
||||||
|
|
||||||
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
arch/x86/kvm/emulate.c | 81 +++++++++++++++---------------------------
|
|
||||||
arch/x86/kvm/x86.c | 75 +++++++++++++++++---------------------
|
|
||||||
2 files changed, 60 insertions(+), 96 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
|
|
||||||
index 7294dffa794a..65d82292ccec 100644
|
|
||||||
--- a/arch/x86/kvm/emulate.c
|
|
||||||
+++ b/arch/x86/kvm/emulate.c
|
|
||||||
@@ -2359,25 +2359,17 @@ static void rsm_set_desc_flags(struct desc_struct *desc, u32 flags)
|
|
||||||
desc->type = (flags >> 8) & 15;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int rsm_load_seg_32(struct x86_emulate_ctxt *ctxt, const char *smstate,
|
|
||||||
+static void rsm_load_seg_32(struct x86_emulate_ctxt *ctxt,
|
|
||||||
+ const struct kvm_smm_seg_state_32 *state,
|
|
||||||
+ u16 selector,
|
|
||||||
int n)
|
|
||||||
{
|
|
||||||
struct desc_struct desc;
|
|
||||||
- int offset;
|
|
||||||
- u16 selector;
|
|
||||||
-
|
|
||||||
- selector = GET_SMSTATE(u32, smstate, 0x7fa8 + n * 4);
|
|
||||||
-
|
|
||||||
- if (n < 3)
|
|
||||||
- offset = 0x7f84 + n * 12;
|
|
||||||
- else
|
|
||||||
- offset = 0x7f2c + (n - 3) * 12;
|
|
||||||
|
|
||||||
- set_desc_base(&desc, GET_SMSTATE(u32, smstate, offset + 8));
|
|
||||||
- set_desc_limit(&desc, GET_SMSTATE(u32, smstate, offset + 4));
|
|
||||||
- rsm_set_desc_flags(&desc, GET_SMSTATE(u32, smstate, offset));
|
|
||||||
+ set_desc_base(&desc, state->base);
|
|
||||||
+ set_desc_limit(&desc, state->limit);
|
|
||||||
+ rsm_set_desc_flags(&desc, state->flags);
|
|
||||||
ctxt->ops->set_segment(ctxt, selector, &desc, 0, n);
|
|
||||||
- return X86EMUL_CONTINUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_X86_64
|
|
||||||
@@ -2448,63 +2440,46 @@ static int rsm_enter_protected_mode(struct x86_emulate_ctxt *ctxt,
|
|
||||||
}
|
|
||||||
|
|
||||||
static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt,
|
|
||||||
- const char *smstate)
|
|
||||||
+ const struct kvm_smram_state_32 *smstate)
|
|
||||||
{
|
|
||||||
- struct desc_struct desc;
|
|
||||||
struct desc_ptr dt;
|
|
||||||
- u16 selector;
|
|
||||||
- u32 val, cr0, cr3, cr4;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
- cr0 = GET_SMSTATE(u32, smstate, 0x7ffc);
|
|
||||||
- cr3 = GET_SMSTATE(u32, smstate, 0x7ff8);
|
|
||||||
- ctxt->eflags = GET_SMSTATE(u32, smstate, 0x7ff4) | X86_EFLAGS_FIXED;
|
|
||||||
- ctxt->_eip = GET_SMSTATE(u32, smstate, 0x7ff0);
|
|
||||||
+ ctxt->eflags = smstate->eflags | X86_EFLAGS_FIXED;
|
|
||||||
+ ctxt->_eip = smstate->eip;
|
|
||||||
|
|
||||||
for (i = 0; i < 8; i++)
|
|
||||||
- *reg_write(ctxt, i) = GET_SMSTATE(u32, smstate, 0x7fd0 + i * 4);
|
|
||||||
-
|
|
||||||
- val = GET_SMSTATE(u32, smstate, 0x7fcc);
|
|
||||||
+ *reg_write(ctxt, i) = smstate->gprs[i];
|
|
||||||
|
|
||||||
- if (ctxt->ops->set_dr(ctxt, 6, val))
|
|
||||||
+ if (ctxt->ops->set_dr(ctxt, 6, smstate->dr6))
|
|
||||||
return X86EMUL_UNHANDLEABLE;
|
|
||||||
-
|
|
||||||
- val = GET_SMSTATE(u32, smstate, 0x7fc8);
|
|
||||||
-
|
|
||||||
- if (ctxt->ops->set_dr(ctxt, 7, val))
|
|
||||||
+ if (ctxt->ops->set_dr(ctxt, 7, smstate->dr7))
|
|
||||||
return X86EMUL_UNHANDLEABLE;
|
|
||||||
|
|
||||||
- selector = GET_SMSTATE(u32, smstate, 0x7fc4);
|
|
||||||
- set_desc_base(&desc, GET_SMSTATE(u32, smstate, 0x7f64));
|
|
||||||
- set_desc_limit(&desc, GET_SMSTATE(u32, smstate, 0x7f60));
|
|
||||||
- rsm_set_desc_flags(&desc, GET_SMSTATE(u32, smstate, 0x7f5c));
|
|
||||||
- ctxt->ops->set_segment(ctxt, selector, &desc, 0, VCPU_SREG_TR);
|
|
||||||
+ rsm_load_seg_32(ctxt, &smstate->tr, smstate->tr_sel, VCPU_SREG_TR);
|
|
||||||
+ rsm_load_seg_32(ctxt, &smstate->ldtr, smstate->ldtr_sel, VCPU_SREG_LDTR);
|
|
||||||
|
|
||||||
- selector = GET_SMSTATE(u32, smstate, 0x7fc0);
|
|
||||||
- set_desc_base(&desc, GET_SMSTATE(u32, smstate, 0x7f80));
|
|
||||||
- set_desc_limit(&desc, GET_SMSTATE(u32, smstate, 0x7f7c));
|
|
||||||
- rsm_set_desc_flags(&desc, GET_SMSTATE(u32, smstate, 0x7f78));
|
|
||||||
- ctxt->ops->set_segment(ctxt, selector, &desc, 0, VCPU_SREG_LDTR);
|
|
||||||
|
|
||||||
- dt.address = GET_SMSTATE(u32, smstate, 0x7f74);
|
|
||||||
- dt.size = GET_SMSTATE(u32, smstate, 0x7f70);
|
|
||||||
+ dt.address = smstate->gdtr.base;
|
|
||||||
+ dt.size = smstate->gdtr.limit;
|
|
||||||
ctxt->ops->set_gdt(ctxt, &dt);
|
|
||||||
|
|
||||||
- dt.address = GET_SMSTATE(u32, smstate, 0x7f58);
|
|
||||||
- dt.size = GET_SMSTATE(u32, smstate, 0x7f54);
|
|
||||||
+ dt.address = smstate->idtr.base;
|
|
||||||
+ dt.size = smstate->idtr.limit;
|
|
||||||
ctxt->ops->set_idt(ctxt, &dt);
|
|
||||||
|
|
||||||
- for (i = 0; i < 6; i++) {
|
|
||||||
- int r = rsm_load_seg_32(ctxt, smstate, i);
|
|
||||||
- if (r != X86EMUL_CONTINUE)
|
|
||||||
- return r;
|
|
||||||
- }
|
|
||||||
+ rsm_load_seg_32(ctxt, &smstate->es, smstate->es_sel, VCPU_SREG_ES);
|
|
||||||
+ rsm_load_seg_32(ctxt, &smstate->cs, smstate->cs_sel, VCPU_SREG_CS);
|
|
||||||
+ rsm_load_seg_32(ctxt, &smstate->ss, smstate->ss_sel, VCPU_SREG_SS);
|
|
||||||
|
|
||||||
- cr4 = GET_SMSTATE(u32, smstate, 0x7f14);
|
|
||||||
+ rsm_load_seg_32(ctxt, &smstate->ds, smstate->ds_sel, VCPU_SREG_DS);
|
|
||||||
+ rsm_load_seg_32(ctxt, &smstate->fs, smstate->fs_sel, VCPU_SREG_FS);
|
|
||||||
+ rsm_load_seg_32(ctxt, &smstate->gs, smstate->gs_sel, VCPU_SREG_GS);
|
|
||||||
|
|
||||||
- ctxt->ops->set_smbase(ctxt, GET_SMSTATE(u32, smstate, 0x7ef8));
|
|
||||||
+ ctxt->ops->set_smbase(ctxt, smstate->smbase);
|
|
||||||
|
|
||||||
- return rsm_enter_protected_mode(ctxt, cr0, cr3, cr4);
|
|
||||||
+ return rsm_enter_protected_mode(ctxt, smstate->cr0,
|
|
||||||
+ smstate->cr3, smstate->cr4);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_X86_64
|
|
||||||
@@ -2651,7 +2626,7 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt)
|
|
||||||
ret = rsm_load_state_64(ctxt, (const char *)&smram);
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
- ret = rsm_load_state_32(ctxt, (const char *)&smram);
|
|
||||||
+ ret = rsm_load_state_32(ctxt, &smram.smram32);
|
|
||||||
|
|
||||||
if (ret != X86EMUL_CONTINUE)
|
|
||||||
goto emulate_shutdown;
|
|
||||||
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
|
|
||||||
index 94c29391b065..579a1cb6a7c8 100644
|
|
||||||
--- a/arch/x86/kvm/x86.c
|
|
||||||
+++ b/arch/x86/kvm/x86.c
|
|
||||||
@@ -10100,22 +10100,18 @@ static u32 enter_smm_get_segment_flags(struct kvm_segment *seg)
|
|
||||||
return flags;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static void enter_smm_save_seg_32(struct kvm_vcpu *vcpu, char *buf, int n)
|
|
||||||
+static void enter_smm_save_seg_32(struct kvm_vcpu *vcpu,
|
|
||||||
+ struct kvm_smm_seg_state_32 *state,
|
|
||||||
+ u32 *selector,
|
|
||||||
+ int n)
|
|
||||||
{
|
|
||||||
struct kvm_segment seg;
|
|
||||||
- int offset;
|
|
||||||
|
|
||||||
kvm_get_segment(vcpu, &seg, n);
|
|
||||||
- put_smstate(u32, buf, 0x7fa8 + n * 4, seg.selector);
|
|
||||||
-
|
|
||||||
- if (n < 3)
|
|
||||||
- offset = 0x7f84 + n * 12;
|
|
||||||
- else
|
|
||||||
- offset = 0x7f2c + (n - 3) * 12;
|
|
||||||
-
|
|
||||||
- put_smstate(u32, buf, offset + 8, seg.base);
|
|
||||||
- put_smstate(u32, buf, offset + 4, seg.limit);
|
|
||||||
- put_smstate(u32, buf, offset, enter_smm_get_segment_flags(&seg));
|
|
||||||
+ *selector = seg.selector;
|
|
||||||
+ state->base = seg.base;
|
|
||||||
+ state->limit = seg.limit;
|
|
||||||
+ state->flags = enter_smm_get_segment_flags(&seg);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_X86_64
|
|
||||||
@@ -10136,54 +10132,47 @@ static void enter_smm_save_seg_64(struct kvm_vcpu *vcpu, char *buf, int n)
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-static void enter_smm_save_state_32(struct kvm_vcpu *vcpu, char *buf)
|
|
||||||
+static void enter_smm_save_state_32(struct kvm_vcpu *vcpu, struct kvm_smram_state_32 *smram)
|
|
||||||
{
|
|
||||||
struct desc_ptr dt;
|
|
||||||
- struct kvm_segment seg;
|
|
||||||
unsigned long val;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
- put_smstate(u32, buf, 0x7ffc, kvm_read_cr0(vcpu));
|
|
||||||
- put_smstate(u32, buf, 0x7ff8, kvm_read_cr3(vcpu));
|
|
||||||
- put_smstate(u32, buf, 0x7ff4, kvm_get_rflags(vcpu));
|
|
||||||
- put_smstate(u32, buf, 0x7ff0, kvm_rip_read(vcpu));
|
|
||||||
+ smram->cr0 = kvm_read_cr0(vcpu);
|
|
||||||
+ smram->cr3 = kvm_read_cr3(vcpu);
|
|
||||||
+ smram->eflags = kvm_get_rflags(vcpu);
|
|
||||||
+ smram->eip = kvm_rip_read(vcpu);
|
|
||||||
|
|
||||||
for (i = 0; i < 8; i++)
|
|
||||||
- put_smstate(u32, buf, 0x7fd0 + i * 4, kvm_register_read_raw(vcpu, i));
|
|
||||||
+ smram->gprs[i] = kvm_register_read_raw(vcpu, i);
|
|
||||||
|
|
||||||
kvm_get_dr(vcpu, 6, &val);
|
|
||||||
- put_smstate(u32, buf, 0x7fcc, (u32)val);
|
|
||||||
+ smram->dr6 = (u32)val;
|
|
||||||
kvm_get_dr(vcpu, 7, &val);
|
|
||||||
- put_smstate(u32, buf, 0x7fc8, (u32)val);
|
|
||||||
+ smram->dr7 = (u32)val;
|
|
||||||
|
|
||||||
- kvm_get_segment(vcpu, &seg, VCPU_SREG_TR);
|
|
||||||
- put_smstate(u32, buf, 0x7fc4, seg.selector);
|
|
||||||
- put_smstate(u32, buf, 0x7f64, seg.base);
|
|
||||||
- put_smstate(u32, buf, 0x7f60, seg.limit);
|
|
||||||
- put_smstate(u32, buf, 0x7f5c, enter_smm_get_segment_flags(&seg));
|
|
||||||
-
|
|
||||||
- kvm_get_segment(vcpu, &seg, VCPU_SREG_LDTR);
|
|
||||||
- put_smstate(u32, buf, 0x7fc0, seg.selector);
|
|
||||||
- put_smstate(u32, buf, 0x7f80, seg.base);
|
|
||||||
- put_smstate(u32, buf, 0x7f7c, seg.limit);
|
|
||||||
- put_smstate(u32, buf, 0x7f78, enter_smm_get_segment_flags(&seg));
|
|
||||||
+ enter_smm_save_seg_32(vcpu, &smram->tr, &smram->tr_sel, VCPU_SREG_TR);
|
|
||||||
+ enter_smm_save_seg_32(vcpu, &smram->ldtr, &smram->ldtr_sel, VCPU_SREG_LDTR);
|
|
||||||
|
|
||||||
static_call(kvm_x86_get_gdt)(vcpu, &dt);
|
|
||||||
- put_smstate(u32, buf, 0x7f74, dt.address);
|
|
||||||
- put_smstate(u32, buf, 0x7f70, dt.size);
|
|
||||||
+ smram->gdtr.base = dt.address;
|
|
||||||
+ smram->gdtr.limit = dt.size;
|
|
||||||
|
|
||||||
static_call(kvm_x86_get_idt)(vcpu, &dt);
|
|
||||||
- put_smstate(u32, buf, 0x7f58, dt.address);
|
|
||||||
- put_smstate(u32, buf, 0x7f54, dt.size);
|
|
||||||
+ smram->idtr.base = dt.address;
|
|
||||||
+ smram->idtr.limit = dt.size;
|
|
||||||
|
|
||||||
- for (i = 0; i < 6; i++)
|
|
||||||
- enter_smm_save_seg_32(vcpu, buf, i);
|
|
||||||
+ enter_smm_save_seg_32(vcpu, &smram->es, &smram->es_sel, VCPU_SREG_ES);
|
|
||||||
+ enter_smm_save_seg_32(vcpu, &smram->cs, &smram->cs_sel, VCPU_SREG_CS);
|
|
||||||
+ enter_smm_save_seg_32(vcpu, &smram->ss, &smram->ss_sel, VCPU_SREG_SS);
|
|
||||||
|
|
||||||
- put_smstate(u32, buf, 0x7f14, kvm_read_cr4(vcpu));
|
|
||||||
+ enter_smm_save_seg_32(vcpu, &smram->ds, &smram->ds_sel, VCPU_SREG_DS);
|
|
||||||
+ enter_smm_save_seg_32(vcpu, &smram->fs, &smram->fs_sel, VCPU_SREG_FS);
|
|
||||||
+ enter_smm_save_seg_32(vcpu, &smram->gs, &smram->gs_sel, VCPU_SREG_GS);
|
|
||||||
|
|
||||||
- /* revision id */
|
|
||||||
- put_smstate(u32, buf, 0x7efc, 0x00020000);
|
|
||||||
- put_smstate(u32, buf, 0x7ef8, vcpu->arch.smbase);
|
|
||||||
+ smram->cr4 = kvm_read_cr4(vcpu);
|
|
||||||
+ smram->smm_revision = 0x00020000;
|
|
||||||
+ smram->smbase = vcpu->arch.smbase;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_X86_64
|
|
||||||
@@ -10254,7 +10243,7 @@ static void enter_smm(struct kvm_vcpu *vcpu)
|
|
||||||
enter_smm_save_state_64(vcpu, (char *)&smram);
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
- enter_smm_save_state_32(vcpu, (char *)&smram);
|
|
||||||
+ enter_smm_save_state_32(vcpu, &smram.smram32);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Give enter_smm() a chance to make ISA-specific changes to the vCPU
|
|
||||||
|
|
@ -1,279 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Date: Wed, 3 Aug 2022 18:50:08 +0300
|
|
||||||
Subject: [PATCH] KVM: x86: emulator/smm: use smram struct for 64 bit smram
|
|
||||||
load/restore
|
|
||||||
|
|
||||||
Use kvm_smram_state_64 struct to save/restore the 64 bit SMM state
|
|
||||||
(used when X86_FEATURE_LM is present in the guest CPUID,
|
|
||||||
regardless of 32-bitness of the guest).
|
|
||||||
|
|
||||||
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
arch/x86/kvm/emulate.c | 88 ++++++++++++++----------------------------
|
|
||||||
arch/x86/kvm/x86.c | 75 ++++++++++++++++-------------------
|
|
||||||
2 files changed, 62 insertions(+), 101 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
|
|
||||||
index 65d82292ccec..03f9e5aa036e 100644
|
|
||||||
--- a/arch/x86/kvm/emulate.c
|
|
||||||
+++ b/arch/x86/kvm/emulate.c
|
|
||||||
@@ -2373,24 +2373,16 @@ static void rsm_load_seg_32(struct x86_emulate_ctxt *ctxt,
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_X86_64
|
|
||||||
-static int rsm_load_seg_64(struct x86_emulate_ctxt *ctxt, const char *smstate,
|
|
||||||
- int n)
|
|
||||||
+static void rsm_load_seg_64(struct x86_emulate_ctxt *ctxt,
|
|
||||||
+ const struct kvm_smm_seg_state_64 *state,
|
|
||||||
+ int n)
|
|
||||||
{
|
|
||||||
struct desc_struct desc;
|
|
||||||
- int offset;
|
|
||||||
- u16 selector;
|
|
||||||
- u32 base3;
|
|
||||||
-
|
|
||||||
- offset = 0x7e00 + n * 16;
|
|
||||||
-
|
|
||||||
- selector = GET_SMSTATE(u16, smstate, offset);
|
|
||||||
- rsm_set_desc_flags(&desc, GET_SMSTATE(u16, smstate, offset + 2) << 8);
|
|
||||||
- set_desc_limit(&desc, GET_SMSTATE(u32, smstate, offset + 4));
|
|
||||||
- set_desc_base(&desc, GET_SMSTATE(u32, smstate, offset + 8));
|
|
||||||
- base3 = GET_SMSTATE(u32, smstate, offset + 12);
|
|
||||||
|
|
||||||
- ctxt->ops->set_segment(ctxt, selector, &desc, base3, n);
|
|
||||||
- return X86EMUL_CONTINUE;
|
|
||||||
+ rsm_set_desc_flags(&desc, state->attributes << 8);
|
|
||||||
+ set_desc_limit(&desc, state->limit);
|
|
||||||
+ set_desc_base(&desc, (u32)state->base);
|
|
||||||
+ ctxt->ops->set_segment(ctxt, state->selector, &desc, state->base >> 32, n);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -2484,71 +2476,49 @@ static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt,
|
|
||||||
|
|
||||||
#ifdef CONFIG_X86_64
|
|
||||||
static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt,
|
|
||||||
- const char *smstate)
|
|
||||||
+ const struct kvm_smram_state_64 *smstate)
|
|
||||||
{
|
|
||||||
- struct desc_struct desc;
|
|
||||||
struct desc_ptr dt;
|
|
||||||
- u64 val, cr0, cr3, cr4;
|
|
||||||
- u32 base3;
|
|
||||||
- u16 selector;
|
|
||||||
int i, r;
|
|
||||||
|
|
||||||
for (i = 0; i < 16; i++)
|
|
||||||
- *reg_write(ctxt, i) = GET_SMSTATE(u64, smstate, 0x7ff8 - i * 8);
|
|
||||||
+ *reg_write(ctxt, i) = smstate->gprs[15 - i];
|
|
||||||
|
|
||||||
- ctxt->_eip = GET_SMSTATE(u64, smstate, 0x7f78);
|
|
||||||
- ctxt->eflags = GET_SMSTATE(u32, smstate, 0x7f70) | X86_EFLAGS_FIXED;
|
|
||||||
+ ctxt->_eip = smstate->rip;
|
|
||||||
+ ctxt->eflags = smstate->rflags | X86_EFLAGS_FIXED;
|
|
||||||
|
|
||||||
- val = GET_SMSTATE(u64, smstate, 0x7f68);
|
|
||||||
-
|
|
||||||
- if (ctxt->ops->set_dr(ctxt, 6, val))
|
|
||||||
+ if (ctxt->ops->set_dr(ctxt, 6, smstate->dr6))
|
|
||||||
return X86EMUL_UNHANDLEABLE;
|
|
||||||
-
|
|
||||||
- val = GET_SMSTATE(u64, smstate, 0x7f60);
|
|
||||||
-
|
|
||||||
- if (ctxt->ops->set_dr(ctxt, 7, val))
|
|
||||||
+ if (ctxt->ops->set_dr(ctxt, 7, smstate->dr7))
|
|
||||||
return X86EMUL_UNHANDLEABLE;
|
|
||||||
|
|
||||||
- cr0 = GET_SMSTATE(u64, smstate, 0x7f58);
|
|
||||||
- cr3 = GET_SMSTATE(u64, smstate, 0x7f50);
|
|
||||||
- cr4 = GET_SMSTATE(u64, smstate, 0x7f48);
|
|
||||||
- ctxt->ops->set_smbase(ctxt, GET_SMSTATE(u32, smstate, 0x7f00));
|
|
||||||
- val = GET_SMSTATE(u64, smstate, 0x7ed0);
|
|
||||||
+ ctxt->ops->set_smbase(ctxt, smstate->smbase);
|
|
||||||
|
|
||||||
- if (ctxt->ops->set_msr(ctxt, MSR_EFER, val & ~EFER_LMA))
|
|
||||||
+ if (ctxt->ops->set_msr(ctxt, MSR_EFER, smstate->efer & ~EFER_LMA))
|
|
||||||
return X86EMUL_UNHANDLEABLE;
|
|
||||||
|
|
||||||
- selector = GET_SMSTATE(u32, smstate, 0x7e90);
|
|
||||||
- rsm_set_desc_flags(&desc, GET_SMSTATE(u32, smstate, 0x7e92) << 8);
|
|
||||||
- set_desc_limit(&desc, GET_SMSTATE(u32, smstate, 0x7e94));
|
|
||||||
- set_desc_base(&desc, GET_SMSTATE(u32, smstate, 0x7e98));
|
|
||||||
- base3 = GET_SMSTATE(u32, smstate, 0x7e9c);
|
|
||||||
- ctxt->ops->set_segment(ctxt, selector, &desc, base3, VCPU_SREG_TR);
|
|
||||||
+ rsm_load_seg_64(ctxt, &smstate->tr, VCPU_SREG_TR);
|
|
||||||
|
|
||||||
- dt.size = GET_SMSTATE(u32, smstate, 0x7e84);
|
|
||||||
- dt.address = GET_SMSTATE(u64, smstate, 0x7e88);
|
|
||||||
+ dt.size = smstate->idtr.limit;
|
|
||||||
+ dt.address = smstate->idtr.base;
|
|
||||||
ctxt->ops->set_idt(ctxt, &dt);
|
|
||||||
|
|
||||||
- selector = GET_SMSTATE(u32, smstate, 0x7e70);
|
|
||||||
- rsm_set_desc_flags(&desc, GET_SMSTATE(u32, smstate, 0x7e72) << 8);
|
|
||||||
- set_desc_limit(&desc, GET_SMSTATE(u32, smstate, 0x7e74));
|
|
||||||
- set_desc_base(&desc, GET_SMSTATE(u32, smstate, 0x7e78));
|
|
||||||
- base3 = GET_SMSTATE(u32, smstate, 0x7e7c);
|
|
||||||
- ctxt->ops->set_segment(ctxt, selector, &desc, base3, VCPU_SREG_LDTR);
|
|
||||||
+ rsm_load_seg_64(ctxt, &smstate->ldtr, VCPU_SREG_LDTR);
|
|
||||||
|
|
||||||
- dt.size = GET_SMSTATE(u32, smstate, 0x7e64);
|
|
||||||
- dt.address = GET_SMSTATE(u64, smstate, 0x7e68);
|
|
||||||
+ dt.size = smstate->gdtr.limit;
|
|
||||||
+ dt.address = smstate->gdtr.base;
|
|
||||||
ctxt->ops->set_gdt(ctxt, &dt);
|
|
||||||
|
|
||||||
- r = rsm_enter_protected_mode(ctxt, cr0, cr3, cr4);
|
|
||||||
+ r = rsm_enter_protected_mode(ctxt, smstate->cr0, smstate->cr3, smstate->cr4);
|
|
||||||
if (r != X86EMUL_CONTINUE)
|
|
||||||
return r;
|
|
||||||
|
|
||||||
- for (i = 0; i < 6; i++) {
|
|
||||||
- r = rsm_load_seg_64(ctxt, smstate, i);
|
|
||||||
- if (r != X86EMUL_CONTINUE)
|
|
||||||
- return r;
|
|
||||||
- }
|
|
||||||
+ rsm_load_seg_64(ctxt, &smstate->es, VCPU_SREG_ES);
|
|
||||||
+ rsm_load_seg_64(ctxt, &smstate->cs, VCPU_SREG_CS);
|
|
||||||
+ rsm_load_seg_64(ctxt, &smstate->ss, VCPU_SREG_SS);
|
|
||||||
+ rsm_load_seg_64(ctxt, &smstate->ds, VCPU_SREG_DS);
|
|
||||||
+ rsm_load_seg_64(ctxt, &smstate->fs, VCPU_SREG_FS);
|
|
||||||
+ rsm_load_seg_64(ctxt, &smstate->gs, VCPU_SREG_GS);
|
|
||||||
|
|
||||||
return X86EMUL_CONTINUE;
|
|
||||||
}
|
|
||||||
@@ -2623,7 +2593,7 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt)
|
|
||||||
|
|
||||||
#ifdef CONFIG_X86_64
|
|
||||||
if (emulator_has_longmode(ctxt))
|
|
||||||
- ret = rsm_load_state_64(ctxt, (const char *)&smram);
|
|
||||||
+ ret = rsm_load_state_64(ctxt, &smram.smram64);
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
ret = rsm_load_state_32(ctxt, &smram.smram32);
|
|
||||||
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
|
|
||||||
index 579a1cb6a7c8..7a4d86f9bdcd 100644
|
|
||||||
--- a/arch/x86/kvm/x86.c
|
|
||||||
+++ b/arch/x86/kvm/x86.c
|
|
||||||
@@ -10115,20 +10115,17 @@ static void enter_smm_save_seg_32(struct kvm_vcpu *vcpu,
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_X86_64
|
|
||||||
-static void enter_smm_save_seg_64(struct kvm_vcpu *vcpu, char *buf, int n)
|
|
||||||
+static void enter_smm_save_seg_64(struct kvm_vcpu *vcpu,
|
|
||||||
+ struct kvm_smm_seg_state_64 *state,
|
|
||||||
+ int n)
|
|
||||||
{
|
|
||||||
struct kvm_segment seg;
|
|
||||||
- int offset;
|
|
||||||
- u16 flags;
|
|
||||||
|
|
||||||
kvm_get_segment(vcpu, &seg, n);
|
|
||||||
- offset = 0x7e00 + n * 16;
|
|
||||||
-
|
|
||||||
- flags = enter_smm_get_segment_flags(&seg) >> 8;
|
|
||||||
- put_smstate(u16, buf, offset, seg.selector);
|
|
||||||
- put_smstate(u16, buf, offset + 2, flags);
|
|
||||||
- put_smstate(u32, buf, offset + 4, seg.limit);
|
|
||||||
- put_smstate(u64, buf, offset + 8, seg.base);
|
|
||||||
+ state->selector = seg.selector;
|
|
||||||
+ state->attributes = enter_smm_get_segment_flags(&seg) >> 8;
|
|
||||||
+ state->limit = seg.limit;
|
|
||||||
+ state->base = seg.base;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -10176,57 +10173,51 @@ static void enter_smm_save_state_32(struct kvm_vcpu *vcpu, struct kvm_smram_stat
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_X86_64
|
|
||||||
-static void enter_smm_save_state_64(struct kvm_vcpu *vcpu, char *buf)
|
|
||||||
+static void enter_smm_save_state_64(struct kvm_vcpu *vcpu, struct kvm_smram_state_64 *smram)
|
|
||||||
{
|
|
||||||
struct desc_ptr dt;
|
|
||||||
- struct kvm_segment seg;
|
|
||||||
unsigned long val;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i = 0; i < 16; i++)
|
|
||||||
- put_smstate(u64, buf, 0x7ff8 - i * 8, kvm_register_read_raw(vcpu, i));
|
|
||||||
+ smram->gprs[15 - i] = kvm_register_read_raw(vcpu, i);
|
|
||||||
+
|
|
||||||
+ smram->rip = kvm_rip_read(vcpu);
|
|
||||||
+ smram->rflags = kvm_get_rflags(vcpu);
|
|
||||||
|
|
||||||
- put_smstate(u64, buf, 0x7f78, kvm_rip_read(vcpu));
|
|
||||||
- put_smstate(u32, buf, 0x7f70, kvm_get_rflags(vcpu));
|
|
||||||
|
|
||||||
kvm_get_dr(vcpu, 6, &val);
|
|
||||||
- put_smstate(u64, buf, 0x7f68, val);
|
|
||||||
+ smram->dr6 = val;
|
|
||||||
kvm_get_dr(vcpu, 7, &val);
|
|
||||||
- put_smstate(u64, buf, 0x7f60, val);
|
|
||||||
-
|
|
||||||
- put_smstate(u64, buf, 0x7f58, kvm_read_cr0(vcpu));
|
|
||||||
- put_smstate(u64, buf, 0x7f50, kvm_read_cr3(vcpu));
|
|
||||||
- put_smstate(u64, buf, 0x7f48, kvm_read_cr4(vcpu));
|
|
||||||
+ smram->dr7 = val;
|
|
||||||
|
|
||||||
- put_smstate(u32, buf, 0x7f00, vcpu->arch.smbase);
|
|
||||||
+ smram->cr0 = kvm_read_cr0(vcpu);
|
|
||||||
+ smram->cr3 = kvm_read_cr3(vcpu);
|
|
||||||
+ smram->cr4 = kvm_read_cr4(vcpu);
|
|
||||||
|
|
||||||
- /* revision id */
|
|
||||||
- put_smstate(u32, buf, 0x7efc, 0x00020064);
|
|
||||||
+ smram->smbase = vcpu->arch.smbase;
|
|
||||||
+ smram->smm_revison = 0x00020064;
|
|
||||||
|
|
||||||
- put_smstate(u64, buf, 0x7ed0, vcpu->arch.efer);
|
|
||||||
+ smram->efer = vcpu->arch.efer;
|
|
||||||
|
|
||||||
- kvm_get_segment(vcpu, &seg, VCPU_SREG_TR);
|
|
||||||
- put_smstate(u16, buf, 0x7e90, seg.selector);
|
|
||||||
- put_smstate(u16, buf, 0x7e92, enter_smm_get_segment_flags(&seg) >> 8);
|
|
||||||
- put_smstate(u32, buf, 0x7e94, seg.limit);
|
|
||||||
- put_smstate(u64, buf, 0x7e98, seg.base);
|
|
||||||
+ enter_smm_save_seg_64(vcpu, &smram->tr, VCPU_SREG_TR);
|
|
||||||
|
|
||||||
static_call(kvm_x86_get_idt)(vcpu, &dt);
|
|
||||||
- put_smstate(u32, buf, 0x7e84, dt.size);
|
|
||||||
- put_smstate(u64, buf, 0x7e88, dt.address);
|
|
||||||
+ smram->idtr.limit = dt.size;
|
|
||||||
+ smram->idtr.base = dt.address;
|
|
||||||
|
|
||||||
- kvm_get_segment(vcpu, &seg, VCPU_SREG_LDTR);
|
|
||||||
- put_smstate(u16, buf, 0x7e70, seg.selector);
|
|
||||||
- put_smstate(u16, buf, 0x7e72, enter_smm_get_segment_flags(&seg) >> 8);
|
|
||||||
- put_smstate(u32, buf, 0x7e74, seg.limit);
|
|
||||||
- put_smstate(u64, buf, 0x7e78, seg.base);
|
|
||||||
+ enter_smm_save_seg_64(vcpu, &smram->ldtr, VCPU_SREG_LDTR);
|
|
||||||
|
|
||||||
static_call(kvm_x86_get_gdt)(vcpu, &dt);
|
|
||||||
- put_smstate(u32, buf, 0x7e64, dt.size);
|
|
||||||
- put_smstate(u64, buf, 0x7e68, dt.address);
|
|
||||||
+ smram->gdtr.limit = dt.size;
|
|
||||||
+ smram->gdtr.base = dt.address;
|
|
||||||
|
|
||||||
- for (i = 0; i < 6; i++)
|
|
||||||
- enter_smm_save_seg_64(vcpu, buf, i);
|
|
||||||
+ enter_smm_save_seg_64(vcpu, &smram->es, VCPU_SREG_ES);
|
|
||||||
+ enter_smm_save_seg_64(vcpu, &smram->cs, VCPU_SREG_CS);
|
|
||||||
+ enter_smm_save_seg_64(vcpu, &smram->ss, VCPU_SREG_SS);
|
|
||||||
+ enter_smm_save_seg_64(vcpu, &smram->ds, VCPU_SREG_DS);
|
|
||||||
+ enter_smm_save_seg_64(vcpu, &smram->fs, VCPU_SREG_FS);
|
|
||||||
+ enter_smm_save_seg_64(vcpu, &smram->gs, VCPU_SREG_GS);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -10240,7 +10231,7 @@ static void enter_smm(struct kvm_vcpu *vcpu)
|
|
||||||
memset(smram.bytes, 0, sizeof(smram.bytes));
|
|
||||||
#ifdef CONFIG_X86_64
|
|
||||||
if (guest_cpuid_has(vcpu, X86_FEATURE_LM))
|
|
||||||
- enter_smm_save_state_64(vcpu, (char *)&smram);
|
|
||||||
+ enter_smm_save_state_64(vcpu, &smram.smram64);
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
enter_smm_save_state_32(vcpu, &smram.smram32);
|
|
||||||
|
|
@ -1,98 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Date: Wed, 3 Aug 2022 18:50:09 +0300
|
|
||||||
Subject: [PATCH] KVM: x86: SVM: use smram structs
|
|
||||||
|
|
||||||
This removes the last user of put_smstate/GET_SMSTATE so
|
|
||||||
remove these functions as well.
|
|
||||||
|
|
||||||
Also add a sanity check that we don't attempt to enter the SMM
|
|
||||||
on non long mode capable guest CPU with a running nested guest.
|
|
||||||
|
|
||||||
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
arch/x86/include/asm/kvm_host.h | 6 ------
|
|
||||||
arch/x86/kvm/svm/svm.c | 21 ++++++---------------
|
|
||||||
2 files changed, 6 insertions(+), 21 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
|
|
||||||
index 6885f3839e25..f5b82b6f4f84 100644
|
|
||||||
--- a/arch/x86/include/asm/kvm_host.h
|
|
||||||
+++ b/arch/x86/include/asm/kvm_host.h
|
|
||||||
@@ -2090,12 +2090,6 @@ static inline int kvm_cpu_get_apicid(int mps_cpu)
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
-#define put_smstate(type, buf, offset, val) \
|
|
||||||
- *(type *)((buf) + (offset) - 0x7e00) = val
|
|
||||||
-
|
|
||||||
-#define GET_SMSTATE(type, buf, offset) \
|
|
||||||
- (*(type *)((buf) + (offset) - 0x7e00))
|
|
||||||
-
|
|
||||||
int kvm_cpu_dirty_log_size(void);
|
|
||||||
|
|
||||||
int memslot_rmap_alloc(struct kvm_memory_slot *slot, unsigned long npages);
|
|
||||||
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
|
|
||||||
index 45c4def86cd3..bfacbef667d7 100644
|
|
||||||
--- a/arch/x86/kvm/svm/svm.c
|
|
||||||
+++ b/arch/x86/kvm/svm/svm.c
|
|
||||||
@@ -4391,15 +4391,11 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, union kvm_smram *smram)
|
|
||||||
struct kvm_host_map map_save;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
- char *smstate = (char *)smram;
|
|
||||||
-
|
|
||||||
if (!is_guest_mode(vcpu))
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
- /* FED8h - SVM Guest */
|
|
||||||
- put_smstate(u64, smstate, 0x7ed8, 1);
|
|
||||||
- /* FEE0h - SVM Guest VMCB Physical Address */
|
|
||||||
- put_smstate(u64, smstate, 0x7ee0, svm->nested.vmcb12_gpa);
|
|
||||||
+ smram->smram64.svm_guest_flag = 1;
|
|
||||||
+ smram->smram64.svm_guest_vmcb_gpa = svm->nested.vmcb12_gpa;
|
|
||||||
|
|
||||||
svm->vmcb->save.rax = vcpu->arch.regs[VCPU_REGS_RAX];
|
|
||||||
svm->vmcb->save.rsp = vcpu->arch.regs[VCPU_REGS_RSP];
|
|
||||||
@@ -4438,28 +4434,23 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram)
|
|
||||||
{
|
|
||||||
struct vcpu_svm *svm = to_svm(vcpu);
|
|
||||||
struct kvm_host_map map, map_save;
|
|
||||||
- u64 saved_efer, vmcb12_gpa;
|
|
||||||
struct vmcb *vmcb12;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
- const char *smstate = (const char *)smram;
|
|
||||||
-
|
|
||||||
if (!guest_cpuid_has(vcpu, X86_FEATURE_LM))
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
/* Non-zero if SMI arrived while vCPU was in guest mode. */
|
|
||||||
- if (!GET_SMSTATE(u64, smstate, 0x7ed8))
|
|
||||||
+ if (!smram->smram64.svm_guest_flag)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (!guest_cpuid_has(vcpu, X86_FEATURE_SVM))
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
- saved_efer = GET_SMSTATE(u64, smstate, 0x7ed0);
|
|
||||||
- if (!(saved_efer & EFER_SVME))
|
|
||||||
+ if (!(smram->smram64.efer & EFER_SVME))
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
- vmcb12_gpa = GET_SMSTATE(u64, smstate, 0x7ee0);
|
|
||||||
- if (kvm_vcpu_map(vcpu, gpa_to_gfn(vmcb12_gpa), &map) == -EINVAL)
|
|
||||||
+ if (kvm_vcpu_map(vcpu, gpa_to_gfn(smram->smram64.svm_guest_vmcb_gpa), &map) == -EINVAL)
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
ret = 1;
|
|
||||||
@@ -4485,7 +4476,7 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram)
|
|
||||||
vmcb12 = map.hva;
|
|
||||||
nested_copy_vmcb_control_to_cache(svm, &vmcb12->control);
|
|
||||||
nested_copy_vmcb_save_to_cache(svm, &vmcb12->save);
|
|
||||||
- ret = enter_svm_guest_mode(vcpu, vmcb12_gpa, vmcb12, false);
|
|
||||||
+ ret = enter_svm_guest_mode(vcpu, smram->smram64.svm_guest_vmcb_gpa, vmcb12, false);
|
|
||||||
|
|
||||||
if (ret)
|
|
||||||
goto unmap_save;
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Date: Wed, 3 Aug 2022 18:50:10 +0300
|
|
||||||
Subject: [PATCH] KVM: x86: SVM: don't save SVM state to SMRAM when VM is not
|
|
||||||
long mode capable
|
|
||||||
|
|
||||||
When the guest CPUID doesn't have support for long mode, 32 bit SMRAM
|
|
||||||
layout is used and it has no support for preserving EFER and/or SVM
|
|
||||||
state.
|
|
||||||
|
|
||||||
Note that this isn't relevant to running 32 bit guests on VM which is
|
|
||||||
long mode capable - such VM can still run 32 bit guests in compatibility
|
|
||||||
mode.
|
|
||||||
|
|
||||||
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
arch/x86/kvm/svm/svm.c | 9 +++++++++
|
|
||||||
1 file changed, 9 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
|
|
||||||
index bfacbef667d7..6b02f99fe70c 100644
|
|
||||||
--- a/arch/x86/kvm/svm/svm.c
|
|
||||||
+++ b/arch/x86/kvm/svm/svm.c
|
|
||||||
@@ -4394,6 +4394,15 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, union kvm_smram *smram)
|
|
||||||
if (!is_guest_mode(vcpu))
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
+ /*
|
|
||||||
+ * 32 bit SMRAM format doesn't preserve EFER and SVM state.
|
|
||||||
+ * SVM should not be enabled by the userspace without marking
|
|
||||||
+ * the CPU as at least long mode capable.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+ if (!guest_cpuid_has(vcpu, X86_FEATURE_LM))
|
|
||||||
+ return 1;
|
|
||||||
+
|
|
||||||
smram->smram64.svm_guest_flag = 1;
|
|
||||||
smram->smram64.svm_guest_vmcb_gpa = svm->nested.vmcb12_gpa;
|
|
||||||
|
|
||||||
|
|
@ -1,180 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Date: Wed, 3 Aug 2022 18:50:11 +0300
|
|
||||||
Subject: [PATCH] KVM: x86: emulator/smm: preserve interrupt shadow in SMRAM
|
|
||||||
|
|
||||||
When #SMI is asserted, the CPU can be in interrupt shadow
|
|
||||||
due to sti or mov ss.
|
|
||||||
|
|
||||||
It is not mandatory in Intel/AMD prm to have the #SMI
|
|
||||||
blocked during the shadow, and on top of
|
|
||||||
that, since neither SVM nor VMX has true support for SMI
|
|
||||||
window, waiting for one instruction would mean single stepping
|
|
||||||
the guest.
|
|
||||||
|
|
||||||
Instead, allow #SMI in this case, but both reset the interrupt
|
|
||||||
window and stash its value in SMRAM to restore it on exit
|
|
||||||
from SMM.
|
|
||||||
|
|
||||||
This fixes rare failures seen mostly on windows guests on VMX,
|
|
||||||
when #SMI falls on the sti instruction which mainfest in
|
|
||||||
VM entry failure due to EFLAGS.IF not being set, but STI interrupt
|
|
||||||
window still being set in the VMCS.
|
|
||||||
|
|
||||||
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
arch/x86/kvm/emulate.c | 17 ++++++++++++++---
|
|
||||||
arch/x86/kvm/kvm_emulate.h | 10 ++++++----
|
|
||||||
arch/x86/kvm/x86.c | 12 ++++++++++++
|
|
||||||
3 files changed, 32 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
|
|
||||||
index 03f9e5aa036e..bb008a5be539 100644
|
|
||||||
--- a/arch/x86/kvm/emulate.c
|
|
||||||
+++ b/arch/x86/kvm/emulate.c
|
|
||||||
@@ -2435,7 +2435,7 @@ static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt,
|
|
||||||
const struct kvm_smram_state_32 *smstate)
|
|
||||||
{
|
|
||||||
struct desc_ptr dt;
|
|
||||||
- int i;
|
|
||||||
+ int i, r;
|
|
||||||
|
|
||||||
ctxt->eflags = smstate->eflags | X86_EFLAGS_FIXED;
|
|
||||||
ctxt->_eip = smstate->eip;
|
|
||||||
@@ -2470,8 +2470,16 @@ static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt,
|
|
||||||
|
|
||||||
ctxt->ops->set_smbase(ctxt, smstate->smbase);
|
|
||||||
|
|
||||||
- return rsm_enter_protected_mode(ctxt, smstate->cr0,
|
|
||||||
- smstate->cr3, smstate->cr4);
|
|
||||||
+ r = rsm_enter_protected_mode(ctxt, smstate->cr0,
|
|
||||||
+ smstate->cr3, smstate->cr4);
|
|
||||||
+
|
|
||||||
+ if (r != X86EMUL_CONTINUE)
|
|
||||||
+ return r;
|
|
||||||
+
|
|
||||||
+ ctxt->ops->set_int_shadow(ctxt, 0);
|
|
||||||
+ ctxt->interruptibility = (u8)smstate->int_shadow;
|
|
||||||
+
|
|
||||||
+ return X86EMUL_CONTINUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_X86_64
|
|
||||||
@@ -2520,6 +2528,9 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt,
|
|
||||||
rsm_load_seg_64(ctxt, &smstate->fs, VCPU_SREG_FS);
|
|
||||||
rsm_load_seg_64(ctxt, &smstate->gs, VCPU_SREG_GS);
|
|
||||||
|
|
||||||
+ ctxt->ops->set_int_shadow(ctxt, 0);
|
|
||||||
+ ctxt->interruptibility = (u8)smstate->int_shadow;
|
|
||||||
+
|
|
||||||
return X86EMUL_CONTINUE;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
diff --git a/arch/x86/kvm/kvm_emulate.h b/arch/x86/kvm/kvm_emulate.h
|
|
||||||
index 76c0b8e7890b..a7313add0f2a 100644
|
|
||||||
--- a/arch/x86/kvm/kvm_emulate.h
|
|
||||||
+++ b/arch/x86/kvm/kvm_emulate.h
|
|
||||||
@@ -234,6 +234,7 @@ struct x86_emulate_ops {
|
|
||||||
bool (*guest_has_rdpid)(struct x86_emulate_ctxt *ctxt);
|
|
||||||
|
|
||||||
void (*set_nmi_mask)(struct x86_emulate_ctxt *ctxt, bool masked);
|
|
||||||
+ void (*set_int_shadow)(struct x86_emulate_ctxt *ctxt, u8 shadow);
|
|
||||||
|
|
||||||
unsigned (*get_hflags)(struct x86_emulate_ctxt *ctxt);
|
|
||||||
void (*exiting_smm)(struct x86_emulate_ctxt *ctxt);
|
|
||||||
@@ -518,7 +519,8 @@ struct kvm_smram_state_32 {
|
|
||||||
u32 reserved1[62];
|
|
||||||
u32 smbase;
|
|
||||||
u32 smm_revision;
|
|
||||||
- u32 reserved2[5];
|
|
||||||
+ u32 reserved2[4];
|
|
||||||
+ u32 int_shadow; /* KVM extension */
|
|
||||||
u32 cr4; /* CR4 is not present in Intel/AMD SMRAM image */
|
|
||||||
u32 reserved3[5];
|
|
||||||
|
|
||||||
@@ -566,6 +568,7 @@ static inline void __check_smram32_offsets(void)
|
|
||||||
__CHECK_SMRAM32_OFFSET(smbase, 0xFEF8);
|
|
||||||
__CHECK_SMRAM32_OFFSET(smm_revision, 0xFEFC);
|
|
||||||
__CHECK_SMRAM32_OFFSET(reserved2, 0xFF00);
|
|
||||||
+ __CHECK_SMRAM32_OFFSET(int_shadow, 0xFF10);
|
|
||||||
__CHECK_SMRAM32_OFFSET(cr4, 0xFF14);
|
|
||||||
__CHECK_SMRAM32_OFFSET(reserved3, 0xFF18);
|
|
||||||
__CHECK_SMRAM32_OFFSET(ds, 0xFF2C);
|
|
||||||
@@ -625,7 +628,7 @@ struct kvm_smram_state_64 {
|
|
||||||
u64 io_restart_rsi;
|
|
||||||
u64 io_restart_rdi;
|
|
||||||
u32 io_restart_dword;
|
|
||||||
- u32 reserved1;
|
|
||||||
+ u32 int_shadow;
|
|
||||||
u8 io_inst_restart;
|
|
||||||
u8 auto_hlt_restart;
|
|
||||||
u8 reserved2[6];
|
|
||||||
@@ -663,7 +666,6 @@ struct kvm_smram_state_64 {
|
|
||||||
u64 gprs[16]; /* GPRS in a reversed "natural" X86 order (R15/R14/../RCX/RAX.) */
|
|
||||||
};
|
|
||||||
|
|
||||||
-
|
|
||||||
static inline void __check_smram64_offsets(void)
|
|
||||||
{
|
|
||||||
#define __CHECK_SMRAM64_OFFSET(field, offset) \
|
|
||||||
@@ -684,7 +686,7 @@ static inline void __check_smram64_offsets(void)
|
|
||||||
__CHECK_SMRAM64_OFFSET(io_restart_rsi, 0xFEB0);
|
|
||||||
__CHECK_SMRAM64_OFFSET(io_restart_rdi, 0xFEB8);
|
|
||||||
__CHECK_SMRAM64_OFFSET(io_restart_dword, 0xFEC0);
|
|
||||||
- __CHECK_SMRAM64_OFFSET(reserved1, 0xFEC4);
|
|
||||||
+ __CHECK_SMRAM64_OFFSET(int_shadow, 0xFEC4);
|
|
||||||
__CHECK_SMRAM64_OFFSET(io_inst_restart, 0xFEC8);
|
|
||||||
__CHECK_SMRAM64_OFFSET(auto_hlt_restart, 0xFEC9);
|
|
||||||
__CHECK_SMRAM64_OFFSET(reserved2, 0xFECA);
|
|
||||||
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
|
|
||||||
index 7a4d86f9bdcd..609829ec1d13 100644
|
|
||||||
--- a/arch/x86/kvm/x86.c
|
|
||||||
+++ b/arch/x86/kvm/x86.c
|
|
||||||
@@ -8173,6 +8173,11 @@ static void emulator_set_nmi_mask(struct x86_emulate_ctxt *ctxt, bool masked)
|
|
||||||
static_call(kvm_x86_set_nmi_mask)(emul_to_vcpu(ctxt), masked);
|
|
||||||
}
|
|
||||||
|
|
||||||
+static void emulator_set_int_shadow(struct x86_emulate_ctxt *ctxt, u8 shadow)
|
|
||||||
+{
|
|
||||||
+ static_call(kvm_x86_set_interrupt_shadow)(emul_to_vcpu(ctxt), shadow);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static unsigned emulator_get_hflags(struct x86_emulate_ctxt *ctxt)
|
|
||||||
{
|
|
||||||
return emul_to_vcpu(ctxt)->arch.hflags;
|
|
||||||
@@ -8253,6 +8258,7 @@ static const struct x86_emulate_ops emulate_ops = {
|
|
||||||
.guest_has_fxsr = emulator_guest_has_fxsr,
|
|
||||||
.guest_has_rdpid = emulator_guest_has_rdpid,
|
|
||||||
.set_nmi_mask = emulator_set_nmi_mask,
|
|
||||||
+ .set_int_shadow = emulator_set_int_shadow,
|
|
||||||
.get_hflags = emulator_get_hflags,
|
|
||||||
.exiting_smm = emulator_exiting_smm,
|
|
||||||
.leave_smm = emulator_leave_smm,
|
|
||||||
@@ -10170,6 +10176,8 @@ static void enter_smm_save_state_32(struct kvm_vcpu *vcpu, struct kvm_smram_stat
|
|
||||||
smram->cr4 = kvm_read_cr4(vcpu);
|
|
||||||
smram->smm_revision = 0x00020000;
|
|
||||||
smram->smbase = vcpu->arch.smbase;
|
|
||||||
+
|
|
||||||
+ smram->int_shadow = static_call(kvm_x86_get_interrupt_shadow)(vcpu);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_X86_64
|
|
||||||
@@ -10218,6 +10226,8 @@ static void enter_smm_save_state_64(struct kvm_vcpu *vcpu, struct kvm_smram_stat
|
|
||||||
enter_smm_save_seg_64(vcpu, &smram->ds, VCPU_SREG_DS);
|
|
||||||
enter_smm_save_seg_64(vcpu, &smram->fs, VCPU_SREG_FS);
|
|
||||||
enter_smm_save_seg_64(vcpu, &smram->gs, VCPU_SREG_GS);
|
|
||||||
+
|
|
||||||
+ smram->int_shadow = static_call(kvm_x86_get_interrupt_shadow)(vcpu);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -10254,6 +10264,8 @@ static void enter_smm(struct kvm_vcpu *vcpu)
|
|
||||||
kvm_set_rflags(vcpu, X86_EFLAGS_FIXED);
|
|
||||||
kvm_rip_write(vcpu, 0x8000);
|
|
||||||
|
|
||||||
+ static_call(kvm_x86_set_interrupt_shadow)(vcpu, 0);
|
|
||||||
+
|
|
||||||
cr0 = vcpu->arch.cr0 & ~(X86_CR0_PE | X86_CR0_EM | X86_CR0_TS | X86_CR0_PG);
|
|
||||||
static_call(kvm_x86_set_cr0)(vcpu, cr0);
|
|
||||||
vcpu->arch.cr0 = cr0;
|
|
||||||
18
debian/patches/series.linux
vendored
18
debian/patches/series.linux
vendored
|
|
@ -1,20 +1,2 @@
|
||||||
ubuntu/0001-apparmor-compatibility-v2.x-net-rules.patch
|
|
||||||
ubuntu/0002-apparmor-af_unix-mediation.patch
|
|
||||||
ubuntu/0003-apparmor-fix-apparmor-mediating-locking-non-fs-unix-sockets.patch
|
|
||||||
ubuntu/0004-apparmor-fix-use-after-free-in-sk_peer_label.patch
|
|
||||||
|
|
||||||
pve/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch
|
|
||||||
pve/0002-bridge-keep-MAC-of-first-assigned-port.patch
|
pve/0002-bridge-keep-MAC-of-first-assigned-port.patch
|
||||||
pve/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch
|
|
||||||
pve/0004-kvm-disable-default-dynamic-halt-polling-growth.patch
|
pve/0004-kvm-disable-default-dynamic-halt-polling-growth.patch
|
||||||
pve/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch
|
|
||||||
# pve/0007-Ubuntu-remove-leftover-reference-to-ubuntu-hio-drive.patch # Not in Ubuntu Mainline
|
|
||||||
pve/0008-bug-introduce-ASSERT_STRUCT_OFFSET.patch
|
|
||||||
pve/0009-KVM-x86-emulator-update-the-emulation-mode-after-rsm.patch
|
|
||||||
pve/0010-KVM-x86-emulator-smm-add-structs-for-KVM-s-smram-lay.patch
|
|
||||||
pve/0011-KVM-x86-emulator-smm-use-smram-structs-in-the-common.patch
|
|
||||||
pve/0012-KVM-x86-emulator-smm-use-smram-struct-for-32-bit-smr.patch
|
|
||||||
pve/0013-KVM-x86-emulator-smm-use-smram-struct-for-64-bit-smr.patch
|
|
||||||
pve/0014-KVM-x86-SVM-use-smram-structs.patch
|
|
||||||
pve/0015-KVM-x86-SVM-don-t-save-SVM-state-to-SMRAM-when-VM-is.patch
|
|
||||||
pve/0016-KVM-x86-emulator-smm-preserve-interrupt-shadow-in-SM.patch
|
|
||||||
|
|
|
||||||
|
|
@ -1,250 +0,0 @@
|
||||||
From f153f512ed7a81e9b92a04d49869cffebf714f52 Mon Sep 17 00:00:00 2001
|
|
||||||
From: John Johansen <john.johansen@canonical.com>
|
|
||||||
Date: Sun, 17 Jun 2018 03:56:25 -0700
|
|
||||||
Subject: UBUNTU: SAUCE: apparmor: patch to provide compatibility with v2.x net
|
|
||||||
rules
|
|
||||||
|
|
||||||
The networking rules upstreamed in 4.17 have a deliberate abi break
|
|
||||||
with the older 2.x network rules.
|
|
||||||
|
|
||||||
This patch provides compatibility with the older rules for those
|
|
||||||
still using an apparmor 2.x userspace and still want network rules
|
|
||||||
to work on a newer kernel.
|
|
||||||
|
|
||||||
Signed-off-by: John Johansen <john.johansen@canonical.com>
|
|
||||||
[ saf: resolve conflicts when rebasing to 4.20 ]
|
|
||||||
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
|
|
||||||
---
|
|
||||||
security/apparmor/apparmorfs.c | 1 +
|
|
||||||
security/apparmor/include/apparmor.h | 2 +-
|
|
||||||
security/apparmor/include/net.h | 11 ++++++++
|
|
||||||
security/apparmor/include/policy.h | 2 ++
|
|
||||||
security/apparmor/net.c | 31 ++++++++++++++++-----
|
|
||||||
security/apparmor/policy.c | 1 +
|
|
||||||
security/apparmor/policy_unpack.c | 54 ++++++++++++++++++++++++++++++++++--
|
|
||||||
7 files changed, 92 insertions(+), 10 deletions(-)
|
|
||||||
|
|
||||||
(limited to 'security/apparmor')
|
|
||||||
|
|
||||||
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
|
|
||||||
index 2ee3b3d..0aef8e3 100644
|
|
||||||
--- a/security/apparmor/apparmorfs.c
|
|
||||||
+++ b/security/apparmor/apparmorfs.c
|
|
||||||
@@ -2362,6 +2362,7 @@ static struct aa_sfs_entry aa_sfs_entry_features[] = {
|
|
||||||
AA_SFS_DIR("domain", aa_sfs_entry_domain),
|
|
||||||
AA_SFS_DIR("file", aa_sfs_entry_file),
|
|
||||||
AA_SFS_DIR("network_v8", aa_sfs_entry_network),
|
|
||||||
+ AA_SFS_DIR("network", aa_sfs_entry_network_compat),
|
|
||||||
AA_SFS_DIR("mount", aa_sfs_entry_mount),
|
|
||||||
AA_SFS_DIR("namespaces", aa_sfs_entry_ns),
|
|
||||||
AA_SFS_FILE_U64("capability", VFS_CAP_FLAGS_MASK),
|
|
||||||
diff --git a/security/apparmor/include/apparmor.h b/security/apparmor/include/apparmor.h
|
|
||||||
index 1fbabdb..5870de2 100644
|
|
||||||
--- a/security/apparmor/include/apparmor.h
|
|
||||||
+++ b/security/apparmor/include/apparmor.h
|
|
||||||
@@ -20,7 +20,7 @@
|
|
||||||
#define AA_CLASS_UNKNOWN 1
|
|
||||||
#define AA_CLASS_FILE 2
|
|
||||||
#define AA_CLASS_CAP 3
|
|
||||||
-#define AA_CLASS_DEPRECATED 4
|
|
||||||
+#define AA_CLASS_NET_COMPAT 4
|
|
||||||
#define AA_CLASS_RLIMITS 5
|
|
||||||
#define AA_CLASS_DOMAIN 6
|
|
||||||
#define AA_CLASS_MOUNT 7
|
|
||||||
diff --git a/security/apparmor/include/net.h b/security/apparmor/include/net.h
|
|
||||||
index aadb4b2..98a42ef 100644
|
|
||||||
--- a/security/apparmor/include/net.h
|
|
||||||
+++ b/security/apparmor/include/net.h
|
|
||||||
@@ -68,6 +68,16 @@ struct aa_sk_ctx {
|
|
||||||
DEFINE_AUDIT_NET(NAME, OP, SK, (SK)->sk_family, (SK)->sk_type, \
|
|
||||||
(SK)->sk_protocol)
|
|
||||||
|
|
||||||
+/* struct aa_net - network confinement data
|
|
||||||
+ * @allow: basic network families permissions
|
|
||||||
+ * @audit: which network permissions to force audit
|
|
||||||
+ * @quiet: which network permissions to quiet rejects
|
|
||||||
+ */
|
|
||||||
+struct aa_net_compat {
|
|
||||||
+ u16 allow[AF_MAX];
|
|
||||||
+ u16 audit[AF_MAX];
|
|
||||||
+ u16 quiet[AF_MAX];
|
|
||||||
+};
|
|
||||||
|
|
||||||
#define af_select(FAMILY, FN, DEF_FN) \
|
|
||||||
({ \
|
|
||||||
@@ -87,6 +97,7 @@ struct aa_secmark {
|
|
||||||
};
|
|
||||||
|
|
||||||
extern struct aa_sfs_entry aa_sfs_entry_network[];
|
|
||||||
+extern struct aa_sfs_entry aa_sfs_entry_network_compat[];
|
|
||||||
|
|
||||||
void audit_net_cb(struct audit_buffer *ab, void *va);
|
|
||||||
int aa_profile_af_perm(struct aa_profile *profile, struct common_audit_data *sa,
|
|
||||||
diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h
|
|
||||||
index b5b4b81..f904105 100644
|
|
||||||
--- a/security/apparmor/include/policy.h
|
|
||||||
+++ b/security/apparmor/include/policy.h
|
|
||||||
@@ -108,6 +108,7 @@ struct aa_data {
|
|
||||||
* @policy: general match rules governing policy
|
|
||||||
* @file: The set of rules governing basic file access and domain transitions
|
|
||||||
* @caps: capabilities for the profile
|
|
||||||
+ * @net_compat: v2 compat network controls for the profile
|
|
||||||
* @rlimits: rlimits for the profile
|
|
||||||
*
|
|
||||||
* @dents: dentries for the profiles file entries in apparmorfs
|
|
||||||
@@ -145,6 +146,7 @@ struct aa_profile {
|
|
||||||
struct aa_policydb policy;
|
|
||||||
struct aa_file_rules file;
|
|
||||||
struct aa_caps caps;
|
|
||||||
+ struct aa_net_compat *net_compat;
|
|
||||||
|
|
||||||
int xattr_count;
|
|
||||||
char **xattrs;
|
|
||||||
diff --git a/security/apparmor/net.c b/security/apparmor/net.c
|
|
||||||
index e0c1b50..e693df8 100644
|
|
||||||
--- a/security/apparmor/net.c
|
|
||||||
+++ b/security/apparmor/net.c
|
|
||||||
@@ -24,6 +24,11 @@ struct aa_sfs_entry aa_sfs_entry_network[] = {
|
|
||||||
{ }
|
|
||||||
};
|
|
||||||
|
|
||||||
+struct aa_sfs_entry aa_sfs_entry_network_compat[] = {
|
|
||||||
+ AA_SFS_FILE_STRING("af_mask", AA_SFS_AF_MASK),
|
|
||||||
+ { }
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
static const char * const net_mask_names[] = {
|
|
||||||
"unknown",
|
|
||||||
"send",
|
|
||||||
@@ -118,14 +123,26 @@ int aa_profile_af_perm(struct aa_profile *profile, struct common_audit_data *sa,
|
|
||||||
if (profile_unconfined(profile))
|
|
||||||
return 0;
|
|
||||||
state = PROFILE_MEDIATES(profile, AA_CLASS_NET);
|
|
||||||
- if (!state)
|
|
||||||
+ if (state) {
|
|
||||||
+ if (!state)
|
|
||||||
+ return 0;
|
|
||||||
+ buffer[0] = cpu_to_be16(family);
|
|
||||||
+ buffer[1] = cpu_to_be16((u16) type);
|
|
||||||
+ state = aa_dfa_match_len(profile->policy.dfa, state,
|
|
||||||
+ (char *) &buffer, 4);
|
|
||||||
+ aa_compute_perms(profile->policy.dfa, state, &perms);
|
|
||||||
+ } else if (profile->net_compat) {
|
|
||||||
+ /* 2.x socket mediation compat */
|
|
||||||
+ perms.allow = (profile->net_compat->allow[family] & (1 << type)) ?
|
|
||||||
+ ALL_PERMS_MASK : 0;
|
|
||||||
+ perms.audit = (profile->net_compat->audit[family] & (1 << type)) ?
|
|
||||||
+ ALL_PERMS_MASK : 0;
|
|
||||||
+ perms.quiet = (profile->net_compat->quiet[family] & (1 << type)) ?
|
|
||||||
+ ALL_PERMS_MASK : 0;
|
|
||||||
+
|
|
||||||
+ } else {
|
|
||||||
return 0;
|
|
||||||
-
|
|
||||||
- buffer[0] = cpu_to_be16(family);
|
|
||||||
- buffer[1] = cpu_to_be16((u16) type);
|
|
||||||
- state = aa_dfa_match_len(profile->policy.dfa, state, (char *) &buffer,
|
|
||||||
- 4);
|
|
||||||
- aa_compute_perms(profile->policy.dfa, state, &perms);
|
|
||||||
+ }
|
|
||||||
aa_apply_modes_to_perms(profile, &perms);
|
|
||||||
|
|
||||||
return aa_check_perms(profile, &perms, request, sa, audit_net_cb);
|
|
||||||
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
|
|
||||||
index 4c010c9..a00e39b 100644
|
|
||||||
--- a/security/apparmor/policy.c
|
|
||||||
+++ b/security/apparmor/policy.c
|
|
||||||
@@ -222,6 +222,7 @@ void aa_free_profile(struct aa_profile *profile)
|
|
||||||
aa_free_file_rules(&profile->file);
|
|
||||||
aa_free_cap_rules(&profile->caps);
|
|
||||||
aa_free_rlimit_rules(&profile->rlimits);
|
|
||||||
+ kfree_sensitive(profile->net_compat);
|
|
||||||
|
|
||||||
for (i = 0; i < profile->xattr_count; i++)
|
|
||||||
kfree_sensitive(profile->xattrs[i]);
|
|
||||||
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
|
|
||||||
index 4e1f96b..aedfecc 100644
|
|
||||||
--- a/security/apparmor/policy_unpack.c
|
|
||||||
+++ b/security/apparmor/policy_unpack.c
|
|
||||||
@@ -34,7 +34,7 @@
|
|
||||||
|
|
||||||
#define v5 5 /* base version */
|
|
||||||
#define v6 6 /* per entry policydb mediation check */
|
|
||||||
-#define v7 7
|
|
||||||
+#define v7 7 /* v2 compat networking */
|
|
||||||
#define v8 8 /* full network masking */
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -314,6 +314,19 @@ fail:
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static bool unpack_u16(struct aa_ext *e, u16 *data, const char *name)
|
|
||||||
+{
|
|
||||||
+ if (unpack_nameX(e, AA_U16, name)) {
|
|
||||||
+ if (!inbounds(e, sizeof(u16)))
|
|
||||||
+ return 0;
|
|
||||||
+ if (data)
|
|
||||||
+ *data = le16_to_cpu(get_unaligned((__le16 *) e->pos));
|
|
||||||
+ e->pos += sizeof(u16);
|
|
||||||
+ return 1;
|
|
||||||
+ }
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static bool unpack_u32(struct aa_ext *e, u32 *data, const char *name)
|
|
||||||
{
|
|
||||||
void *pos = e->pos;
|
|
||||||
@@ -676,7 +689,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name)
|
|
||||||
struct aa_profile *profile = NULL;
|
|
||||||
const char *tmpname, *tmpns = NULL, *name = NULL;
|
|
||||||
const char *info = "failed to unpack profile";
|
|
||||||
- size_t ns_len;
|
|
||||||
+ size_t size = 0, ns_len;
|
|
||||||
struct rhashtable_params params = { 0 };
|
|
||||||
char *key = NULL;
|
|
||||||
struct aa_data *data;
|
|
||||||
@@ -823,6 +836,43 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name)
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ size = unpack_array(e, "net_allowed_af");
|
|
||||||
+ if (size || VERSION_LT(e->version, v8)) {
|
|
||||||
+ profile->net_compat = kzalloc(sizeof(struct aa_net_compat), GFP_KERNEL);
|
|
||||||
+ if (!profile->net_compat) {
|
|
||||||
+ info = "out of memory";
|
|
||||||
+ goto fail;
|
|
||||||
+ }
|
|
||||||
+ for (i = 0; i < size; i++) {
|
|
||||||
+ /* discard extraneous rules that this kernel will
|
|
||||||
+ * never request
|
|
||||||
+ */
|
|
||||||
+ if (i >= AF_MAX) {
|
|
||||||
+ u16 tmp;
|
|
||||||
+
|
|
||||||
+ if (!unpack_u16(e, &tmp, NULL) ||
|
|
||||||
+ !unpack_u16(e, &tmp, NULL) ||
|
|
||||||
+ !unpack_u16(e, &tmp, NULL))
|
|
||||||
+ goto fail;
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
+ if (!unpack_u16(e, &profile->net_compat->allow[i], NULL))
|
|
||||||
+ goto fail;
|
|
||||||
+ if (!unpack_u16(e, &profile->net_compat->audit[i], NULL))
|
|
||||||
+ goto fail;
|
|
||||||
+ if (!unpack_u16(e, &profile->net_compat->quiet[i], NULL))
|
|
||||||
+ goto fail;
|
|
||||||
+ }
|
|
||||||
+ if (size && !unpack_nameX(e, AA_ARRAYEND, NULL))
|
|
||||||
+ goto fail;
|
|
||||||
+ if (VERSION_LT(e->version, v7)) {
|
|
||||||
+ /* pre v7 policy always allowed these */
|
|
||||||
+ profile->net_compat->allow[AF_UNIX] = 0xffff;
|
|
||||||
+ profile->net_compat->allow[AF_NETLINK] = 0xffff;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+
|
|
||||||
if (unpack_nameX(e, AA_STRUCT, "policydb")) {
|
|
||||||
/* generic policy dfa - optional and may be NULL */
|
|
||||||
info = "failed to unpack policydb";
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,38 +0,0 @@
|
||||||
From d7410054784d8aa0e313f9eeb6110a791420f3d3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: John Johansen <john.johansen@canonical.com>
|
|
||||||
Date: Mon, 30 Jul 2018 13:55:30 -0700
|
|
||||||
Subject: UBUNTU SAUCE: apparmor: fix apparmor mediating locking non-fs, unix
|
|
||||||
sockets
|
|
||||||
|
|
||||||
The apparmor policy language current does not allow expressing of the
|
|
||||||
locking permission for no-fs unix sockets. However the kernel is
|
|
||||||
enforcing mediation.
|
|
||||||
|
|
||||||
Add the AA_MAY_LOCK perm to the computed perm mask which will grant
|
|
||||||
permission for all current abi profiles, but still allow specifying
|
|
||||||
auditing of the operation if needed.
|
|
||||||
|
|
||||||
BugLink: http://bugs.launchpad.net/bugs/1780227
|
|
||||||
Signed-off-by: John Johansen <john.johansen@canonical.com>
|
|
||||||
Acked-by: Acked-by: Stefan Bader <stefan.bader@canonical.com>
|
|
||||||
Acked-by: Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
|
|
||||||
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
|
|
||||||
---
|
|
||||||
security/apparmor/lib.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
(limited to 'security/apparmor')
|
|
||||||
|
|
||||||
diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
|
|
||||||
index fa49b81..bf72843 100644
|
|
||||||
--- a/security/apparmor/lib.c
|
|
||||||
+++ b/security/apparmor/lib.c
|
|
||||||
@@ -334,7 +334,7 @@ void aa_compute_perms(struct aa_dfa *dfa, unsigned int state,
|
|
||||||
/* for v5 perm mapping in the policydb, the other set is used
|
|
||||||
* to extend the general perm set
|
|
||||||
*/
|
|
||||||
- perms->allow |= map_other(dfa_other_allow(dfa, state));
|
|
||||||
+ perms->allow |= map_other(dfa_other_allow(dfa, state)) | AA_MAY_LOCK;
|
|
||||||
perms->audit |= map_other(dfa_other_audit(dfa, state));
|
|
||||||
perms->quiet |= map_other(dfa_other_quiet(dfa, state));
|
|
||||||
// perms->xindex = dfa_user_xindex(dfa, state);
|
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
From e9243f6a285589f49161faf0f96f4cf15c1dafae Mon Sep 17 00:00:00 2001
|
|
||||||
From: John Johansen <john.johansen@canonical.com>
|
|
||||||
Date: Tue, 26 Jun 2018 20:19:19 -0700
|
|
||||||
Subject: UBUNTU: SAUCE: apparmor: fix use after free in sk_peer_label
|
|
||||||
|
|
||||||
BugLink: http://bugs.launchpad.net/bugs/1778646
|
|
||||||
Signed-off-by: John Johansen <john.johansen@canonical.com>
|
|
||||||
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
|
|
||||||
---
|
|
||||||
security/apparmor/lsm.c | 11 +++++++----
|
|
||||||
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
(limited to 'security/apparmor')
|
|
||||||
|
|
||||||
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
|
|
||||||
index 59a8ddd..b1216ee 100644
|
|
||||||
--- a/security/apparmor/lsm.c
|
|
||||||
+++ b/security/apparmor/lsm.c
|
|
||||||
@@ -1162,9 +1162,10 @@ static struct aa_label *sk_peer_label(struct sock *sk)
|
|
||||||
{
|
|
||||||
struct sock *peer_sk;
|
|
||||||
struct aa_sk_ctx *ctx = SK_CTX(sk);
|
|
||||||
+ struct aa_label *label = ERR_PTR(-ENOPROTOOPT);
|
|
||||||
|
|
||||||
if (ctx->peer)
|
|
||||||
- return ctx->peer;
|
|
||||||
+ return aa_get_label(ctx->peer);
|
|
||||||
|
|
||||||
if (sk->sk_family != PF_UNIX)
|
|
||||||
return ERR_PTR(-ENOPROTOOPT);
|
|
||||||
@@ -1172,14 +1173,15 @@ static struct aa_label *sk_peer_label(struct sock *sk)
|
|
||||||
/* check for sockpair peering which does not go through
|
|
||||||
* security_unix_stream_connect
|
|
||||||
*/
|
|
||||||
- peer_sk = unix_peer(sk);
|
|
||||||
+ peer_sk = unix_peer_get(sk);
|
|
||||||
if (peer_sk) {
|
|
||||||
ctx = SK_CTX(peer_sk);
|
|
||||||
if (ctx->label)
|
|
||||||
- return ctx->label;
|
|
||||||
+ label = aa_get_label(ctx->label);
|
|
||||||
+ sock_put(peer_sk);
|
|
||||||
}
|
|
||||||
|
|
||||||
- return ERR_PTR(-ENOPROTOOPT);
|
|
||||||
+ return label;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
@@ -1223,6 +1225,7 @@ out:
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
+ aa_put_label(peer);
|
|
||||||
done:
|
|
||||||
end_current_label_crit_section(label);
|
|
||||||
|
|
||||||
|
|
@ -67,4 +67,4 @@ index 20064a0fb..4d5f545ad 100644
|
||||||
+ elif test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
|
+ elif test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
|
||||||
_match="${ZFS_META_NAME}-${ZFS_META_VERSION}"
|
_match="${ZFS_META_NAME}-${ZFS_META_VERSION}"
|
||||||
_alias=$(git describe --match=${_match} 2>/dev/null)
|
_alias=$(git describe --match=${_match} 2>/dev/null)
|
||||||
_release=$(echo ${_alias}|sed "s/${ZFS_META_NAME}//"|cut -f3- -d'-'|tr - _)
|
_release=$(echo ${_alias}|sed "s/${ZFS_META_NAME}//"|cut -f3- -d'-'|tr - _)
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in
|
diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in
|
||||||
index 008075138..570e27707 100644
|
index be80025a4..20ce8e632 100644
|
||||||
--- a/etc/systemd/system/zfs-zed.service.in
|
--- a/etc/systemd/system/zfs-zed.service.in
|
||||||
+++ b/etc/systemd/system/zfs-zed.service.in
|
+++ b/etc/systemd/system/zfs-zed.service.in
|
||||||
@@ -4,7 +4,7 @@ Documentation=man:zed(8)
|
@@ -4,7 +4,7 @@ Documentation=man:zed(8)
|
||||||
|
|
@ -22,6 +22,6 @@ index 008075138..570e27707 100644
|
||||||
[Service]
|
[Service]
|
||||||
-ExecStart=@sbindir@/zed -F
|
-ExecStart=@sbindir@/zed -F
|
||||||
+ExecStart=/usr/sbin/zed -F
|
+ExecStart=/usr/sbin/zed -F
|
||||||
Restart=on-abort
|
Restart=always
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
|
diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
|
||||||
index c1111c73a..c5e12c2c6 100644
|
index 598ef501b..e4f3a70c1 100644
|
||||||
--- a/etc/systemd/system/zfs-import-scan.service.in
|
--- a/etc/systemd/system/zfs-import-scan.service.in
|
||||||
+++ b/etc/systemd/system/zfs-import-scan.service.in
|
+++ b/etc/systemd/system/zfs-import-scan.service.in
|
||||||
@@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs
|
@@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs
|
||||||
|
|
|
||||||
|
|
@ -13,10 +13,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
|
diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
|
||||||
index 9ac77f929..672617f54 100644
|
index 227b26c26..240d0dbfa 100644
|
||||||
--- a/cmd/zed/zed.d/zed.rc
|
--- a/cmd/zed/zed.d/zed.rc
|
||||||
+++ b/cmd/zed/zed.d/zed.rc
|
+++ b/cmd/zed/zed.d/zed.rc
|
||||||
@@ -41,7 +41,7 @@ ZED_EMAIL_ADDR="root"
|
@@ -42,7 +42,7 @@ ZED_EMAIL_ADDR="root"
|
||||||
##
|
##
|
||||||
# Minimum number of seconds between notifications for a similar event.
|
# Minimum number of seconds between notifications for a similar event.
|
||||||
#
|
#
|
||||||
|
|
@ -24,4 +24,4 @@ index 9ac77f929..672617f54 100644
|
||||||
+ZED_NOTIFY_INTERVAL_SECS=3600
|
+ZED_NOTIFY_INTERVAL_SECS=3600
|
||||||
|
|
||||||
##
|
##
|
||||||
# Notification verbosity.
|
# Notification verbosity.
|
||||||
|
|
|
||||||
|
|
@ -16,10 +16,10 @@ Forwarded: no need
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
|
diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
|
||||||
index 8b2d0c200..118c96547 100644
|
index 2c8173b3e..ad39292e4 100644
|
||||||
--- a/cmd/zed/zed.d/Makefile.am
|
--- a/cmd/zed/zed.d/Makefile.am
|
||||||
+++ b/cmd/zed/zed.d/Makefile.am
|
+++ b/cmd/zed/zed.d/Makefile.am
|
||||||
@@ -48,6 +48,6 @@ install-data-hook:
|
@@ -49,7 +49,7 @@ install-data-hook:
|
||||||
for f in $(zedconfdefaults); do \
|
for f in $(zedconfdefaults); do \
|
||||||
test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
|
test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
|
||||||
-L "$(DESTDIR)$(zedconfdir)/$${f}" || \
|
-L "$(DESTDIR)$(zedconfdir)/$${f}" || \
|
||||||
|
|
@ -27,3 +27,4 @@ index 8b2d0c200..118c96547 100644
|
||||||
+ echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
|
+ echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
|
||||||
done
|
done
|
||||||
chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc"
|
chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,11 +28,11 @@ index 3788543b0..c7ee4ae9a 100755
|
||||||
|
|
||||||
typeset -i cnt=0
|
typeset -i cnt=0
|
||||||
diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
|
diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
|
||||||
index f89cb3b31..375d483f7 100755
|
index 370f5382e..661fbe85d 100755
|
||||||
--- a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
|
--- a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
|
||||||
+++ b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
|
+++ b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
|
||||||
@@ -87,7 +87,7 @@ log_must xattrtest -f 10 -x 3 -s 32768 -r -k -p /$TESTPOOL/$TESTFS2/xattrsadir
|
@@ -87,7 +87,7 @@ log_must xattrtest -f 10 -x 3 -s 32768 -r -k -p /$TESTPOOL/$TESTFS2/xattrsadir
|
||||||
# ZoL issue #7432
|
# OpenZFS issue #7432
|
||||||
log_must zfs set compression=on xattr=sa $TESTPOOL/$TESTFS2
|
log_must zfs set compression=on xattr=sa $TESTPOOL/$TESTFS2
|
||||||
log_must touch /$TESTPOOL/$TESTFS2/attrs
|
log_must touch /$TESTPOOL/$TESTFS2/attrs
|
||||||
-log_must eval "python -c 'print \"a\" * 4096' | \
|
-log_must eval "python -c 'print \"a\" * 4096' | \
|
||||||
|
|
@ -41,10 +41,10 @@ index f89cb3b31..375d483f7 100755
|
||||||
log_must zfs set compression=off xattr=on $TESTPOOL/$TESTFS2
|
log_must zfs set compression=off xattr=on $TESTPOOL/$TESTFS2
|
||||||
|
|
||||||
diff --git a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
|
diff --git a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
|
||||||
index 394fe95bb..43560aac5 100755
|
index 551ed15db..bd30488ea 100755
|
||||||
--- a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
|
--- a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
|
||||||
+++ b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
|
+++ b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
|
||||||
@@ -93,7 +93,7 @@ log_must zfs snapshot $POOL/fs@c
|
@@ -88,7 +88,7 @@ log_must zfs snapshot $POOL/fs@c
|
||||||
# 4. Create an empty file and add xattrs to it to exercise reclaiming a
|
# 4. Create an empty file and add xattrs to it to exercise reclaiming a
|
||||||
# dnode that requires more than 1 slot for its bonus buffer (Zol #7433)
|
# dnode that requires more than 1 slot for its bonus buffer (Zol #7433)
|
||||||
log_must zfs set compression=on xattr=sa $POOL/fs
|
log_must zfs set compression=on xattr=sa $POOL/fs
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ index e4056a92c..030611419 100644
|
||||||
enable zfs-mount.service
|
enable zfs-mount.service
|
||||||
enable zfs-share.service
|
enable zfs-share.service
|
||||||
diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
|
diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
|
||||||
index 5e65e1db4..8e6baeb68 100644
|
index 35f833de5..af3ae597c 100644
|
||||||
--- a/etc/systemd/system/Makefile.am
|
--- a/etc/systemd/system/Makefile.am
|
||||||
+++ b/etc/systemd/system/Makefile.am
|
+++ b/etc/systemd/system/Makefile.am
|
||||||
@@ -7,6 +7,7 @@ systemdunit_DATA = \
|
@@ -7,6 +7,7 @@ systemdunit_DATA = \
|
||||||
|
|
|
||||||
|
|
@ -8,23 +8,38 @@ Originally-By: Antonio Russo <aerusso@aerusso.net>
|
||||||
|
|
||||||
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
|
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
|
||||||
---
|
---
|
||||||
|
man/Makefile.am | 2 +-
|
||||||
|
man/{man1/arcstat.1 => man8/arcstat.8} | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)
|
||||||
|
|
||||||
diff --git a/man/Makefile.am b/man/Makefile.am
|
diff --git a/man/Makefile.am b/man/Makefile.am
|
||||||
index 8ab1b7572..5485076f9 100644
|
index 64650c2b9..95a66a62f 100644
|
||||||
--- a/man/Makefile.am
|
--- a/man/Makefile.am
|
||||||
+++ b/man/Makefile.am
|
+++ b/man/Makefile.am
|
||||||
@@ -8,7 +8,7 @@ dist_man_MANS = \
|
@@ -8,7 +8,6 @@ dist_man_MANS = \
|
||||||
man1/ztest.1 \
|
man1/ztest.1 \
|
||||||
man1/raidz_test.1 \
|
man1/raidz_test.1 \
|
||||||
man1/zvol_wait.1 \
|
man1/zvol_wait.1 \
|
||||||
- man1/arcstat.1 \
|
- man1/arcstat.1 \
|
||||||
+ man8/arcstat.8 \
|
|
||||||
\
|
\
|
||||||
man5/vdev_id.conf.5 \
|
man5/vdev_id.conf.5 \
|
||||||
\
|
\
|
||||||
diff --git a/man/man1/arcstat.1 b/man/man1/arcstat.1
|
@@ -22,6 +21,7 @@ dist_man_MANS = \
|
||||||
|
man7/zpoolconcepts.7 \
|
||||||
|
man7/zpoolprops.7 \
|
||||||
|
\
|
||||||
|
+ man8/arcstat.8 \
|
||||||
|
man8/fsck.zfs.8 \
|
||||||
|
man8/mount.zfs.8 \
|
||||||
|
man8/vdev_id.8 \
|
||||||
|
diff --git a/man/man1/arcstat.1 b/man/man8/arcstat.8
|
||||||
|
similarity index 99%
|
||||||
|
rename from man/man1/arcstat.1
|
||||||
|
rename to man/man8/arcstat.8
|
||||||
index a69cd8937..dfe9c971b 100644
|
index a69cd8937..dfe9c971b 100644
|
||||||
--- a/man/man1/arcstat.1
|
--- a/man/man1/arcstat.1
|
||||||
+++ b/man/man1/arcstat.1
|
+++ b/man/man8/arcstat.8
|
||||||
@@ -13,7 +13,7 @@
|
@@ -13,7 +13,7 @@
|
||||||
.\" Copyright (c) 2020 by AJ Jordan. All rights reserved.
|
.\" Copyright (c) 2020 by AJ Jordan. All rights reserved.
|
||||||
.\"
|
.\"
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||||
1 file changed, 33 insertions(+), 33 deletions(-)
|
1 file changed, 33 insertions(+), 33 deletions(-)
|
||||||
|
|
||||||
diff --git a/cmd/arcstat/arcstat.in b/cmd/arcstat/arcstat.in
|
diff --git a/cmd/arcstat/arcstat.in b/cmd/arcstat/arcstat.in
|
||||||
index 9e7c52a6c..cd9a803a2 100755
|
index 425e52d1f..010f69ec0 100755
|
||||||
--- a/cmd/arcstat/arcstat.in
|
--- a/cmd/arcstat/arcstat.in
|
||||||
+++ b/cmd/arcstat/arcstat.in
|
+++ b/cmd/arcstat/arcstat.in
|
||||||
@@ -441,73 +441,73 @@ def calculate():
|
@@ -441,73 +441,73 @@ def calculate():
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
|
||||||
2 files changed, 21 insertions(+), 21 deletions(-)
|
2 files changed, 21 insertions(+), 21 deletions(-)
|
||||||
|
|
||||||
diff --git a/cmd/arc_summary/arc_summary3 b/cmd/arc_summary/arc_summary3
|
diff --git a/cmd/arc_summary/arc_summary3 b/cmd/arc_summary/arc_summary3
|
||||||
index 7b28012ed..fe6a6d9e2 100755
|
index 301c485b3..ac46f5843 100755
|
||||||
--- a/cmd/arc_summary/arc_summary3
|
--- a/cmd/arc_summary/arc_summary3
|
||||||
+++ b/cmd/arc_summary/arc_summary3
|
+++ b/cmd/arc_summary/arc_summary3
|
||||||
@@ -617,13 +617,13 @@ def section_arc(kstats_dict):
|
@@ -617,13 +617,13 @@ def section_arc(kstats_dict):
|
||||||
|
|
@ -79,7 +79,7 @@ index 7b28012ed..fe6a6d9e2 100755
|
||||||
print()
|
print()
|
||||||
prt_1('L2ARC breakdown:', f_hits(l2_access_total))
|
prt_1('L2ARC breakdown:', f_hits(l2_access_total))
|
||||||
diff --git a/cmd/arcstat/arcstat.in b/cmd/arcstat/arcstat.in
|
diff --git a/cmd/arcstat/arcstat.in b/cmd/arcstat/arcstat.in
|
||||||
index cd9a803a2..ea45dc602 100755
|
index 010f69ec0..50e5a7150 100755
|
||||||
--- a/cmd/arcstat/arcstat.in
|
--- a/cmd/arcstat/arcstat.in
|
||||||
+++ b/cmd/arcstat/arcstat.in
|
+++ b/cmd/arcstat/arcstat.in
|
||||||
@@ -482,8 +482,8 @@ def calculate():
|
@@ -482,8 +482,8 @@ def calculate():
|
||||||
|
|
@ -109,4 +109,4 @@ index cd9a803a2..ea45dc602 100755
|
||||||
+ v["l2meta"] = cur.get("l2_bufc_metadata_asize", 0)
|
+ v["l2meta"] = cur.get("l2_bufc_metadata_asize", 0)
|
||||||
v["l2pref%"] = 100 * v["l2pref"] // v["l2asize"]
|
v["l2pref%"] = 100 * v["l2pref"] // v["l2asize"]
|
||||||
v["l2mfu%"] = 100 * v["l2mfu"] // v["l2asize"]
|
v["l2mfu%"] = 100 * v["l2mfu"] // v["l2asize"]
|
||||||
v["l2mru%"] = 100 * v["l2mru"] // v["l2asize"]
|
v["l2mru%"] = 100 * v["l2mru"] // v["l2asize"]
|
||||||
|
|
|
||||||
10
debian/rules
vendored
10
debian/rules
vendored
|
|
@ -27,8 +27,8 @@ debian/SOURCE:
|
||||||
## Debhelper phases
|
## Debhelper phases
|
||||||
override_dh_quilt_patch:
|
override_dh_quilt_patch:
|
||||||
# Apply crack bundle
|
# Apply crack bundle
|
||||||
git -C ${KERNEL_SRC} fetch ../crack.bundle $$(git -C ${KERNEL_SRC} ls-remote ../crack.bundle | cut -f1)
|
# git -C ${KERNEL_SRC} fetch ../crack.bundle $$(git -C ${KERNEL_SRC} ls-remote ../crack.bundle | cut -f1)
|
||||||
git -C ${KERNEL_SRC} checkout -f FETCH_HEAD
|
# git -C ${KERNEL_SRC} checkout -f FETCH_HEAD
|
||||||
# Apply patches
|
# Apply patches
|
||||||
cd ${KERNEL_SRC}; \
|
cd ${KERNEL_SRC}; \
|
||||||
QUILT_PATCHES=../debian/patches \
|
QUILT_PATCHES=../debian/patches \
|
||||||
|
|
@ -86,11 +86,7 @@ override_dh_auto_clean: debian/control
|
||||||
PVE_KERNEL_TEMPLATES := $(patsubst debian/templates/pve-kernel.%.in, debian/${PVE_KERNEL_PKG}.%, $(wildcard debian/templates/pve-kernel.*.in))
|
PVE_KERNEL_TEMPLATES := $(patsubst debian/templates/pve-kernel.%.in, debian/${PVE_KERNEL_PKG}.%, $(wildcard debian/templates/pve-kernel.*.in))
|
||||||
|
|
||||||
${KERNEL_SRC}/.config:
|
${KERNEL_SRC}/.config:
|
||||||
python3 ${KERNEL_SRC}/debian/scripts/misc/annotations -f ${KERNEL_SRC}/debian.master/config/annotations -a ${DEB_BUILD_ARCH} --export > ${KERNEL_SRC}/debian.master/config/config.ubuntu
|
cp debian/config/config.pve ${KERNEL_SRC}/.config
|
||||||
${KERNEL_SRC}/scripts/kconfig/merge_config.sh -m \
|
|
||||||
-O ${KERNEL_SRC} \
|
|
||||||
${KERNEL_SRC}/debian.master/config/config.ubuntu \
|
|
||||||
debian/config/config.pve
|
|
||||||
${MAKE} -C ${KERNEL_SRC} CC=${PVE_KERNEL_CC} olddefconfig
|
${MAKE} -C ${KERNEL_SRC} CC=${PVE_KERNEL_CC} olddefconfig
|
||||||
|
|
||||||
debian/${PVE_KERNEL_PKG}.%: debian/templates/pve-kernel.%.in
|
debian/${PVE_KERNEL_PKG}.%: debian/templates/pve-kernel.%.in
|
||||||
|
|
|
||||||
2
linux
2
linux
|
|
@ -1 +1 @@
|
||||||
Subproject commit 05ecb680708a1dbe6554d6fc17e5d9a8a7cb5e6a
|
Subproject commit a5acb54d4066f27e9707af9d93f047f542d5ad88
|
||||||
Loading…
Reference in a new issue