svn commit: r346559 - in stable/11/sys: conf geom geom/label modules/geom/geom_label

[Ian Lepore]

Author: ian
Date: Mon Apr 22 15:09:47 2019
New Revision: 346559
URL: https://svnweb.freebsd.org/changeset/base/346559

Log:
  MFC r345480, r346013
  
  r345480:
  Support device-independent labels for geom_flashmap slices.
  
  While geom_flashmap has always supported label names for its slices, it does
  so by appending "s.labelname" to the provider device name, meaning you still
  have to know the name and unit of the hardware device to use the labels.
  
  These changes add support for device-independent geom_flashmap labels, using
  the standard geom_label infrastructure. geom_flashmap now creates a softc
  struct attached to its geom, and as it creates slices it stores the label
  into an array in the softc. The new geom_label_flashmap uses those labels
  when tasting a geom_flashmap provider.
  
  Differential Revision:https://reviews.freebsd.org/D19535
  
  r346013:
  Add g_label_flashmap.c to the module, should have been part of r345480.

Added:
  stable/11/sys/geom/geom_flashmap.h
 - copied unchanged from r345480, head/sys/geom/geom_flashmap.h
  stable/11/sys/geom/label/g_label_flashmap.c
 - copied unchanged from r345480, head/sys/geom/label/g_label_flashmap.c
Modified:
  stable/11/sys/conf/files
  stable/11/sys/geom/geom_flashmap.c
  stable/11/sys/geom/label/g_label.c
  stable/11/sys/geom/label/g_label.h
  stable/11/sys/modules/geom/geom_label/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/conf/files
==
--- stable/11/sys/conf/filesMon Apr 22 15:06:56 2019(r346558)
+++ stable/11/sys/conf/filesMon Apr 22 15:09:47 2019(r346559)
@@ -3475,6 +3475,7 @@ geom/journal/g_journal.c  optional geom_journal
 geom/journal/g_journal_ufs.c   optional geom_journal
 geom/label/g_label.c   optional geom_label | geom_label_gpt
 geom/label/g_label_ext2fs.coptional geom_label
+geom/label/g_label_flashmap.c  optional geom_label
 geom/label/g_label_iso9660.c   optional geom_label
 geom/label/g_label_msdosfs.c   optional geom_label
 geom/label/g_label_ntfs.c  optional geom_label

Modified: stable/11/sys/geom/geom_flashmap.c
==
--- stable/11/sys/geom/geom_flashmap.c  Mon Apr 22 15:06:56 2019
(r346558)
+++ stable/11/sys/geom/geom_flashmap.c  Mon Apr 22 15:09:47 2019
(r346559)
@@ -37,13 +37,12 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #include 
-#include 
 #include 
+#include 
+#include 
 
 #include 
 
-#defineFLASHMAP_CLASS_NAME "Flashmap"
-
 struct g_flashmap_slice {
off_t   sl_start;
off_t   sl_end;
@@ -69,8 +68,8 @@ static g_taste_t g_flashmap_taste;
 
 static int g_flashmap_load(device_t dev, struct g_provider *pp,
 flash_slicer_t slicer, struct g_flashmap_head *head);
-static int g_flashmap_modify(struct g_geom *gp, const char *devname,
-int secsize, struct g_flashmap_head *slices);
+static int g_flashmap_modify(struct g_flashmap *gfp, struct g_geom *gp,
+const char *devname, int secsize, struct g_flashmap_head *slices);
 static void g_flashmap_print(struct g_flashmap_slice *slice);
 
 MALLOC_DECLARE(M_FLASHMAP);
@@ -86,8 +85,8 @@ g_flashmap_print(struct g_flashmap_slice *slice)
 }
 
 static int
-g_flashmap_modify(struct g_geom *gp, const char *devname, int secsize,
-struct g_flashmap_head *slices)
+g_flashmap_modify(struct g_flashmap *gfp, struct g_geom *gp,
+const char *devname, int secsize, struct g_flashmap_head *slices)
 {
struct g_flashmap_slice *slice;
int i, error;
@@ -112,6 +111,8 @@ g_flashmap_modify(struct g_geom *gp, const char *devna
 
i = 0;
STAILQ_FOREACH(slice, slices, sl_link) {
+   free(__DECONST(void *, gfp->labels[i]), M_FLASHMAP);
+   gfp->labels[i] = strdup(slice->sl_name, M_FLASHMAP);
error = g_slice_config(gp, i++, G_SLICE_CONFIG_SET,
slice->sl_start,
slice->sl_end - slice->sl_start + 1,
@@ -151,6 +152,7 @@ g_flashmap_taste(struct g_class *mp, struct g_provider
struct g_consumer *cp;
struct g_flashmap_head head;
struct g_flashmap_slice *slice, *slice_temp;
+   struct g_flashmap *gfp;
flash_slicer_t slicer;
device_t dev;
int i, size;
@@ -162,7 +164,8 @@ g_flashmap_taste(struct g_class *mp, struct g_provider
strcmp(pp->geom->class->name, G_DISK_CLASS_NAME) != 0)
return (NULL);
 
-   gp = g_slice_new(mp, FLASH_SLICES_MAX_NUM, pp, &cp, NULL, 0, NULL);
+   gp = g_slice_new(mp, FLASH_SLICES_MAX_NUM, pp, &cp, (void**)&gfp,
+   sizeof(struct g_flashmap), NULL);
if (gp == NULL)
return (NULL);
 
@@ -184,7 +187,7 @@ g_flashmap_taste(struct g_class *mp, struct g_provider
if (g_flashmap_load(dev, pp, slicer, &head) == 0)
brea

svn commit: r346559 - in stable/11/sys: conf geom geom/label modules/geom/geom_label

[Ian Lepore]

Author: ian
Date: Mon Apr 22 15:09:47 2019
New Revision: 346559
URL: https://svnweb.freebsd.org/changeset/base/346559

Log:
  MFC r345480, r346013
  
  r345480:
  Support device-independent labels for geom_flashmap slices.
  
  While geom_flashmap has always supported label names for its slices, it does
  so by appending "s.labelname" to the provider device name, meaning you still
  have to know the name and unit of the hardware device to use the labels.
  
  These changes add support for device-independent geom_flashmap labels, using
  the standard geom_label infrastructure. geom_flashmap now creates a softc
  struct attached to its geom, and as it creates slices it stores the label
  into an array in the softc. The new geom_label_flashmap uses those labels
  when tasting a geom_flashmap provider.
  
  Differential Revision:https://reviews.freebsd.org/D19535
  
  r346013:
  Add g_label_flashmap.c to the module, should have been part of r345480.

Added:
  stable/11/sys/geom/geom_flashmap.h
 - copied unchanged from r345480, head/sys/geom/geom_flashmap.h
  stable/11/sys/geom/label/g_label_flashmap.c
 - copied unchanged from r345480, head/sys/geom/label/g_label_flashmap.c
Modified:
  stable/11/sys/conf/files
  stable/11/sys/geom/geom_flashmap.c
  stable/11/sys/geom/label/g_label.c
  stable/11/sys/geom/label/g_label.h
  stable/11/sys/modules/geom/geom_label/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/conf/files
==
--- stable/11/sys/conf/filesMon Apr 22 15:06:56 2019(r346558)
+++ stable/11/sys/conf/filesMon Apr 22 15:09:47 2019(r346559)
@@ -3475,6 +3475,7 @@ geom/journal/g_journal.c  optional geom_journal
 geom/journal/g_journal_ufs.c   optional geom_journal
 geom/label/g_label.c   optional geom_label | geom_label_gpt
 geom/label/g_label_ext2fs.coptional geom_label
+geom/label/g_label_flashmap.c  optional geom_label
 geom/label/g_label_iso9660.c   optional geom_label
 geom/label/g_label_msdosfs.c   optional geom_label
 geom/label/g_label_ntfs.c  optional geom_label

Modified: stable/11/sys/geom/geom_flashmap.c
==
--- stable/11/sys/geom/geom_flashmap.c  Mon Apr 22 15:06:56 2019
(r346558)
+++ stable/11/sys/geom/geom_flashmap.c  Mon Apr 22 15:09:47 2019
(r346559)
@@ -37,13 +37,12 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #include 
-#include 
 #include 
+#include 
+#include 
 
 #include 
 
-#defineFLASHMAP_CLASS_NAME "Flashmap"
-
 struct g_flashmap_slice {
off_t   sl_start;
off_t   sl_end;
@@ -69,8 +68,8 @@ static g_taste_t g_flashmap_taste;
 
 static int g_flashmap_load(device_t dev, struct g_provider *pp,
 flash_slicer_t slicer, struct g_flashmap_head *head);
-static int g_flashmap_modify(struct g_geom *gp, const char *devname,
-int secsize, struct g_flashmap_head *slices);
+static int g_flashmap_modify(struct g_flashmap *gfp, struct g_geom *gp,
+const char *devname, int secsize, struct g_flashmap_head *slices);
 static void g_flashmap_print(struct g_flashmap_slice *slice);
 
 MALLOC_DECLARE(M_FLASHMAP);
@@ -86,8 +85,8 @@ g_flashmap_print(struct g_flashmap_slice *slice)
 }
 
 static int
-g_flashmap_modify(struct g_geom *gp, const char *devname, int secsize,
-struct g_flashmap_head *slices)
+g_flashmap_modify(struct g_flashmap *gfp, struct g_geom *gp,
+const char *devname, int secsize, struct g_flashmap_head *slices)
 {
struct g_flashmap_slice *slice;
int i, error;
@@ -112,6 +111,8 @@ g_flashmap_modify(struct g_geom *gp, const char *devna
 
i = 0;
STAILQ_FOREACH(slice, slices, sl_link) {
+   free(__DECONST(void *, gfp->labels[i]), M_FLASHMAP);
+   gfp->labels[i] = strdup(slice->sl_name, M_FLASHMAP);
error = g_slice_config(gp, i++, G_SLICE_CONFIG_SET,
slice->sl_start,
slice->sl_end - slice->sl_start + 1,
@@ -151,6 +152,7 @@ g_flashmap_taste(struct g_class *mp, struct g_provider
struct g_consumer *cp;
struct g_flashmap_head head;
struct g_flashmap_slice *slice, *slice_temp;
+   struct g_flashmap *gfp;
flash_slicer_t slicer;
device_t dev;
int i, size;
@@ -162,7 +164,8 @@ g_flashmap_taste(struct g_class *mp, struct g_provider
strcmp(pp->geom->class->name, G_DISK_CLASS_NAME) != 0)
return (NULL);
 
-   gp = g_slice_new(mp, FLASH_SLICES_MAX_NUM, pp, &cp, NULL, 0, NULL);
+   gp = g_slice_new(mp, FLASH_SLICES_MAX_NUM, pp, &cp, (void**)&gfp,
+   sizeof(struct g_flashmap), NULL);
if (gp == NULL)
return (NULL);
 
@@ -184,7 +187,7 @@ g_flashmap_taste(struct g_class *mp, struct g_provider
if (g_flashmap_load(dev, pp, slicer, &head) == 0)
brea