added more mask entries, improved kmod error handling and dependency

checking

Signed-off-by: Zen <[email protected]>

Author: desultory

src/ugrd/kmod/kmod.py

@@ -13,6 +13,10 @@ class DependencyResolutionError(Exception):
     pass
 
 
+class IgnoredKernelModuleError(Exception):
+    pass
+
+
 def _process_kmod_ignore_multi(self, module: str) -> None:
     """
     Adds ignored modules to self['kmod_ignore'].
@@ -40,17 +44,17 @@ def _process_kernel_modules_multi(self, module: str) -> None:
     Adds the passed kernel module to self['kernel_modules']
     Checks if the module is ignored
     """
-    if module in self['kmod_ignore']:
-        self.logger.warning("Not adding ignored kernel module to kernel_modules: %s" % module)
-        _remove_kmod(self, module, 'Ignored')
-        return
-
     try:
         _get_kmod_info(self, module)
-    except DependencyResolutionError:
-        if module in self['kmod_init'] or module in self['_kmod_depend']:
-            raise DependencyResolutionError("Failed to get modinfo for kernel required module: %s" % module)
-        self.logger.error("Failed to get modinfo for kernel module: %s" % module)
+    except IgnoredKernelModuleError:
+        self.logger.debug("[%s] Kernel module is in ignore list." % module)
+        return
+    except DependencyResolutionError as e:
+        if module in self['_kmod_depend']:
+            raise DependencyResolutionError("Failed to get modinfo for required kernel module: %s" % module)
+        elif module in self['kmod_init']:
+            self.logger.warning("Failed to get modinfo for init kernel module: %s" % module)
+        self.logger.debug("[%s] Failed to get modinfo for kernel module: %s" % (module, e))
         self['kmod_ignore'] = module
         return
 
@@ -70,8 +74,9 @@ def _process_kernel_modules_multi(self, module: str) -> None:
 
     for dependency in dependencies:
         if dependency in self['kmod_ignore']:
-            self.logger.error("Kernel module dependency is in ignore list: %s" % dependency)
+            self.logger.warning("[%s] Kernel module dependency is in ignore list: %s" % (module, dependency))
             self['kmod_ignore'] = module
+            return
         self.logger.debug("[%s] Processing dependency: %s" % (module, dependency))
         self['kernel_modules'] = dependency
 
@@ -85,10 +90,13 @@ def _process_kernel_modules_multi(self, module: str) -> None:
 
 def _process_kmod_init_multi(self, module: str) -> None:
     """ Adds init modules to self['kernel_modules']. """
+    if module in self['kmod_ignore']:
+        self.logger.debug("[%s] Module is in ignore list." % module)
+        return
     # First append it to kmod_init
     self['kmod_init'].append(module)
     self.logger.debug("Adding kmod_init module to kernel_modules: %s", module)
-    # If it's an ignored module, kernel_modules processing will resolve that issue
+    # If it has ignored dependencies, kernel_modules processing will resolve that issue
     self['kernel_modules'] = module
 
 
@@ -98,6 +106,9 @@ def _get_kmod_info(self, module: str):
         self.logger.log(5, "Module info already exists for: %s" % module)
         return
 
+    if module in self['kmod_ignore']:
+        raise IgnoredKernelModuleError("[%s] Module is in ignore list." % module)
+
     args = ['modinfo', module]
     # Set kernel version if it exists, otherwise use the running kernel
     if self.get('kernel_version'):

src/ugrd/kmod/nonetwork.toml

@@ -1,3 +1,8 @@
 mod_depends = ['ugrd.kmod.kmod']
 
-kmod_ignore = ['r8169', 'iwlwifi', 'r8169', 'stp', 'rfkill', '8021q', 'llc', 'garp', 'net_failover', 'failover', 'mrp']
+kmod_ignore = ['r8169', 'iwlwifi', 'r8169', 'stp', 'rfkill', '8021q', 'llc', 'garp', 'net_failover', 'failover', 'mrp', 'btusb',
+               'tun', 'r8152', 'ip6table_nat', 'xt_MASQUERADE', 'btbcm', 'tap', 'nf_defrag_ipv6', 'xt_conntrack',
+	       'iptable_filter', 'nf_conntrack', 'nf_defrag_ipv4', 'ip6_tables', 'usbnet', 'wireguard', 'ip6table_filter',
+	       'iptable_mangle', 'mac80211', 'ipt_REJECT', 'ip_tables', 'xt_CHECKSUM', 'iptable_nat', 'nf_reject_ipv4',
+	       'ip6_udp_tunnel', 'udp_tunnel', 'nf_nat', 'btmtk', 'bluetooth', 'ip6table_mangle', 'bridge', 'iwlmvm',
+	       'btintel', 'btrtl', 'r8153_ecm', 'cdc_ether', 'cfg80211', 'vhost_net']

src/ugrd/kmod/nosound.toml

@@ -1,3 +1,5 @@
 mod_depends = ['ugrd.kmod.kmod']
 
-kmod_ignore = ['snd_hda_intel', 'snd-hda-core', 'snd-hda-codec', 'snd', 'snd-intel-dspcfg', 'snd-pcm', 'snd-hwdep', 'soundcore', 'snd-intel-sdw-acpi', 'snd-timer', 'ledtrig_audio']
+kmod_ignore = ['snd_hda_intel', 'snd', 'soundcore', 'ledtrig_audio', 'snd_intel_sdw_acpi', 'snd_rawmidi', 'snd_seq_dummy',
+	       'snd_hda_codec', 'snd_seq_device', 'snd_hrtimer', 'snd_hwdep', 'snd_usbmidi_lib', 'snd_pcm', 'snd_hda_codec_hdmi',
+	       'snd_timer', 'snd_usb_audio', 'snd_hda_core', 'snd-seq-device', 'snd_seq', 'snd_intel_dspcfg']

src/ugrd/kmod/novideo.toml

@@ -1,3 +1,5 @@
 mod_depends = ['ugrd.kmod.kmod']
 
-kmod_ignore = ['amdgpu', 'drm_kms_helper', 'ttm', 'drm_display_helper', 'gpu-sched', 'drm_buddy', 'video', 'drm_ttm_helper']
+kmod_ignore = ['amdgpu', 'drm_kms_helper', 'ttm', 'drm_display_helper', 'gpu_sched', 'drm_buddy', 'video', 'drm_ttm_helper',
+               'videobuf2_common', 'uvc', 'amdxcp', 'videobuf2_v4l2', 'drm_suballoc_helper', 'uvcvideo', 'videobuf2_vmalloc',
+	       'videodev', 'videobuf2_memops']