diff mbox series

[04/14] scsi: cxlflash: Replaced ternary operation in write_same16 with min()

Message ID 20240626101342.1440049-5-prabhakar.pujeri@gmail.com
State New
Headers show
Series SCSI: Replace ternary operations with min()/max() macros | expand

Commit Message

Prabhakar Pujeri June 26, 2024, 10:13 a.m. UTC
Signed-off-by: Prabhakar Pujeri <prabhakar.pujeri@gmail.com>
---
 drivers/scsi/cxlflash/vlun.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

kernel test robot June 27, 2024, 5:05 a.m. UTC | #1
Hi Prabhakar,

kernel test robot noticed the following build errors:

[auto build test ERROR on jejb-scsi/for-next]
[also build test ERROR on mkp-scsi/for-next linus/master v6.10-rc5 next-20240626]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Prabhakar-Pujeri/scsi-advansys-Simplified-memcpy-length-calculation-in-adv_build_req/20240626-231800
base:   https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git for-next
patch link:    https://lore.kernel.org/r/20240626101342.1440049-5-prabhakar.pujeri%40gmail.com
patch subject: [PATCH 04/14] scsi: cxlflash: Replaced ternary operation in write_same16 with min()
config: powerpc-powernv_defconfig (https://download.01.org/0day-ci/archive/20240627/202406271203.uuqA8eNf-lkp@intel.com/config)
compiler: powerpc64le-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240627/202406271203.uuqA8eNf-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202406271203.uuqA8eNf-lkp@intel.com/

All errors (new ones prefixed by >>):

   In file included from include/linux/container_of.h:5,
                    from include/linux/kernel.h:22,
                    from include/linux/interrupt.h:6,
                    from drivers/scsi/cxlflash/vlun.c:11:
   drivers/scsi/cxlflash/vlun.c: In function 'write_same16':
>> include/linux/build_bug.h:78:41: error: static assertion failed: "min(ws_limit, left) signedness error, fix types or consider umin() before min_t()"
      78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
         |                                         ^~~~~~~~~~~~~~
   include/linux/build_bug.h:77:34: note: in expansion of macro '__static_assert'
      77 | #define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr)
         |                                  ^~~~~~~~~~~~~~~
   include/linux/minmax.h:51:9: note: in expansion of macro 'static_assert'
      51 |         static_assert(__types_ok(x, y),                 \
         |         ^~~~~~~~~~~~~
   include/linux/minmax.h:58:17: note: in expansion of macro '__cmp_once'
      58 |                 __cmp_once(op, x, y, __UNIQUE_ID(__x), __UNIQUE_ID(__y)))
         |                 ^~~~~~~~~~
   include/linux/minmax.h:85:25: note: in expansion of macro '__careful_cmp'
      85 | #define min(x, y)       __careful_cmp(min, x, y)
         |                         ^~~~~~~~~~~~~
   drivers/scsi/cxlflash/vlun.c:448:36: note: in expansion of macro 'min'
     448 |                 put_unaligned_be32(min(ws_limit, left),
         |                                    ^~~


vim +78 include/linux/build_bug.h

bc6245e5efd70c Ian Abbott       2017-07-10  60  
6bab69c65013be Rasmus Villemoes 2019-03-07  61  /**
6bab69c65013be Rasmus Villemoes 2019-03-07  62   * static_assert - check integer constant expression at build time
6bab69c65013be Rasmus Villemoes 2019-03-07  63   *
6bab69c65013be Rasmus Villemoes 2019-03-07  64   * static_assert() is a wrapper for the C11 _Static_assert, with a
6bab69c65013be Rasmus Villemoes 2019-03-07  65   * little macro magic to make the message optional (defaulting to the
6bab69c65013be Rasmus Villemoes 2019-03-07  66   * stringification of the tested expression).
6bab69c65013be Rasmus Villemoes 2019-03-07  67   *
6bab69c65013be Rasmus Villemoes 2019-03-07  68   * Contrary to BUILD_BUG_ON(), static_assert() can be used at global
6bab69c65013be Rasmus Villemoes 2019-03-07  69   * scope, but requires the expression to be an integer constant
6bab69c65013be Rasmus Villemoes 2019-03-07  70   * expression (i.e., it is not enough that __builtin_constant_p() is
6bab69c65013be Rasmus Villemoes 2019-03-07  71   * true for expr).
6bab69c65013be Rasmus Villemoes 2019-03-07  72   *
6bab69c65013be Rasmus Villemoes 2019-03-07  73   * Also note that BUILD_BUG_ON() fails the build if the condition is
6bab69c65013be Rasmus Villemoes 2019-03-07  74   * true, while static_assert() fails the build if the expression is
6bab69c65013be Rasmus Villemoes 2019-03-07  75   * false.
6bab69c65013be Rasmus Villemoes 2019-03-07  76   */
6bab69c65013be Rasmus Villemoes 2019-03-07  77  #define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr)
6bab69c65013be Rasmus Villemoes 2019-03-07 @78  #define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
6bab69c65013be Rasmus Villemoes 2019-03-07  79  
07a368b3f55a79 Maxim Levitsky   2022-10-25  80
kernel test robot June 27, 2024, 8:59 a.m. UTC | #2
Hi Prabhakar,

kernel test robot noticed the following build errors:

[auto build test ERROR on jejb-scsi/for-next]
[also build test ERROR on mkp-scsi/for-next linus/master v6.10-rc5 next-20240626]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Prabhakar-Pujeri/scsi-advansys-Simplified-memcpy-length-calculation-in-adv_build_req/20240626-231800
base:   https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git for-next
patch link:    https://lore.kernel.org/r/20240626101342.1440049-5-prabhakar.pujeri%40gmail.com
patch subject: [PATCH 04/14] scsi: cxlflash: Replaced ternary operation in write_same16 with min()
config: powerpc-allyesconfig (https://download.01.org/0day-ci/archive/20240627/202406271631.jhZ8qH3o-lkp@intel.com/config)
compiler: clang version 19.0.0git (https://github.com/llvm/llvm-project ad79a14c9e5ec4a369eed4adf567c22cc029863f)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240627/202406271631.jhZ8qH3o-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202406271631.jhZ8qH3o-lkp@intel.com/

All errors (new ones prefixed by >>):

   In file included from drivers/scsi/cxlflash/vlun.c:11:
   In file included from include/linux/interrupt.h:11:
   In file included from include/linux/hardirq.h:11:
   In file included from arch/powerpc/include/asm/hardirq.h:6:
   In file included from include/linux/irq.h:20:
   In file included from include/linux/io.h:14:
   In file included from arch/powerpc/include/asm/io.h:24:
   In file included from include/linux/mm.h:2253:
   include/linux/vmstat.h:500:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
     500 |         return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
         |                            ~~~~~~~~~~~~~~~~~~~~~ ^
     501 |                            item];
         |                            ~~~~
   include/linux/vmstat.h:507:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
     507 |         return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
         |                            ~~~~~~~~~~~~~~~~~~~~~ ^
     508 |                            NR_VM_NUMA_EVENT_ITEMS +
         |                            ~~~~~~~~~~~~~~~~~~~~~~
   include/linux/vmstat.h:514:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
     514 |         return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
         |                               ~~~~~~~~~~~ ^ ~~~
   include/linux/vmstat.h:519:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
     519 |         return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
         |                            ~~~~~~~~~~~~~~~~~~~~~ ^
     520 |                            NR_VM_NUMA_EVENT_ITEMS +
         |                            ~~~~~~~~~~~~~~~~~~~~~~
   include/linux/vmstat.h:528:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
     528 |         return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
         |                            ~~~~~~~~~~~~~~~~~~~~~ ^
     529 |                            NR_VM_NUMA_EVENT_ITEMS +
         |                            ~~~~~~~~~~~~~~~~~~~~~~
>> drivers/scsi/cxlflash/vlun.c:448:22: error: static assertion failed due to requirement '__builtin_choose_expr((sizeof(int) == sizeof (*(8 ? ((void *)((long)((((const unsigned int)(-1)) < (const unsigned int)1)) * 0L)) : (int *)8))), (((const unsigned int)(-1)) < (const unsigned int)1), 0) == __builtin_choose_expr((sizeof(int) == sizeof (*(8 ? ((void *)((long)((((int)(-1)) < (int)1)) * 0L)) : (int *)8))), (((int)(-1)) < (int)1), 0) || __builtin_choose_expr((sizeof(int) == sizeof (*(8 ? ((void *)((long)((((unsigned int)(-1)) < (unsigned int)1)) * 0L)) : (int *)8))), (((unsigned int)(-1)) < (unsigned int)1), 0) == __builtin_choose_expr((sizeof(int) == sizeof (*(8 ? ((void *)((long)((((int)(-1)) < (int)1)) * 0L)) : (int *)8))), (((int)(-1)) < (int)1), 0) || (__builtin_choose_expr((sizeof(int) == sizeof (*(8 ? ((void *)((long)(ws_limit) * 0L)) : (int *)8))) && __builtin_choose_expr((sizeof(int) == sizeof (*(8 ? ((void *)((long)((((const unsigned int)(-1)) < (const unsigned int)1)) * 0L)) : (int *)8))), (((const unsigned int)(-1)) < (const unsigned int)1), 0), ws_limit, -1) >= 0) || (__builtin_choose_expr((sizeof(int) == sizeof (*(8 ? ((void *)((long)(left) * 0L)) : (int *)8))) && __builtin_choose_expr((sizeof(int) == sizeof (*(8 ? ((void *)((long)((((int)(-1)) < (int)1)) * 0L)) : (int *)8))), (((int)(-1)) < (int)1), 0), left, -1) >= 0)': min(ws_limit, left) signedness error, fix types or consider umin() before min_t()
     448 |                 put_unaligned_be32(min(ws_limit, left),
         |                                    ^~~~~~~~~~~~~~~~~~~
   include/linux/minmax.h:85:19: note: expanded from macro 'min'
      85 | #define min(x, y)       __careful_cmp(min, x, y)
         |                         ^~~~~~~~~~~~~~~~~~~~~~~~
   include/linux/minmax.h:58:3: note: expanded from macro '__careful_cmp'
      58 |                 __cmp_once(op, x, y, __UNIQUE_ID(__x), __UNIQUE_ID(__y)))
         |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   include/linux/minmax.h:51:16: note: expanded from macro '__cmp_once'
      51 |         static_assert(__types_ok(x, y),                 \
         |         ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      52 |                 #op "(" #x ", " #y ") signedness error, fix types or consider u" #op "() before " #op "_t()"); \
         |                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   note: (skipping 1 expansions in backtrace; use -fmacro-backtrace-limit=0 to see all)
   include/linux/minmax.h:31:2: note: expanded from macro '__is_signed'
      31 |         __builtin_choose_expr(__is_constexpr(is_signed_type(typeof(x))),        \
         |         ^
   include/linux/build_bug.h:77:50: note: expanded from macro 'static_assert'
      77 | #define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr)
         |                                  ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~
   include/linux/build_bug.h:78:56: note: expanded from macro '__static_assert'
      78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
         |                                                        ^~~~
   5 warnings and 1 error generated.


vim +448 drivers/scsi/cxlflash/vlun.c

   392	
   393	/**
   394	 * write_same16() - sends a SCSI WRITE_SAME16 (0) command to specified LUN
   395	 * @sdev:	SCSI device associated with LUN.
   396	 * @lba:	Logical block address to start write same.
   397	 * @nblks:	Number of logical blocks to write same.
   398	 *
   399	 * The SCSI WRITE_SAME16 can take quite a while to complete. Should an EEH occur
   400	 * while in scsi_execute_cmd(), the EEH handler will attempt to recover. As
   401	 * part of the recovery, the handler drains all currently running ioctls,
   402	 * waiting until they have completed before proceeding with a reset. As this
   403	 * routine is used on the ioctl path, this can create a condition where the
   404	 * EEH handler becomes stuck, infinitely waiting for this ioctl thread. To
   405	 * avoid this behavior, temporarily unmark this thread as an ioctl thread by
   406	 * releasing the ioctl read semaphore. This will allow the EEH handler to
   407	 * proceed with a recovery while this thread is still running. Once the
   408	 * scsi_execute_cmd() returns, reacquire the ioctl read semaphore and check the
   409	 * adapter state in case it changed while inside of scsi_execute_cmd(). The
   410	 * state check will wait if the adapter is still being recovered or return a
   411	 * failure if the recovery failed. In the event that the adapter reset failed,
   412	 * simply return the failure as the ioctl would be unable to continue.
   413	 *
   414	 * Note that the above puts a requirement on this routine to only be called on
   415	 * an ioctl thread.
   416	 *
   417	 * Return: 0 on success, -errno on failure
   418	 */
   419	static int write_same16(struct scsi_device *sdev,
   420				u64 lba,
   421				u32 nblks)
   422	{
   423		u8 *cmd_buf = NULL;
   424		u8 *scsi_cmd = NULL;
   425		int rc = 0;
   426		int result = 0;
   427		u64 offset = lba;
   428		int left = nblks;
   429		struct cxlflash_cfg *cfg = shost_priv(sdev->host);
   430		struct device *dev = &cfg->dev->dev;
   431		const u32 s = ilog2(sdev->sector_size) - 9;
   432		const u32 to = sdev->request_queue->rq_timeout;
   433		const u32 ws_limit =
   434			sdev->request_queue->limits.max_write_zeroes_sectors >> s;
   435	
   436		cmd_buf = kzalloc(CMD_BUFSIZE, GFP_KERNEL);
   437		scsi_cmd = kzalloc(MAX_COMMAND_SIZE, GFP_KERNEL);
   438		if (unlikely(!cmd_buf || !scsi_cmd)) {
   439			rc = -ENOMEM;
   440			goto out;
   441		}
   442	
   443		while (left > 0) {
   444	
   445			scsi_cmd[0] = WRITE_SAME_16;
   446			scsi_cmd[1] = cfg->ws_unmap ? 0x8 : 0;
   447			put_unaligned_be64(offset, &scsi_cmd[2]);
 > 448			put_unaligned_be32(min(ws_limit, left),
   449					   &scsi_cmd[10]);
   450	
   451			/* Drop the ioctl read semaphore across lengthy call */
   452			up_read(&cfg->ioctl_rwsem);
   453			result = scsi_execute_cmd(sdev, scsi_cmd, REQ_OP_DRV_OUT,
   454						  cmd_buf, CMD_BUFSIZE, to,
   455						  CMD_RETRIES, NULL);
   456			down_read(&cfg->ioctl_rwsem);
   457			rc = check_state(cfg);
   458			if (rc) {
   459				dev_err(dev, "%s: Failed state result=%08x\n",
   460					__func__, result);
   461				rc = -ENODEV;
   462				goto out;
   463			}
   464	
   465			if (result) {
   466				dev_err_ratelimited(dev, "%s: command failed for "
   467						    "offset=%lld result=%08x\n",
   468						    __func__, offset, result);
   469				rc = -EIO;
   470				goto out;
   471			}
   472			left -= ws_limit;
   473			offset += ws_limit;
   474		}
   475	
   476	out:
   477		kfree(cmd_buf);
   478		kfree(scsi_cmd);
   479		dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
   480		return rc;
   481	}
   482
diff mbox series

Patch

diff --git a/drivers/scsi/cxlflash/vlun.c b/drivers/scsi/cxlflash/vlun.c
index 35326e311991..e39ef6967d5d 100644
--- a/drivers/scsi/cxlflash/vlun.c
+++ b/drivers/scsi/cxlflash/vlun.c
@@ -445,7 +445,7 @@  static int write_same16(struct scsi_device *sdev,
 		scsi_cmd[0] = WRITE_SAME_16;
 		scsi_cmd[1] = cfg->ws_unmap ? 0x8 : 0;
 		put_unaligned_be64(offset, &scsi_cmd[2]);
-		put_unaligned_be32(ws_limit < left ? ws_limit : left,
+		put_unaligned_be32(min(ws_limit, left),
 				   &scsi_cmd[10]);
 
 		/* Drop the ioctl read semaphore across lengthy call */