target: Have core_tmr_alloc_req() take an explicit GFP_xxx flag

Testing in_interrupt() to know when sleeping is allowed is not really
reliable (since eg it won't be true if the caller is holding a spinlock).
Instead have the caller tell core_tmr_alloc_req() what GFP_xxx to use;
every caller except tcm_qla2xxx can use GFP_KERNEL.

Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

4 files changed, 7 insertions, 6 deletions

diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
index f00137f377b2..c4be6223b9cc 100644
--- a/drivers/target/iscsi/iscsi_target_util.c
+++ b/drivers/target/iscsi/iscsi_target_util.c
@@ -289,7 +289,8 @@ struct iscsi_cmd *iscsit_allocate_se_cmd_for_tmr(
         }
 
         se_cmd->se_tmr_req = core_tmr_alloc_req(se_cmd,
-                                (void *)cmd->tmr_req, tcm_function);
+                                (void *)cmd->tmr_req, tcm_function,
+                                GFP_KERNEL);
         if (!se_cmd->se_tmr_req)
                 goto out;
 
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index f0e701d27bd1..5b870c316b9c 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -366,7 +366,7 @@ static int tcm_loop_device_reset(struct scsi_cmnd *sc)
          * Allocate the LUN_RESET TMR
          */
         se_cmd->se_tmr_req = core_tmr_alloc_req(se_cmd, tl_tmr,
-                                TMR_LUN_RESET);
+                                                TMR_LUN_RESET, GFP_KERNEL);
         if (IS_ERR(se_cmd->se_tmr_req))
                 goto release;
         /*
diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
index d04cc1016ebf..efc5ec7da57c 100644
--- a/drivers/target/target_core_tmr.c
+++ b/drivers/target/target_core_tmr.c
@@ -43,12 +43,12 @@
 struct se_tmr_req *core_tmr_alloc_req(
         struct se_cmd *se_cmd,
         void *fabric_tmr_ptr,
-        u8 function)
+        u8 function,
+        gfp_t gfp_flags)
 {
         struct se_tmr_req *tmr;
 
-        tmr = kmem_cache_zalloc(se_tmr_req_cache, (in_interrupt()) ?
-                                        GFP_ATOMIC : GFP_KERNEL);
+        tmr = kmem_cache_zalloc(se_tmr_req_cache, gfp_flags);
         if (!tmr) {
                 pr_err("Unable to allocate struct se_tmr_req\n");
                 return ERR_PTR(-ENOMEM);
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index 7f2ee5a0ed79..55a278ed1111 100644
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -396,7 +396,7 @@ static void ft_send_tm(struct ft_cmd *cmd)
         }
 
         pr_debug("alloc tm cmd fn %d\n", tm_func);
-        tmr = core_tmr_alloc_req(&cmd->se_cmd, cmd, tm_func);
+        tmr = core_tmr_alloc_req(&cmd->se_cmd, cmd, tm_func, GFP_KERNEL);
         if (!tmr) {
                 pr_debug("alloc failed\n");
                 ft_send_resp_code_and_free(cmd, FCP_TMF_FAILED);