Merge duplicate MD code into MI sr_open_chunk()

It does not have the prettiest signature, but nicely folds identical copies
into softraid.c, which then allows us to reuse sr_open_chunk() yet again in
an upcoming diff to make -p softraid aware (fixes arm64 installations).

Regress keeps passing.
Works fine on amd64, arm64 and sparc64.
"looks fine" mlarkin for whom this unbreaks a fresh arm64 softraid install

diff --git a/usr.sbin/installboot/efi_softraid.c b/usr.sbin/installboot/efi_softraid.c
index ed1c642..7d0ce58 100644 (file)
--- a/usr.sbin/installboot/efi_softraid.c
+++ b/usr.sbin/installboot/efi_softraid.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: efi_softraid.c,v 1.3 2022/10/05 09:58:43 kn Exp $     */
+/*     $OpenBSD: efi_softraid.c,v 1.4 2022/11/07 15:56:09 kn Exp $     */
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2022 Klemens Nanni <kn@openbsd.org>
@@ -16,18 +16,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
-#include <sys/disklabel.h>
-#include <sys/ioctl.h>
-
 #include <dev/biovar.h>
-#include <dev/softraidvar.h>
 
-#include <err.h>
-#include <fcntl.h>
 #include <stdio.h>
-#include <string.h>
-#include <util.h>
 #include <unistd.h>
 
 #include "installboot.h"
@@ -40,38 +31,9 @@ sr_install_bootblk(int devfd, int vol, int disk)
        int diskfd;
        char part;
 
-       /* Get device name for this disk/chunk. */
-       memset(&bd, 0, sizeof(bd));
-       bd.bd_volid = vol;
-       bd.bd_diskid = disk;
-       if (ioctl(devfd, BIOCDISK, &bd) == -1)
-               err(1, "BIOCDISK");
-
-       /* Check disk status. */
-       if (bd.bd_status != BIOC_SDONLINE && bd.bd_status != BIOC_SDREBUILD) {
-               fprintf(stderr, "softraid chunk %u not online - skipping...\n",
-                   disk);
-               return;
-       }
-
-       /* Keydisks always have a size of zero. */
-       if (bd.bd_size == 0) {
-               fprintf(stderr, "softraid chunk %u is keydisk - skipping...\n",
-                   disk);
+       diskfd = sr_open_chunk(devfd, vol, disk, &bd, &realdev, &part);
+       if (diskfd == -1)
                return;
-       }
-
-       if (strlen(bd.bd_vendor) < 1)
-               errx(1, "invalid disk name");
-       part = bd.bd_vendor[strlen(bd.bd_vendor) - 1];
-       if (part < 'a' || part >= 'a' + MAXPARTITIONS)
-               errx(1, "invalid partition %c\n", part);
-       bd.bd_vendor[strlen(bd.bd_vendor) - 1] = '\0';
-
-       /* Open device. */
-       if ((diskfd = opendev(bd.bd_vendor, (nowrite ? O_RDONLY : O_RDWR),
-           OPENDEV_PART, &realdev)) == -1)
-               err(1, "open: %s", realdev);
 
        if (verbose)
                fprintf(stderr, "%s%c: %s boot blocks on %s\n", bd.bd_vendor,

diff --git a/usr.sbin/installboot/i386_softraid.c b/usr.sbin/installboot/i386_softraid.c
index 16ae394..9d64858 100644 (file)
--- a/usr.sbin/installboot/i386_softraid.c
+++ b/usr.sbin/installboot/i386_softraid.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: i386_softraid.c,v 1.20 2022/10/05 09:58:43 kn Exp $   */
+/*     $OpenBSD: i386_softraid.c,v 1.21 2022/11/07 15:56:09 kn Exp $   */
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2010 Otto Moerbeek <otto@drijf.net>
@@ -32,7 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <util.h>
 
 #include "installboot.h"
 #include "i386_installboot.h"
@@ -51,38 +50,9 @@ sr_install_bootblk(int devfd, int vol, int disk)
        char part, efipart;
        int diskfd;
 
-       /* Get device name for this disk/chunk. */
-       memset(&bd, 0, sizeof(bd));
-       bd.bd_volid = vol;
-       bd.bd_diskid = disk;
-       if (ioctl(devfd, BIOCDISK, &bd) == -1)
-               err(1, "BIOCDISK");
-
-       /* Check disk status. */
-       if (bd.bd_status != BIOC_SDONLINE && bd.bd_status != BIOC_SDREBUILD) {
-               fprintf(stderr, "softraid chunk %u not online - skipping...\n",
-                   disk);
+       diskfd = sr_open_chunk(devfd, vol, disk, &bd, &dev, &part);
+       if (diskfd == -1)
                return;
-       }
-
-       /* Keydisks always have a size of zero. */
-       if (bd.bd_size == 0) {
-               fprintf(stderr, "softraid chunk %u is keydisk - skipping...\n",
-                   disk);
-               return;
-       }
-
-       if (strlen(bd.bd_vendor) < 1)
-               errx(1, "invalid disk name");
-       part = bd.bd_vendor[strlen(bd.bd_vendor) - 1];
-       if (part < 'a' || part >= 'a' + MAXPARTITIONS)
-               errx(1, "invalid partition %c\n", part);
-       bd.bd_vendor[strlen(bd.bd_vendor) - 1] = '\0';
-
-       /* Open this device and check its disklabel. */
-       if ((diskfd = opendev(bd.bd_vendor, (nowrite? O_RDONLY:O_RDWR),
-           OPENDEV_PART, &dev)) == -1)
-               err(1, "open: %s", dev);
 
        /* Get and check disklabel. */
        if (ioctl(diskfd, DIOCGDINFO, &dl) == -1)

diff --git a/usr.sbin/installboot/installboot.h b/usr.sbin/installboot/installboot.h
index 0665592..d70005d 100644 (file)
--- a/usr.sbin/installboot/installboot.h
+++ b/usr.sbin/installboot/installboot.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: installboot.h,v 1.14 2022/02/03 10:25:14 visa Exp $   */
+/*     $OpenBSD: installboot.h,v 1.15 2022/11/07 15:56:09 kn Exp $     */
 /*
  * Copyright (c) 2012, 2013 Joel Sing <jsing@openbsd.org>
  *
@@ -43,6 +43,7 @@ void  md_prepareboot(int, char *);
 void   md_installboot(int, char *);
 
 #ifdef SOFTRAID
+int    sr_open_chunk(int, int, int, struct bioc_disk *, char **, char *);
 void   sr_installboot(int, char *);
 void   sr_install_bootblk(int, int, int);
 void   sr_install_bootldr(int, char *);

diff --git a/usr.sbin/installboot/softraid.c b/usr.sbin/installboot/softraid.c
index c197164..1bb6254 100644 (file)
--- a/usr.sbin/installboot/softraid.c
+++ b/usr.sbin/installboot/softraid.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: softraid.c,v 1.5 2020/06/08 19:17:12 kn Exp $ */
+/*     $OpenBSD: softraid.c,v 1.6 2022/11/07 15:56:09 kn Exp $ */
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
  *
@@ -15,14 +15,18 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/types.h>
+#include <sys/disklabel.h>
 #include <sys/dkio.h>
 #include <sys/ioctl.h>
 
 #include <dev/biovar.h>
 
 #include <err.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
+#include <util.h>
 
 #include "installboot.h"
 
@@ -108,3 +112,46 @@ sr_status(struct bio_status *bs)
                        exit(1);
        }
 }
+
+int
+sr_open_chunk(int devfd, int vol, int disk, struct bioc_disk *bd,
+    char **realdev, char *part)
+{
+       int diskfd;
+
+       /* Get device name for this disk/chunk. */
+       memset(bd, 0, sizeof(*bd));
+       bd->bd_volid = vol;
+       bd->bd_diskid = disk;
+       if (ioctl(devfd, BIOCDISK, bd) == -1)
+               err(1, "BIOCDISK");
+
+       /* Check disk status. */
+       if (bd->bd_status != BIOC_SDONLINE &&
+           bd->bd_status != BIOC_SDREBUILD) {
+               fprintf(stderr, "softraid chunk %u not online - skipping...\n",
+                   disk);
+               return -1;
+       }
+
+       /* Keydisks always have a size of zero. */
+       if (bd->bd_size == 0) {
+               fprintf(stderr, "softraid chunk %u is keydisk - skipping...\n",
+                   disk);
+               return -1;
+       }
+
+       if (strlen(bd->bd_vendor) < 1)
+               errx(1, "invalid disk name");
+       *part = bd->bd_vendor[strlen(bd->bd_vendor) - 1];
+       if (*part < 'a' || *part >= 'a' + MAXPARTITIONS)
+               errx(1, "invalid partition %c\n", *part);
+       bd->bd_vendor[strlen(bd->bd_vendor) - 1] = '\0';
+
+       /* Open device. */
+       if ((diskfd = opendev(bd->bd_vendor, (nowrite ? O_RDONLY : O_RDWR),
+           OPENDEV_PART, realdev)) == -1)
+               err(1, "open: %s", *realdev);
+
+       return diskfd;
+}

diff --git a/usr.sbin/installboot/sparc64_softraid.c b/usr.sbin/installboot/sparc64_softraid.c
index 81fb199..c0bf9a8 100644 (file)
--- a/usr.sbin/installboot/sparc64_softraid.c
+++ b/usr.sbin/installboot/sparc64_softraid.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sparc64_softraid.c,v 1.7 2022/10/05 09:58:43 kn Exp $ */
+/*     $OpenBSD: sparc64_softraid.c,v 1.8 2022/11/07 15:56:09 kn Exp $ */
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
  *
@@ -41,38 +41,9 @@ sr_install_bootblk(int devfd, int vol, int disk)
        int diskfd;
        char part;
 
-       /* Get device name for this disk/chunk. */
-       memset(&bd, 0, sizeof(bd));
-       bd.bd_volid = vol;
-       bd.bd_diskid = disk;
-       if (ioctl(devfd, BIOCDISK, &bd) == -1)
-               err(1, "BIOCDISK");
-
-       /* Check disk status. */
-       if (bd.bd_status != BIOC_SDONLINE && bd.bd_status != BIOC_SDREBUILD) {
-               fprintf(stderr, "softraid chunk %u not online - skipping...\n",
-                   disk);
-               return;
-       }
-
-       /* Keydisks always have a size of zero. */
-       if (bd.bd_size == 0) {
-               fprintf(stderr, "softraid chunk %u is keydisk - skipping...\n",
-                   disk);
+       diskfd = sr_open_chunk(devfd, vol, disk, &bd, &realdev, &part);
+       if (diskfd == -1)
                return;
-       }
-
-       if (strlen(bd.bd_vendor) < 1)
-               errx(1, "invalid disk name");
-       part = bd.bd_vendor[strlen(bd.bd_vendor) - 1];
-       if (part < 'a' || part >= 'a' + MAXPARTITIONS)
-               errx(1, "invalid partition %c\n", part);
-       bd.bd_vendor[strlen(bd.bd_vendor) - 1] = '\0';
-
-       /* Open device. */
-       if ((diskfd = opendev(bd.bd_vendor, (nowrite ? O_RDONLY : O_RDWR),
-           OPENDEV_PART, &realdev)) == -1)
-               err(1, "open: %s", realdev);
 
        if (verbose)
                fprintf(stderr, "%s%c: %s boot blocks on %s\n", bd.bd_vendor,