wdc: use libnvme's nvme_uuid_find() for UUID lookup

Replace the internal implementation for finding specific UUIDs
with the `nvme_uuid_find()` function provided by libnvme.

This change simplifies the code and improves maintainability
by leveraging a well-tested utility function from the library.
While the internal implementation might have offered slightly
better performance as we looped only once,
the clarity and reduced code duplication are preferred.

Signed-off-by: Tomas Winkler <[email protected]>

Author: tomas-winkler-sndk

plugins/wdc/wdc-nvme.c

@@ -524,24 +524,16 @@ enum NVME_FEATURE_IDENTIFIERS {
 };
 
 /*  WDC UUID value */
-const uint8_t WDC_UUID[] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x2d, 0xb9, 0x8c, 0x52, 0x0c, 0x4c,
-	0x5a, 0x15, 0xab, 0xe6, 0x33, 0x29, 0x9a, 0x70, 0xdf, 0xd0
+static const __u8 WDC_UUID[NVME_UUID_LEN] = {
+	0x2d, 0xb9, 0x8c, 0x52, 0x0c, 0x4c, 0x5a, 0x15,
+	0xab, 0xe6, 0x33, 0x29, 0x9a, 0x70, 0xdf, 0xd0
 };
 
-/* WDC_UUID value for SN640_3 devices */
-const uint8_t WDC_UUID_SN640_3[] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
-	0x11, 0x11, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22
-};
 
-/* UUID field with value of 0 indicates end of UUID List*/
-const uint8_t UUID_END[] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+/* WDC_UUID value for SN640_3 devices */
+static const __u8 WDC_UUID_SN640_3[NVME_UUID_LEN] = {
+	0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
+	0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22
 };
 
 enum WDC_DRIVE_ESSENTIAL_TYPE {
@@ -1585,7 +1577,6 @@ static bool wdc_is_zn350(__u32 device_id)
 	return (device_id == WDC_NVME_ZN350_DEV_ID ||
 		device_id == WDC_NVME_ZN350_DEV_ID_1);
 }
-
 static bool needs_c2_log_page_check(__u32 device_id)
 {
 	if ((wdc_is_sn640(device_id)) ||
@@ -2663,8 +2654,7 @@ static bool get_dev_mgment_data(nvme_root_t r, struct nvme_dev *dev,
 	bool found = false;
 	*data = NULL;
 	__u32 device_id = 0, vendor_id = 0;
-	bool uuid_present = false;
-	int index = 0, uuid_index = 0;
+	int uuid_index = 0;
 	struct nvme_id_uuid_list uuid_list;
 
 	/* The wdc_get_pci_ids function could fail when drives are connected
@@ -2675,45 +2665,27 @@ static bool get_dev_mgment_data(nvme_root_t r, struct nvme_dev *dev,
 	 */
 	wdc_get_pci_ids(r, dev, &device_id, &vendor_id);
 
-	typedef struct nvme_id_uuid_list_entry *uuid_list_entry;
-
 	memset(&uuid_list, 0, sizeof(struct nvme_id_uuid_list));
 	if (wdc_CheckUuidListSupport(dev, &uuid_list)) {
-		uuid_list_entry uuid_list_entry_ptr = (uuid_list_entry)&uuid_list.entry[0];
-
-		while (index <= NVME_ID_UUID_LIST_MAX &&
-		       !wdc_UuidEqual(uuid_list_entry_ptr, (uuid_list_entry)UUID_END)) {
-
-			if (wdc_UuidEqual(uuid_list_entry_ptr,
-					  (uuid_list_entry)WDC_UUID)) {
-				uuid_present = true;
-				break;
-			} else if (wdc_UuidEqual(uuid_list_entry_ptr,
-						 (uuid_list_entry)WDC_UUID_SN640_3) &&
-				   wdc_is_sn640_3(device_id)) {
-				uuid_present = true;
-				break;
+		uuid_index = nvme_uuid_find(&uuid_list, WDC_UUID);
+		if (uuid_index > 0) {
+			found = get_dev_mgmt_log_page_data(dev, data, uuid_index);
+		} else {
+			uuid_index = nvme_uuid_find(&uuid_list, WDC_UUID_SN640_3);
+			if (uuid_index > 0 && wdc_is_sn640_3(device_id)) {
+				found = get_dev_mgmt_log_page_data(dev, data, uuid_index);
 			}
-			index++;
-			uuid_list_entry_ptr = (uuid_list_entry)&uuid_list.entry[index];
 		}
-		if (uuid_present)
-			uuid_index = index + 1;
 	}
 
-	if (uuid_present) {
-		/* use the uuid index found above */
-		found = get_dev_mgmt_log_page_data(dev, data, uuid_index);
-	} else {
-		if (!uuid_index && needs_c2_log_page_check(device_id)) {
-			/* In certain devices that don't support UUID lists, there are multiple
-			 * definitions of the C2 logpage. In those cases, the code
-			 * needs to try two UUID indexes and use an identification algorithm
-			 * to determine which is returning the correct log page data.
-			 */
-			uuid_index = 1;
-		}
+	if (!found && needs_c2_log_page_check(device_id)) {
+		/* In certain devices that don't support UUID lists, there are multiple
+		 * definitions of the C2 logpage. In those cases, the code
+		 * needs to try two UUID indexes and use an identification algorithm
+		 * to determine which is returning the correct log page data.
+		 */
 
+		uuid_index = 1;
 		found = get_dev_mgmt_log_page_data(dev, data, uuid_index);
 
 		if (!found) {
@@ -2737,8 +2709,7 @@ static bool get_dev_mgment_cbs_data(nvme_root_t r, struct nvme_dev *dev,
 	__u8 lid = 0;
 	*cbs_data = NULL;
 	__u32 device_id = 0, vendor_id = 0;
-	bool uuid_present = false;
-	int index = 0, uuid_index = 0;
+	int uuid_index = 0;
 	struct nvme_id_uuid_list uuid_list;
 
 	/* The wdc_get_pci_ids function could fail when drives are connected
@@ -2751,50 +2722,30 @@ static bool get_dev_mgment_cbs_data(nvme_root_t r, struct nvme_dev *dev,
 
 	lid = WDC_NVME_GET_DEV_MGMNT_LOG_PAGE_ID;
 
-	typedef struct nvme_id_uuid_list_entry *uuid_list_entry;
-
 	memset(&uuid_list, 0, sizeof(struct nvme_id_uuid_list));
-	if (wdc_CheckUuidListSupport(dev, &uuid_list)) {
-		uuid_list_entry uuid_list_entry_ptr = (uuid_list_entry)&uuid_list.entry[0];
 
-		while (index <= NVME_ID_UUID_LIST_MAX &&
-		       !wdc_UuidEqual(uuid_list_entry_ptr, (uuid_list_entry)UUID_END)) {
-
-			if (wdc_UuidEqual(uuid_list_entry_ptr,
-					  (uuid_list_entry)WDC_UUID)) {
-				uuid_present = true;
-				break;
-			} else if (wdc_UuidEqual(uuid_list_entry_ptr,
-						 (uuid_list_entry)WDC_UUID_SN640_3) &&
-				   wdc_is_sn640_3(device_id)) {
-				uuid_present = true;
-				break;
+	if (wdc_CheckUuidListSupport(dev, &uuid_list)) {
+		uuid_index = nvme_uuid_find(&uuid_list, WDC_UUID);
+		if (uuid_index > 0) {
+			found = get_dev_mgmt_log_page_lid_data(dev, cbs_data, lid, log_id,
+							       uuid_index);
+		} else {
+			uuid_index = nvme_uuid_find(&uuid_list, WDC_UUID_SN640_3);
+			if (uuid_index > 0 && wdc_is_sn640_3(device_id)) {
+				found = get_dev_mgmt_log_page_lid_data(dev, cbs_data, lid, log_id,
+								       uuid_index);
 			}
-			index++;
-			uuid_list_entry_ptr = (uuid_list_entry)&uuid_list.entry[index];
 		}
-		if (uuid_present)
-			uuid_index = index + 1;
 	}
 
-	if (uuid_present) {
-		/* use the uuid index found above */
-		found = get_dev_mgmt_log_page_lid_data(dev, cbs_data, lid, log_id, uuid_index);
-	} else if (wdc_is_zn350(device_id)) {
-		uuid_index = 0;
-		found = get_dev_mgmt_log_page_lid_data(dev, cbs_data, lid, log_id, uuid_index);
-	} else {
-		if (!uuid_index && needs_c2_log_page_check(device_id)) {
-			/* In certain devices that don't support UUID lists, there are multiple
-			 * definitions of the C2 logpage. In those cases, the code
-			 * needs to try two UUID indexes and use an identification algorithm
-			 * to determine which is returning the correct log page data.
-			 */
-			uuid_ix = 1;
-		}
-
+	if (!found && needs_c2_log_page_check(device_id)) {
+		/* In certain devices that don't support UUID lists, there are multiple
+		 * definitions of the C2 logpage. In those cases, the code
+		 * needs to try two UUID indexes and use an identification algorithm
+		 * to determine which is returning the correct log page data.
+		 */
+		uuid_ix = 1;
 		found = get_dev_mgmt_log_page_lid_data(dev, cbs_data, lid, log_id, uuid_ix);
-
 		if (!found) {
 			/* not found with uuid = 1 try with uuid = 0 */
 			uuid_ix = 0;

plugins/wdc/wdc-utils.c

@@ -189,8 +189,3 @@ bool wdc_CheckUuidListSupport(struct nvme_dev *dev, struct nvme_id_uuid_list *uu
 
 	return false;
 }
-
-bool wdc_UuidEqual(struct nvme_id_uuid_list_entry *entry1, struct nvme_id_uuid_list_entry *entry2)
-{
-	return !memcmp(entry1->uuid, entry2->uuid, NVME_UUID_LEN);
-}

plugins/wdc/wdc-utils.h

@@ -78,4 +78,3 @@ int wdc_UtilsCreateDir(char *path);
 int wdc_WriteToFile(char *fileName, char *buffer, unsigned int bufferLen);
 void wdc_StrFormat(char *formatter, size_t fmt_sz, char *tofmt, size_t tofmtsz);
 bool wdc_CheckUuidListSupport(struct nvme_dev *dev, struct nvme_id_uuid_list *uuid_list);
-bool wdc_UuidEqual(struct nvme_id_uuid_list_entry *entry1, struct nvme_id_uuid_list_entry *entry2);