The new PAPR nested guest API introduces the concept of a Guest State
Buffer for communication about L2 guests between L1 and L0 hosts.
In the new API, the L0 manages the L2 on behalf of the L1. This means
that if the L1 needs to change L2 state (e.g. GPRs, SPRs, partition
table...), it must request the L0 perform the modification. If the
nested host needs to read L2 state likewise this request must
go through the L0.
The Guest State Buffer is a Type-Length-Value style data format defined
in the PAPR which assigns all relevant partition state a unique
identity. Unlike a typical TLV format the length is redundant as the
length of each identity is fixed but is included for checking
correctness.
A guest state buffer consists of an element count followed by a stream
of elements, where elements are composed of an ID number, data length,
then the data:
Header:
<---4 bytes--->
+----------------+-----
| Element Count | Elements...
+----------------+-----
Element:
<----2 bytes---> <-2 bytes-> <-Length bytes->
+----------------+-----------+----------------+
| Guest State ID | Length | Data |
+----------------+-----------+----------------+
Guest State IDs have other attributes defined in the PAPR such as
whether they are per thread or per guest, or read-only.
Introduce a library for using guest state buffers. This includes support
for actions such as creating buffers, adding elements to buffers,
reading the value of elements and parsing buffers. This will be used
later by the PAPR nested guest support.
Signed-off-by: Jordan Niethe <jpn@xxxxxxxxxxxxxxxxxx>
---
v2:
- Add missing #ifdef CONFIG_VSXs
- Move files from lib/ to kvm/
- Guard compilation on CONFIG_KVM_BOOK3S_HV_POSSIBLE
- Use kunit for guest state buffer tests
- Add configuration option for the tests
- Use macros for contiguous id ranges like GPRs
- Add some missing EXPORTs to functions
- HEIR element is a double word not a word
---
arch/powerpc/Kconfig.debug | 12 +
arch/powerpc/include/asm/guest-state-buffer.h | 901 ++++++++++++++++++
arch/powerpc/include/asm/kvm_book3s.h | 2 +
arch/powerpc/kvm/Makefile | 3 +
arch/powerpc/kvm/guest-state-buffer.c | 563 +++++++++++
arch/powerpc/kvm/test-guest-state-buffer.c | 321 +++++++
6 files changed, 1802 insertions(+)
create mode 100644 arch/powerpc/include/asm/guest-state-buffer.h
create mode 100644 arch/powerpc/kvm/guest-state-buffer.c
create mode 100644 arch/powerpc/kvm/test-guest-state-buffer.c
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 6aaf8dc60610..ed830a714720 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -82,6 +82,18 @@ config MSI_BITMAP_SELFTEST
bool "Run self-tests of the MSI bitmap code"
depends on DEBUG_KERNEL
+config GUEST_STATE_BUFFER_TEST
+ def_tristate n
+ prompt "Enable Guest State Buffer unit tests"
+ depends on KUNIT
+ depends on KVM_BOOK3S_HV_POSSIBLE
+ default KUNIT_ALL_TESTS
+ help
+ The Guest State Buffer is a data format specified in the PAPR.
+ It is by hcalls to communicate the state of L2 guests between
+ the L1 and L0 hypervisors. Enable unit tests for the library
+ used to create and use guest state buffers.
+
config PPC_IRQ_SOFT_MASK_DEBUG
bool "Include extra checks for powerpc irq soft masking"
depends on PPC64
diff --git a/arch/powerpc/include/asm/guest-state-buffer.h b/arch/powerpc/include/asm/guest-state-buffer.h
new file mode 100644
index 000000000000..65a840abf1bb
--- /dev/null
+++ b/arch/powerpc/include/asm/guest-state-buffer.h
@@ -0,0 +1,901 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Interface based on include/net/netlink.h
+ */
+#ifndef _ASM_POWERPC_GUEST_STATE_BUFFER_H
+#define _ASM_POWERPC_GUEST_STATE_BUFFER_H
+
+#include <linux/gfp.h>
+#include <linux/bitmap.h>
+#include <asm/plpar_wrappers.h>
+
+/**************************************************************************
+ * Guest State Buffer Constants
+ **************************************************************************/
+#define GSID_BLANK 0x0000
+
+#define GSID_HOST_STATE_SIZE 0x0001 /* Size of Hypervisor Internal Format VCPU state */
+#define GSID_RUN_OUTPUT_MIN_SIZE 0x0002 /* Minimum size of the Run VCPU output buffer */
+#define GSID_LOGICAL_PVR 0x0003 /* Logical PVR */
+#define GSID_TB_OFFSET 0x0004 /* Timebase Offset */
+#define GSID_PARTITION_TABLE 0x0005 /* Partition Scoped Page Table */
+#define GSID_PROCESS_TABLE 0x0006 /* Process Table */
+
+#define GSID_RUN_INPUT 0x0C00 /* Run VCPU Input Buffer */
+#define GSID_RUN_OUTPUT 0x0C01 /* Run VCPU Out Buffer */
+#define GSID_VPA 0x0C02 /* HRA to Guest VCPU VPA */
+
+#define GSID_GPR(x) (0x1000 + (x))
+#define GSID_HDEC_EXPIRY_TB 0x1020
+#define GSID_NIA 0x1021
+#define GSID_MSR 0x1022
+#define GSID_LR 0x1023
+#define GSID_XER 0x1024
+#define GSID_CTR 0x1025
+#define GSID_CFAR 0x1026
+#define GSID_SRR0 0x1027
+#define GSID_SRR1 0x1028
+#define GSID_DAR 0x1029
+#define GSID_DEC_EXPIRY_TB 0x102A
+#define GSID_VTB 0x102B
+#define GSID_LPCR 0x102C
+#define GSID_HFSCR 0x102D
+#define GSID_FSCR 0x102E
+#define GSID_FPSCR 0x102F
+#define GSID_DAWR0 0x1030
+#define GSID_DAWR1 0x1031
+#define GSID_CIABR 0x1032
+#define GSID_PURR 0x1033
+#define GSID_SPURR 0x1034
+#define GSID_IC 0x1035
+#define GSID_SPRG0 0x1036
+#define GSID_SPRG1 0x1037
+#define GSID_SPRG2 0x1038
+#define GSID_SPRG3 0x1039
+#define GSID_PPR 0x103A
+#define GSID_MMCR(x) (0x103B + (x))
+#define GSID_MMCRA 0x103F
+#define GSID_SIER(x) (0x1040 + (x))
+#define GSID_BESCR 0x1043
+#define GSID_EBBHR 0x1044
+#define GSID_EBBRR 0x1045
+#define GSID_AMR 0x1046
+#define GSID_IAMR 0x1047
+#define GSID_AMOR 0x1048
+#define GSID_UAMOR 0x1049
+#define GSID_SDAR 0x104A
+#define GSID_SIAR 0x104B
+#define GSID_DSCR 0x104C
+#define GSID_TAR 0x104D
+#define GSID_DEXCR 0x104E
+#define GSID_HDEXCR 0x104F
+#define GSID_HASHKEYR 0x1050
+#define GSID_HASHPKEYR 0x1051
+#define GSID_CTRL 0x1052
+
+#define GSID_CR 0x2000
+#define GSID_PIDR 0x2001
+#define GSID_DSISR 0x2002
+#define GSID_VSCR 0x2003
+#define GSID_VRSAVE 0x2004
+#define GSID_DAWRX0 0x2005
+#define GSID_DAWRX1 0x2006
+#define GSID_PMC(x) (0x2007 + (x))
+#define GSID_WORT 0x200D
+#define GSID_PSPB 0x200E
+
+#define GSID_VSRS(x) (0x3000 + (x))
+
+#define GSID_HDAR 0xF000
+#define GSID_HDSISR 0xF001
+#define GSID_HEIR 0xF002
+#define GSID_ASDR 0xF003
+
+
+#define GSE_GUESTWIDE_START GSID_BLANK
+#define GSE_GUESTWIDE_END GSID_PROCESS_TABLE
+#define GSE_GUESTWIDE_COUNT (GSE_GUESTWIDE_END - GSE_GUESTWIDE_START + 1)
+
+#define GSE_META_START GSID_RUN_INPUT
+#define GSE_META_END GSID_VPA
+#define GSE_META_COUNT (GSE_META_END - GSE_META_START + 1)
+
+#define GSE_DW_REGS_START GSID_GPR(0)
+#define GSE_DW_REGS_END GSID_CTRL
+#define GSE_DW_REGS_COUNT (GSE_DW_REGS_END - GSE_DW_REGS_START + 1)
+
+#define GSE_W_REGS_START GSID_CR
+#define GSE_W_REGS_END GSID_PSPB
+#define GSE_W_REGS_COUNT (GSE_W_REGS_END - GSE_W_REGS_START + 1)
+
+#define GSE_VSRS_START GSID_VSRS(0)
+#define GSE_VSRS_END GSID_VSRS(63)
+#define GSE_VSRS_COUNT (GSE_VSRS_END - GSE_VSRS_START + 1)
+
+#define GSE_INTR_REGS_START GSID_HDAR
+#define GSE_INTR_REGS_END GSID_ASDR
+#define GSE_INTR_REGS_COUNT (GSE_INTR_REGS_END - GSE_INTR_REGS_START + 1)
+
+#define GSE_IDEN_COUNT \
+ (GSE_GUESTWIDE_COUNT + GSE_META_COUNT + GSE_DW_REGS_COUNT + \
+ GSE_W_REGS_COUNT + GSE_VSRS_COUNT + GSE_INTR_REGS_COUNT)
+
+
+/**
+ * Ranges of guest state buffer elements
+ */
+enum {
+ GS_CLASS_GUESTWIDE = 0x01,
+ GS_CLASS_META = 0x02,
+ GS_CLASS_DWORD_REG = 0x04,
+ GS_CLASS_WORD_REG = 0x08,
+ GS_CLASS_VECTOR = 0x10,
+ GS_CLASS_INTR = 0x20,
+};
+
+/**
+ * Types of guest state buffer elements
+ */
+enum {
+ GSE_BE32,
+ GSE_BE64,
+ GSE_VEC128,
+ GSE_PARTITION_TABLE,
+ GSE_PROCESS_TABLE,
+ GSE_BUFFER,
+ __GSE_TYPE_MAX,
+};
+
+/**
+ * Flags for guest state elements
+ */
+enum {
+ GS_FLAGS_WIDE = 0x01,
+};
+
+/**
+ * struct gs_part_table - deserialized partition table information element
+ * @address: start of the partition table
+ * @ea_bits: number of bits in the effective address
+ * @gpd_size: root page directory size
+ */
+struct gs_part_table {
+ u64 address;
+ u64 ea_bits;
+ u64 gpd_size;
+};
+
+/**
+ * struct gs_proc_table - deserialized process table information element
+ * @address: start of the process table
+ * @gpd_size: process table size
+ */
+struct gs_proc_table {
+ u64 address;
+ u64 gpd_size;
+};
+
+/**
+ * struct gs_buff_info - deserialized meta guest state buffer information
+ * @address: start of the guest state buffer
+ * @size: size of the guest state buffer
+ */
+struct gs_buff_info {
+ u64 address;
+ u64 size;
+};
+
+/**
+ * struct gs_header - serialized guest state buffer header
+ * @nelem: count of guest state elements in the buffer
+ * @data: start of the stream of elements in the buffer
+ */
+struct gs_header {
+ __be32 nelems;
+ char data[];
+} __packed;
+
+/**
+ * struct gs_elem - serialized guest state buffer element
+ * @iden: Guest State ID
+ * @len: length of data
+ * @data: the guest state buffer element's value
+ */
+struct gs_elem {
+ __be16 iden;
+ __be16 len;
+ char data[];
+} __packed;
+
+/**
+ * struct gs_buff - a guest state buffer with metadata.
+ * @capacity: total length of the buffer
+ * @len: current length of the elements and header
+ * @guest_id: guest id associated with the buffer
+ * @vcpu_id: vcpu_id associated with the buffer
+ * @hdr: the serialised guest state buffer
+ */
+struct gs_buff {
+ size_t capacity;
+ size_t len;
+ unsigned long guest_id;
+ unsigned long vcpu_id;
+ struct gs_header *hdr;
+};
+
+/**
+ * struct gs_bitmap - a bitmap for element ids
+ * @bitmap: a bitmap large enough for all Guest State IDs
+ */
+struct gs_bitmap {
+/* private: */
+ DECLARE_BITMAP(bitmap, GSE_IDEN_COUNT);
+};
+
+/**
+ * struct gs_parser - a map of element ids to locations in a buffer
+ * @iterator: bitmap used for iterating
+ * @gses: contains the pointers to elements
+ *
+ * A guest state parser is used for deserialising a guest state buffer.
+ * Given a buffer, it then allows looking up guest state elements using
+ * a guest state id.
+ */
+struct gs_parser {
+/* private: */
+ struct gs_bitmap iterator;
+ struct gs_elem *gses[GSE_IDEN_COUNT];
+};
+
+enum {
+ GSM_GUEST_WIDE = 0x1,
+ GSM_SEND = 0x2,
+ GSM_RECEIVE = 0x4,
+ GSM_GSB_OWNER = 0x8,
+};
+
+struct gs_msg;
+
+/**
+ * struct gs_msg_ops - guest state message behavior
+ * @get_size: maximum size required for the message data
+ * @fill_info: serializes to the guest state buffer format
+ * @refresh_info: dserializes from the guest state buffer format
+ */
+struct gs_msg_ops {
+ size_t (*get_size)(struct gs_msg *gsm);
+ int (*fill_info)(struct gs_buff *gsb, struct gs_msg *gsm);
+ int (*refresh_info)(struct gs_msg *gsm, struct gs_buff *gsb);
+};
+
+/**
+ * struct gs_msg - a guest state message
+ * @bitmap: the guest state ids that should be included
+ * @ops: modify message behavior for reading and writing to buffers
+ * @flags: guest wide or thread wide
+ * @data: location where buffer data will be written to or from.
+ *
+ * A guest state message is allows flexibility in sending in receiving data
+ * in a guest state buffer format.
+ */
+struct gs_msg {
+ struct gs_bitmap bitmap;
+ struct gs_msg_ops *ops;
+ unsigned long flags;
+ void *data;
+};
+
+/**************************************************************************
+ * Guest State IDs
+ **************************************************************************/
+
+u16 gsid_size(u16 iden);
+unsigned long gsid_flags(u16 iden);
+u64 gsid_mask(u16 iden);
+
+/**************************************************************************
+ * Guest State Buffers
+ **************************************************************************/
+struct gs_buff *gsb_new(size_t size, unsigned long guest_id,
+ unsigned long vcpu_id, gfp_t flags);
+void gsb_free(struct gs_buff *gsb);
+void *gsb_put(struct gs_buff *gsb, size_t size);
+
+/**
+ * gsb_header() - the header of a guest state buffer
+ * @gsb: guest state buffer
+ *
+ * Returns a pointer to the buffer header.
+ */
+static inline struct gs_header *gsb_header(struct gs_buff *gsb)
+{
+ return gsb->hdr;
+}
+
+/**
+ * gsb_data() - the elements of a guest state buffer
+ * @gsb: guest state buffer
+ *
+ * Returns a pointer to the first element of the buffer data.
+ */
+static inline struct gs_elem *gsb_data(struct gs_buff *gsb)
+{
+ return (struct gs_elem *)gsb_header(gsb)->data;
+}
+
+/**
+ * gsb_len() - the current length of a guest state buffer
+ * @gsb: guest state buffer
+ *
+ * Returns the length including the header of a buffer.
+ */
+static inline size_t gsb_len(struct gs_buff *gsb)
+{
+ return gsb->len;
+}
+
+/**
+ * gsb_capacity() - the capacity of a guest state buffer
+ * @gsb: guest state buffer
+ *
+ * Returns the capacity of a buffer.
+ */
+static inline size_t gsb_capacity(struct gs_buff *gsb)
+{
+ return gsb->capacity;
+}
+
+/**
+ * gsb_paddress() - the physical address of buffer
+ * @gsb: guest state buffer
+ *
+ * Returns the physical address of the buffer.
+ */
+static inline u64 gsb_paddress(struct gs_buff *gsb)
+{
+ return __pa(gsb_header(gsb));
+}
+
+/**
+ * gsb_nelems() - the number of elements in a buffer
+ * @gsb: guest state buffer
+ *
+ * Returns the number of elements in a buffer
+ */
+static inline u32 gsb_nelems(struct gs_buff *gsb)
+{
+ return be32_to_cpu(gsb_header(gsb)->nelems);
+}
+
+/**
+ * gsb_reset() - empty a guest state buffer
+ * @gsb: guest state buffer
+ *
+ * Reset the number of elements and length of buffer to empty.
+ */
+static inline void gsb_reset(struct gs_buff *gsb)
+{
+ gsb_header(gsb)->nelems = cpu_to_be32(0);
+ gsb->len = sizeof(struct gs_header);
+}
+
+/**
+ * gsb_data_len() - the length of a buffer excluding the header
+ * @gsb: guest state buffer
+ *
+ * Returns the length of a buffer excluding the header
+ */
+static inline size_t gsb_data_len(struct gs_buff *gsb)
+{
+ return gsb->len - sizeof(struct gs_header);
+}
+
+/**
+ * gsb_data_cap() - the capacity of a buffer excluding the header
+ * @gsb: guest state buffer
+ *
+ * Returns the capacity of a buffer excluding the header
+ */
+static inline size_t gsb_data_cap(struct gs_buff *gsb)
+{
+ return gsb->capacity - sizeof(struct gs_header);
+}
+
+/**
+ * gsb_for_each_elem - iterate over the elements in a buffer
+ * @i: loop counter
+ * @pos: set to current element
+ * @gsb: guest state buffer
+ * @rem: initialized to buffer capacity, holds bytes currently remaining in stream
+ */
+#define gsb_for_each_elem(i, pos, gsb, rem) \
+ gse_for_each_elem(i, gsb_nelems(gsb), pos, gsb_data(gsb), \
+ gsb_data_cap(gsb), rem)
+
+/**************************************************************************
+ * Guest State Elements
+ **************************************************************************/
+
+/**
+ * gse_iden() - guest state ID of element
+ * @gse: guest state element
+ *
+ * Return the guest state ID in host endianness.
+ */
+static inline u16 gse_iden(const struct gs_elem *gse)
+{
+ return be16_to_cpu(gse->iden);
+}
+
+/**
+ * gse_len() - length of guest state element data
+ * @gse: guest state element
+ *
+ * Returns the length of guest state element data
+ */
+static inline u16 gse_len(const struct gs_elem *gse)
+{
+ return be16_to_cpu(gse->len);
+}
+
+/**
+ * gse_total_len() - total length of guest state element
+ * @gse: guest state element
+ *
+ * Returns the length of the data plus the ID and size header.
+ */
+static inline u16 gse_total_len(const struct gs_elem *gse)
+{
+ return be16_to_cpu(gse->len) + sizeof(*gse);
+}
+
+/**
+ * gse_total_size() - space needed for a given data length
+ * @size: data length
+ *
+ * Returns size plus the space needed for the ID and size header.
+ */
+static inline u16 gse_total_size(u16 size)
+{
+ return sizeof(struct gs_elem) + size;
+}
+
+/**
+ * gse_data() - pointer to data of a guest state element
+ * @gse: guest state element
+ *
+ * Returns a pointer to the beginning of guest state element data.
+ */
+static inline void *gse_data(const struct gs_elem *gse)
+{
+ return (void *)gse->data;
+}
+
+/**
+ * gse_ok() - checks space exists for guest state element
+ * @gse: guest state element
+ * @remaining: bytes of space remaining
+ *
+ * Returns true if the guest state element can fit in remaining space.
+ */
+static inline bool gse_ok(const struct gs_elem *gse, int remaining)
+{
+ return remaining >= gse_total_len(gse);
+}
+
+/**
+ * gse_next() - iterate to the next guest state element in a stream
+ * @gse: stream of guest state elements
+ * @remaining: length of the guest element stream
+ *
+ * Returns the next guest state element in a stream of elements. The length of
+ * the stream is updated in remaining.
+ */
+static inline struct gs_elem *gse_next(const struct gs_elem *gse,
+ int *remaining)
+{
+ int len = sizeof(*gse) + gse_len(gse);
+
+ *remaining -= len;
+ return (struct gs_elem *)(gse->data + gse_len(gse));
+}
+
+/**
+ * gse_for_each_elem - iterate over a stream of guest state elements
+ * @i: loop counter
+ * @max: number of elements
+ * @pos: set to current element
+ * @head: head of elements
+ * @len: length of the stream
+ * @rem: initialized to len, holds bytes currently remaining elements
+ */
+#define gse_for_each_elem(i, max, pos, head, len, rem) \
+ for (i = 0, pos = head, rem = len; gse_ok(pos, rem) && i < max; \
+ pos = gse_next(pos, &(rem)), i++)
+
+int __gse_put(struct gs_buff *gsb, u16 iden, u16 size, const void *data);
+int gse_parse(struct gs_parser *gsp, struct gs_buff *gsb);
+
+/**
+ * gse_put_be32() - add a be32 guest state element to a buffer
+ * @gsb: guest state buffer to add element to
+ * @iden: guest state ID
+ * @val: big endian value
+ */
+static inline int gse_put_be32(struct gs_buff *gsb, u16 iden, __be32 val)
+{
+ __be32 tmp;
+
+ tmp = val;
+ return __gse_put(gsb, iden, sizeof(__be32), &tmp);
+}
+
+/**
+ * gse_put_u32() - add a host endian 32bit int guest state element to a buffer
+ * @gsb: guest state buffer to add element to
+ * @iden: guest state ID
+ * @val: host endian value
+ */
+static inline int gse_put_u32(struct gs_buff *gsb, u16 iden, u32 val)
+{
+ __be32 tmp;
+
+ tmp = cpu_to_be32(val);
+ return gse_put_be32(gsb, iden, tmp);
+}
+
+/**
+ * gse_put_be64() - add a be64 guest state element to a buffer
+ * @gsb: guest state buffer to add element to
+ * @iden: guest state ID
+ * @val: big endian value
+ */
+static inline int gse_put_be64(struct gs_buff *gsb, u16 iden, __be64 val)
+{
+ __be64 tmp;
+
+ tmp = val;
+ return __gse_put(gsb, iden, sizeof(__be64), &tmp);
+}
+
+/**
+ * gse_put_u64() - add a host endian 64bit guest state element to a buffer
+ * @gsb: guest state buffer to add element to
+ * @iden: guest state ID
+ * @val: host endian value
+ */
+static inline int gse_put_u64(struct gs_buff *gsb, u16 iden, u64 val)
+{
+ __be64 tmp;
+
+ tmp = cpu_to_be64(val);
+ return gse_put_be64(gsb, iden, tmp);
+}
+
+/**
+ * __gse_put_reg() - add a register type guest state element to a buffer
+ * @gsb: guest state buffer to add element to
+ * @iden: guest state ID
+ * @val: host endian value
+ *
+ * Adds a register type guest state element. Uses the guest state ID for
+ * determining the length of the guest element. If the guest state ID has
+ * bits that can not be set they will be cleared.
+ */
+static inline int __gse_put_reg(struct gs_buff *gsb, u16 iden, u64 val)
+{
+ val &= gsid_mask(iden);
+ if (gsid_size(iden) == sizeof(u64))
+ return gse_put_u64(gsb, iden, val);
+
+ if (gsid_size(iden) == sizeof(u32)) {
+ u32 tmp;
+
+ tmp = (u32)val;
+ if (tmp != val)
+ return -EINVAL;
+
+ return gse_put_u32(gsb, iden, tmp);
+ }
+ return -EINVAL;
+}
+
+/**
+ * gse_put_vector128() - add a vector guest state element to a buffer
+ * @gsb: guest state buffer to add element to
+ * @iden: guest state ID
+ * @val: 16 byte vector value
+ */
+static inline int gse_put_vector128(struct gs_buff *gsb, u16 iden,
+ vector128 val)
+{
+ __be64 tmp[2] = { 0 };
+ union {
+ __vector128 v;
+ u64 dw[2];
+ } u;
+
+ u.v = val;
+ tmp[0] = cpu_to_be64(u.dw[TS_FPROFFSET]);
+#ifdef CONFIG_VSX
+ tmp[1] = cpu_to_be64(u.dw[TS_VSRLOWOFFSET]);
+#endif
+ return __gse_put(gsb, iden, sizeof(tmp), &tmp);
+}
+
+/**
+ * gse_put_part_table() - add a partition table guest state element to a buffer
+ * @gsb: guest state buffer to add element to
+ * @iden: guest state ID
+ * @val: partition table value
+ */
+static inline int gse_put_part_table(struct gs_buff *gsb, u16 iden,
+ struct gs_part_table val)
+{
+ __be64 tmp[3];
+
+ tmp[0] = cpu_to_be64(val.address);
+ tmp[1] = cpu_to_be64(val.ea_bits);
+ tmp[2] = cpu_to_be64(val.gpd_size);
+ return __gse_put(gsb, GSID_PARTITION_TABLE, sizeof(tmp), &tmp);
+}
+
+/**
+ * gse_put_proc_table() - add a process table guest state element to a buffer
+ * @gsb: guest state buffer to add element to
+ * @iden: guest state ID
+ * @val: process table value
+ */
+static inline int gse_put_proc_table(struct gs_buff *gsb, u16 iden,
+ struct gs_proc_table val)
+{
+ __be64 tmp[2];
+
+ tmp[0] = cpu_to_be64(val.address);
+ tmp[1] = cpu_to_be64(val.gpd_size);
+ return __gse_put(gsb, GSID_PROCESS_TABLE, sizeof(tmp), &tmp);
+}
+
+/**
+ * gse_put_buff_info() - adds a GSB description guest state element to a buffer
+ * @gsb: guest state buffer to add element to
+ * @iden: guest state ID
+ * @val: guest state buffer description value
+ */
+static inline int gse_put_buff_info(struct gs_buff *gsb, u16 iden,
+ struct gs_buff_info val)
+{
+ __be64 tmp[2];
+
+ tmp[0] = cpu_to_be64(val.address);
+ tmp[1] = cpu_to_be64(val.size);
+ return __gse_put(gsb, iden, sizeof(tmp), &tmp);
+}
+
+int __gse_put(struct gs_buff *gsb, u16 iden, u16 size, const void *data);
+
+/**
+ * gse_get_be32() - return the data of a be32 element
+ * @gse: guest state element
+ */
+static inline __be32 gse_get_be32(const struct gs_elem *gse)
+{
+ return *(__be32 *)gse_data(gse);
+}
+
+/**
+ * gse_get_u32() - return the data of a be32 element in host endianness
+ * @gse: guest state element
+ */
+static inline u32 gse_get_u32(const struct gs_elem *gse)
+{
+ return be32_to_cpu(gse_get_be32(gse));
+}
+
+/**
+ * gse_get_be64() - return the data of a be64 element
+ * @gse: guest state element
+ */
+static inline __be64 gse_get_be64(const struct gs_elem *gse)
+{
+ return *(__be64 *)gse_data(gse);
+}
+
+/**
+ * gse_get_u64() - return the data of a be64 element in host endianness
+ * @gse: guest state element
+ */
+static inline u64 gse_get_u64(const struct gs_elem *gse)
+{
+ return be64_to_cpu(gse_get_be64(gse));
+}
+
+/**
+ * __gse_get_reg() - return the date of a register type guest state element
+ * @gse: guest state element
+ *
+ * Determine the element data size from its guest state ID and return the
+ * correctly sized value.
+ */
+static inline u64 __gse_get_reg(const struct gs_elem *gse)
+{
+ if (gse_len(gse) == sizeof(u64))
+ return gse_get_u64(gse);
+
+ if (gse_len(gse) == sizeof(u32)) {
+ u32 tmp;
+
+ tmp = gse_get_u32(gse);
+ return (u64)tmp;
+ }
+ return 0;
+}
+
+/**
+ * gse_get_vector128() - return the data of a vector element
+ * @gse: guest state element
+ */
+static inline vector128 gse_get_vector128(const struct gs_elem *gse)
+{
+ union {
+ __vector128 v;
+ u64 dw[2];
+ } u = { 0 };
+ __be64 *src;
+
+ src = (__be64 *)gse_data(gse);
+ u.dw[TS_FPROFFSET] = be64_to_cpu(src[0]);
+#ifdef CONFIG_VSX
+ u.dw[TS_VSRLOWOFFSET] = be64_to_cpu(src[1]);
+#endif
+ return u.v;
+}
+
+/**
+ * gse_put - add a guest state element to a buffer
+ * @gsb: guest state buffer to add to
+ * @iden: guest state identity
+ * @v: generic value
+ */
+#define gse_put(gsb, iden, v) \
+ (_Generic((v), \
+ u64 : __gse_put_reg, \
+ long unsigned int : __gse_put_reg, \
+ u32 : __gse_put_reg, \
+ struct gs_buff_info : gse_put_buff_info, \
+ struct gs_proc_table : gse_put_proc_table, \
+ struct gs_part_table : gse_put_part_table, \
+ vector128 : gse_put_vector128)(gsb, iden, v))
+
+/**
+ * gse_get - return the data of a guest state element
+ * @gsb: guest state element to add to
+ * @v: generic value pointer to return in
+ */
+#define gse_get(gse, v) \
+ (*v = (_Generic((v), \
+ u64 * : __gse_get_reg, \
+ unsigned long * : __gse_get_reg, \
+ u32 * : __gse_get_reg, \
+ vector128 * : gse_get_vector128)(gse)))
+
+/**************************************************************************
+ * Guest State Bitmap
+ **************************************************************************/
+
+bool gsbm_test(struct gs_bitmap *gsbm, u16 iden);
+void gsbm_set(struct gs_bitmap *gsbm, u16 iden);
+void gsbm_clear(struct gs_bitmap *gsbm, u16 iden);
+u16 gsbm_next(struct gs_bitmap *gsbm, u16 prev);
+
+/**
+ * gsbm_zero - zero the entire bitmap
+ * @gsbm: guest state buffer bitmap
+ */
+static inline void gsbm_zero(struct gs_bitmap *gsbm)
+{
+ bitmap_zero(gsbm->bitmap, GSE_IDEN_COUNT);
+}
+
+/**
+ * gsbm_fill - fill the entire bitmap
+ * @gsbm: guest state buffer bitmap
+ */
+static inline void gsbm_fill(struct gs_bitmap *gsbm)
+{
+ bitmap_fill(gsbm->bitmap, GSE_IDEN_COUNT);
+ clear_bit(0, gsbm->bitmap);
+}
+
+/**
+ * gsbm_for_each - iterate the present guest state IDs
+ * @gsbm: guest state buffer bitmap
+ * @iden: current guest state ID
+ */
+#define gsbm_for_each(gsbm, iden) \
+ for (iden = gsbm_next(gsbm, 0); iden != 0; iden = gsbm_next(gsbm, iden))
+
+
+/**************************************************************************
+ * Guest State Parser
+ **************************************************************************/
+
+void gsp_insert(struct gs_parser *gsp, u16 iden, struct gs_elem *gse);
+struct gs_elem *gsp_lookup(struct gs_parser *gsp, u16 iden);
+
+/**
+ * gsp_for_each - iterate the <guest state IDs, guest state element> pairs
+ * @gsp: guest state buffer bitmap
+ * @iden: current guest state ID
+ * @gse: guest state element
+ */
+#define gsp_for_each(gsp, iden, gse) \
+ for (iden = gsbm_next(&(gsp)->iterator, 0), \
+ gse = gsp_lookup((gsp), iden); \
+ iden != 0; iden = gsbm_next(&(gsp)->iterator, iden), \
+ gse = gsp_lookup((gsp), iden))
+
+/**************************************************************************
+ * Guest State Message
+ **************************************************************************/
+
+/**
+ * gsm_for_each - iterate the guest state IDs included in a guest state message
+ * @gsp: guest state buffer bitmap
+ * @iden: current guest state ID
+ * @gse: guest state element
+ */
+#define gsm_for_each(gsm, iden) \
+ for (iden = gsbm_next(&gsm->bitmap, 0); iden != 0; \
+ iden = gsbm_next(&gsm->bitmap, iden))
+
+int gsm_init(struct gs_msg *mgs, struct gs_msg_ops *ops, void *data,
+ unsigned long flags);
+
+struct gs_msg *gsm_new(struct gs_msg_ops *ops, void *data, unsigned long flags,
+ gfp_t gfp_flags);
+void gsm_free(struct gs_msg *gsm);
+size_t gsm_size(struct gs_msg *gsm);
+int gsm_fill_info(struct gs_msg *gsm, struct gs_buff *gsb);
+int gsm_refresh_info(struct gs_msg *gsm, struct gs_buff *gsb);
+
+/**
+ * gsm_include - indicate a guest state ID should be included when serializing
+ * @gsm: guest state message
+ * @iden: guest state ID
+ */
+static inline void gsm_include(struct gs_msg *gsm, u16 iden)
+{
+ gsbm_set(&gsm->bitmap, iden);
+}
+
+/**
+ * gsm_includes - check if a guest state ID will be included when serializing
+ * @gsm: guest state message
+ * @iden: guest state ID
+ */
+static inline bool gsm_includes(struct gs_msg *gsm, u16 iden)
+{
+ return gsbm_test(&gsm->bitmap, iden);
+}
+
+/**
+ * gsm_includes - indicate all guest state IDs should be included when serializing
+ * @gsm: guest state message
+ * @iden: guest state ID
+ */
+static inline void gsm_include_all(struct gs_msg *gsm)
+{
+ gsbm_fill(&gsm->bitmap);
+}
+
+/**
+ * gsm_include - clear the guest state IDs that should be included when serializing
+ * @gsm: guest state message
+ */
+static inline void gsm_reset(struct gs_msg *gsm)
+{
+ gsbm_zero(&gsm->bitmap);
+}
+
+#endif /* _ASM_POWERPC_GUEST_STATE_BUFFER_H */
diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h
index 77653c5b356b..0ca2d8b37b42 100644
--- a/arch/powerpc/include/asm/kvm_book3s.h
+++ b/arch/powerpc/include/asm/kvm_book3s.h
@@ -444,6 +444,7 @@ static inline void kvmppc_set_vsx_fpr(struct kvm_vcpu *vcpu, int i, int j, u64 v
vcpu->arch.fp.fpr[i][j] = val;
}
+#ifdef CONFIG_VSX
static inline vector128 kvmppc_get_vsx_vr(struct kvm_vcpu *vcpu, int i)
{
return vcpu->arch.vr.vr[i];
@@ -463,6 +464,7 @@ static inline void kvmppc_set_vscr(struct kvm_vcpu *vcpu, u32 val)
{
vcpu->arch.vr.vscr.u[3] = val;
}
+#endif
#define BOOK3S_WRAPPER_SET(reg, size) \
static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, u##size val) \
diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile
index 5319d889b184..eb8445e71c14 100644
--- a/arch/powerpc/kvm/Makefile
+++ b/arch/powerpc/kvm/Makefile
@@ -87,8 +87,11 @@ kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) += \
book3s_hv_ras.o \
book3s_hv_builtin.o \
book3s_hv_p9_perf.o \
+ guest-state-buffer.o \
$(kvm-book3s_64-builtin-tm-objs-y) \
$(kvm-book3s_64-builtin-xics-objs-y)
+
+obj-$(CONFIG_GUEST_STATE_BUFFER_TEST) += test-guest-state-buffer.o
endif
kvm-book3s_64-objs-$(CONFIG_KVM_XICS) += \
diff --git a/arch/powerpc/kvm/guest-state-buffer.c b/arch/powerpc/kvm/guest-state-buffer.c
new file mode 100644
index 000000000000..db4a79bfcaf1
--- /dev/null
+++ b/arch/powerpc/kvm/guest-state-buffer.c
@@ -0,0 +1,563 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "asm/hvcall.h"
+#include <linux/log2.h>
+#include <asm/pgalloc.h>
+#include <asm/guest-state-buffer.h>
+
+static const u16 gse_iden_len[__GSE_TYPE_MAX] = {
+ [GSE_BE32] = sizeof(__be32),
+ [GSE_BE64] = sizeof(__be64),
+ [GSE_VEC128] = sizeof(vector128),
+ [GSE_PARTITION_TABLE] = sizeof(struct gs_part_table),
+ [GSE_PROCESS_TABLE] = sizeof(struct gs_proc_table),
+ [GSE_BUFFER] = sizeof(struct gs_buff_info),
+};
+
+/**
+ * gsb_new() - create a new guest state buffer
+ * @size: total size of the guest state buffer (includes header)
+ * @guest_id: guest_id
+ * @vcpu_id: vcpu_id
+ * @flags: GFP flags
+ *
+ * Returns a guest state buffer.
+ */
+struct gs_buff *gsb_new(size_t size, unsigned long guest_id,
+ unsigned long vcpu_id, gfp_t flags)
+{
+ struct gs_buff *gsb;
+
+ gsb = kzalloc(sizeof(*gsb), flags);
+ if (!gsb)
+ return NULL;
+
+ size = roundup_pow_of_two(size);
+ gsb->hdr = kzalloc(size, GFP_KERNEL);
+ if (!gsb->hdr)
+ goto free;
+
+ gsb->capacity = size;
+ gsb->len = sizeof(struct gs_header);
+ gsb->vcpu_id = vcpu_id;
+ gsb->guest_id = guest_id;
+
+ gsb->hdr->nelems = cpu_to_be32(0);
+
+ return gsb;
+
+free:
+ kfree(gsb);
+ return NULL;
+}
+EXPORT_SYMBOL(gsb_new);
+
+/**
+ * gsb_free() - free a guest state buffer
+ * @gsb: guest state buffer
+ */
+void gsb_free(struct gs_buff *gsb)
+{
+ kfree(gsb->hdr);
+ kfree(gsb);
+}
+EXPORT_SYMBOL(gsb_free);
+
+/**
+ * gsb_put() - allocate space in a guest state buffer
+ * @gsb: buffer to allocate in
+ * @size: amount of space to allocate
+ *
+ * Returns a pointer to the amount of space requested within the buffer and
+ * increments the count of elements in the buffer.
+ *
+ * Does not check if there is enough space in the buffer.
+ */
+void *gsb_put(struct gs_buff *gsb, size_t size)
+{
+ u32 nelems = gsb_nelems(gsb);
+ void *p;
+
+ p = (void *)gsb_header(gsb) + gsb_len(gsb);
+ gsb->len += size;
+
+ gsb_header(gsb)->nelems = cpu_to_be32(nelems + 1);
+ return p;
+}
+EXPORT_SYMBOL(gsb_put);
+
+static int gsid_class(u16 iden)
+{
+ if ((iden >= GSE_GUESTWIDE_START) && (iden <= GSE_GUESTWIDE_END))
+ return GS_CLASS_GUESTWIDE;
+
+ if ((iden >= GSE_META_START) && (iden <= GSE_META_END))
+ return GS_CLASS_META;
+
+ if ((iden >= GSE_DW_REGS_START) && (iden <= GSE_DW_REGS_END))
+ return GS_CLASS_DWORD_REG;
+
+ if ((iden >= GSE_W_REGS_START) && (iden <= GSE_W_REGS_END))
+ return GS_CLASS_WORD_REG;
+
+ if ((iden >= GSE_VSRS_START) && (iden <= GSE_VSRS_END))
+ return GS_CLASS_VECTOR;
+
+ if ((iden >= GSE_INTR_REGS_START) && (iden <= GSE_INTR_REGS_END))
+ return GS_CLASS_INTR;
+
+ return -1;
+}
+
+static int gsid_type(u16 iden)
+{
+ int type = -1;
+
+ switch (gsid_class(iden)) {
+ case GS_CLASS_GUESTWIDE:
+ switch (iden) {
+ case GSID_HOST_STATE_SIZE:
+ case GSID_RUN_OUTPUT_MIN_SIZE:
+ case GSID_TB_OFFSET:
+ type = GSE_BE64;
+ break;
+ case GSID_PARTITION_TABLE:
+ type = GSE_PARTITION_TABLE;
+ break;
+ case GSID_PROCESS_TABLE:
+ type = GSE_PROCESS_TABLE;
+ break;
+ case GSID_LOGICAL_PVR:
+ type = GSE_BE32;
+ break;
+ }
+ break;
+ case GS_CLASS_META:
+ switch (iden) {
+ case GSID_RUN_INPUT:
+ case GSID_RUN_OUTPUT:
+ type = GSE_BUFFER;
+ break;
+ case GSID_VPA:
+ type = GSE_BE64;
+ break;
+ }
+ break;
+ case GS_CLASS_DWORD_REG:
+ type = GSE_BE64;
+ break;
+ case GS_CLASS_WORD_REG:
+ type = GSE_BE32;
+ break;
+ case GS_CLASS_VECTOR:
+ type = GSE_VEC128;
+ break;
+ case GS_CLASS_INTR:
+ switch (iden) {
+ case GSID_HDAR:
+ case GSID_ASDR:
+ case GSID_HEIR:
+ type = GSE_BE64;
+ break;
+ case GSID_HDSISR:
+ type = GSE_BE32;
+ break;
+ }
+ break;
+ }
+
+ return type;
+}
+
+/**
+ * gsid_flags() - the flags for a guest state ID
+ * @iden: guest state ID
+ *
+ * Returns any flags for the guest state ID.
+ */
+unsigned long gsid_flags(u16 iden)
+{
+ unsigned long flags = 0;
+
+ switch (gsid_class(iden)) {
+ case GS_CLASS_GUESTWIDE:
+ flags = GS_FLAGS_WIDE;
+ break;
+ case GS_CLASS_META:
+ case GS_CLASS_DWORD_REG:
+ case GS_CLASS_WORD_REG:
+ case GS_CLASS_VECTOR:
+ case GS_CLASS_INTR:
+ break;
+ }
+
+ return flags;
+}
+EXPORT_SYMBOL(gsid_flags);
+
+/**
+ * gsid_size() - the size of a guest state ID
+ * @iden: guest state ID
+ *
+ * Returns the size of guest state ID.
+ */
+u16 gsid_size(u16 iden)
+{
+ int type;
+
+ type = gsid_type(iden);
+ if (type == -1)
+ return 0;
+
+ if (type >= __GSE_TYPE_MAX)
+ return 0;
+
+ return gse_iden_len[type];
+}
+EXPORT_SYMBOL(gsid_size);
+
+/**
+ * gsid_mask() - the settable bits of a guest state ID
+ * @iden: guest state ID
+ *
+ * Returns a mask of settable bits for a guest state ID.
+ */
+u64 gsid_mask(u16 iden)
+{
+ u64 mask = ~0ull;
+
+ switch (iden) {
+ case GSID_LPCR:
+ mask = LPCR_DPFD | LPCR_ILE | LPCR_AIL | LPCR_LD | LPCR_MER | LPCR_GTSE;
+ break;
+ case GSID_MSR:
+ mask = ~(MSR_HV | MSR_S | MSR_ME);
+ break;
+ }
+
+ return mask;
+}
+EXPORT_SYMBOL(gsid_mask);
+
+/**
+ * __gse_put() - add a guest state element to a buffer
+ * @gsb: buffer to the element to
+ * @iden: guest state ID
+ * @size: length of data
+ * @data: pointer to data
+ */
+int __gse_put(struct gs_buff *gsb, u16 iden, u16 size, const void *data)
+{
+ struct gs_elem *gse;
+ u16 total_size;
+
+ total_size = sizeof(*gse) + size;
+ if (total_size + gsb_len(gsb) > gsb_capacity(gsb))
+ return -ENOMEM;
+
+ if (gsid_size(iden) != size)
+ return -EINVAL;
+
+ gse = gsb_put(gsb, total_size);
+ gse->iden = cpu_to_be16(iden);
+ gse->len = cpu_to_be16(size);
+ memcpy(gse->data, data, size);
+
+ return 0;
+}
+EXPORT_SYMBOL(__gse_put);
+
+/**
+ * gse_parse() - create a parse map from a guest state buffer
+ * @gsp: guest state parser
+ * @gsb: guest state buffer
+ */
+int gse_parse(struct gs_parser *gsp, struct gs_buff *gsb)
+{
+ struct gs_elem *curr;
+ int rem, i;
+
+ gsb_for_each_elem(i, curr, gsb, rem) {
+ if (gse_len(curr) != gsid_size(gse_iden(curr)))
+ return -EINVAL;
+ gsp_insert(gsp, gse_iden(curr), curr);
+ }
+
+ if (gsb_nelems(gsb) != i)
+ return -EINVAL;
+ return 0;
+}
+EXPORT_SYMBOL(gse_parse);
+
+static inline int gse_flatten_iden(u16 iden)
+{
+ int bit = 0;
+ int class;
+
+ class = gsid_class(iden);
+
+ if (class == GS_CLASS_GUESTWIDE) {
+ bit += iden - GSE_GUESTWIDE_START;
+ return bit;
+ }
+
+ bit += GSE_GUESTWIDE_COUNT;
+
+ if (class == GS_CLASS_META) {
+ bit += iden - GSE_META_START;
+ return bit;
+ }
+
+ bit += GSE_META_COUNT;
+
+ if (class == GS_CLASS_DWORD_REG) {
+ bit += iden - GSE_DW_REGS_START;
+ return bit;
+ }
+
+ bit += GSE_DW_REGS_COUNT;
+
+ if (class == GS_CLASS_WORD_REG) {
+ bit += iden - GSE_W_REGS_START;
+ return bit;
+ }
+
+ bit += GSE_W_REGS_COUNT;
+
+ if (class == GS_CLASS_VECTOR) {
+ bit += iden - GSE_VSRS_START;
+ return bit;
+ }
+
+ bit += GSE_VSRS_COUNT;
+
+ if (class == GS_CLASS_INTR) {
+ bit += iden - GSE_INTR_REGS_START;
+ return bit;
+ }
+
+ return 0;
+}
+
+static inline u16 gse_unflatten_iden(int bit)
+{
+ u16 iden;
+
+ if (bit < GSE_GUESTWIDE_COUNT) {
+ iden = GSE_GUESTWIDE_START + bit;
+ return iden;
+ }
+ bit -= GSE_GUESTWIDE_COUNT;
+
+ if (bit < GSE_META_COUNT) {
+ iden = GSE_META_START + bit;
+ return iden;
+ }
+ bit -= GSE_META_COUNT;
+
+ if (bit < GSE_DW_REGS_COUNT) {
+ iden = GSE_DW_REGS_START + bit;
+ return iden;
+ }
+ bit -= GSE_DW_REGS_COUNT;
+
+ if (bit < GSE_W_REGS_COUNT) {
+ iden = GSE_W_REGS_START + bit;
+ return iden;
+ }
+ bit -= GSE_W_REGS_COUNT;
+
+ if (bit < GSE_VSRS_COUNT) {
+ iden = GSE_VSRS_START + bit;
+ return iden;
+ }
+ bit -= GSE_VSRS_COUNT;
+
+ if (bit < GSE_IDEN_COUNT) {
+ iden = GSE_INTR_REGS_START + bit;
+ return iden;
+ }
+
+ return 0;
+}
+
+/**
+ * gsp_insert() - add a mapping from an guest state ID to an element
+ * @gsp: guest state parser
+ * @iden: guest state id (key)
+ * @gse: guest state element (value)
+ */
+void gsp_insert(struct gs_parser *gsp, u16 iden, struct gs_elem *gse)
+{
+ int i;
+
+ i = gse_flatten_iden(iden);
+ gsbm_set(&gsp->iterator, iden);
+ gsp->gses[i] = gse;
+}
+EXPORT_SYMBOL(gsp_insert);
+
+/**
+ * gsp_lookup() - lookup an element from a guest state ID
+ * @gsp: guest state parser
+ * @iden: guest state ID (key)
+ *
+ * Returns the guest state element if present.
+ */
+struct gs_elem *gsp_lookup(struct gs_parser *gsp, u16 iden)
+{
+ int i;
+
+ i = gse_flatten_iden(iden);
+ return gsp->gses[i];
+}
+EXPORT_SYMBOL(gsp_lookup);
+
+/**
+ * gsbm_set() - set the guest state ID
+ * @gsbm: guest state bitmap
+ * @iden: guest state ID
+ */
+void gsbm_set(struct gs_bitmap *gsbm, u16 iden)
+{
+ set_bit(gse_flatten_iden(iden), gsbm->bitmap);
+}
+EXPORT_SYMBOL(gsbm_set);
+
+/**
+ * gsbm_clear() - clear the guest state ID
+ * @gsbm: guest state bitmap
+ * @iden: guest state ID
+ */
+void gsbm_clear(struct gs_bitmap *gsbm, u16 iden)
+{
+ clear_bit(gse_flatten_iden(iden), gsbm->bitmap);
+}
+EXPORT_SYMBOL(gsbm_clear);
+
+/**
+ * gsbm_test() - test the guest state ID
+ * @gsbm: guest state bitmap
+ * @iden: guest state ID
+ */
+bool gsbm_test(struct gs_bitmap *gsbm, u16 iden)
+{
+ return test_bit(gse_flatten_iden(iden), gsbm->bitmap);
+}
+EXPORT_SYMBOL(gsbm_test);
+
+/**
+ * gsbm_next() - return the next set guest state ID
+ * @gsbm: guest state bitmap
+ * @prev: last guest state ID
+ */
+u16 gsbm_next(struct gs_bitmap *gsbm, u16 prev)
+{
+ int bit, pbit;
+
+ pbit = prev ? gse_flatten_iden(prev) + 1 : 0;
+ bit = find_next_bit(gsbm->bitmap, GSE_IDEN_COUNT, pbit);
+
+ if (bit < GSE_IDEN_COUNT)
+ return gse_unflatten_iden(bit);
+ return 0;
+}
+EXPORT_SYMBOL(gsbm_next);
+
+/**
+ * gsm_init() - initialize a guest state message
+ * @gsm: guest state message
+ * @ops: callbacks
+ * @data: private data
+ * @flags: guest wide or thread wide
+ */
+int gsm_init(struct gs_msg *gsm, struct gs_msg_ops *ops, void *data,
+ unsigned long flags)
+{
+ memset(gsm, 0, sizeof(*gsm));
+ gsm->ops = ops;
+ gsm->data = data;
+ gsm->flags = flags;
+
+ return 0;
+}
+EXPORT_SYMBOL(gsm_init);
+
+/**
+ * gsm_init() - creates a new guest state message
+ * @ops: callbacks
+ * @data: private data
+ * @flags: guest wide or thread wide
+ * @gfp_flags: GFP allocation flags
+ *
+ * Returns an initialized guest state message.
+ */
+struct gs_msg *gsm_new(struct gs_msg_ops *ops, void *data, unsigned long flags,
+ gfp_t gfp_flags)
+{
+ struct gs_msg *gsm;
+
+ gsm = kzalloc(sizeof(*gsm), gfp_flags);
+ if (!gsm)
+ return NULL;
+
+ gsm_init(gsm, ops, data, flags);
+
+ return gsm;
+}
+EXPORT_SYMBOL(gsm_new);
+
+/**
+ * gsm_size() - creates a new guest state message
+ * @gsm: self
+ *
+ * Returns the size required for the message.
+ */
+size_t gsm_size(struct gs_msg *gsm)
+{
+ if (gsm->ops->get_size)
+ return gsm->ops->get_size(gsm);
+ return 0;
+}
+EXPORT_SYMBOL(gsm_size);
+
+/**
+ * gsm_free() - free guest state message
+ * @gsm: guest state message
+ *
+ * Returns the size required for the message.
+ */
+void gsm_free(struct gs_msg *gsm)
+{
+ kfree(gsm);
+}
+EXPORT_SYMBOL(gsm_free);
+
+/**
+ * gsm_fill_info() - serialises message to guest state buffer format
+ * @gsm: self
+ * @gsb: buffer to serialise into
+ */
+int gsm_fill_info(struct gs_msg *gsm, struct gs_buff *gsb)
+{
+ if (!gsm->ops->fill_info)
+ return -EINVAL;
+
+ gsb_reset(gsb);
+ return gsm->ops->fill_info(gsb, gsm);
+}
+EXPORT_SYMBOL(gsm_fill_info);
+
+/**
+ * gsm_fill_info() - deserialises from guest state buffer
+ * @gsm: self
+ * @gsb: buffer to serialise from
+ */
+int gsm_refresh_info(struct gs_msg *gsm, struct gs_buff *gsb)
+{
+ if (!gsm->ops->fill_info)
+ return -EINVAL;
+
+ return gsm->ops->refresh_info(gsm, gsb);
+}
+EXPORT_SYMBOL(gsm_refresh_info);
diff --git a/arch/powerpc/kvm/test-guest-state-buffer.c b/arch/powerpc/kvm/test-guest-state-buffer.c
new file mode 100644
index 000000000000..d038051b61f8
--- /dev/null
+++ b/arch/powerpc/kvm/test-guest-state-buffer.c
@@ -0,0 +1,321 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <linux/init.h>
+#include <linux/log2.h>
+#include <kunit/test.h>
+
+
+#include <asm/guest-state-buffer.h>
+
+static void test_creating_buffer(struct kunit *test)
+{
+ struct gs_buff *gsb;
+ size_t size = 0x100;
+
+ gsb = gsb_new(size, 0, 0, GFP_KERNEL);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, gsb);
+
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, gsb->hdr);
+
+ KUNIT_EXPECT_EQ(test, gsb->capacity, roundup_pow_of_two(size));
+ KUNIT_EXPECT_EQ(test, gsb->len, sizeof(__be32));
+
+ gsb_free(gsb);
+}
+
+static void test_adding_element(struct kunit *test)
+{
+ const struct gs_elem *head, *curr;
+ union {
+ __vector128 v;
+ u64 dw[2];
+ } u;
+ int rem;
+ struct gs_buff *gsb;
+ size_t size = 0x1000;
+ int i, rc;
+ u64 data;
+
+ gsb = gsb_new(size, 0, 0, GFP_KERNEL);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, gsb);
+
+ /* Single elements, direct use of __gse_put() */
+ data = 0xdeadbeef;
+ rc = __gse_put(gsb, GSID_GPR(0), 8, &data);
+ KUNIT_EXPECT_GE(test, rc, 0);
+
+ head = gsb_data(gsb);
+ KUNIT_EXPECT_EQ(test, gse_iden(head), GSID_GPR(0));
+ KUNIT_EXPECT_EQ(test, gse_len(head), 8);
+ data = 0;
+ memcpy(&data, gse_data(head), 8);
+ KUNIT_EXPECT_EQ(test, data, 0xdeadbeef);
+
+ /* Multiple elements, simple wrapper */
+ rc = gse_put_u64(gsb, GSID_GPR(1), 0xcafef00d);
+ KUNIT_EXPECT_GE(test, rc, 0);
+
+ u.dw[0] = 0x1;
+ u.dw[1] = 0x2;
+ rc = gse_put_vector128(gsb, GSID_VSRS(0), u.v);
+ KUNIT_EXPECT_GE(test, rc, 0);
+ u.dw[0] = 0x0;
+ u.dw[1] = 0x0;
+
+ gsb_for_each_elem(i, curr, gsb, rem) {
+ switch (i) {
+ case 0:
+ KUNIT_EXPECT_EQ(test, gse_iden(curr), GSID_GPR(0));
+ KUNIT_EXPECT_EQ(test, gse_len(curr), 8);
+ KUNIT_EXPECT_EQ(test, gse_get_be64(curr), 0xdeadbeef);
+ break;
+ case 1:
+ KUNIT_EXPECT_EQ(test, gse_iden(curr), GSID_GPR(1));
+ KUNIT_EXPECT_EQ(test, gse_len(curr), 8);
+ KUNIT_EXPECT_EQ(test, gse_get_u64(curr), 0xcafef00d);
+ break;
+ case 2:
+ KUNIT_EXPECT_EQ(test, gse_iden(curr), GSID_VSRS(0));
+ KUNIT_EXPECT_EQ(test, gse_len(curr), 16);
+ u.v = gse_get_vector128(curr);
+ KUNIT_EXPECT_EQ(test, u.dw[0], 0x1);
+ KUNIT_EXPECT_EQ(test, u.dw[1], 0x2);
+ break;
+ }
+ }
+ KUNIT_EXPECT_EQ(test, i, 3);
+
+ gsb_reset(gsb);
+ KUNIT_EXPECT_EQ(test, gsb_nelems(gsb), 0);
+ KUNIT_EXPECT_EQ(test, gsb_len(gsb), sizeof(struct gs_header));
+
+ gsb_free(gsb);
+}
+
+static void test_gs_parsing(struct kunit *test)
+{
+ struct gs_elem *gse;
+ struct gs_parser gsp = { 0 };
+ struct gs_buff *gsb;
+ size_t size = 0x1000;
+ u64 tmp1, tmp2;
+
+ gsb = gsb_new(size, 0, 0, GFP_KERNEL);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, gsb);
+
+ tmp1 = 0xdeadbeefull;
+ gse_put(gsb, GSID_GPR(0), tmp1);
+
+ KUNIT_EXPECT_GE(test, gse_parse(&gsp, gsb), 0);
+
+ gse = gsp_lookup(&gsp, GSID_GPR(0));
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, gse);
+
+ gse_get(gse, &tmp2);
+ KUNIT_EXPECT_EQ(test, tmp2, 0xdeadbeefull);
+
+ gsb_free(gsb);
+}
+
+static void test_gs_bitmap(struct kunit *test)
+{
+ struct gs_bitmap gsbm = { 0 };
+ struct gs_bitmap gsbm1 = { 0 };
+ struct gs_bitmap gsbm2 = { 0 };
+ u16 iden;
+ int i, j;
+
+ i = 0;
+ for (u16 iden = GSID_HOST_STATE_SIZE;
+ iden <= GSID_PROCESS_TABLE; iden++) {
+ gsbm_set(&gsbm, iden);
+ gsbm_set(&gsbm1, iden);
+ KUNIT_EXPECT_TRUE(test, gsbm_test(&gsbm, iden));
+ gsbm_clear(&gsbm, iden);
+ KUNIT_EXPECT_FALSE(test, gsbm_test(&gsbm, iden));
+ i++;
+ }
+
+ for (u16 iden = GSID_RUN_INPUT; iden <= GSID_VPA;
+ iden++) {
+ gsbm_set(&gsbm, iden);
+ gsbm_set(&gsbm1, iden);
+ KUNIT_EXPECT_TRUE(test, gsbm_test(&gsbm, iden));
+ gsbm_clear(&gsbm, iden);
+ KUNIT_EXPECT_FALSE(test, gsbm_test(&gsbm, iden));
+ i++;
+ }
+
+ for (u16 iden = GSID_GPR(0); iden <= GSID_CTRL;
+ iden++) {
+ gsbm_set(&gsbm, iden);
+ gsbm_set(&gsbm1, iden);
+ KUNIT_EXPECT_TRUE(test, gsbm_test(&gsbm, iden));
+ gsbm_clear(&gsbm, iden);
+ KUNIT_EXPECT_FALSE(test, gsbm_test(&gsbm, iden));
+ i++;
+ }
+
+ for (u16 iden = GSID_CR; iden <= GSID_PSPB; iden++) {
+ gsbm_set(&gsbm, iden);
+ gsbm_set(&gsbm1, iden);
+ KUNIT_EXPECT_TRUE(test, gsbm_test(&gsbm, iden));
+ gsbm_clear(&gsbm, iden);
+ KUNIT_EXPECT_FALSE(test, gsbm_test(&gsbm, iden));
+ i++;
+ }
+
+ for (u16 iden = GSID_VSRS(0); iden <= GSID_VSRS(63);
+ iden++) {
+ gsbm_set(&gsbm, iden);
+ gsbm_set(&gsbm1, iden);
+ KUNIT_EXPECT_TRUE(test, gsbm_test(&gsbm, iden));
+ gsbm_clear(&gsbm, iden);
+ KUNIT_EXPECT_FALSE(test, gsbm_test(&gsbm, iden));
+ i++;
+ }
+
+ for (u16 iden = GSID_HDAR; iden <= GSID_ASDR;
+ iden++) {
+ gsbm_set(&gsbm, iden);
+ gsbm_set(&gsbm1, iden);
+ KUNIT_EXPECT_TRUE(test, gsbm_test(&gsbm, iden));
+ gsbm_clear(&gsbm, iden);
+ KUNIT_EXPECT_FALSE(test, gsbm_test(&gsbm, iden));
+ i++;
+ }
+
+ j = 0;
+ gsbm_for_each(&gsbm1, iden)
+ {
+ gsbm_set(&gsbm2, iden);
+ j++;
+ }
+ KUNIT_EXPECT_EQ(test, i, j);
+ KUNIT_EXPECT_MEMEQ(test, &gsbm1, &gsbm2, sizeof(gsbm1));
+}
+
+struct gs_msg_test1_data {
+ u64 a;
+ u32 b;
+ struct gs_part_table c;
+ struct gs_proc_table d;
+ struct gs_buff_info e;
+};
+
+static size_t test1_get_size(struct gs_msg *gsm)
+{
+ size_t size = 0;
+ u16 ids[] = {
+ GSID_PARTITION_TABLE,
+ GSID_PROCESS_TABLE,
+ GSID_RUN_INPUT,
+ GSID_GPR(0),
+ GSID_CR,
+ };
+
+ for (int i = 0; i < ARRAY_SIZE(ids); i++)
+ size += gse_total_size(gsid_size(ids[i]));
+ return size;
+}
+
+static int test1_fill_info(struct gs_buff *gsb, struct gs_msg *gsm)
+{
+ struct gs_msg_test1_data *data = gsm->data;
+
+ if (gsm_includes(gsm, GSID_GPR(0)))
+ gse_put(gsb, GSID_GPR(0), data->a);
+
+ if (gsm_includes(gsm, GSID_CR))
+ gse_put(gsb, GSID_CR, data->b);
+
+ if (gsm_includes(gsm, GSID_PARTITION_TABLE))
+ gse_put(gsb, GSID_PARTITION_TABLE, data->c);
+
+ if (gsm_includes(gsm, GSID_PROCESS_TABLE))
+ gse_put(gsb, GSID_PARTITION_TABLE, data->d);
+
+ if (gsm_includes(gsm, GSID_RUN_INPUT))
+ gse_put(gsb, GSID_RUN_INPUT, data->e);
+
+ return 0;
+}
+
+static int test1_refresh_info(struct gs_msg *gsm, struct gs_buff *gsb)
+{
+ struct gs_parser gsp = { 0 };
+ struct gs_msg_test1_data *data = gsm->data;
+ struct gs_elem *gse;
+ int rc;
+
+ rc = gse_parse(&gsp, gsb);
+ if (rc < 0)
+ return rc;
+
+ gse = gsp_lookup(&gsp, GSID_GPR(0));
+ if (gse)
+ gse_get(gse, &data->a);
+
+ gse = gsp_lookup(&gsp, GSID_CR);
+ if (gse)
+ gse_get(gse, &data->b);
+
+ return 0;
+}
+
+static struct gs_msg_ops gs_msg_test1_ops = {
+ .get_size = test1_get_size,
+ .fill_info = test1_fill_info,
+ .refresh_info = test1_refresh_info,
+};
+
+static void test_gs_msg(struct kunit *test)
+{
+ struct gs_msg_test1_data test1_data = {
+ .a = 0xdeadbeef,
+ .b = 0x1,
+ };
+ struct gs_msg *gsm;
+ struct gs_buff *gsb;
+
+ gsm = gsm_new(&gs_msg_test1_ops, &test1_data, GSM_SEND, GFP_KERNEL);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, gsm);
+
+ gsb = gsb_new(gsm_size(gsm), 0, 0, GFP_KERNEL);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, gsb);
+
+ gsm_include(gsm, GSID_PARTITION_TABLE);
+ gsm_include(gsm, GSID_PROCESS_TABLE);
+ gsm_include(gsm, GSID_RUN_INPUT);
+ gsm_include(gsm, GSID_GPR(0));
+ gsm_include(gsm, GSID_CR);
+
+ gsm_fill_info(gsm, gsb);
+
+ memset(&test1_data, 0, sizeof(test1_data));
+
+ gsm_refresh_info(gsm, gsb);
+ KUNIT_EXPECT_EQ(test, test1_data.a, 0xdeadbeef);
+ KUNIT_EXPECT_EQ(test, test1_data.b, 0x1);
+
+ gsm_free(gsm);
+}
+
+
+static struct kunit_case guest_state_buffer_testcases[] = {
+ KUNIT_CASE(test_creating_buffer),
+ KUNIT_CASE(test_adding_element),
+ KUNIT_CASE(test_gs_bitmap),
+ KUNIT_CASE(test_gs_parsing),
+ KUNIT_CASE(test_gs_msg),
+ {}
+};
+
+static struct kunit_suite guest_state_buffer_test_suite = {
+ .name = "guest_state_buffer_test",
+ .test_cases = guest_state_buffer_testcases,
+};
+
+kunit_test_suites(&guest_state_buffer_test_suite);
+
+MODULE_LICENSE("GPL");
--
2.31.1
