Version 6.2.4.26

- Modified physical growth to validate the new VDO size against the size of
  the underlying storage.
- Fixed issues which prevented lvrename from working on lvm managed
  VDO devices.

kvdo.spec

@@ -1,6 +1,6 @@
 %define spec_release 1
 %define kmod_name		kvdo
-%define kmod_driver_version	6.2.4.14
+%define kmod_driver_version	6.2.4.26
 %define kmod_rpm_release	%{spec_release}
 %define kmod_kernel_version	3.10.0-693.el7
 
@@ -85,5 +85,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_usr}/src/%{kmod_name}-%{version}-%{kmod_driver_version}/*
 
 %changelog
-* Thu Oct 01 2020 - Red Hat VDO Group <[email protected]> - 6.2.4.14-1
-HASH(0x55c9459fe3b8)
+* Mon Nov 02 2020 - Red Hat VDO Group <[email protected]> - 6.2.4.26-1
+HASH(0x5645fb62bab0)

uds/Makefile

@@ -1,4 +1,4 @@
-UDS_VERSION = 8.0.2.2
+UDS_VERSION = 8.0.2.4
 
 SOURCES =  $(notdir $(wildcard $(src)/*.c)) murmur/MurmurHash3.c
 SOURCES += $(addprefix util/,$(notdir $(wildcard $(src)/util/*.c)))

vdo/Makefile

@@ -1,4 +1,4 @@
-VDO_VERSION = 6.2.4.14
+VDO_VERSION = 6.2.4.26
 
 VDO_VERSION_MAJOR = $(word 1,$(subst ., ,$(VDO_VERSION)))
 VDO_VERSION_MINOR = $(word 2,$(subst ., ,$(VDO_VERSION)))

vdo/kernel/dmvdo.c

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/aluminum/src/c++/vdo/kernel/dmvdo.c#39 $
+ * $Id: //eng/vdo-releases/aluminum/src/c++/vdo/kernel/dmvdo.c#42 $
  */
 
 #include "dmvdo.h"
@@ -582,17 +582,13 @@ static int vdoInitialize(struct dm_target *ti,
 /**********************************************************************/
 static int vdoCtr(struct dm_target *ti, unsigned int argc, char **argv)
 {
-  // Mild hack to avoid bumping instance number when we needn't.
-  char *poolName;
-  int result = getPoolNameFromArgv(argc, argv, &ti->error, &poolName);
-  if (result != VDO_SUCCESS) {
-    return -EINVAL;
-  }
-
+  int result = VDO_SUCCESS;
+
   RegisteredThread allocatingThread;
   registerAllocatingThread(&allocatingThread, NULL);
 
-  KernelLayer *oldLayer = findLayerMatching(layerIsNamed, poolName);
+  const char *deviceName = dm_device_name(dm_table_get_md(ti->table));  
+  KernelLayer *oldLayer = findLayerMatching(layerIsNamed, (void *)deviceName);
   unsigned int instance;
   if (oldLayer == NULL) {
     result = allocateKVDOInstance(&instance);
@@ -727,6 +723,15 @@ static int vdoPreresume(struct dm_target *ti)
   KernelLayer *layer = getKernelLayerForTarget(ti);
   DeviceConfig *config = ti->private;
   RegisteredThread instanceThread;
+
+  BlockCount backingBlocks = getUnderlyingDeviceBlockCount(layer);
+  if (backingBlocks < config->physicalBlocks) {
+    logError("resume of device '%s' failed: backing device has %" PRIu64
+             " blocks but VDO physical size is %llu blocks",
+             config->poolName, backingBlocks, config->physicalBlocks);
+    return -EINVAL;
+  }
+
   registerThreadDevice(&instanceThread, layer);
 
   if (getKernelLayerState(layer) == LAYER_STARTING) {
@@ -786,7 +791,7 @@ static void vdoResume(struct dm_target *ti)
 static struct target_type vdoTargetBio = {
   .features        = DM_TARGET_SINGLETON,
   .name            = "vdo",
-  .version         = {6, 2, 2},
+  .version         = {6, 2, 3},
   .module          = THIS_MODULE,
   .ctr             = vdoCtr,
   .dtr             = vdoDtr,

vdo/kernel/kernelLayer.c

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/aluminum/src/c++/vdo/kernel/kernelLayer.c#37 $
+ * $Id: //eng/vdo-releases/aluminum/src/c++/vdo/kernel/kernelLayer.c#38 $
  */
 
 #include "kernelLayer.h"
@@ -105,7 +105,9 @@ static BlockCount kvdoGetBlockCount(PhysicalLayer *header)
 /**********************************************************************/
 bool layerIsNamed(KernelLayer *layer, void *context)
 {
-  return (strcmp(layer->deviceConfig->poolName, (char *) context) == 0);
+  struct dm_target *ti = layer->deviceConfig->owningTarget;
+  const char *deviceName = dm_device_name(dm_table_get_md(ti->table));
+  return (strcmp(deviceName, (const char *) context) == 0);
 }
 
 /**
@@ -958,6 +960,41 @@ int prepareToModifyKernelLayer(KernelLayer       *layer,
   return VDO_SUCCESS;
 }
 
+/**********************************************************************
+ * Modify the pool name of the device.
+ *
+ * @param layer      The kernel layer
+ * @param oldName    The old pool name
+ * @param newName    The new pool name
+ *
+ * @return  VDO_SUCCESS or an error
+ *
+ */
+int modifyPoolName(KernelLayer *layer, char *oldName, char *newName)
+{
+  // We use pool name for sysfs and procfs. Rename them accordingly
+  logInfo("Modify pool name from %s to %s", oldName, newName);
+
+  void *procfsPrivate;
+  int result = vdoCreateProcfsEntry(layer, newName, &procfsPrivate);
+  if (result != VDO_SUCCESS) {
+    return result;
+  }
+
+  result = kobject_rename(&layer->kobj, newName);
+  if (result != 0) {
+    vdoDestroyProcfsEntry(newName, procfsPrivate);
+    return result;
+  }
+
+  void *tmpProcfs = layer->procfsPrivate;
+  layer->procfsPrivate = procfsPrivate;
+
+  vdoDestroyProcfsEntry(oldName, tmpProcfs);
+
+  return VDO_SUCCESS;
+}
+
 /**********************************************************************/
 int modifyKernelLayer(KernelLayer  *layer,
                       DeviceConfig *config)
@@ -1010,6 +1047,16 @@ int modifyKernelLayer(KernelLayer  *layer,
     }
   }
 
+  if (strcmp(config->poolName, extantConfig->poolName) != 0) {
+    logInfo("Modifying device '%s' pool name from %s to %s",
+	    config->poolName, extantConfig->poolName, config->poolName);
+    int result = modifyPoolName(layer, extantConfig->poolName,
+				config->poolName);
+    if (result != VDO_SUCCESS) {
+      return result;
+    }
+  }
+
   return VDO_SUCCESS;
 }