[src/trunk]: src/sys/dev/raidframe Don't attempt to read or write component l...

[oster <oster%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a5f8196de06f
branches:  trunk
changeset: 752685:a5f8196de06f
user:      oster <oster%NetBSD.org@localhost>
date:      Wed Mar 03 14:23:27 2010 +0000

description:
Don't attempt to read or write component label stuff from/to 'dead disks'.
Update used spares with the correct parity map bits too.

Addresses PR#42904 by Louis Guillaume.  Fix confirmed by submitter.
Thanks!

diffstat:

 sys/dev/raidframe/rf_paritymap.c |  56 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 52 insertions(+), 4 deletions(-)

diffs (131 lines):

diff -r c5bb7ad7bd0e -r a5f8196de06f sys/dev/raidframe/rf_paritymap.c
--- a/sys/dev/raidframe/rf_paritymap.c  Wed Mar 03 13:57:35 2010 +0000
+++ b/sys/dev/raidframe/rf_paritymap.c  Wed Mar 03 14:23:27 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_paritymap.c,v 1.3 2009/11/26 07:35:39 pooka Exp $ */
+/* $NetBSD: rf_paritymap.c,v 1.4 2010/03/03 14:23:27 oster Exp $ */
 
 /*-
  * Copyright (c) 2009 Jed Davis.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_paritymap.c,v 1.3 2009/11/26 07:35:39 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_paritymap.c,v 1.4 2010/03/03 14:23:27 oster Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>
@@ -359,12 +359,31 @@
        if (todisk) {
                raidPtr = pm->raid;
                for (col = 0; col < raidPtr->numCol; col++) {
+                       if (RF_DEAD_DISK(raidPtr->Disks[col].status))
+                               continue;
+
                        clabel = raidget_component_label(raidPtr, col);
                        clabel->parity_map_ntick = cooldown;
                        clabel->parity_map_tickms = tickms;
                        clabel->parity_map_regions = regions;
+                       
+                       /* Don't touch the disk if it's been spared */
+                       if (clabel->status == rf_ds_spared)
+                               continue;
+                               
                        raidflush_component_label(raidPtr, col);
                }
+
+               /* handle the spares too... */
+               for (col = 0; col < raidPtr->numSpare; col++) {
+                       if (raidPtr->Disks[raidPtr->numCol+col].status == rf_ds_used_spare) {
+                               clabel = raidget_component_label(raidPtr, raidPtr->numCol+col);
+                               clabel->parity_map_ntick = cooldown;
+                               clabel->parity_map_tickms = tickms;
+                               clabel->parity_map_regions = regions;
+                               raidflush_component_label(raidPtr, raidPtr->numCol+col);
+                       }                               
+               }
        }
        return 0;
 }
@@ -603,6 +622,8 @@
         */
        if (!force) {
                for (col = 0; col < raidPtr->numCol; col++) {
+                       if (RF_DEAD_DISK(raidPtr->Disks[col].status))
+                               continue;
                        clabel = raidget_component_label(raidPtr, col);
                        flags = clabel->parity_map_flags;
                        /* Check for use by non-parity-map kernel. */
@@ -670,6 +691,8 @@
 
        /* Alter labels in-core to reflect the current view of things. */
        for (col = 0; col < raidPtr->numCol; col++) {
+               if (RF_DEAD_DISK(raidPtr->Disks[col].status))
+                       continue;
                clabel = raidget_component_label(raidPtr, col);
 
                if (pm_use)
@@ -683,12 +706,13 @@
                clabel->parity_map_regions = g_regions;
                raidflush_component_label(raidPtr, col);
        }
+       /* Note that we're just in 'attach' here, and there won't
+          be any spare disks at this point. */
 }
 
 /*
  * For initializing the parity-map fields of a component label, both on
- * initial creation and on reconstruct/copyback/etc.
- */
+ * initial creation and on reconstruct/copyback/etc.  */
 void
 rf_paritymap_init_label(struct rf_paritymap *pm, RF_ComponentLabel_t *clabel)
 {
@@ -724,10 +748,19 @@
 
        dis = 0;
        for (col = 0; col < raidPtr->numCol; col++) {
+               if (RF_DEAD_DISK(raidPtr->Disks[col].status))
+                       continue;
                clabel = raidget_component_label(raidPtr, col);
                if (clabel->parity_map_flags & RF_PMLABEL_DISABLE)
                        dis = 1;
        }
+        for (col = 0; col < raidPtr->numSpare; col++) {
+               if (raidPtr->Disks[raidPtr->numCol+col].status != rf_ds_used_spare)
+                        continue;
+                clabel = raidget_component_label(raidPtr, raidPtr->numCol+col);
+                if (clabel->parity_map_flags & RF_PMLABEL_DISABLE)
+                        dis = 1;
+        }
 
        return dis;
 }
@@ -740,6 +773,8 @@
        RF_RowCol_t col;
 
        for (col = 0; col < raidPtr->numCol; col++) {
+               if (RF_DEAD_DISK(raidPtr->Disks[col].status))
+                       continue;
                clabel = raidget_component_label(raidPtr, col);
                if (dis)
                        clabel->parity_map_flags |= RF_PMLABEL_DISABLE;
@@ -747,4 +782,17 @@
                        clabel->parity_map_flags &= ~RF_PMLABEL_DISABLE;
                raidflush_component_label(raidPtr, col);
        }
+
+       /* update any used spares as well */
+       for (col = 0; col < raidPtr->numSpare; col++) {
+               if (raidPtr->Disks[raidPtr->numCol+col].status != rf_ds_used_spare)
+                       continue;
+
+               clabel = raidget_component_label(raidPtr, raidPtr->numCol+col);
+               if (dis)
+                       clabel->parity_map_flags |= RF_PMLABEL_DISABLE;
+               else
+                       clabel->parity_map_flags &= ~RF_PMLABEL_DISABLE;
+               raidflush_component_label(raidPtr, raidPtr->numCol+col);
+       }
 }