From c34f823c647173e6a7700eaa5af88cef34926b73 Mon Sep 17 00:00:00 2001
From: Anatol Pomozov <anatol.pomozov@gmail.com>
Date: Tue, 21 Dec 2021 22:18:55 -0800
Subject: [PATCH] Add uas to the list of default modules

Introduce an idea of quirks for modaliases. Some modules do not report
aliases they use. So we just add all registered modaliases to the
booster image.

Closes #121
---
 generator/generator.go |  2 +-
 generator/kmod.go      | 72 ++++++++++++++++++++++++++----------------
 2 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/generator/generator.go b/generator/generator.go
index ac0cebc0..269026a8 100644
--- a/generator/generator.go
+++ b/generator/generator.go
@@ -79,7 +79,7 @@ var defaultModulesList = []string{
 	"kernel/drivers/hid/",
 	"hid_generic", "sd_mod", "ahci",
 	"sdhci", "sdhci_acpi", "sdhci_pci", "mmc_block", // mmc
-	"nvme", "usb_storage",
+	"nvme", "usb_storage", "uas",
 	"virtio_pci", "virtio_blk", "virtio_scsi", "virtio_crypto",
 }
 
diff --git a/generator/kmod.go b/generator/kmod.go
index 2ec3744c..9273502a 100644
--- a/generator/kmod.go
+++ b/generator/kmod.go
@@ -589,37 +589,59 @@ func (k *Kmod) filterAliasesForRequiredModules(conf *generatorConfig) ([]alias,
 		}
 	}
 
-	if !k.universal {
-		devAliases, err := conf.readDeviceAliases() // list of current host aliases as reported by /sys/devices
+	if k.universal {
+		return filteredAliases, nil
+	}
+
+	// for a non-universal mode filter out only aliases known to kernel
+	uniqAliases := make(map[alias]bool)
+
+	devAliases, err := conf.readDeviceAliases() // list of current host aliases as reported by /sys/devices
+	if err != nil {
+		return nil, err
+	}
+	for a := range devAliases {
+		matched, err := matchAlias(a, filteredAliases)
 		if err != nil {
 			return nil, err
 		}
+		if len(matched) == 0 {
+			debug("no matches found for a device alias '%s'", a)
+			continue
+		}
 
-		// filter out only aliases known to kernel
-		var newFilteredAliases []alias // aliases for the given devices
-		uniqAliases := make(map[alias]bool)
-		for a := range devAliases {
-			matched, err := matchAlias(a, filteredAliases)
-			if err != nil {
-				return nil, err
-			}
-			if len(matched) == 0 {
-				debug("no matches found for a device alias '%s'", a)
-				continue
-			}
+		for _, m := range matched {
+			uniqAliases[m] = true
+		}
+	}
 
-			for _, m := range matched {
-				if _, exists := uniqAliases[m]; exists {
-					continue
-				}
-				uniqAliases[m] = true
-				newFilteredAliases = append(newFilteredAliases, m)
+	// quirk: some modules do not report modaliases they use at /sysfs so we just add all aliases for specified modules.
+	addAllAliasesForModules := []string{
+		// mmc bus sends an udev event modalias 'mmc:block' (see Linux drivers/mmc/core/bus.c)
+		// but it seems that this modalias is not reported anywhere under /sys/devices, see https://github.com/anatol/booster/issues/90
+		"mmc_block",
+		// uas does not report alias for its USB_PR_BULK interface https://github.com/anatol/booster/issues/121
+		"uas",
+	}
+	for _, m := range addAllAliasesForModules {
+		if !k.requiredModules[m] {
+			continue
+		}
+
+		for _, a := range filteredAliases {
+			if a.module != m {
+				continue
 			}
+			uniqAliases[a] = true
 		}
-		filteredAliases = newFilteredAliases
 	}
 
-	return filteredAliases, nil
+	newFilteredAliases := make([]alias, 0, len(uniqAliases)) // aliases for the given devices
+	for a := range uniqAliases {
+		newFilteredAliases = append(newFilteredAliases, a)
+	}
+
+	return newFilteredAliases, nil
 }
 
 func readDeviceAliases() (set, error) {
@@ -650,12 +672,6 @@ func readDeviceAliases() (set, error) {
 		return nil
 	})
 
-	// Buses might have associated modaliases e.g. mmc bus sends an udev event modalias 'mmc:block' (see Linux drivers/mmc/core/bus.c)
-	// But it seems that this modalias is not reported anywhere under /sys/devices, see https://github.com/anatol/booster/issues/90
-
-	// insert implicit modaliases. TODO: find a more straightforward way to detect all buses modaliases
-	aliases["mmc:block"] = true
-
 	return aliases, err
 }