scsi: target: Detect UNMAP support post configuration

On our backend we can do something similar to LIO where we can enable and
disable UNMAP support on the fly. In the SCSI/block layer we can detect
this by just doing a rescan. However, LIO cannot detect this change because
we only check during the initial configuration. This patch allows UNMAP
detection to also happen when the user tries to turn it on.

Link: https://lore.kernel.org/r/20220628200230.15052-6-michael.christie@oracle.com
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index bbcbbfa72b07bc90bb013adab0c1581aba4d6932..416514c5c7acd5acf92914d7d9348d988e0ebb0c 100644 (file)
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -732,6 +732,7 @@ static ssize_t emulate_tpu_store(struct config_item *item,
                const char *page, size_t count)
 {
        struct se_dev_attrib *da = to_attrib(item);
+       struct se_device *dev = da->da_dev;
        bool flag;
        int ret;
 
@@ -744,8 +745,11 @@ static ssize_t emulate_tpu_store(struct config_item *item,
         * Discard supported is detected iblock_create_virtdevice().
         */
        if (flag && !da->max_unmap_block_desc_count) {
-               pr_err("Generic Block Discard not supported\n");
-               return -ENOSYS;
+               if (!dev->transport->configure_unmap ||
+                   !dev->transport->configure_unmap(dev)) {
+                       pr_err("Generic Block Discard not supported\n");
+                       return -ENOSYS;
+               }
        }
 
        da->emulate_tpu = flag;
@@ -758,6 +762,7 @@ static ssize_t emulate_tpws_store(struct config_item *item,
                const char *page, size_t count)
 {
        struct se_dev_attrib *da = to_attrib(item);
+       struct se_device *dev = da->da_dev;
        bool flag;
        int ret;
 
@@ -770,8 +775,11 @@ static ssize_t emulate_tpws_store(struct config_item *item,
         * Discard supported is detected iblock_create_virtdevice().
         */
        if (flag && !da->max_unmap_block_desc_count) {
-               pr_err("Generic Block Discard not supported\n");
-               return -ENOSYS;
+               if (!dev->transport->configure_unmap ||
+                   !dev->transport->configure_unmap(dev)) {
+                       pr_err("Generic Block Discard not supported\n");
+                       return -ENOSYS;
+               }
        }
 
        da->emulate_tpws = flag;
@@ -964,6 +972,7 @@ static ssize_t unmap_zeroes_data_store(struct config_item *item,
                const char *page, size_t count)
 {
        struct se_dev_attrib *da = to_attrib(item);
+       struct se_device *dev = da->da_dev;
        bool flag;
        int ret;
 
@@ -982,10 +991,12 @@ static ssize_t unmap_zeroes_data_store(struct config_item *item,
         * Discard supported is detected iblock_configure_device().
         */
        if (flag && !da->max_unmap_block_desc_count) {
-               pr_err("dev[%p]: Thin Provisioning LBPRZ will not be set"
-                      " because max_unmap_block_desc_count is zero\n",
-                      da->da_dev);
-               return -ENOSYS;
+               if (!dev->transport->configure_unmap ||
+                   !dev->transport->configure_unmap(dev)) {
+                       pr_err("dev[%p]: Thin Provisioning LBPRZ will not be set because max_unmap_block_desc_count is zero\n",
+                              da->da_dev);
+                       return -ENOSYS;
+               }
        }
        da->unmap_zeroes_data = flag;
        pr_debug("dev[%p]: SE Device Thin Provisioning LBPRZ bit: %d\n",