forked from pool/grub2
8ee92f5194
- Implement NV index mode for TPM 2.0 key protector
0001-protectors-Implement-NV-index.patch
- Fall back to passphrase mode when the key protector fails to
unlock the disk
0002-cryptodisk-Fallback-to-passphrase.patch
- Wipe out the cached key cleanly
0003-cryptodisk-wipe-out-the-cached-keys-from-protectors.patch
- Make diskfiler to look up cryptodisk devices first
0004-diskfilter-look-up-cryptodisk-devices-first.patch
- Version bump to 2.12~rc1
* Added:
- grub-2.12~rc1.tar.xz
* Removed:
- grub-2.06.tar.xz
* Patch dropped merged by new version:
- grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
- grub2-s390x-02-kexec-module-added-to-emu.patch
- grub2-efi-chainloader-root.patch
- grub2-Fix-incorrect-netmask-on-ppc64.patch
- 0001-osdep-Introduce-include-grub-osdep-major.h-and-use-i.patch
- 0002-osdep-linux-hostdisk-Use-stat-instead-of-udevadm-for.patch
- 0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
- grub2-s390x-10-keep-network-at-kexec.patch
- 0001-Fix-build-error-in-binutils-2.36.patch
- 0001-emu-fix-executable-stack-marking.patch
- 0046-squash-verifiers-Move-verifiers-API-to-kernel-image.patch
- 0001-30_uefi-firmware-fix-printf-format-with-null-byte.patch
- 0001-tpm-Pass-unknown-error-as-non-fatal-but-debug-print-.patch
- 0001-Filter-out-POSIX-locale-for-translation.patch
OBS-URL: https://build.opensuse.org/request/show/1105405
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=458
122 lines
3.1 KiB
Diff
122 lines
3.1 KiB
Diff
From b99c45820f228ff5b881700eda95a017abf2e198 Mon Sep 17 00:00:00 2001
|
|
From: Mukesh Kumar Chaurasiya <mchauras@linux.vnet.ibm.com>
|
|
Date: Wed, 1 Mar 2023 15:08:05 +0530
|
|
Subject: [PATCH] ieee1275/ofdisk: retry on open and read failure
|
|
|
|
Sometimes, when booting from a very busy SAN, the access to the
|
|
disk can fail and then grub will eventually drop to grub prompt.
|
|
This scenario is more frequent when deploying many machines at
|
|
the same time using the same SAN.
|
|
This patch aims to force the ofdisk module to retry the open or
|
|
read function after it fails. We use MAX_RETRIES to specify the
|
|
amount of times it will try to access the disk before it
|
|
definitely fails.
|
|
|
|
Signed-off-by: Mukesh Kumar Chaurasiya <mchauras@linux.vnet.ibm.com>
|
|
---
|
|
grub-core/disk/ieee1275/ofdisk.c | 65 +++++++++++++++++++++++++++++++-
|
|
1 file changed, 63 insertions(+), 2 deletions(-)
|
|
|
|
--- a/grub-core/disk/ieee1275/ofdisk.c
|
|
+++ b/grub-core/disk/ieee1275/ofdisk.c
|
|
@@ -24,6 +24,9 @@
|
|
#include <grub/ieee1275/ofdisk.h>
|
|
#include <grub/i18n.h>
|
|
#include <grub/time.h>
|
|
+#include <grub/env.h>
|
|
+
|
|
+#define RETRY_DEFAULT_TIMEOUT 15000
|
|
|
|
static char *last_devpath;
|
|
static grub_ieee1275_ihandle_t last_ihandle;
|
|
@@ -783,7 +786,7 @@
|
|
}
|
|
|
|
static grub_err_t
|
|
-grub_ofdisk_open (const char *name, grub_disk_t disk)
|
|
+grub_ofdisk_open_real (const char *name, grub_disk_t disk)
|
|
{
|
|
grub_ieee1275_phandle_t dev;
|
|
char *devpath;
|
|
@@ -879,6 +882,41 @@
|
|
return 0;
|
|
}
|
|
|
|
+static grub_uint64_t
|
|
+grub_ofdisk_disk_timeout(void)
|
|
+{
|
|
+ if(grub_env_get("ofdisk_retry_timeout") != NULL)
|
|
+ {
|
|
+ grub_uint64_t retry = grub_strtoul(grub_env_get("ofdisk_retry_timeout"), 0, 10);
|
|
+ if(retry)
|
|
+ return retry;
|
|
+ }
|
|
+
|
|
+ return RETRY_DEFAULT_TIMEOUT;
|
|
+}
|
|
+
|
|
+static grub_err_t
|
|
+grub_ofdisk_open (const char *name, grub_disk_t disk)
|
|
+{
|
|
+ grub_err_t err;
|
|
+ grub_uint64_t timeout = grub_get_time_ms () + grub_ofdisk_disk_timeout();
|
|
+
|
|
+ retry:
|
|
+ err = grub_ofdisk_open_real (name, disk);
|
|
+
|
|
+ if (err == GRUB_ERR_UNKNOWN_DEVICE)
|
|
+ {
|
|
+ if (grub_get_time_ms () < timeout)
|
|
+ {
|
|
+ grub_dprintf ("ofdisk","Failed to open disk %s. Retrying...\n", name);
|
|
+ grub_errno = GRUB_ERR_NONE;
|
|
+ goto retry;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return err;
|
|
+}
|
|
+
|
|
static void
|
|
grub_ofdisk_close (grub_disk_t disk)
|
|
{
|
|
@@ -915,7 +953,7 @@
|
|
}
|
|
|
|
static grub_err_t
|
|
-grub_ofdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
|
|
+grub_ofdisk_read_real (grub_disk_t disk, grub_disk_addr_t sector,
|
|
grub_size_t size, char *buf)
|
|
{
|
|
grub_err_t err;
|
|
@@ -935,6 +973,29 @@
|
|
}
|
|
|
|
static grub_err_t
|
|
+grub_ofdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
|
|
+ grub_size_t size, char *buf)
|
|
+{
|
|
+ grub_err_t err;
|
|
+ grub_uint64_t timeout = grub_get_time_ms () + grub_ofdisk_disk_timeout();
|
|
+
|
|
+ retry:
|
|
+ err = grub_ofdisk_read_real (disk, sector, size, buf);
|
|
+
|
|
+ if (err == GRUB_ERR_READ_ERROR)
|
|
+ {
|
|
+ if (grub_get_time_ms () < timeout)
|
|
+ {
|
|
+ grub_dprintf ("ofdisk","Failed to read disk %s. Retrying...\n", (char*)disk->data);
|
|
+ grub_errno = GRUB_ERR_NONE;
|
|
+ goto retry;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return err;
|
|
+}
|
|
+
|
|
+static grub_err_t
|
|
grub_ofdisk_write (grub_disk_t disk, grub_disk_addr_t sector,
|
|
grub_size_t size, const char *buf)
|
|
{
|