[efi] Allow vetoing of drivers that cannot be unloaded

Some UEFI drivers (observed with the "Usb Xhci Driver" on an HP
EliteBook) are particularly badly behaved: they cannot be unloaded and
will leave handles opened with BY_DRIVER attributes even after
disconnecting the driver, thereby preventing a replacement iPXE driver
from opening the handle.

Allow such drivers to be vetoed by falling back to a brute-force
mechanism that will disconnect the driver from all handles, uninstall
the driver binding protocol (to prevent it from attaching to any new
handles), and finally close any stray handles that the vetoed driver
has left open.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/include/ipxe/efi/efi_veto.h b/src/include/ipxe/efi/efi_veto.h
index f0c225543bd0cbaa0b7bd28a654d843cc1fe7f36..c9ecbb05cf7a61db3120da0f5f526949874ec374 100644 (file)
--- a/src/include/ipxe/efi/efi_veto.h
+++ b/src/include/ipxe/efi/efi_veto.h
@@ -8,6 +8,6 @@
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
-extern void efi_veto_unload ( void );
+extern void efi_veto ( void );
 
 #endif /* _IPXE_EFI_VETO_H */

diff --git a/src/interface/efi/efi_veto.c b/src/interface/efi/efi_veto.c
index 79190e21997b96f79745a9ebe20ca76794f69c26..1f7cc712e00e9ebf661badc63a89ac855156e072 100644 (file)
--- a/src/interface/efi/efi_veto.c
+++ b/src/interface/efi/efi_veto.c
@@ -56,6 +56,310 @@ struct efi_veto {
                         const char *manufacturer, const CHAR16 *name );
 };
 
+/**
+ * Unload an EFI driver
+ *
+ * @v driver           Driver binding handle
+ * @ret rc             Return status code
+ */
+static int efi_veto_unload ( EFI_HANDLE driver ) {
+       EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
+       EFI_STATUS efirc;
+       int rc;
+
+       /* Unload the driver */
+       if ( ( efirc = bs->UnloadImage ( driver ) ) != 0 ) {
+               rc = -EEFI ( efirc );
+               DBGC ( driver, "EFIVETO %s could not unload: %s\n",
+                      efi_handle_name ( driver ), strerror ( rc ) );
+               return rc;
+       }
+
+       return 0;
+}
+
+/**
+ * Disconnect an EFI driver from all handles
+ *
+ * @v driver           Driver binding handle
+ * @ret rc             Return status code
+ */
+static int efi_veto_disconnect ( EFI_HANDLE driver ) {
+       EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
+       EFI_HANDLE *handles;
+       EFI_HANDLE handle;
+       UINTN count;
+       unsigned int i;
+       EFI_STATUS efirc;
+       int rc;
+
+       /* Enumerate all handles */
+       if ( ( efirc = bs->LocateHandleBuffer ( AllHandles, NULL, NULL,
+                                               &count, &handles ) ) != 0 ) {
+               rc = -EEFI ( efirc );
+               DBGC ( driver, "EFIVETO %s could not enumerate handles: %s\n",
+                      efi_handle_name ( driver ), strerror ( rc ) );
+               goto err_list;
+       }
+
+       /* Disconnect driver from all handles, in reverse order */
+       for ( i = 0 ; i < count ; i++ ) {
+               handle = handles[ count - i - 1 ];
+               efirc = bs->DisconnectController ( handle, driver, NULL );
+               if ( ( efirc != 0 ) && ( efirc != EFI_NOT_FOUND ) ) {
+                       rc = -EEFI ( efirc );
+                       DBGC ( driver, "EFIVETO %s could not disconnect",
+                              efi_handle_name ( driver ) );
+                       DBGC ( driver, " %s: %s\n",
+                              efi_handle_name ( handle ), strerror ( rc ) );
+                       goto err_disconnect;
+               }
+       }
+
+       /* Success */
+       rc = 0;
+       DBGC2 ( driver, "EFIVETO %s disconnected all handles\n",
+               efi_handle_name ( driver ) );
+
+ err_disconnect:
+       bs->FreePool ( handles );
+ err_list:
+       return rc;
+}
+
+/**
+ * Uninstall an EFI driver binding protocol
+ *
+ * @v driver           Driver binding handle
+ * @ret rc             Return status code
+ */
+static int efi_veto_uninstall ( EFI_HANDLE driver ) {
+       EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
+       union {
+               EFI_DRIVER_BINDING_PROTOCOL *binding;
+               void *interface;
+       } binding;
+       EFI_STATUS efirc;
+       int rc;
+
+       /* Open driver binding protocol */
+       if ( ( efirc = bs->OpenProtocol (
+                       driver, &efi_driver_binding_protocol_guid,
+                       &binding.interface, efi_image_handle, driver,
+                       EFI_OPEN_PROTOCOL_GET_PROTOCOL ) ) != 0 ) {
+               rc = -EEFI ( efirc );
+               DBGC ( driver, "EFIVETO %s could not open driver binding "
+                      "protocol: %s\n", efi_handle_name ( driver ),
+                      strerror ( rc ) );
+               return rc;
+       }
+
+       /* Close driver binding protocol */
+       bs->CloseProtocol ( driver, &efi_driver_binding_protocol_guid,
+                           efi_image_handle, driver );
+
+       /* Uninstall driver binding protocol */
+       if ( ( efirc = bs->UninstallMultipleProtocolInterfaces (
+                       driver, &efi_driver_binding_protocol_guid,
+                       binding.binding, NULL ) ) != 0 ) {
+               rc = -EEFI ( efirc );
+               DBGC ( driver, "EFIVETO %s could not uninstall driver "
+                      "binding protocol: %s\n",
+                      efi_handle_name ( driver ), strerror ( rc ) );
+               return rc;
+       }
+
+       DBGC2 ( driver, "EFIVETO %s uninstalled driver binding protocol\n",
+               efi_handle_name ( driver ) );
+       return 0;
+}
+
+/**
+ * Close protocol on handle potentially opened by an EFI driver
+ *
+ * @v driver           Driver binding handle
+ * @v handle           Potentially opened handle
+ * @v protocol         Opened protocol
+ * @ret rc             Return status code
+ */
+static int efi_veto_close_protocol ( EFI_HANDLE driver, EFI_HANDLE handle,
+                                    EFI_GUID *protocol ) {
+       EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
+       EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *openers;
+       EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *opener;
+       EFI_HANDLE controller;
+       UINTN count;
+       unsigned int i;
+       EFI_STATUS efirc;
+       int rc;
+
+       /* Retrieve list of openers */
+       if ( ( efirc = bs->OpenProtocolInformation ( handle, protocol, &openers,
+                                                    &count ) ) != 0 ) {
+               rc = -EEFI ( efirc );
+               DBGC ( driver, "EFIVETO %s could not retrieve openers",
+                      efi_handle_name ( driver ) );
+               DBGC ( driver, " of %s %s: %s", efi_handle_name ( handle ),
+                      efi_guid_ntoa ( protocol ), strerror ( rc ) );
+               goto err_list;
+       }
+
+       /* Close anything opened by this driver */
+       for ( i = 0 ; i < count ; i++ ) {
+               opener = &openers[i];
+               if ( opener->AgentHandle != driver )
+                       continue;
+               controller = opener->ControllerHandle;
+               DBGC_EFI_OPENER ( driver, handle, protocol, opener );
+               if ( ( efirc = bs->CloseProtocol ( handle, protocol, driver,
+                                                  controller ) ) != 0 ) {
+                       rc = -EEFI ( efirc );
+                       DBGC ( driver, "EFIVETO %s could not close stray open",
+                              efi_handle_name ( driver ) );
+                       DBGC ( driver, " of %s: %s\n",
+                              efi_handle_name ( handle ), strerror ( rc ) );
+                       goto err_close;
+               }
+       }
+
+       /* Success */
+       rc = 0;
+
+ err_close:
+       bs->FreePool ( openers );
+ err_list:
+       return rc;
+}
+
+/**
+ * Close handle potentially opened by an EFI driver
+ *
+ * @v driver           Driver binding handle
+ * @v handle           Potentially opened handle
+ * @ret rc             Return status code
+ */
+static int efi_veto_close_handle ( EFI_HANDLE driver, EFI_HANDLE handle ) {
+       EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
+       EFI_GUID **protocols;
+       UINTN count;
+       unsigned int i;
+       EFI_STATUS efirc;
+       int rc;
+
+       /* Retrieve list of protocols */
+       if ( ( efirc = bs->ProtocolsPerHandle ( handle, &protocols,
+                                               &count ) ) != 0 ) {
+               rc = -EEFI ( efirc );
+               DBGC ( driver, "EFIVETO %s could not retrieve protocols",
+                      efi_handle_name ( driver ) );
+               DBGC ( driver, " for %s: %s\n",
+                      efi_handle_name ( handle ), strerror ( rc ) );
+               goto err_list;
+       }
+
+       /* Close each protocol */
+       for ( i = 0 ; i < count ; i++ ) {
+               if ( ( rc = efi_veto_close_protocol ( driver, handle,
+                                                     protocols[i] ) ) != 0 )
+                       goto err_close;
+       }
+
+       /* Success */
+       rc = 0;
+
+ err_close:
+       bs->FreePool ( protocols );
+ err_list:
+       return rc;
+}
+
+/**
+ * Close all remaining handles opened by an EFI driver
+ *
+ * @v driver           Driver binding handle
+ * @ret rc             Return status code
+ */
+static int efi_veto_close ( EFI_HANDLE driver ) {
+       EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
+       EFI_HANDLE *handles;
+       UINTN count;
+       unsigned int i;
+       EFI_STATUS efirc;
+       int rc;
+
+       /* Enumerate all handles */
+       if ( ( efirc = bs->LocateHandleBuffer ( AllHandles, NULL, NULL,
+                                               &count, &handles ) ) != 0 ) {
+               rc = -EEFI ( efirc );
+               DBGC ( driver, "EFIVETO %s could not enumerate handles: %s\n",
+                      efi_handle_name ( driver ), strerror ( rc ) );
+               goto err_list;
+       }
+
+       /* Close each handle */
+       for ( i = 0 ; i < count ; i++ ) {
+               if ( ( rc = efi_veto_close_handle ( driver,
+                                                   handles[i] ) ) != 0 )
+                       goto err_close;
+       }
+
+       /* Success */
+       rc = 0;
+       DBGC2 ( driver, "EFIVETO %s closed all remaining handles\n",
+               efi_handle_name ( driver ) );
+
+ err_close:
+       bs->FreePool ( handles );
+ err_list:
+       return rc;
+}
+
+/**
+ * Terminate an EFI driver with extreme prejudice
+ *
+ * @v driver           Driver binding handle
+ * @ret rc             Return status code
+ */
+static int efi_veto_destroy ( EFI_HANDLE driver ) {
+       int rc;
+
+       /* Disconnect driver from all handles */
+       if ( ( rc = efi_veto_disconnect ( driver ) ) != 0 )
+               return rc;
+
+       /* Uninstall driver binding protocol */
+       if ( ( rc = efi_veto_uninstall ( driver ) ) != 0 )
+               return rc;
+
+       /* Close any remaining opened handles */
+       if ( ( rc = efi_veto_close ( driver ) ) != 0 )
+               return rc;
+
+       DBGC ( driver, "EFIVETO %s forcibly removed\n",
+              efi_handle_name ( driver ) );
+       return 0;
+}
+
+/**
+ * Veto an EFI driver
+ *
+ * @v driver           Driver binding handle
+ * @ret rc             Return status code
+ */
+static int efi_veto_driver ( EFI_HANDLE driver ) {
+       int rc;
+
+       /* Try gracefully unloading the driver */
+       if ( ( rc = efi_veto_unload ( driver ) ) == 0 )
+               return 0;
+
+       /* If that fails, use a hammer */
+       if ( ( rc = efi_veto_destroy ( driver ) ) == 0 )
+               return 0;
+
+       return rc;
+}
+
 /**
  * Veto Dell Ip4ConfigDxe driver
  *
@@ -201,10 +505,10 @@ static int efi_veto_find ( EFI_HANDLE driver, const char *manufacturer,
 }
 
 /**
- * Unload any vetoed drivers
+ * Remove any vetoed drivers
  *
  */
-void efi_veto_unload ( void ) {
+void efi_veto ( void ) {
        EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
        struct efi_veto *veto;
        EFI_HANDLE *drivers;
@@ -241,11 +545,10 @@ void efi_veto_unload ( void ) {
                }
                if ( ! veto )
                        continue;
-               DBGC ( driver, "EFIVETO unloading %s (%s)\n",
+               DBGC ( driver, "EFIVETO %s is vetoed (%s)\n",
                       efi_handle_name ( driver ), veto->name );
-               if ( ( efirc = bs->UnloadImage ( driver ) ) != 0 ) {
-                       rc = -EEFI ( efirc );
-                       DBGC ( driver, "EFIVETO could not unload %s: %s\n",
+               if ( ( rc = efi_veto_driver ( driver ) ) != 0 ) {
+                       DBGC ( driver, "EFIVETO %s could not veto: %s\n",
                               efi_handle_name ( driver ), strerror ( rc ) );
                }
        }

diff --git a/src/interface/efi/efiprefix.c b/src/interface/efi/efiprefix.c
index 14f36661f03afbc7d8c8022c02b48235b6ae7b20..3273b79d842fd03f24a76a7999e28838610a8d0f 100644 (file)
--- a/src/interface/efi/efiprefix.c
+++ b/src/interface/efi/efiprefix.c
@@ -79,8 +79,8 @@ EFI_STATUS EFIAPI _efi_start ( EFI_HANDLE image_handle,
  */
 static int efi_probe ( struct root_device *rootdev __unused ) {
 
-       /* Unloaded any vetoed drivers */
-       efi_veto_unload();
+       /* Remove any vetoed drivers */
+       efi_veto();
 
        /* Connect our drivers */
        return efi_driver_connect_all();