Add support for deserializing the binary PCI/PCIe VPD format and storing results in memory. The VPD format is specified in "I.3. VPD Definitions" in PCI specs (2.2+) and "6.28.1 VPD Format" PCIe 4.0. As section 6.28 in PCIe 4.0 notes, the PCI Local Bus and PCIe VPD formats are binary compatible and PCIe 4.0 merely started incorporating what was already present in PCI specs. Linux kernel exposes a binary blob in the VPD format via sysfs since v2.6.26 (commit 94e6108803469a37ee1e3c92dafdd1d59298602f) which requires a parser to interpret. Signed-off-by: Dmitrii Shcherbakov <dmitrii.shcherbakov(a)canonical.com&gt; --- build-aux/syntax-check.mk | 4 +- po/POTFILES.in | 1 + src/libvirt_private.syms | 18 + src/util/meson.build | 1 + src/util/virpcivpd.c | 743 ++++++++++++++++++++++++++++++++++++ src/util/virpcivpd.h | 111 ++++++ src/util/virpcivpdpriv.h | 48 +++ tests/meson.build | 1 + tests/testutils.c | 35 ++ tests/testutils.h | 4 + tests/virpcivpdtest.c | 768 ++++++++++++++++++++++++++++++++++++++ 11 files changed, 1732 insertions(+), 2 deletions(-) create mode 100644 src/util/virpcivpd.c create mode 100644 src/util/virpcivpd.h create mode 100644 src/util/virpcivpdpriv.h create mode 100644 tests/virpcivpdtest.c diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index cb12b64532..2a6e2f86a1 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -775,9 +775,9 @@ sc_prohibit_windows_special_chars_in_filename: { echo '$(ME): Windows special chars in filename not allowed' 1>&2; echo exit 1; } || : sc_prohibit_mixed_case_abbreviations: - @prohibit='Pci|Usb|Scsi' \ + @prohibit='Pci|Usb|Scsi|Vpd' \ in_vc_files='\.[ch]$$' \ - halt='Use PCI, USB, SCSI, not Pci, Usb, Scsi' \ + halt='Use PCI, USB, SCSI, VPD, not Pci, Usb, Scsi, Vpd' \ $(_sc_search_regexp) # Require #include <locale.h> in all files that call setlocale() diff --git a/po/POTFILES.in b/po/POTFILES.in index c200d7452a..4be4139529 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -302,6 +302,7 @@ @SRCDIR(a)src/util/virnvme.c @SRCDIR(a)src/util/virobject.c @SRCDIR(a)src/util/virpci.c +@SRCDIR(a)src/util/virpcivpd.c @SRCDIR(a)src/util/virperf.c @SRCDIR(a)src/util/virpidfile.c @SRCDIR(a)src/util/virpolkit.c diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fd0eea0777..8499281864 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3576,6 +3576,24 @@ virVHBAManageVport; virVHBAPathExists; +# util/virpcivpd.h + +virPCIVPDParse; +virPCIVPDParseVPDLargeResourceFields; +virPCIVPDParseVPDLargeResourceString; +virPCIVPDReadVPDBytes; +virPCIVPDResourceCustomCompareIndex; +virPCIVPDResourceCustomFree; +virPCIVPDResourceCustomUpsertValue; +virPCIVPDResourceFree; +virPCIVPDResourceGetFieldValueFormat; +virPCIVPDResourceIsValidTextValue; +virPCIVPDResourceROFree; +virPCIVPDResourceRONew; +virPCIVPDResourceRWFree; +virPCIVPDResourceRWNew; +virPCIVPDResourceUpdateKeyword; + # util/virvsock.h virVsockAcquireGuestCid; virVsockSetGuestCid; diff --git a/src/util/meson.build b/src/util/meson.build index 05934f6841..24350a3e67 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -105,6 +105,7 @@ util_sources = [ 'virutil.c', 'viruuid.c', 'virvhba.c', + 'virpcivpd.c', 'virvsock.c', 'virxml.c', ] diff --git a/src/util/virpcivpd.c b/src/util/virpcivpd.c new file mode 100644 index 0000000000..5caede815f --- /dev/null +++ b/src/util/virpcivpd.c @@ -0,0 +1,743 @@ +/* + * virpcivpd.c: helper APIs for working with the PCI/PCIe VPD capability + * + * Copyright (C) 2021 Canonical Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>;. + */ + +#include <config.h> + +#ifdef __linux__ +# include <unistd.h> +#endif + +#define LIBVIRT_VIRPCIVPDPRIV_H_ALLOW + +#include "virthread.h" +#include "virpcivpdpriv.h" +#include "virlog.h" +#include "virerror.h" +#include "virfile.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +VIR_LOG_INIT("util.pcivpd"); + +static bool +virPCIVPDResourceIsUpperOrNumber(const char c) +{ + return g_ascii_isupper(c) || g_ascii_isdigit(c); +} + +static bool +virPCIVPDResourceIsVendorKeyword(const char *keyword) +{ + return g_str_has_prefix(keyword, "V") && virPCIVPDResourceIsUpperOrNumber(keyword[1]); +} + +static bool +virPCIVPDResourceIsSystemKeyword(const char *keyword) +{ + /* Special-case the system-specific keywords since they share the "Y" prefix with "YA". */ + return (g_str_has_prefix(keyword, "Y") && virPCIVPDResourceIsUpperOrNumber(keyword[1]) && + STRNEQ(keyword, "YA")); +} + +static char * +virPCIVPDResourceGetKeywordPrefix(const char *keyword) +{ + g_autofree char *key = NULL; + + /* Keywords must have a length of 2 bytes. */ + if (strlen(keyword) != 2) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("The keyword length is not 2 bytes: %s"), keyword); + return NULL; + } else if (!(virPCIVPDResourceIsUpperOrNumber(keyword[0]) && + virPCIVPDResourceIsUpperOrNumber(keyword[1]))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("The keyword is not comprised only of uppercase ASCII letters or digits")); + return NULL; + } + /* Special-case the system-specific keywords since they share the "Y" prefix with "YA". */ + if (virPCIVPDResourceIsSystemKeyword(keyword) || virPCIVPDResourceIsVendorKeyword(keyword)) { + key = g_strndup(keyword, 1); + } else { + key = g_strndup(keyword, 2); + } + return g_steal_pointer(&key); +} + +static GHashTable *fieldValueFormats; + +static int +virPCIVPDResourceOnceInit(void) +{ + if (!fieldValueFormats) { + /* Initialize a hash table once with static format metadata coming from the PCI(e) specs. + * The VPD format does not embed format metadata into the resource records so it is not + * possible to do format discovery without static information. Legacy PICMIG keywords + * are not included. NOTE: string literals are copied as g_hash_table_insert + * requires pointers to non-const data. */ + fieldValueFormats = g_hash_table_new(g_str_hash, g_str_equal); + /* Extended capability. Contains binary data per PCI(e) specs. */ + g_hash_table_insert(fieldValueFormats, g_strdup("CP"), + GINT_TO_POINTER(VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_BINARY)); + /* Engineering Change Level of an Add-in Card. */ + g_hash_table_insert(fieldValueFormats, g_strdup("EC"), + GINT_TO_POINTER(VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT)); + /* Manufacture ID */ + g_hash_table_insert(fieldValueFormats, g_strdup("MN"), + GINT_TO_POINTER(VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT)); + /* Add-in Card Part Number */ + g_hash_table_insert(fieldValueFormats, g_strdup("PN"), + GINT_TO_POINTER(VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT)); + /* Checksum and Reserved */ + g_hash_table_insert(fieldValueFormats, g_strdup("RV"), + GINT_TO_POINTER(VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_RESVD)); + /* Remaining Read/Write Area */ + g_hash_table_insert(fieldValueFormats, g_strdup("RW"), + GINT_TO_POINTER(VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_RDWR)); + /* Serial Number */ + g_hash_table_insert(fieldValueFormats, g_strdup("SN"), + GINT_TO_POINTER(VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT)); + /* Asset Tag Identifier */ + g_hash_table_insert(fieldValueFormats, g_strdup("YA"), + GINT_TO_POINTER(VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT)); + /* This is a vendor specific item and the characters are alphanumeric. The second + * character (x) of the keyword can be 0 through Z so only the first one is stored. */ + g_hash_table_insert(fieldValueFormats, g_strdup("V"), + GINT_TO_POINTER(VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT)); + /* This is a system specific item and the characters are alphanumeric. + * The second character (x) of the keyword can be 0 through 9 and B through Z. */ + g_hash_table_insert(fieldValueFormats, g_strdup("Y"), + GINT_TO_POINTER(VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT)); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Field value formats must only be initialized once.")); + return -1; + } + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virPCIVPDResource); + +/** + * virPCIVPDResourceGetFieldValueFormat: + * @keyword: A keyword for which to get a value type + * + * Returns: a virPCIVPDResourceFieldValueFormat value which specifies the field value type for + * a provided keyword based on the static information from PCI(e) specs. + */ +virPCIVPDResourceFieldValueFormat +virPCIVPDResourceGetFieldValueFormat(const char *keyword) +{ + g_autofree char *key = NULL; + gpointer keyVal = NULL; + virPCIVPDResourceFieldValueFormat format = VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST; + + /* Keywords are expected to be 2 bytes in length which is defined in the specs. */ + if (strlen(keyword) != 2) { + return VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST; + } + + if (virPCIVPDResourceInitialize() < 0) + return VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST; + + /* The system and vendor-specific keywords have a variable part - lookup + * the prefix significant for determining the value format. */ + key = virPCIVPDResourceGetKeywordPrefix(keyword); + if (key) { + keyVal = g_hash_table_lookup(fieldValueFormats, key); + if (keyVal) { + format = GPOINTER_TO_INT(keyVal); + } + } + return format; +} + +#define ACCEPTED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -_,.:;=" + +/** + * virPCIVPDResourceIsValidTextValue: + * @value: A NULL-terminated string to assess. + * + * Returns: a boolean indicating whether this value is a valid string resource + * value or text field value. The expectations are based on the keywords specified + * in relevant sections of PCI(e) specifications + * ("I.3. VPD Definitions" in PCI specs, "6.28.1 VPD Format" PCIe 4.0). + */ +bool +virPCIVPDResourceIsValidTextValue(const char *value) +{ + /* + * The PCI(e) specs mention alphanumeric characters when talking about text fields + * and the string resource but also include spaces and dashes in the provided example. + * Dots, commas, equal signs have also been observed in values used by major device vendors. + * The specs do not specify a full set of allowed code points and for Libvirt it is important + * to keep values in the ranges allowed within XML elements (mainly excluding less-than, + * greater-than and ampersand). + */ + + if (value == NULL) { + return false; + } + /* An empty string is a valid value. */ + if (STREQ(value, "")) { + return true; + } + + if (strspn(value, ACCEPTED_CHARS) != strlen(value)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("The provided value contains invalid characters: %s"), value); + return false; + } + return true; +} + +void +virPCIVPDResourceFree(virPCIVPDResource *res) +{ + if (!res) { + return; + } + virPCIVPDResourceROFree(res->ro); + virPCIVPDResourceRWFree(res->rw); +} + +virPCIVPDResourceRO * +virPCIVPDResourceRONew(void) +{ + g_autoptr(virPCIVPDResourceRO) ro = g_new0(virPCIVPDResourceRO, 1); + ro->vendor_specific = g_ptr_array_new_full(0, (GDestroyNotify)virPCIVPDResourceCustomFree); + return g_steal_pointer(&ro); +} + +void +virPCIVPDResourceROFree(virPCIVPDResourceRO *ro) +{ + if (!ro) { + return; + } + g_free(ro->change_level); + g_free(ro->manufacture_id); + g_free(ro->part_number); + g_free(ro->serial_number); + g_ptr_array_unref(ro->vendor_specific); +} + +virPCIVPDResourceRW * +virPCIVPDResourceRWNew(void) +{ + g_autoptr(virPCIVPDResourceRW) rw = g_new0(virPCIVPDResourceRW, 1); + rw->vendor_specific = g_ptr_array_new_full(0, (GDestroyNotify)virPCIVPDResourceCustomFree); + rw->system_specific = g_ptr_array_new_full(0, (GDestroyNotify)virPCIVPDResourceCustomFree); + return g_steal_pointer(&rw); +} + +void +virPCIVPDResourceRWFree(virPCIVPDResourceRW *rw) +{ + if (!rw) { + return; + } + g_free(rw->asset_tag); + g_ptr_array_unref(rw->vendor_specific); + g_ptr_array_unref(rw->system_specific); +} + +void +virPCIVPDResourceCustomFree(virPCIVPDResourceCustom *custom) +{ + g_free(custom->value); + g_free(custom); +} + +bool +virPCIVPDResourceCustomCompareIndex(virPCIVPDResourceCustom *a, virPCIVPDResourceCustom *b) +{ + if (a == b) { + return true; + } else if (a == NULL || b == NULL) { + return false; + } else { + return a->idx == b->idx; + } + return true; +} + +/** + * virPCIVPDResourceCustomUpsertValue: + * @arr: A GPtrArray with virPCIVPDResourceCustom entries to update. + * @index: An index character for the keyword. + * @value: A pointer to the value to be inserted at a given index. + * + * Returns: true if a value has been updated successfully, false otherwise. + */ +bool +virPCIVPDResourceCustomUpsertValue(GPtrArray *arr, char index, const char *const value) +{ + g_autoptr(virPCIVPDResourceCustom) custom = NULL; + virPCIVPDResourceCustom *existing = NULL; + guint pos = 0; + bool found = false; + + if (arr == NULL || value == NULL) { + return false; + } + + custom = g_new0(virPCIVPDResourceCustom, 1); + custom->idx = index; + custom->value = g_strdup(value); + found = g_ptr_array_find_with_equal_func(arr, custom, + (GEqualFunc)virPCIVPDResourceCustomCompareIndex, + &pos); + if (found) { + existing = g_ptr_array_index(arr, pos); + g_free(existing->value); + existing->value = g_steal_pointer(&custom->value); + } else { + g_ptr_array_add(arr, g_steal_pointer(&custom)); + } + return true; +} + +/** + * virPCIVPDResourceUpdateKeyword: + * @res: A non-NULL pointer to a virPCIVPDResource where a keyword will be updated. + * @readOnly: A bool specifying which section to update (in-memory): read-only or read-write. + * @keyword: A non-NULL pointer to a name of the keyword that will be updated. + * @value: A pointer to the keyword value or NULL. The value is copied on successful update. + * + * The caller is responsible for initializing the relevant RO or RW sections of the resource, + * otherwise, false will be returned. + * + * Keyword names are either 2-byte keywords from the spec or their human-readable alternatives + * used in XML elements. For vendor-specific and system-specific keywords only V%s and Y%s + * (except "YA" which is an asset tag) formatted values are accepted. + * + * Returns: true if a keyword has been updated successfully, false otherwise. + */ +bool +virPCIVPDResourceUpdateKeyword(virPCIVPDResource *res, const bool readOnly, + const char *const keyword, const char *const value) +{ + if (!res) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot update the resource: a NULL resource pointer has been provided.")); + return false; + } else if (!keyword) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot update the resource: a NULL keyword pointer has been provided.")); + return false; + } + + if (readOnly) { + if (!res->ro) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot update the read-only keyword: RO section not initialized.")); + return false; + } + + if (STREQ("EC", keyword) || STREQ("change_level", keyword)) { + res->ro->change_level = g_strdup(value); + return true; + } else if (STREQ("MN", keyword) || STREQ("manufacture_id", keyword)) { + res->ro->manufacture_id = g_strdup(value); + return true; + } else if (STREQ("PN", keyword) || STREQ("part_number", keyword)) { + res->ro->part_number = g_strdup(value); + return true; + } else if (STREQ("SN", keyword) || STREQ("serial_number", keyword)) { + res->ro->serial_number = g_strdup(value); + return true; + } else if (virPCIVPDResourceIsVendorKeyword(keyword)) { + if (!virPCIVPDResourceCustomUpsertValue(res->ro->vendor_specific, keyword[1], value)) { + return false; + } + return true; + } else if (STREQ("FG", keyword) || STREQ("LC", keyword) || STREQ("PG", keyword)) { + /* Legacy PICMIG keywords are skipped on purpose. */ + return true; + } else if (STREQ("CP", keyword)) { + /* The CP keyword is currently not supported and is skipped. */ + return true; + } + + } else { + if (!res->rw) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _ + ("Cannot update the read-write keyword: read-write section not initialized.")); + return false; + } + + if (STREQ("YA", keyword) || STREQ("asset_tag", keyword)) { + res->rw->asset_tag = g_strdup(value); + return true; + } else if (virPCIVPDResourceIsVendorKeyword(keyword)) { + if (!virPCIVPDResourceCustomUpsertValue(res->rw->vendor_specific, keyword[1], value)) { + return false; + } + return true; + } else if (virPCIVPDResourceIsSystemKeyword(keyword)) { + if (!virPCIVPDResourceCustomUpsertValue(res->rw->system_specific, keyword[1], value)) { + return false; + } + return true; + } + } + /* Unsupported keyword. */ + return false; +} + +#ifdef __linux__ + +/** + * virPCIVPDReadVPDBytes: + * @vpdFileFd: A file descriptor associated with a file containing PCI device VPD. + * @buf: An allocated buffer to use for storing VPD bytes read. + * @count: The number of bytes to read from the VPD file descriptor. + * @offset: The offset at which bytes need to be read. + * @csum: A pointer to a byte containing the current checksum value. Mutated by this function. + * + * Returns: the number of VPD bytes read from the specified file descriptor. The csum value is + * also modified as bytes are read. If an error occurs while reading data from the VPD file + * descriptor, it is reported and -1 is returned to the caller. If EOF is occurred, 0 is returned + * to the caller. + */ +size_t +virPCIVPDReadVPDBytes(int vpdFileFd, uint8_t *buf, size_t count, off_t offset, uint8_t *csum) +{ + ssize_t numRead = pread(vpdFileFd, buf, count, offset); + + if (numRead == -1) { + VIR_DEBUG("Unable to read %zu bytes at offset %ld from fd: %d", count, offset, vpdFileFd); + } else if (numRead) { + /* + * Update the checksum for every byte read. Per the PCI(e) specs + * the checksum is correct if the sum of all bytes in VPD from + * VPD address 0 up to and including the VPD-R RV field's first + * data byte is zero. + */ + while (count--) { + *csum += *buf; + buf++; + } + } + return numRead; +} + +/** + * virPCIVPDParseVPDLargeResourceFields: + * @vpdFileFd: A file descriptor associated with a file containing PCI device VPD. + * @resPos: A position where the resource data bytes begin in a file descriptor. + * @resDataLen: A length of the data portion of a resource. + * @readOnly: A boolean showing whether the resource type is VPD-R or VPD-W. + * @csum: A pointer to a 1-byte checksum. + * @res: A pointer to virPCIVPDResource. + * + * Returns: a pointer to a VPDResource which needs to be freed by the caller or + * NULL if getting it failed for some reason. + */ +bool +virPCIVPDParseVPDLargeResourceFields(int vpdFileFd, uint16_t resPos, uint16_t resDataLen, + bool readOnly, uint8_t *csum, virPCIVPDResource *res) +{ + g_autofree char *fieldKeyword = NULL; + g_autofree char *fieldValue = NULL; + virPCIVPDResourceFieldValueFormat fieldFormat = VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST; + + /* A buffer of up to one resource record field size (plus a zero byte) is needed. */ + g_autofree uint8_t *buf = g_malloc0(PCI_VPD_MAX_FIELD_SIZE + 1); + uint16_t fieldDataLen = 0, bytesToRead = 0; + uint16_t fieldPos = resPos; + + bool hasChecksum = false; + bool hasRW = false; + + while (fieldPos + 3 < resPos + resDataLen) { + /* Keyword resources consist of keywords (2 ASCII bytes per the spec) and 1-byte length. */ + if (virPCIVPDReadVPDBytes(vpdFileFd, buf, 3, fieldPos, csum) != 3) { + /* Invalid field encountered which means the resource itself is invalid too. Report + * That VPD has invalid format and bail. */ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not read a resource field header - VPD has invalid format")); + return false; + } + fieldDataLen = buf[2]; + /* Change the position to the field's data portion skipping the keyword and length bytes. */ + fieldPos += 3; + fieldKeyword = g_strndup((char *)buf, 2); + fieldFormat = virPCIVPDResourceGetFieldValueFormat(fieldKeyword); + + /* Handle special cases first */ + if (!readOnly && fieldFormat == VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_RESVD) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unexpected RV keyword in the read-write section.")); + return false; + } else if (readOnly && fieldFormat == VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_RDWR) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unexpected RW keyword in the read-only section.")); + return false; + } + + /* Determine how many bytes to read per field value type. */ + switch (fieldFormat) { + case VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT: + case VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_RDWR: + case VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_BINARY: + bytesToRead = fieldDataLen; + break; + case VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_RESVD: + /* Only need one byte to be read and accounted towards + * the checksum calculation. */ + bytesToRead = 1; + break; + case VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST: + /* The VPD format could be extended in future versions with new + * keywords - attempt to skip them by reading past them since + * their data length would still be specified. */ + VIR_DEBUG("Could not determine a field value format for keyword: %s", fieldKeyword); + bytesToRead = fieldDataLen; + break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unexpected field value format encountered.")); + return false; + } + + if (virPCIVPDReadVPDBytes(vpdFileFd, buf, bytesToRead, fieldPos, csum) != bytesToRead) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not parse a resource field data - VPD has invalid format")); + return false; + } + /* Advance the position to the first byte of the next field. */ + fieldPos += fieldDataLen; + + if (fieldFormat == VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT) { + /* Trim whitespace around a retrieved value and set it to be a field's value. Cases + * where unnecessary whitespace was present around a field value have been encountered + * in the wild. + */ + fieldValue = g_strstrip(g_strndup((char *)buf, fieldDataLen)); + if (!virPCIVPDResourceIsValidTextValue(fieldValue)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Field value contains invalid characters")); + return false; + } + } else if (fieldFormat == VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_RESVD) { + if (*csum) { + /* All bytes up to and including the checksum byte should add up to 0. */ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Checksum validation has failed")); + return false; + } + hasChecksum = true; + g_free(g_steal_pointer(&fieldKeyword)); + g_free(g_steal_pointer(&fieldValue)); + continue; + } else if (fieldFormat == VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_RDWR) { + /* Skip the read-write space since it is used for indication only. */ + hasRW = true; + g_free(g_steal_pointer(&fieldKeyword)); + g_free(g_steal_pointer(&fieldValue)); + } else if (fieldFormat == VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST) { + /* Skip unknown fields */ + g_free(g_steal_pointer(&fieldKeyword)); + g_free(g_steal_pointer(&fieldValue)); + continue; + } else { + fieldValue = g_malloc(fieldDataLen); + memcpy(fieldValue, buf, fieldDataLen); + } + + if (readOnly) { + if (!res->ro) { + res->ro = virPCIVPDResourceRONew(); + } + } else { + if (!res->rw) { + res->rw = virPCIVPDResourceRWNew(); + } + } + /* The field format, keyword and value are determined. Attempt to update the resource. */ + if (!virPCIVPDResourceUpdateKeyword(res, readOnly, fieldKeyword, fieldValue)) { + /* Write an error but attempt to handle it gracefully by continuing. + * Unexpected keywords may be a result of a spec extension in the future. */ + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not update the VPD resource keyword: %s"), fieldKeyword); + } + } + if (readOnly && !hasChecksum) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("VPD-R does not contain the mandatory RV field")); + return false; + } else if (!readOnly && !hasRW) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("VPD-W does not contain the mandatory RW field")); + return false; + } + + return true; +} + +/** + * virPCIVPDParseVPDLargeResourceString: + * @vpdFileFd: A file descriptor associated with a file containing PCI device VPD. + * @resPos: A position where the resource data bytes begin in a file descriptor. + * @resDataLen: A length of the data portion of a resource. + * @csum: A pointer to a 1-byte checksum. + * + * Returns: a pointer to a VPDResource which needs to be freed by the caller or + * NULL if getting it failed for some reason. + */ +bool +virPCIVPDParseVPDLargeResourceString(int vpdFileFd, uint16_t resPos, + uint16_t resDataLen, uint8_t *csum, virPCIVPDResource *res) +{ + g_autofree char *resValue = NULL; + + /* The resource value is not NULL-terminated so add one more byte. */ + g_autofree char *buf = g_malloc0(resDataLen + 1); + + if (virPCIVPDReadVPDBytes(vpdFileFd, (uint8_t *)buf, resDataLen, resPos, csum) != resDataLen) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not read a part of a resource - VPD has invalid format")); + return false; + } + resValue = g_strdup(g_strstrip(buf)); + if (!virPCIVPDResourceIsValidTextValue(resValue)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("The string resource has invalid characters in its value")); + return false; + } + res->name = g_steal_pointer(&resValue); + return true; +} + +/** + * virPCIVPDParse: + * @vpdFileFd: a file descriptor associated with a file containing PCI device VPD. + * + * Parse a PCI device's Vital Product Data (VPD) contained in a file descriptor. + * + * Returns: a pointer to a GList of VPDResource types which needs to be freed by the caller or + * NULL if getting it failed for some reason. + */ +virPCIVPDResource * +virPCIVPDParse(int vpdFileFd) +{ + /* A checksum which is calculated as a sum of all bytes from VPD byte 0 up to + * the checksum byte in the RV field's value. The RV field is only present in the + * VPD-R resource and the checksum byte there is the first byte of the field's value. + * The checksum byte in RV field is actually a two's complement of the sum of all bytes + * of VPD that come before it so adding the two together must produce 0 if data + * was not corrupted and VPD storage is intact. + */ + uint8_t csum = 0; + uint8_t headerBuf[2]; + + bool isWellFormed = false; + uint16_t resPos = 0, resDataLen; + uint8_t tag = 0; + bool endResReached = false, hasReadOnly = false; + + g_autoptr(virPCIVPDResource) res = g_new0(virPCIVPDResource, 1); + + while (resPos <= PCI_VPD_ADDR_MASK) { + /* Read the resource data type tag. */ + if (virPCIVPDReadVPDBytes(vpdFileFd, &tag, 1, resPos, &csum) != 1) { + break; + } + /* 0x80 == 0b10000000 - the large resource data type flag. */ + if (tag & PCI_VPD_LARGE_RESOURCE_FLAG) { + if (resPos > PCI_VPD_ADDR_MASK + 1 - 3) { + /* Bail if the large resource starts at the position + * where the end tag should be. */ + break; + } + /* Read the two length bytes of the large resource record. */ + if (virPCIVPDReadVPDBytes(vpdFileFd, headerBuf, 2, resPos + 1, &csum) != 2) { + break; + } + resDataLen = headerBuf[0] + (headerBuf[1] << 8); + /* Change the position to the byte following the tag and length bytes. */ + resPos += 3; + } else { + /* Handle a small resource record. + * 0xxxxyyy & 00000111, where xxxx - resource data type bits, yyy - length bits. */ + resDataLen = tag & 7; + /* 0xxxxyyy >> 3 == 0000xxxx */ + tag >>= 3; + /* Change the position to the byte past the byte containing tag and length bits. */ + resPos += 1; + } + if (tag == PCI_VPD_RESOURCE_END_TAG) { + /* Stop VPD traversal since the end tag was encountered. */ + endResReached = true; + break; + } + if (resDataLen > PCI_VPD_ADDR_MASK + 1 - resPos) { + /* Bail if the resource is too long to fit into the VPD address space. */ + break; + } + + switch (tag) { + /* Large resource type which is also a string: 0x80 | 0x02 = 0x82 */ + case PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_STRING_RESOURCE_FLAG: + isWellFormed = virPCIVPDParseVPDLargeResourceString(vpdFileFd, resPos, resDataLen, + &csum, res); + break; + /* Large resource type which is also a VPD-R: 0x80 | 0x10 == 0x90 */ + case PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_READ_ONLY_LARGE_RESOURCE_FLAG: + isWellFormed = virPCIVPDParseVPDLargeResourceFields(vpdFileFd, resPos, + resDataLen, true, &csum, res); + /* Encountered the VPD-R tag. The resource record parsing also validates + * the presence of the required checksum in the RV field. */ + hasReadOnly = true; + break; + /* Large resource type which is also a VPD-W: 0x80 | 0x11 == 0x91 */ + case PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_READ_WRITE_LARGE_RESOURCE_FLAG: + isWellFormed = virPCIVPDParseVPDLargeResourceFields(vpdFileFd, resPos, resDataLen, + false, &csum, res); + break; + default: + /* While we cannot parse unknown resource types, they can still be skipped + * based on the header and data length. */ + VIR_DEBUG("Encountered an unexpected VPD resource tag: %#x", tag); + resPos += resDataLen; + continue; + } + + if (!isWellFormed) { + VIR_DEBUG("Encountered an invalid VPD"); + return NULL; + } + + /* Continue processing other resource records. */ + resPos += resDataLen; + } + if (!hasReadOnly) { + VIR_DEBUG("Encountered an invalid VPD: does not have a VPD-R record"); + return NULL; + } else if (!endResReached) { + /* Does not have an end tag. */ + VIR_DEBUG("Encountered an invalid VPD"); + return NULL; + } + return g_steal_pointer(&res); +} + +#endif /* __linux__ */ diff --git a/src/util/virpcivpd.h b/src/util/virpcivpd.h new file mode 100644 index 0000000000..25aee5dffe --- /dev/null +++ b/src/util/virpcivpd.h @@ -0,0 +1,111 @@ +/* + * virpcivpd.h: helper APIs for working with the PCI/PCIe VPD capability + * + * Copyright (C) 2021 Canonical Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>;. + */ + +#pragma once + +#include "internal.h" + +/* + * PCI Local bus (2.2+, Appendix I) and PCIe 4.0+ (7.9.19 VPD Capability) define + * the VPD capability structure (8 bytes in total) and VPD registers that can be used to access + * VPD data including: + * bit 31 of the first 32-bit DWORD: data transfer completion flag (between the VPD data register + * and the VPD data storage hardware); + * bits 30:16 of the first 32-bit DWORD: VPD address of the first VPD data byte to be accessed; + * bits 31:0 of the second 32-bit DWORD: VPD data bytes with LSB being pointed to by the VPD address. + * + * Given that only 15 bits (30:16) are allocated for VPD address its mask is 0x7fff. +*/ +#define PCI_VPD_ADDR_MASK 0x7FFF + +/* + * VPD data consists of small and large resource data types. Information within a resource type + * consists of a 2-byte keyword, 1-byte length and data bytes (up to 255). +*/ +#define PCI_VPD_MAX_FIELD_SIZE 255 +#define PCI_VPD_LARGE_RESOURCE_FLAG 0x80 +#define PCI_VPD_STRING_RESOURCE_FLAG 0x02 +#define PCI_VPD_READ_ONLY_LARGE_RESOURCE_FLAG 0x10 +#define PCI_VPD_READ_WRITE_LARGE_RESOURCE_FLAG 0x11 +#define PCI_VPD_RESOURCE_END_TAG 0x0F +#define PCI_VPD_RESOURCE_END_VAL PCI_VPD_RESOURCE_END_TAG << 3 + +typedef enum { + VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT = 1, + VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_BINARY, + VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_RESVD, + VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_RDWR, + VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST +} virPCIVPDResourceFieldValueFormat; + +virPCIVPDResourceFieldValueFormat virPCIVPDResourceGetFieldValueFormat(const char *value); + +typedef struct virPCIVPDResourceCustom virPCIVPDResourceCustom; +struct virPCIVPDResourceCustom { + char idx; + char *value; +}; + +typedef struct virPCIVPDResourceRO virPCIVPDResourceRO; +struct virPCIVPDResourceRO { + char *part_number; + char *change_level; + char *manufacture_id; + char *serial_number; + GPtrArray *vendor_specific; +}; + +typedef struct virPCIVPDResourceRW virPCIVPDResourceRW; +struct virPCIVPDResourceRW { + char *asset_tag; + GPtrArray *vendor_specific; + GPtrArray *system_specific; +}; + +typedef struct virPCIVPDResource virPCIVPDResource; +struct virPCIVPDResource { + char *name; + virPCIVPDResourceRO *ro; + virPCIVPDResourceRW *rw; +}; + + +virPCIVPDResource *virPCIVPDParse(int vpdFileFd); +void virPCIVPDResourceFree(virPCIVPDResource *res); + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virPCIVPDResource, virPCIVPDResourceFree); + +virPCIVPDResourceRO *virPCIVPDResourceRONew(void); +void virPCIVPDResourceROFree(virPCIVPDResourceRO *ro); + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virPCIVPDResourceRO, virPCIVPDResourceROFree); + +virPCIVPDResourceRW *virPCIVPDResourceRWNew(void); +void virPCIVPDResourceRWFree(virPCIVPDResourceRW *rw); + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virPCIVPDResourceRW, virPCIVPDResourceRWFree); + +bool +virPCIVPDResourceUpdateKeyword(virPCIVPDResource *res, const bool readOnly, + const char *const keyword, const char *const value); + +void virPCIVPDResourceCustomFree(virPCIVPDResourceCustom *custom); + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virPCIVPDResourceCustom, virPCIVPDResourceCustomFree); diff --git a/src/util/virpcivpdpriv.h b/src/util/virpcivpdpriv.h new file mode 100644 index 0000000000..b0347ecef1 --- /dev/null +++ b/src/util/virpcivpdpriv.h @@ -0,0 +1,48 @@ +/* + * virpcivpdpriv.h: helper APIs for working with the PCI/PCIe VPD capability + * + * Copyright (C) 2021 Canonical Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>;. + */ + +#ifndef LIBVIRT_VIRPCIVPDPRIV_H_ALLOW +# error "virpcivpdpriv.h may only be included by virpcivpd.c or test suites" +#endif /* LIBVIRT_VIRPCIVPDPRIV_H_ALLOW */ + +#pragma once + +#include "virpcivpd.h" + +bool virPCIVPDResourceIsValidTextValue(const char *value); + +bool +virPCIVPDResourceCustomCompareIndex(virPCIVPDResourceCustom *a, virPCIVPDResourceCustom *b); + +bool +virPCIVPDResourceCustomUpsertValue(GPtrArray *arr, char index, const char *const value); + +#ifdef __linux__ + +size_t +virPCIVPDReadVPDBytes(int vpdFileFd, uint8_t *buf, size_t count, off_t offset, uint8_t *csum); + +bool virPCIVPDParseVPDLargeResourceFields(int vpdFileFd, uint16_t resPos, uint16_t resDataLen, + bool readOnly, uint8_t *csum, virPCIVPDResource *res); + +bool virPCIVPDParseVPDLargeResourceString(int vpdFileFd, uint16_t resPos, uint16_t resDataLen, + uint8_t *csum, virPCIVPDResource *res); + +#endif /* __linux__ */ diff --git a/tests/meson.build b/tests/meson.build index dfbc2c01e2..1948c07ae3 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -336,6 +336,7 @@ tests += [ { 'name': 'virtimetest' }, { 'name': 'virtypedparamtest' }, { 'name': 'viruritest' }, + { 'name': 'virpcivpdtest' }, { 'name': 'vshtabletest', 'link_with': [ libvirt_shell_lib ] }, { 'name': 'virmigtest' }, ] diff --git a/tests/testutils.c b/tests/testutils.c index d071abd6d7..3bc4274e97 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -1143,3 +1143,38 @@ virTestStablePath(const char *path) return g_strdup(path); } + +#ifdef __linux__ +/** + * virCreateAnonymousFile: + * @data: a pointer to data to be written into a new file. + * @len: the length of data to be written (in bytes). + * + * Create a fake fd, write initial data to it. + * + */ +int +virCreateAnonymousFile(const uint8_t *data, size_t len) +{ + int fd = -1; + char path[] = abs_builddir "testutils-memfd-XXXXXX"; + /* A temp file is used since not all supported distributions support memfd. */ + if ((fd = g_mkstemp_full(path, O_RDWR | O_CLOEXEC, S_IRUSR | S_IWUSR)) < 0) { + return fd; + } + g_unlink(path); + + if (safewrite(fd, data, len) != len) { + VIR_TEST_DEBUG("%s: %s", "failed to write to an anonymous file", + g_strerror(errno)); + goto cleanup; + } + return fd; + cleanup: + if (VIR_CLOSE(fd) < 0) { + VIR_TEST_DEBUG("%s: %s", "failed to close an anonymous file", + g_strerror(errno)); + } + return -1; +} +#endif diff --git a/tests/testutils.h b/tests/testutils.h index 27d135fc02..13a154a5af 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -173,3 +173,7 @@ int testCompareDomXML2XMLFiles(virCaps *caps, char * virTestStablePath(const char *path); + +#ifdef __linux__ +int virCreateAnonymousFile(const uint8_t *data, size_t len); +#endif diff --git a/tests/virpcivpdtest.c b/tests/virpcivpdtest.c new file mode 100644 index 0000000000..fcfb646b96 --- /dev/null +++ b/tests/virpcivpdtest.c @@ -0,0 +1,768 @@ +/* + * Copyright (C) 2021 Canonical Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>;. + */ + +#include <config.h> + +#include "internal.h" +#include "testutils.h" + +#define LIBVIRT_VIRPCIVPDPRIV_H_ALLOW + +#include "virpcivpdpriv.h" +#include "virlog.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +#ifdef __linux__ + +VIR_LOG_INIT("tests.vpdtest"); + + +typedef struct _TestPCIVPDKeywordValue { + const char *keyword; + const char *value; + char **actual; +} TestPCIVPDKeywordValue; + +static int +testPCIVPDResourceBasic(const void *data G_GNUC_UNUSED) +{ + size_t i = 0; + g_autoptr(virPCIVPDResourceRO) ro = virPCIVPDResourceRONew(); + g_autoptr(virPCIVPDResourceRW) rw = virPCIVPDResourceRWNew(); + const TestPCIVPDKeywordValue readOnlyCases[] = { + {.keyword = "EC", .value = "level1", .actual = &ro->change_level}, + {.keyword = "EC", .value = "level2", .actual = &ro->change_level}, + {.keyword = "change_level", .value = "level3", .actual = &ro->change_level}, + {.keyword = "PN", .value = "number1", .actual = &ro->part_number}, + {.keyword = "PN", .value = "number2", .actual = &ro->part_number}, + {.keyword = "part_number", .value = "number3", .actual = &ro->part_number}, + {.keyword = "MN", .value = "id1", .actual = &ro->manufacture_id}, + {.keyword = "MN", .value = "id2", .actual = &ro->manufacture_id}, + {.keyword = "manufacture_id", .value = "id3", &ro->manufacture_id}, + {.keyword = "SN", .value = "serial1", .actual = &ro->serial_number}, + {.keyword = "SN", .value = "serial2", .actual = &ro->serial_number}, + {.keyword = "serial_number", .value = "serial3", .actual = &ro->serial_number}, + }; + const TestPCIVPDKeywordValue readWriteCases[] = { + {.keyword = "YA", .value = "tag1", .actual = &ro->change_level}, + {.keyword = "YA", .value = "tag2", .actual = &ro->change_level}, + {.keyword = "asset_tag", .value = "tag3", .actual = &ro->change_level}, + }; + size_t numROCases = sizeof(readOnlyCases) / sizeof(TestPCIVPDKeywordValue); + size_t numRWCases = sizeof(readWriteCases) / sizeof(TestPCIVPDKeywordValue); + g_autoptr(virPCIVPDResource) res = g_new0(virPCIVPDResource, 1); + virPCIVPDResourceCustom *custom = NULL; + + g_autofree char *val = g_strdup("testval"); + res->name = g_steal_pointer(&val); + + /* RO has not been initialized - make sure updates fail. */ + for (i = 0; i < numROCases; ++i) { + if (virPCIVPDResourceUpdateKeyword(res, true, + readOnlyCases[i].keyword, + readOnlyCases[i].value)) { + return -1; + } + } + /* RW has not been initialized - make sure updates fail. */ + for (i = 0; i < numRWCases; ++i) { + if (virPCIVPDResourceUpdateKeyword(res, false, + readWriteCases[i].keyword, + readWriteCases[i].value)) { + return -1; + } + } + /* Initialize RO */ + res->ro = g_steal_pointer(&ro); + + /* Update keywords one by one and compare actual values with the expected ones. */ + for (i = 0; i < numROCases; ++i) { + if (!virPCIVPDResourceUpdateKeyword(res, true, + readOnlyCases[i].keyword, + readOnlyCases[i].value)) { + return -1; + } + if (STRNEQ(readOnlyCases[i].value, *readOnlyCases[i].actual)) { + return -1; + } + } + + /* Do a basic vendor field check. */ + if (!virPCIVPDResourceUpdateKeyword(res, true, "V0", "vendor0")) { + return -1; + } + if (res->ro->vendor_specific->len != 1) { + return -1; + } + custom = g_ptr_array_index(res->ro->vendor_specific, 0); + if (custom->idx != '0' || STRNEQ(custom->value, "vendor0")) { + return -1; + } + + /* Check that RW updates fail if RW has not been initialized. */ + if (virPCIVPDResourceUpdateKeyword(res, false, "YA", "tag1")) { + return -1; + } + if (virPCIVPDResourceUpdateKeyword(res, false, "asset_tag", "tag1")) { + return -1; + } + + /* Initialize RW */ + res->rw = g_steal_pointer(&rw); + if (!virPCIVPDResourceUpdateKeyword(res, false, "YA", "tag1") + || STRNEQ(res->rw->asset_tag, "tag1")) { + return -1; + } + if (!virPCIVPDResourceUpdateKeyword(res, false, "asset_tag", "tag2") + || STRNEQ(res->rw->asset_tag, "tag2")) { + return -1; + } + + /* Do a basic system field check. */ + if (!virPCIVPDResourceUpdateKeyword(res, false, "Y0", "system0")) { + return -1; + } + if (res->rw->system_specific->len != 1) { + return -1; + } + custom = g_ptr_array_index(res->rw->system_specific, 0); + if (custom->idx != '0' || STRNEQ(custom->value, "system0")) { + return -1; + } + + /* Just make sure the name has not been changed during keyword updates. */ + if (!STREQ_NULLABLE(res->name, "testval")) { + return -1; + } + return 0; +} + +static int +testPCIVPDResourceCustomCompareIndex(const void *data G_GNUC_UNUSED) +{ + g_autoptr(virPCIVPDResourceCustom) a = NULL, b = NULL; + + /* Both are NULL */ + if (!virPCIVPDResourceCustomCompareIndex(a, b)) { + return -1; + } + + /* a is not NULL */ + a = g_new0(virPCIVPDResourceCustom, 1); + if (virPCIVPDResourceCustomCompareIndex(a, b)) { + return -1; + } + + /* Reverse */ + if (virPCIVPDResourceCustomCompareIndex(b, a)) { + return -1; + } + + /* Same index, different strings */ + b = g_new0(virPCIVPDResourceCustom, 1); + a->idx = 'z'; + a->value = g_strdup("42"); + b->idx = 'z'; + b->value = g_strdup("24"); + if (!virPCIVPDResourceCustomCompareIndex(b, a)) { + return -1; + } + /* Different index, different strings */ + a->idx = 'a'; + if (virPCIVPDResourceCustomCompareIndex(b, a)) { + return -1; + } + + /* Same index, same strings */ + a->idx = 'z'; + a->value = g_strdup("42"); + b->idx = 'z'; + b->value = g_strdup("42"); + if (!virPCIVPDResourceCustomCompareIndex(b, a)) { + return -1; + } + /* Different index, same strings */ + a->idx = 'a'; + if (virPCIVPDResourceCustomCompareIndex(b, a)) { + return -1; + } + /* Different index, same value pointers */ + g_free(b->value); + b->value = a->value; + if (virPCIVPDResourceCustomCompareIndex(b, a)) { + return -1; + } + b->value = NULL; + + return 0; +} + +static int +testPCIVPDResourceCustomUpsertValue(const void *data G_GNUC_UNUSED) +{ + g_autoptr(GPtrArray) arr = g_ptr_array_new_full(0, (GDestroyNotify)virPCIVPDResourceCustomFree); + virPCIVPDResourceCustom *custom = NULL; + if (!virPCIVPDResourceCustomUpsertValue(arr, 'A', "testval")) { + return -1; + } + if (arr->len != 1) { + return -1; + } + custom = g_ptr_array_index(arr, 0); + if (custom == NULL || custom->idx != 'A' || STRNEQ_NULLABLE(custom->value, "testval")) { + return -1; + } + + /* Idempotency */ + if (!virPCIVPDResourceCustomUpsertValue(arr, 'A', "testval")) { + return -1; + } + if (arr->len != 1) { + return -1; + } + custom = g_ptr_array_index(arr, 0); + if (custom == NULL || custom->idx != 'A' || STRNEQ_NULLABLE(custom->value, "testval")) { + return -1; + } + + /* Existing value updates. */ + if (!virPCIVPDResourceCustomUpsertValue(arr, 'A', "testvalnew")) { + return -1; + } + if (arr->len != 1) { + return -1; + } + custom = g_ptr_array_index(arr, 0); + if (custom == NULL || custom->idx != 'A' || STRNEQ_NULLABLE(custom->value, "testvalnew")) { + return -1; + } + + /* Inserting multiple values */ + if (!virPCIVPDResourceCustomUpsertValue(arr, '1', "42")) { + return -1; + } + if (arr->len != 2) { + return -1; + } + custom = g_ptr_array_index(arr, 1); + if (custom == NULL || custom->idx != '1' || STRNEQ_NULLABLE(custom->value, "42")) { + return -1; + } + + return 0; +} + + +typedef struct _TestPCIVPDExpectedString { + const char *keyword; + bool expected; +} TestPCIVPDExpectedString; + +/* + * testPCIVPDIsValidTextValue: + * + * Test expected text value validation. Static metadata about possible values is taken + * from the PCI(e) standards and based on some real-world hardware examples. + * */ +static int +testPCIVPDIsValidTextValue(const void *data G_GNUC_UNUSED) +{ + size_t i = 0; + + const TestPCIVPDExpectedString textValueCases[] = { + /* Numbers */ + {"42", true}, + /* Alphanumeric */ + {"DCM1001008FC52101008FC53201008FC54301008FC5", true}, + /* Dots */ + {"DSV1028VPDR.VER1.0", true}, + /* Whitespace presence */ + {"NMVIntel Corp", true}, + /* Comma and spaces */ + {"BlueField-2 DPU 25GbE Dual-Port SFP56, Tall Bracket", true}, + /* Equal signs and colons. */ + {"MLX:MN=MLNX:CSKU=V2:UUID=V3:PCI=V0:MODL=BF2H332A", true}, + /* Dashes */ + {"MBF2H332A-AEEOT", true}, + {"under_score_example", true}, + {"", true}, + {";", true}, + {"\\42", false}, + {"/42", false}, + }; + for (i = 0; i < sizeof(textValueCases) / sizeof(textValueCases[0]); ++i) { + if (virPCIVPDResourceIsValidTextValue(textValueCases[i].keyword) != + textValueCases[i].expected) { + return -1; + } + } + return 0; +} + +/* + * testPCIVPDGetFieldValueFormat: + * + * A simple test to assess the functionality of the + * virPCIVPDResourceGetFieldValueFormat function. + * */ +static int +testPCIVPDGetFieldValueFormat(const void *data G_GNUC_UNUSED) +{ + typedef struct _TestPCIVPDExpectedFieldValueFormat { + const char *keyword; + virPCIVPDResourceFieldValueFormat expected; + } TestPCIVPDExpectedFieldValueFormat; + + size_t i = 0; + + const TestPCIVPDExpectedFieldValueFormat valueFormatCases[] = { + {"SN", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT}, + {"EC", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT}, + {"MN", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT}, + {"PN", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT}, + {"RV", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_RESVD}, + {"RW", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_RDWR}, + {"VA", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT}, + {"YA", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT}, + {"YZ", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_TEXT}, + {"CP", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_BINARY}, + /* Invalid keywords. */ + {"", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + {"sn", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + {"ec", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + {"mn", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + {"pn", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + {"4", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + {"42", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + {"Y", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + {"V", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + {"v", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + {"vA", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + {"va", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + {"ya", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + {"Ya", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + /* 2 bytes but not present in the spec. */ + {"EX", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + /* Many numeric bytes. */ + {"4242", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + /* Many letters. */ + {"EXAMPLE", VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_LAST}, + }; + for (i = 0; i < sizeof(valueFormatCases) / sizeof(valueFormatCases[0]); ++i) { + if (virPCIVPDResourceGetFieldValueFormat(valueFormatCases[i].keyword) != + valueFormatCases[i].expected) { + return -1; + } + } + return 0; +} + +# define VPD_STRING_RESOURCE_EXAMPLE_HEADER \ + PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_STRING_RESOURCE_FLAG, 0x08, 0x00 + +# define VPD_STRING_RESOURCE_EXAMPLE_DATA \ + 't', 'e', 's', 't', 'n', 'a', 'm', 'e' + +# define VPD_R_FIELDS_EXAMPLE_HEADER \ + PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_READ_ONLY_LARGE_RESOURCE_FLAG, 0x16, 0x00 + +# define VPD_R_EXAMPLE_VALID_RV_FIELD \ + 'R', 'V', 0x02, 0x31, 0x00 + +# define VPD_R_EXAMPLE_INVALID_RV_FIELD \ + 'R', 'V', 0x02, 0xFF, 0x00 + +# define VPD_R_EXAMPLE_FIELDS \ + 'P', 'N', 0x02, '4', '2', \ + 'E', 'C', 0x04, '4', '2', '4', '2', \ + 'V', 'A', 0x02, 'E', 'X' + +# define VPD_R_FIELDS_EXAMPLE_DATA \ + VPD_R_EXAMPLE_FIELDS, \ + VPD_R_EXAMPLE_VALID_RV_FIELD + +# define VPD_W_FIELDS_EXAMPLE_HEADER \ + PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_READ_WRITE_LARGE_RESOURCE_FLAG, 0x19, 0x00 + +# define VPD_W_EXAMPLE_FIELDS \ + 'V', 'Z', 0x02, '4', '2', \ + 'Y', 'A', 0x04, 'I', 'D', '4', '2', \ + 'Y', 'F', 0x02, 'E', 'X', \ + 'Y', 'E', 0x00, \ + 'R', 'W', 0x02, 0x00, 0x00 + +static int +testVirPCIVPDReadVPDBytes(const void *opaque G_GNUC_UNUSED) +{ + int fd = -1; + g_autofree uint8_t *buf = NULL; + uint8_t csum = 0; + size_t readBytes = 0; + size_t dataLen = 0; + + /* An example of a valid VPD record with one VPD-R resource and 2 fields. */ + uint8_t fullVPDExample[] = { + VPD_STRING_RESOURCE_EXAMPLE_HEADER, VPD_STRING_RESOURCE_EXAMPLE_DATA, + VPD_R_FIELDS_EXAMPLE_HEADER, VPD_R_FIELDS_EXAMPLE_DATA, + PCI_VPD_RESOURCE_END_VAL + }; + dataLen = sizeof(fullVPDExample) / sizeof(uint8_t) - 2; + buf = g_malloc0(dataLen); + + fd = virCreateAnonymousFile(fullVPDExample, dataLen); + + readBytes = virPCIVPDReadVPDBytes(fd, buf, dataLen, 0, &csum); + + if (readBytes != dataLen) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "The number of bytes read %zu is lower than expected %zu ", + readBytes, dataLen); + return -1; + } + + if (csum) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "The sum of all VPD bytes up to and including the checksum byte" + "is equal to zero: 0x%02x", csum); + return -1; + } + return 0; +} + +static int +testVirPCIVPDParseVPDStringResource(const void *opaque G_GNUC_UNUSED) +{ + int fd = -1; + uint8_t csum = 0; + size_t dataLen = 0; + bool result = false; + + g_autoptr(virPCIVPDResource) res = g_new0(virPCIVPDResource, 1); + const char *expectedValue = "testname"; + + const uint8_t stringResExample[] = { + VPD_STRING_RESOURCE_EXAMPLE_DATA + }; + + dataLen = sizeof(stringResExample) / sizeof(uint8_t); + fd = virCreateAnonymousFile(stringResExample, dataLen); + result = virPCIVPDParseVPDLargeResourceString(fd, 0, dataLen, &csum, res); + VIR_FORCE_CLOSE(fd); + + if (!result) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "Could not parse the example resource."); + return -1; + } + + if (STRNEQ(expectedValue, res->name)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "Unexpected string resource value: %s, expected: %s", + res->name, expectedValue); + return -1; + } + return 0; +} + +static int +testVirPCIVPDValidateExampleReadOnlyFields(virPCIVPDResource *res) +{ + const char *expectedName = "testname"; + virPCIVPDResourceCustom *custom = NULL; + if (STRNEQ(res->name, expectedName)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "Unexpected string resource value: %s, expected: %s", + res->name, expectedName); + return -1; + } + + if (!res->ro) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "Read-only keywords are missing from the VPD resource."); + return -1; + } + + if (STRNEQ_NULLABLE(res->ro->part_number, "42")) { + return -1; + } else if (STRNEQ_NULLABLE(res->ro->change_level, "4242")) { + return -1; + } + if (!res->ro->vendor_specific) { + return -1; + } + + custom = g_ptr_array_index(res->ro->vendor_specific, 0); + if (custom->idx != 'A' || STRNEQ_NULLABLE(custom->value, "EX")) { + return -1; + } + return 0; +} + +static int +testVirPCIVPDParseFullVPD(const void *opaque G_GNUC_UNUSED) +{ + int fd = -1; + size_t dataLen = 0; + int ret = 0; + + virPCIVPDResource *res = NULL; + virPCIVPDResourceCustom *custom = NULL; + + const uint8_t fullVPDExample[] = { + VPD_STRING_RESOURCE_EXAMPLE_HEADER, VPD_STRING_RESOURCE_EXAMPLE_DATA, + VPD_R_FIELDS_EXAMPLE_HEADER, VPD_R_FIELDS_EXAMPLE_DATA, + VPD_W_FIELDS_EXAMPLE_HEADER, VPD_W_EXAMPLE_FIELDS, + PCI_VPD_RESOURCE_END_VAL + }; + + dataLen = sizeof(fullVPDExample) / sizeof(uint8_t); + fd = virCreateAnonymousFile(fullVPDExample, dataLen); + res = virPCIVPDParse(fd); + VIR_FORCE_CLOSE(fd); + + if (!res) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "The resource pointer is NULL after parsing which is unexpected"); + return ret; + } + + if (!res->ro) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "Read-only keywords are missing from the VPD resource."); + return -1; + } else if (!res->rw) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "Read-write keywords are missing from the VPD resource."); + return -1; + } + + if (testVirPCIVPDValidateExampleReadOnlyFields(res)) { + return -1; + } + + if (STRNEQ_NULLABLE(res->rw->asset_tag, "ID42")) { + return -1; + } + + if (!res->rw->vendor_specific) { + return -1; + } + custom = g_ptr_array_index(res->rw->vendor_specific, 0); + if (custom->idx != 'Z' || STRNEQ_NULLABLE(custom->value, "42")) { + return -1; + } + + if (!res->rw->system_specific) { + return -1; + } + + custom = g_ptr_array_index(res->rw->system_specific, 0); + if (custom->idx != 'F' || STRNEQ_NULLABLE(custom->value, "EX")) { + return -1; + } + + custom = g_ptr_array_index(res->rw->system_specific, 1); + if (custom->idx != 'E' || STRNEQ_NULLABLE(custom->value, "")) { + return -1; + } + return ret; +} + +static int +testVirPCIVPDParseFullVPDSkipInvalidKeywords(const void *opaque G_GNUC_UNUSED) +{ + int fd = -1; + size_t dataLen = 0; + + virPCIVPDResource *res = NULL; + + const uint8_t fullVPDExample[] = { + VPD_STRING_RESOURCE_EXAMPLE_HEADER, + VPD_STRING_RESOURCE_EXAMPLE_DATA, + PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_READ_ONLY_LARGE_RESOURCE_FLAG, 0x25, 0x00, + VPD_R_EXAMPLE_FIELDS, + /* The keywords below (except for "RV") are invalid but will be skipped by the parser */ + 0x07, 'A', 0x02, 0x00, 0x00, + 'V', 0x07, 0x02, 0x00, 0x00, + 'e', 'x', 0x02, 0x00, 0x00, + 'R', 'V', 0x02, 0x9A, 0x00, + PCI_VPD_RESOURCE_END_VAL + }; + + dataLen = sizeof(fullVPDExample) / sizeof(uint8_t); + fd = virCreateAnonymousFile(fullVPDExample, dataLen); + res = virPCIVPDParse(fd); + VIR_FORCE_CLOSE(fd); + + if (!res) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "The resource pointer is NULL after parsing which is unexpected."); + return -1; + } + if (!res->ro) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "The RO portion of the VPD resource is NULL."); + return -1; + } + + if (testVirPCIVPDValidateExampleReadOnlyFields(res)) { + return -1; + } + return 0; +} + +static int +testVirPCIVPDParseFullVPDInvalid(const void *opaque G_GNUC_UNUSED) +{ + int fd = -1; + size_t dataLen = 0; + +# define VPD_INVALID_ZERO_BYTE \ + 0x00 + +# define VPD_INVALID_STRING_HEADER_DATA_LONG \ + PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_STRING_RESOURCE_FLAG, 0x04, 0x00, \ + VPD_STRING_RESOURCE_EXAMPLE_DATA, \ + PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_READ_ONLY_LARGE_RESOURCE_FLAG, 0x05, 0x00, \ + 'R', 'V', 0x02, 0xDA, 0x00, \ + PCI_VPD_RESOURCE_END_VAL + +# define VPD_INVALID_STRING_HEADER_DATA_SHORT \ + PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_STRING_RESOURCE_FLAG, 0x0A, 0x00, \ + VPD_STRING_RESOURCE_EXAMPLE_DATA, \ + PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_READ_ONLY_LARGE_RESOURCE_FLAG, 0x05, 0x00, \ + 'R', 'V', 0x02, 0xD4, 0x00, \ + PCI_VPD_RESOURCE_END_VAL + +# define VPD_NO_VPD_R \ + VPD_STRING_RESOURCE_EXAMPLE_HEADER, \ + VPD_STRING_RESOURCE_EXAMPLE_DATA, \ + PCI_VPD_RESOURCE_END_VAL + +# define VPD_R_NO_RV \ + VPD_STRING_RESOURCE_EXAMPLE_HEADER, \ + VPD_STRING_RESOURCE_EXAMPLE_DATA, \ + VPD_R_FIELDS_EXAMPLE_HEADER, \ + VPD_R_EXAMPLE_FIELDS, \ + PCI_VPD_RESOURCE_END_VAL + +# define VPD_R_INVALID_RV \ + VPD_STRING_RESOURCE_EXAMPLE_HEADER, \ + VPD_STRING_RESOURCE_EXAMPLE_DATA, \ + VPD_R_FIELDS_EXAMPLE_HEADER, \ + VPD_R_EXAMPLE_FIELDS, \ + VPD_R_EXAMPLE_INVALID_RV_FIELD, \ + PCI_VPD_RESOURCE_END_VAL + +# define VPD_R_INVALID_RV_ZERO_LENGTH \ + VPD_STRING_RESOURCE_EXAMPLE_HEADER, \ + VPD_STRING_RESOURCE_EXAMPLE_DATA, \ + PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_READ_ONLY_LARGE_RESOURCE_FLAG, 0x14, 0x00, \ + VPD_R_EXAMPLE_FIELDS, \ + 'R', 'V', 0x00, \ + PCI_VPD_RESOURCE_END_VAL + +/* The RW key is not expected in a VPD-R record. */ +# define VPD_R_UNEXPECTED_RW_IN_VPD_R_KEY \ + VPD_STRING_RESOURCE_EXAMPLE_HEADER, \ + VPD_STRING_RESOURCE_EXAMPLE_DATA, \ + PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_READ_ONLY_LARGE_RESOURCE_FLAG, 0x1B, 0x00, \ + VPD_R_EXAMPLE_FIELDS, \ + 'R', 'W', 0x02, 0x00, 0x00, \ + 'R', 'V', 0x02, 0x81, 0x00, \ + PCI_VPD_RESOURCE_END_VAL + +# define VPD_R_INVALID_FIELD_VALUE \ + VPD_STRING_RESOURCE_EXAMPLE_HEADER, \ + VPD_STRING_RESOURCE_EXAMPLE_DATA, \ + PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_READ_ONLY_LARGE_RESOURCE_FLAG, 0x0A, 0x00, \ + 'S', 'N', 0x02, 0x04, 0x02, \ + 'R', 'V', 0x02, 0x28, 0x00, \ + PCI_VPD_RESOURCE_END_VAL + +# define VPD_INVALID_STRING_RESOURCE_VALUE \ + VPD_STRING_RESOURCE_EXAMPLE_HEADER, \ + 't', 0x03, 's', 't', 'n', 'a', 'm', 'e', \ + PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_READ_ONLY_LARGE_RESOURCE_FLAG, 0x0A, 0x00, \ + 'S', 'N', 0x02, 0x04, 0x02, \ + 'R', 'V', 0x02, 0x8A, 0x00, \ + PCI_VPD_RESOURCE_END_VAL + +# define TEST_INVALID_VPD(invalidVPD) \ + do { \ + const uint8_t testCase[] = { invalidVPD }; \ + dataLen = sizeof(testCase) / sizeof(uint8_t); \ + fd = virCreateAnonymousFile(testCase, dataLen); \ + if (virPCIVPDParse(fd)) { \ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", \ + "Successfully parsed an invalid VPD - this is not expected"); \ + return -1; \ + } \ + VIR_FORCE_CLOSE(fd); \ + } while (0); + + TEST_INVALID_VPD(VPD_INVALID_ZERO_BYTE); + TEST_INVALID_VPD(VPD_INVALID_STRING_HEADER_DATA_SHORT); + TEST_INVALID_VPD(VPD_INVALID_STRING_HEADER_DATA_LONG); + TEST_INVALID_VPD(VPD_NO_VPD_R); + TEST_INVALID_VPD(VPD_R_NO_RV); + TEST_INVALID_VPD(VPD_R_INVALID_RV); + TEST_INVALID_VPD(VPD_R_INVALID_RV_ZERO_LENGTH); + TEST_INVALID_VPD(VPD_R_UNEXPECTED_RW_IN_VPD_R_KEY); + TEST_INVALID_VPD(VPD_R_INVALID_FIELD_VALUE); + TEST_INVALID_VPD(VPD_INVALID_STRING_RESOURCE_VALUE); + + return 0; +} + +static int +mymain(void) +{ + int ret = 0; + + if (virTestRun("Basic functionality of virPCIVPDResource ", testPCIVPDResourceBasic, NULL) < 0) + ret = -1; + if (virTestRun("Custom field index comparison", + testPCIVPDResourceCustomCompareIndex, NULL) < 0) + ret = -1; + if (virTestRun("Custom field value insertion and updates ", + testPCIVPDResourceCustomUpsertValue, NULL) < 0) + ret = -1; + if (virTestRun("Valid text values ", testPCIVPDIsValidTextValue, NULL) < 0) + ret = -1; + if (virTestRun("Determining a field value format by a key ", + testPCIVPDGetFieldValueFormat, NULL) < 0) + ret = -1; + if (virTestRun("Reading VPD bytes ", testVirPCIVPDReadVPDBytes, NULL) < 0) + ret = -1; + if (virTestRun("Parsing VPD string resources ", testVirPCIVPDParseVPDStringResource, NULL) < 0) + ret = -1; + if (virTestRun("Parsing a VPD resource with an invalid keyword ", + testVirPCIVPDParseFullVPDSkipInvalidKeywords, NULL) < 0) + ret = -1; + if (virTestRun("Parsing VPD resources from a full VPD ", testVirPCIVPDParseFullVPD, NULL) < 0) + ret = -1; + if (virTestRun("Parsing invalid VPD records ", testVirPCIVPDParseFullVPDInvalid, NULL) < 0) + ret = -1; + + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIR_TEST_MAIN(mymain) +#endif -- 2.30.2

* XML serialization and deserialization of PCI VPD; * PCI VPD capability flags added and used in relevant places; * XML to XML tests for the added capability. Signed-off-by: Dmitrii Shcherbakov <dmitrii.shcherbakov(a)canonical.com&gt; --- docs/schemas/nodedev.rng | 96 ++++++ include/libvirt/libvirt-nodedev.h | 1 + src/conf/node_device_conf.c | 293 ++++++++++++++++++ src/conf/node_device_conf.h | 7 +- src/conf/virnodedeviceobj.c | 7 +- src/node_device/node_device_driver.c | 2 + src/node_device/node_device_udev.c | 2 + .../pci_0000_42_00_0_vpd.xml | 42 +++ .../pci_0000_42_00_0_vpd.xml | 1 + tests/nodedevxml2xmltest.c | 1 + tools/virsh-nodedev.c | 3 + 11 files changed, 453 insertions(+), 2 deletions(-) create mode 100644 tests/nodedevschemadata/pci_0000_42_00_0_vpd.xml create mode 120000 tests/nodedevxml2xmlout/pci_0000_42_00_0_vpd.xml diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng index e089e66858..e4733f0804 100644 --- a/docs/schemas/nodedev.rng +++ b/docs/schemas/nodedev.rng @@ -223,6 +223,10 @@ <ref name="mdev_types"/> </optional> + <optional> + <ref name="vpd"/> + </optional> + <optional> <element name="iommuGroup"> <attribute name="number"> @@ -770,6 +774,80 @@ </element> </define> + <define name="vpd"> + <element name="capability"> + <attribute name="type"> + <value>vpd</value> + </attribute> + <element name="name"> + <ref name="vpdFieldValueFormat"/> + </element> + <optional> + <element name="fields"> + <attribute name="access"> + <value>readonly</value> + </attribute> + <optional> + <element name="change_level"> + <ref name="vpdFieldValueFormat"/> + </element> + </optional> + <optional> + <element name="manufacture_id"> + <ref name="vpdFieldValueFormat"/> + </element> + </optional> + <optional> + <element name="part_number"> + <ref name="vpdFieldValueFormat"/> + </element> + </optional> + <optional> + <element name="serial_number"> + <ref name="vpdFieldValueFormat"/> + </element> + </optional> + <zeroOrMore> + <element name="vendor_field"> + <attribute name="index"> + <ref name="vendorVPDFieldIndex"/> + </attribute> + <ref name="vpdFieldValueFormat"/> + </element> + </zeroOrMore> + </element> + </optional> + <optional> + <element name="fields"> + <attribute name="access"> + <value>readwrite</value> + </attribute> + <optional> + <element name="asset_tag"> + <ref name="vpdFieldValueFormat"/> + </element> + </optional> + <zeroOrMore> + <element name="vendor_field"> + <attribute name="index"> + <ref name="vendorVPDFieldIndex"/> + </attribute> + <ref name="vpdFieldValueFormat"/> + </element> + </zeroOrMore> + <zeroOrMore> + <element name="system_field"> + <attribute name="index"> + <ref name="systemVPDFieldIndex"/> + </attribute> + <ref name="vpdFieldValueFormat"/> + </element> + </zeroOrMore> + </element> + </optional> + </element> + </define> + <define name="apDomainRange"> <choice> <data type="string"> @@ -782,4 +860,22 @@ </choice> </define> + <define name="vpdFieldValueFormat"> + <data type="string"> + <param name="pattern">[0-9a-zA-F -_,.:;=]{0,255}</param> + </data> + </define> + + <define name="vendorVPDFieldIndex"> + <data type="string"> + <param name="pattern">[0-9A-Z]{1}</param> + </data> + </define> + + <define name="systemVPDFieldIndex"> + <data type="string"> + <param name="pattern">[0-9B-Z]{1}</param> + </data> + </define> + </grammar> diff --git a/include/libvirt/libvirt-nodedev.h b/include/libvirt/libvirt-nodedev.h index e492634217..245365b07f 100644 --- a/include/libvirt/libvirt-nodedev.h +++ b/include/libvirt/libvirt-nodedev.h @@ -84,6 +84,7 @@ typedef enum { VIR_CONNECT_LIST_NODE_DEVICES_CAP_AP_CARD = 1 << 18, /* s390 AP Card device */ VIR_CONNECT_LIST_NODE_DEVICES_CAP_AP_QUEUE = 1 << 19, /* s390 AP Queue */ VIR_CONNECT_LIST_NODE_DEVICES_CAP_AP_MATRIX = 1 << 20, /* s390 AP Matrix */ + VIR_CONNECT_LIST_NODE_DEVICES_CAP_VPD = 1 << 21, /* Device with VPD */ /* filter the devices by active state */ VIR_CONNECT_LIST_NODE_DEVICES_INACTIVE = 1 << 30, /* Inactive devices */ diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 9bbff97ffd..8ff756b666 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -36,6 +36,7 @@ #include "virrandom.h" #include "virlog.h" #include "virfcp.h" +#include "virpcivpd.h" #define VIR_FROM_THIS VIR_FROM_NODEDEV @@ -70,6 +71,7 @@ VIR_ENUM_IMPL(virNodeDevCap, "ap_card", "ap_queue", "ap_matrix", + "vpd", ); VIR_ENUM_IMPL(virNodeDevNetCap, @@ -240,6 +242,80 @@ virNodeDeviceCapMdevTypesFormat(virBuffer *buf, } } +static void +virNodeDeviceCapVPDFormatCustomVendorField(virPCIVPDResourceCustom *field, virBuffer *buf) +{ + if (field == NULL || field->value == NULL) { + return; + } + virBufferAsprintf(buf, "<vendor_field index='%c'>%s</vendor_field>\n", field->idx, + field->value); +} + +static void +virNodeDeviceCapVPDFormatCustomSystemField(virPCIVPDResourceCustom *field, virBuffer *buf) +{ + if (field == NULL || field->value == NULL) { + return; + } + virBufferAsprintf(buf, "<system_field index='%c'>%s</system_field>\n", field->idx, + field->value); +} + +static inline void +virNodeDeviceCapVPDFormatRegularField(virBuffer *buf, const char *keyword, const char *value) +{ + if (keyword == NULL || value == NULL) { + return; + } + virBufferAsprintf(buf, "<%s>%s</%s>\n", keyword, value, keyword); +} + +static void +virNodeDeviceCapVPDFormat(virBuffer *buf, virPCIVPDResource *res) +{ + if (res == NULL) { + return; + } + + virBufferAddLit(buf, "<capability type='vpd'>\n"); + virBufferAdjustIndent(buf, 2); + if (res->name != NULL) { + virBufferEscapeString(buf, "<name>%s</name>\n", res->name); + } + + if (res->ro != NULL) { + virBufferEscapeString(buf, "<fields access='%s'>\n", "readonly"); + + virBufferAdjustIndent(buf, 2); + virNodeDeviceCapVPDFormatRegularField(buf, "change_level", res->ro->change_level); + virNodeDeviceCapVPDFormatRegularField(buf, "manufacture_id", res->ro->manufacture_id); + virNodeDeviceCapVPDFormatRegularField(buf, "part_number", res->ro->part_number); + virNodeDeviceCapVPDFormatRegularField(buf, "serial_number", res->ro->serial_number); + g_ptr_array_foreach(res->ro->vendor_specific, + (GFunc)virNodeDeviceCapVPDFormatCustomVendorField, buf); + virBufferAdjustIndent(buf, -2); + + virBufferAddLit(buf, "</fields>\n"); + } + + if (res->rw != NULL) { + virBufferEscapeString(buf, "<fields access='%s'>\n", "readwrite"); + + virBufferAdjustIndent(buf, 2); + virNodeDeviceCapVPDFormatRegularField(buf, "asset_tag", res->rw->asset_tag); + g_ptr_array_foreach(res->rw->vendor_specific, + (GFunc)virNodeDeviceCapVPDFormatCustomVendorField, buf); + g_ptr_array_foreach(res->rw->system_specific, + (GFunc)virNodeDeviceCapVPDFormatCustomSystemField, buf); + virBufferAdjustIndent(buf, -2); + + virBufferAddLit(buf, "</fields>\n"); + } + + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "</capability>\n"); +} static void virNodeDeviceCapPCIDefFormat(virBuffer *buf, @@ -315,6 +391,9 @@ virNodeDeviceCapPCIDefFormat(virBuffer *buf, data->pci_dev.mdev_types, data->pci_dev.nmdev_types); } + if (data->pci_dev.flags & VIR_NODE_DEV_CAP_FLAG_PCI_VPD) { + virNodeDeviceCapVPDFormat(buf, data->pci_dev.vpd); + } if (data->pci_dev.nIommuGroupDevices) { virBufferAsprintf(buf, "<iommuGroup number='%d'>\n", data->pci_dev.iommuGroupNumber); @@ -673,6 +752,7 @@ virNodeDeviceDefFormat(const virNodeDeviceDef *def) case VIR_NODE_DEV_CAP_MDEV_TYPES: case VIR_NODE_DEV_CAP_FC_HOST: case VIR_NODE_DEV_CAP_VPORTS: + case VIR_NODE_DEV_CAP_VPD: case VIR_NODE_DEV_CAP_LAST: break; } @@ -859,6 +939,165 @@ virNodeDevCapMdevTypesParseXML(xmlXPathContextPtr ctxt, return ret; } +static int +virNodeDeviceCapVPDParseCustomFields(xmlXPathContextPtr ctxt, virPCIVPDResource *res, bool readOnly) +{ + int nfields = -1; + g_autofree char *index = NULL; + g_autofree char* value = NULL; + g_autofree xmlNodePtr *nodes = NULL; + xmlNodePtr orignode = NULL; + size_t i = 0; + + orignode = ctxt->node; + if ((nfields = virXPathNodeSet("./vendor_field[@index]", ctxt, &nodes)) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("failed to evaluate <vendor_field> elements")); + ctxt->node = orignode; + return -1; + } + for (i = 0; i < nfields; i++) { + ctxt->node = nodes[i]; + if (!(index = virXPathStringLimit("string(./@index[1])", 2, ctxt))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("<vendor_field> evaluation has failed")); + continue; + } + if (!(value = virXPathString("string(./text())", ctxt))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("<vendor_field> value evaluation has failed")); + continue; + } + virPCIVPDResourceUpdateKeyword(res, readOnly, g_strdup_printf("V%c", index[0]), value); + } + ctxt->node = orignode; + + if (!readOnly) { + if ((nfields = virXPathNodeSet("./system_field[@index]", ctxt, &nodes)) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("failed to evaluate <system_field> elements")); + ctxt->node = orignode; + return -1; + } + for (i = 0; i < nfields; i++) { + ctxt->node = nodes[i]; + if (!(index = virXPathStringLimit("string(./@index[1])", 2, ctxt))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("<system_field> evaluation has failed")); + continue; + } + if (!(value = virXPathString("string(./text())", ctxt))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("<system_field> value evaluation has failed")); + continue; + } + virPCIVPDResourceUpdateKeyword(res, readOnly, g_strdup_printf("Y%c", index[0]), value); + } + ctxt->node = orignode; + } + + return 0; +} + +static int +virNodeDeviceCapVPDParseReadOnlyFields(xmlXPathContextPtr ctxt, virPCIVPDResource *res) +{ + const char *keywords[] = {"change_level", "manufacture_id", + "serial_number", "part_number", NULL}; + g_autofree char *expression = NULL; + size_t i = 0; + + if (res == NULL) { + return -1; + } + res->ro = virPCIVPDResourceRONew(); + + while (keywords[i]) { + expression = g_strdup_printf("string(./%s)", keywords[i]); + virPCIVPDResourceUpdateKeyword(res, true, keywords[i], virXPathString(expression, ctxt)); + g_free(g_steal_pointer(&expression)); + ++i; + } + if (virNodeDeviceCapVPDParseCustomFields(ctxt, res, true) < 0) { + return -1; + } + return 0; +} + +static int +virNodeDeviceCapVPDParseReadWriteFields(xmlXPathContextPtr ctxt, virPCIVPDResource *res) +{ + res->rw = virPCIVPDResourceRWNew(); + virPCIVPDResourceUpdateKeyword(res, false, "asset_tag", virXPathString("string(./asset_tag)", ctxt)); + if (virNodeDeviceCapVPDParseCustomFields(ctxt, res, false) < 0) { + return -1; + } + return 0; +} + +static int +virNodeDeviceCapVPDParseXML(xmlXPathContextPtr ctxt, virPCIVPDResource **res) +{ + xmlNodePtr orignode = NULL; + g_autofree xmlNodePtr *nodes = NULL; + int nfields = -1; + g_autofree char *access = NULL; + size_t i = 0; + g_autoptr(virPCIVPDResource) newres = g_new0(virPCIVPDResource, 1); + + if (res == NULL) { + return -1; + } + + orignode = ctxt->node; + + if (!(newres->name = virXPathString("string(./name)", ctxt))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Could not read a device name from the <name> element")); + ctxt->node = orignode; + return -1; + } + + if ((nfields = virXPathNodeSet("./fields[@access]", ctxt, &nodes)) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("no VPD <fields> elements with an access type attribute found")); + ctxt->node = orignode; + return -1; + } + + for (i = 0; i < nfields; i++) { + ctxt->node = nodes[i]; + if (!(access = virXPathString("string(./@access[1])", ctxt))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("VPD fields access type parsing has failed")); + ctxt->node = orignode; + return -1; + } + + if (STREQ(access, "readonly")) { + if (virNodeDeviceCapVPDParseReadOnlyFields(ctxt, newres) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Could not parse %s VPD resource fields"), access); + } + } else if (STREQ(access, "readwrite")) { + if (virNodeDeviceCapVPDParseReadWriteFields(ctxt, newres) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Could not parse %s VPD resource fields"), access); + } + } else { + virReportError(VIR_ERR_XML_ERROR, _("Unsupported VPD field access type specified %s"), + access); + } + } + ctxt->node = orignode; + + /* Replace the existing VPD representation if there is one already. */ + if (*res != NULL) { + virPCIVPDResourceFree(*res); + } + *res = g_steal_pointer(&newres); + return 0; +} static int virNodeDevAPMatrixCapabilityParseXML(xmlXPathContextPtr ctxt, @@ -1718,6 +1957,11 @@ virNodeDevPCICapabilityParseXML(xmlXPathContextPtr ctxt, &pci_dev->nmdev_types) < 0) return -1; pci_dev->flags |= VIR_NODE_DEV_CAP_FLAG_PCI_MDEV; + } else if (STREQ(type, "vpd")) { + if (virNodeDeviceCapVPDParseXML(ctxt, &pci_dev->vpd) < 0) { + return -1; + } + pci_dev->flags |= VIR_NODE_DEV_CAP_FLAG_PCI_VPD; } else { int hdrType = virPCIHeaderTypeFromString(type); @@ -2024,6 +2268,7 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt, case VIR_NODE_DEV_CAP_VPORTS: case VIR_NODE_DEV_CAP_SCSI_GENERIC: case VIR_NODE_DEV_CAP_VDPA: + case VIR_NODE_DEV_CAP_VPD: case VIR_NODE_DEV_CAP_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown capability type '%d' for '%s'"), @@ -2287,6 +2532,7 @@ virNodeDevCapsDefFree(virNodeDevCapsDef *caps) for (i = 0; i < data->pci_dev.nmdev_types; i++) virMediatedDeviceTypeFree(data->pci_dev.mdev_types[i]); g_free(data->pci_dev.mdev_types); + virPCIVPDResourceFree(g_steal_pointer(&data->pci_dev.vpd)); break; case VIR_NODE_DEV_CAP_USB_DEV: g_free(data->usb_dev.product_name); @@ -2352,6 +2598,7 @@ virNodeDevCapsDefFree(virNodeDevCapsDef *caps) case VIR_NODE_DEV_CAP_VDPA: case VIR_NODE_DEV_CAP_AP_CARD: case VIR_NODE_DEV_CAP_AP_QUEUE: + case VIR_NODE_DEV_CAP_VPD: case VIR_NODE_DEV_CAP_LAST: /* This case is here to shutup the compiler */ break; @@ -2418,6 +2665,7 @@ virNodeDeviceUpdateCaps(virNodeDeviceDef *def) case VIR_NODE_DEV_CAP_VDPA: case VIR_NODE_DEV_CAP_AP_CARD: case VIR_NODE_DEV_CAP_AP_QUEUE: + case VIR_NODE_DEV_CAP_VPD: case VIR_NODE_DEV_CAP_LAST: break; } @@ -2489,6 +2737,10 @@ virNodeDeviceCapsListExport(virNodeDeviceDef *def, MAYBE_ADD_CAP(VIR_NODE_DEV_CAP_MDEV_TYPES); ncaps++; } + if (flags & VIR_NODE_DEV_CAP_FLAG_PCI_VPD) { + MAYBE_ADD_CAP(VIR_NODE_DEV_CAP_VPD); + ncaps++; + } } if (caps->data.type == VIR_NODE_DEV_CAP_CSS_DEV) { @@ -2749,6 +3001,44 @@ virNodeDeviceGetMdevTypesCaps(const char *sysfspath, } +/** + * virNodeDeviceGetPCIVPDDynamicCap: + * @devCapPCIDev: a virNodeDevCapPCIDev for which to add VPD resources. + * + * While VPD has a read-only portion, there may be a read-write portion per + * the specs which may change dynamically. + * + * Returns: 0 if the operation was successful (even if VPD is not present for + * that device since it is optional in the specs, -1 otherwise. + */ +static int +virNodeDeviceGetPCIVPDDynamicCap(virNodeDevCapPCIDev *devCapPCIDev) +{ + g_autoptr(virPCIDevice) pciDev = NULL; + virPCIDeviceAddress devAddr; + g_autoptr(virPCIVPDResource) res = NULL; + + devAddr.domain = devCapPCIDev->domain; + devAddr.bus = devCapPCIDev->bus; + devAddr.slot = devCapPCIDev->slot; + devAddr.function = devCapPCIDev->function; + + if (!(pciDev = virPCIDeviceNew(&devAddr))) + return -1; + + if (virPCIDeviceHasVPD(pciDev)) { + /* VPD is optional in PCI(e) specs. If it is there, attempt to add it. */ + if ((res = virPCIDeviceGetVPD(pciDev))) { + devCapPCIDev->flags |= VIR_NODE_DEV_CAP_FLAG_PCI_VPD; + devCapPCIDev->vpd = g_steal_pointer(&res); + } else { + virPCIVPDResourceFree(g_steal_pointer(&devCapPCIDev->vpd)); + } + } + return 0; +} + + /* virNodeDeviceGetPCIDynamicCaps() get info that is stored in sysfs * about devices related to this device, i.e. things that can change * without this device itself changing. These must be refreshed @@ -2771,6 +3061,9 @@ virNodeDeviceGetPCIDynamicCaps(const char *sysfsPath, if (pci_dev->nmdev_types > 0) pci_dev->flags |= VIR_NODE_DEV_CAP_FLAG_PCI_MDEV; + if (virNodeDeviceGetPCIVPDDynamicCap(pci_dev) < 0) + return -1; + return 0; } diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index 5a4d9c7a55..e4d1f67d53 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -24,6 +24,7 @@ #include "internal.h" #include "virbitmap.h" +#include "virpcivpd.h" #include "virscsihost.h" #include "virpci.h" #include "virvhba.h" @@ -69,6 +70,7 @@ typedef enum { VIR_NODE_DEV_CAP_AP_CARD, /* s390 AP Card device */ VIR_NODE_DEV_CAP_AP_QUEUE, /* s390 AP Queue */ VIR_NODE_DEV_CAP_AP_MATRIX, /* s390 AP Matrix device */ + VIR_NODE_DEV_CAP_VPD, /* Device provides VPD */ VIR_NODE_DEV_CAP_LAST } virNodeDevCapType; @@ -103,6 +105,7 @@ typedef enum { VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION = (1 << 1), VIR_NODE_DEV_CAP_FLAG_PCIE = (1 << 2), VIR_NODE_DEV_CAP_FLAG_PCI_MDEV = (1 << 3), + VIR_NODE_DEV_CAP_FLAG_PCI_VPD = (1 << 4), } virNodeDevPCICapFlags; typedef enum { @@ -181,6 +184,7 @@ struct _virNodeDevCapPCIDev { int hdrType; /* enum virPCIHeaderType or -1 */ virMediatedDeviceType **mdev_types; size_t nmdev_types; + virPCIVPDResource *vpd; }; typedef struct _virNodeDevCapUSBDev virNodeDevCapUSBDev; @@ -418,7 +422,8 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNodeDevCapsDef, virNodeDevCapsDefFree); VIR_CONNECT_LIST_NODE_DEVICES_CAP_VDPA | \ VIR_CONNECT_LIST_NODE_DEVICES_CAP_AP_CARD | \ VIR_CONNECT_LIST_NODE_DEVICES_CAP_AP_QUEUE | \ - VIR_CONNECT_LIST_NODE_DEVICES_CAP_AP_MATRIX) + VIR_CONNECT_LIST_NODE_DEVICES_CAP_AP_MATRIX | \ + VIR_CONNECT_LIST_NODE_DEVICES_CAP_VPD) #define VIR_CONNECT_LIST_NODE_DEVICES_FILTERS_ACTIVE \ VIR_CONNECT_LIST_NODE_DEVICES_ACTIVE | \ diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 9a9841576a..165ec1f1dd 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -701,6 +701,9 @@ virNodeDeviceObjHasCap(const virNodeDeviceObj *obj, if (type == VIR_NODE_DEV_CAP_MDEV_TYPES && (cap->data.pci_dev.flags & VIR_NODE_DEV_CAP_FLAG_PCI_MDEV)) return true; + if (type == VIR_NODE_DEV_CAP_VPD && + (cap->data.pci_dev.flags & VIR_NODE_DEV_CAP_FLAG_PCI_VPD)) + return true; break; case VIR_NODE_DEV_CAP_SCSI_HOST: @@ -742,6 +745,7 @@ virNodeDeviceObjHasCap(const virNodeDeviceObj *obj, case VIR_NODE_DEV_CAP_VDPA: case VIR_NODE_DEV_CAP_AP_CARD: case VIR_NODE_DEV_CAP_AP_QUEUE: + case VIR_NODE_DEV_CAP_VPD: case VIR_NODE_DEV_CAP_LAST: break; } @@ -899,7 +903,8 @@ virNodeDeviceObjMatch(virNodeDeviceObj *obj, MATCH_CAP(VDPA) || MATCH_CAP(AP_CARD) || MATCH_CAP(AP_QUEUE) || - MATCH_CAP(AP_MATRIX))) + MATCH_CAP(AP_MATRIX) || + MATCH_CAP(VPD))) return false; } diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 3bc6eb1c11..d19ed7d948 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -708,6 +708,7 @@ nodeDeviceObjFormatAddress(virNodeDeviceObj *obj) case VIR_NODE_DEV_CAP_VDPA: case VIR_NODE_DEV_CAP_AP_CARD: case VIR_NODE_DEV_CAP_AP_QUEUE: + case VIR_NODE_DEV_CAP_VPD: case VIR_NODE_DEV_CAP_LAST: break; } @@ -1983,6 +1984,7 @@ int nodeDeviceDefValidate(virNodeDeviceDef *def, case VIR_NODE_DEV_CAP_AP_CARD: case VIR_NODE_DEV_CAP_AP_QUEUE: case VIR_NODE_DEV_CAP_AP_MATRIX: + case VIR_NODE_DEV_CAP_VPD: case VIR_NODE_DEV_CAP_LAST: break; } diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 71f0bef827..7c3bb762b3 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -42,6 +42,7 @@ #include "virnetdev.h" #include "virmdev.h" #include "virutil.h" +#include "virpcivpd.h" #include "configmake.h" @@ -1397,6 +1398,7 @@ udevGetDeviceDetails(struct udev_device *device, case VIR_NODE_DEV_CAP_AP_MATRIX: return udevProcessAPMatrix(device, def); case VIR_NODE_DEV_CAP_MDEV_TYPES: + case VIR_NODE_DEV_CAP_VPD: case VIR_NODE_DEV_CAP_SYSTEM: case VIR_NODE_DEV_CAP_FC_HOST: case VIR_NODE_DEV_CAP_VPORTS: diff --git a/tests/nodedevschemadata/pci_0000_42_00_0_vpd.xml b/tests/nodedevschemadata/pci_0000_42_00_0_vpd.xml new file mode 100644 index 0000000000..8b56e4f6b4 --- /dev/null +++ b/tests/nodedevschemadata/pci_0000_42_00_0_vpd.xml @@ -0,0 +1,42 @@ +<device> + <name>pci_0000_42_00_0</name> + <capability type='pci'> + <class>0x020000</class> + <domain>0</domain> + <bus>66</bus> + <slot>0</slot> + <function>0</function> + <product id='0xa2d6'>MT42822 BlueField-2 integrated ConnectX-6 Dx network controller</product> + <vendor id='0x15b3'>Mellanox Technologies</vendor> + <capability type='virt_functions' maxCount='16'/> + <capability type='vpd'> + <name>BlueField-2 DPU 25GbE Dual-Port SFP56, Crypto Enabled, 16GB on-board DDR, 1GbE OOB management, Tall Bracket</name> + <fields access='readonly'> + <change_level>B1</change_level> + <manufacture_id>foobar</manufacture_id> + <part_number>MBF2H332A-AEEOT</part_number> + <serial_number>MT2113X00000</serial_number> + <vendor_field index='0'>PCIeGen4 x8</vendor_field> + <vendor_field index='2'>MBF2H332A-AEEOT</vendor_field> + <vendor_field index='3'>3c53d07eec484d8aab34dabd24fe575aa</vendor_field> + <vendor_field index='A'>MLX:MN=MLNX:CSKU=V2:UUID=V3:PCI=V0:MODL=BF2H332A</vendor_field> + </fields> + <fields access='readwrite'> + <asset_tag>fooasset</asset_tag> + <vendor_field index='0'>vendorfield0</vendor_field> + <vendor_field index='2'>vendorfield2</vendor_field> + <vendor_field index='A'>vendorfieldA</vendor_field> + <system_field index='B'>systemfieldB</system_field> + <system_field index='0'>systemfield0</system_field> + </fields> + </capability> + <iommuGroup number='65'> + <address domain='0x0000' bus='0x42' slot='0x00' function='0x0'/> + </iommuGroup> + <numa node='0'/> + <pci-express> + <link validity='cap' port='0' speed='16' width='8'/> + <link validity='sta' speed='8' width='8'/> + </pci-express> + </capability> +</device> diff --git a/tests/nodedevxml2xmlout/pci_0000_42_00_0_vpd.xml b/tests/nodedevxml2xmlout/pci_0000_42_00_0_vpd.xml new file mode 120000 index 0000000000..a0b5372ca0 --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_0000_42_00_0_vpd.xml @@ -0,0 +1 @@ +../nodedevschemadata/pci_0000_42_00_0_vpd.xml \ No newline at end of file diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index 9e32e7d553..557347fb07 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -121,6 +121,7 @@ mymain(void) DO_TEST("pci_0000_02_10_7_sriov_pf_vfs_all_header_type"); DO_TEST("drm_renderD129"); DO_TEST("pci_0000_02_10_7_mdev_types"); + DO_TEST("pci_0000_42_00_0_vpd"); DO_TEST("mdev_3627463d_b7f0_4fea_b468_f1da537d301b"); DO_TEST("ccw_0_0_ffff"); DO_TEST("css_0_0_ffff"); diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index c989a77ad2..1ad8db7a3f 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -472,6 +472,9 @@ cmdNodeListDevices(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) case VIR_NODE_DEV_CAP_MDEV: flags |= VIR_CONNECT_LIST_NODE_DEVICES_CAP_MDEV; break; + case VIR_NODE_DEV_CAP_VPD: + flags |= VIR_CONNECT_LIST_NODE_DEVICES_CAP_VPD; + break; case VIR_NODE_DEV_CAP_CCW_DEV: flags |= VIR_CONNECT_LIST_NODE_DEVICES_CAP_CCW_DEV; break; -- 2.30.2

Signed-off-by: Dmitrii Shcherbakov <dmitrii.shcherbakov(a)canonical.com&gt; --- NEWS.rst | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index ae678bffc4..7d4244e938 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -40,6 +40,28 @@ v7.9.0 (unreleased) domain definition when the guest was first started).This setting is only applicable for x86 guests using qemu driver. + * virpcivpd: Add a PCI VPD parser + + A parser for the standard PCI/PCIe VPD ("I.3. VPD Definitions" in PCI 2.2+ + and an equivalent definition in "6.28.1 VPD Format" PCIe 4.0) was added + along with relevant types to represent PCI VPD in memory. This + functionality got added for Linux only at this point (kernels above + v2.6.26 have support for exposing VPD via sysfs). + + * virpci: Add PCI VPD-related helper functions to virpci + + In order to utilize the PCI VPD parser, a couple of helper functions got + introduced to check for the presence of a VPD file in the sysfs tree and + to invoke the PCI VPD parser to get a list of resources representing PCI + VPD contents in memory. + + * nodedev: Add PCI VPD capability support + + Support for serializing and deserializing PCI VPD data structures is added + following the addition of the PCI VPD parser. A new PCI device capability + called "vpd" is introduced holding string resources and keyword resources + found in PCI VPD. + * **Improvements** * **Bug fixes** -- 2.30.2