Add "devices/issue_discards" to lvm.conf.

Issue discards on lvremove if enabled and both storage and kernel have support.

diff --git a/WHATS_NEW b/WHATS_NEW
index 0eb5e81d512ea762f29b131558e418b2e0a752ef..952c984f5dbe8e2dae534e5e9d28b495ce766c4c 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,7 @@
 Version 2.02.85 - 
 ===================================
+  Add "devices/issue_discards" to lvm.conf.
+  Issue discards on lvremove if enabled and both storage and kernel have support.
   Fix incorrect tests for dm_snprintf() failure.
   Fix some unmatching sign comparation gcc warnings in the code.
   Allow lv_extend() to work on zero length intrinsically layered LVs.

diff --git a/doc/example.conf.in b/doc/example.conf.in
index f154ca573f2a30ea089ba6d46777f4472bd3fbad..cf31855322c5e8ee745bbab9fce2460eeacb7309 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -151,6 +151,14 @@ devices {
     # Example: Ignore devices smaller than 2MB (i.e. floppy drives).
     # pv_min_size = 2048
     pv_min_size = 512
+
+    # Issue discards to an LV's underlying PV(s) when the LV is removed.
+    # Discards inform the storage that a region is no longer in use.  If set
+    # to 1, discards will only be issued if both the storage and kernel provide
+    # support.  Not all storage will support or benefit from discards but SSDs
+    # or thinly provisioned LUNs generally do.
+    # 1 enables; 0 disables.
+    issue_discards = 0
 }
 
 # This section allows you to configure the way in which LVM selects

diff --git a/lib/config/defaults.h b/lib/config/defaults.h
index 2e20f932bb6889101bed6a0c0d886caf04cb6f6a..5a9ec12c526b0b35b24720f637adc2c8803c116d 100644 (file)
--- a/lib/config/defaults.h
+++ b/lib/config/defaults.h
@@ -37,6 +37,7 @@
 #define DEFAULT_REQUIRE_RESTOREFILE_WITH_UUID 1
 #define DEFAULT_DATA_ALIGNMENT_OFFSET_DETECTION 1
 #define DEFAULT_DATA_ALIGNMENT_DETECTION 1
+#define DEFAULT_ISSUE_DISCARDS 0
 
 #define DEFAULT_LOCKING_LIB "liblvm2clusterlock.so"
 #define DEFAULT_FALLBACK_TO_LOCAL_LOCKING 1

diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c
index 3de6cd166ec20892dde7209f1fbf18b3ec042790..154b2ccebb19768b518fc2032461032e6da2a01e 100644 (file)
--- a/lib/device/dev-io.c
+++ b/lib/device/dev-io.c
@@ -36,6 +36,9 @@
 #  ifndef BLKGETSIZE64         /* fs.h out-of-date */
 #    define BLKGETSIZE64 _IOR(0x12, 114, size_t)
 #  endif /* BLKGETSIZE64 */
+#  ifndef BLKDISCARD
+#    define BLKDISCARD _IO(0x12,119)
+#  endif
 #else
 #  include <sys/disk.h>
 #  define BLKBSZGET DKIOCGETBLOCKSIZE
@@ -301,6 +304,33 @@ static int _dev_read_ahead_dev(struct device *dev, uint32_t *read_ahead)
        return 1;
 }
 
+static int _dev_discard_blocks(struct device *dev, uint64_t offset_bytes, uint64_t size_bytes)
+{
+       uint64_t discard_range[2];
+
+       if (!dev_open(dev))
+               return_0;
+
+       discard_range[0] = offset_bytes;
+       discard_range[1] = size_bytes;
+
+       log_debug("Discarding %" PRIu64 " bytes offset %" PRIu64 " bytes on %s.",
+                 size_bytes, offset_bytes, dev_name(dev));
+       if (ioctl(dev->fd, BLKDISCARD, &discard_range) < 0) {
+               log_error("%s: BLKDISCARD ioctl at offset %" PRIu64 " size %" PRIu64 " failed: %s.",
+                         dev_name(dev), offset_bytes, size_bytes, strerror(errno));
+               if (!dev_close(dev))
+                       stack;
+               /* It doesn't matter if discard failed, so return success. */
+               return 1;
+       }
+
+       if (!dev_close(dev))
+               stack;
+
+       return 1;
+}
+
 /*-----------------------------------------------------------------
  * Public functions
  *---------------------------------------------------------------*/
@@ -329,6 +359,17 @@ int dev_get_read_ahead(struct device *dev, uint32_t *read_ahead)
        return _dev_read_ahead_dev(dev, read_ahead);
 }
 
+int dev_discard_blocks(struct device *dev, uint64_t offset_bytes, uint64_t size_bytes)
+{
+       if (!dev)
+               return 0;
+
+       if (dev->flags & DEV_REGULAR)
+               return 1;
+
+       return _dev_discard_blocks(dev, offset_bytes, size_bytes);
+}
+
 /* FIXME Unused
 int dev_get_sectsize(struct device *dev, uint32_t *size)
 {

diff --git a/lib/device/device.c b/lib/device/device.c
index a1d98f1ccf9b14fdbec75e65c5ae6a43c0c8566d..37bed6311b9167f777075975f6f77b595942cb5a 100644 (file)
--- a/lib/device/device.c
+++ b/lib/device/device.c
@@ -455,6 +455,20 @@ unsigned long dev_optimal_io_size(const char *sysfs_dir,
                                       sysfs_dir, dev);
 }
 
+unsigned long dev_discard_max_bytes(const char *sysfs_dir,
+                                   struct device *dev)
+{
+       return _dev_topology_attribute("queue/discard_max_bytes",
+                                      sysfs_dir, dev);
+}
+
+unsigned long dev_discard_granularity(const char *sysfs_dir,
+                                     struct device *dev)
+{
+       return _dev_topology_attribute("queue/discard_granularity",
+                                      sysfs_dir, dev);
+}
+
 #else
 
 int get_primary_dev(const char *sysfs_dir,
@@ -481,4 +495,16 @@ unsigned long dev_optimal_io_size(const char *sysfs_dir,
        return 0UL;
 }
 
+unsigned long dev_discard_max_bytes(const char *sysfs_dir,
+                                   struct device *dev)
+{
+       return 0UL;
+}
+
+unsigned long dev_discard_granularity(const char *sysfs_dir,
+                                     struct device *dev)
+{
+       return 0UL;
+}
+
 #endif

diff --git a/lib/device/device.h b/lib/device/device.h
index 251a2017da987f50c9669b4db94aa56e15bad393..dc4d50ab31bb001326e9dc56987c1d1d18117e91 100644 (file)
--- a/lib/device/device.h
+++ b/lib/device/device.h
@@ -68,6 +68,7 @@ struct device_area {
 int dev_get_size(const struct device *dev, uint64_t *size);
 int dev_get_sectsize(struct device *dev, uint32_t *size);
 int dev_get_read_ahead(struct device *dev, uint32_t *read_ahead);
+int dev_discard_blocks(struct device *dev, uint64_t offset_bytes, uint64_t size_bytes);
 
 /* Use quiet version if device number could change e.g. when opening LV */
 int dev_open(struct device *dev);
@@ -115,4 +116,10 @@ unsigned long dev_minimum_io_size(const char *sysfs_dir,
 unsigned long dev_optimal_io_size(const char *sysfs_dir,
                                  struct device *dev);
 
+unsigned long dev_discard_max_bytes(const char *sysfs_dir,
+                                   struct device *dev);
+
+unsigned long dev_discard_granularity(const char *sysfs_dir,
+                                     struct device *dev);
+
 #endif

diff --git a/lib/metadata/pv_manip.c b/lib/metadata/pv_manip.c
index fdba91dda7addbbed6f15377283838611f8022a0..8a06a72241c7bd64e26b4635ebe66408dc7512a3 100644 (file)
--- a/lib/metadata/pv_manip.c
+++ b/lib/metadata/pv_manip.c
@@ -20,6 +20,7 @@
 #include "archiver.h"
 #include "locking.h"
 #include "lvmcache.h"
+#include "defaults.h"
 
 static struct pv_segment *_alloc_pv_segment(struct dm_pool *mem,
                                            struct physical_volume *pv,
@@ -190,12 +191,38 @@ struct pv_segment *assign_peg_to_lvseg(struct physical_volume *pv,
 
 int release_pv_segment(struct pv_segment *peg, uint32_t area_reduction)
 {
+       uint64_t discard_offset;
+       uint64_t pe_start = peg->pv->pe_start;
+       uint64_t discard_area_reduction = area_reduction;
+
        if (!peg->lvseg) {
                log_error("release_pv_segment with unallocated segment: "
                          "%s PE %" PRIu32, pv_dev_name(peg->pv), peg->pe);
                return 0;
        }
 
+       /*
+        * Only issue discards if enabled in lvm.conf and both
+        * the device and kernel (>= 2.6.35) supports discards.
+        */
+       if (find_config_tree_bool(peg->pv->fmt->cmd,
+                                 "devices/issue_discards", DEFAULT_ISSUE_DISCARDS) &&
+           dev_discard_max_bytes(peg->pv->fmt->cmd->sysfs_dir, peg->pv->dev) &&
+           dev_discard_granularity(peg->pv->fmt->cmd->sysfs_dir, peg->pv->dev)) {
+               if (!pe_start) {
+                       /* skip the first extent */
+                       pe_start = peg->pv->vg->extent_size;
+                       discard_area_reduction--;
+               }
+               discard_offset = peg->pe + peg->lvseg->area_len - area_reduction;
+               discard_offset = (discard_offset * peg->pv->vg->extent_size) + pe_start;
+               log_debug("Discarding %" PRIu32 " extents offset %" PRIu64 " sectors on %s.",
+                        discard_area_reduction, discard_offset, dev_name(peg->pv->dev));
+               if (!dev_discard_blocks(peg->pv->dev, discard_offset << SECTOR_SHIFT,
+                                       discard_area_reduction * peg->pv->vg->extent_size * SECTOR_SIZE))
+                       return_0;
+       }
+
        if (peg->lvseg->area_len == area_reduction) {
                peg->pv->pe_alloc_count -= area_reduction;
                peg->lvseg->lv->vg->free_count += area_reduction;

diff --git a/man/lvm.conf.5.in b/man/lvm.conf.5.in
index 2baca9bdee5b6f256787f525b65639ac236442c0..0b0accfce1f5beec45e271beb9a42b37223e76be 100644 (file)
--- a/man/lvm.conf.5.in
+++ b/man/lvm.conf.5.in
@@ -180,6 +180,13 @@ ignore devices smaller than 2MB (i.e. floppy drives):
 .IP
 pv_min_size = 2048
 .IP
+\fBissue_discards\fP \(em
+Issue discards to an LV's underlying PV(s) when the LV is removed.  Discards
+inform the storage that a region is no longer in use.  If set to 1, discards will
+only be issued if both the storage and kernel provide support.  Not all storage
+will support or benefit from discards but SSDs or thinly provisioned LUNs
+generally do.
+.IP
 .TP
 \fBallocation\fP \(em Space allocation policies
 .IP