Skip to contentSkip to conversation

ata: libata-scsi: Refactor scsi_6_lba_len() with use of get_unaligned_be24()

PATCH In review Andy Shevchenko 3 participants 5 messages Jul 26, 2022 – Jul 29, 2022 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ata: libata-scsi: Refactor scsi_6_lba_len() with use of get_unaligned_be24()

Refactor scsi_6_lba_len() with use of get_unaligned_be24() to make it consistent with other similar helper implementations.

---
 drivers/ata/libata-scsi.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/ata/libata-scsi.c +2 -11
index 29e2f55c6faa..857996add897 100644
@@ -1318,17 +1318,8 @@ static unsigned int ata_scsi_flush_xlat(struct ata_queued_cmd *qc)
  */
 static void scsi_6_lba_len(const u8 *cdb, u64 *plba, u32 *plen)
 {
-	u64 lba = 0;
-	u32 len;
-
-	lba |= ((u64)(cdb[1] & 0x1f)) << 16;
-	lba |= ((u64)cdb[2]) << 8;
-	lba |= ((u64)cdb[3]);
-
-	len = cdb[4];
-
-	*plba = lba;
-	*plen = len;
+	*plba = get_unaligned_be24(cdb[1]) & 0x1fffff;
+	*plen = cdb[4];
 }
 
 /**
Signature · 1 line
2.35.1
#1 lore raw

drivers/ata/libata-scsi.c static unsigned int ata_scsi_flush_xlat(struct ata_queued_cmd *qc) · line 1322

Quoted 4 lines · Andy Shevchenko

static void scsi_6_lba_len(const u8 *cdb, u64 *plba, u32 *plen) {

drivers/ata/libata-scsi.c +2 -0
+	*plba = get_unaligned_be24(cdb[1]) & 0x1fffff;
+	*plen = cdb[4];

I think just pen coding this in the caller would be a lot cleaner.

Same for scsi_10_lba_len and scsi_16_lba_len in their two callers each.

#2 lore raw
In reply to Andy Shevchenko
I love your patch! Yet something to improve:

Hi Andy,

I love your patch! Yet something to improve:

[auto build test ERROR on linus/master]
[also build test ERROR on v5.19-rc8 next-20220728]
[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/Andy-Shevchenko/ata-libata-scsi-Refactor-scsi_6_lba_len-with-use-of-get_unaligned_be24/20220726-234746
base:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e0dccc3b76fb35bb257b4118367a883073d7390e
config: mips-randconfig-r011-20220724 (https://download.01.org/0day-ci/archive/20220729/[email protected]/config)
compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project 83882606dbd7ffb0bdd3460356202d97705809c8)

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install mips cross compiling tool for clang build
# apt-get install binutils-mips-linux-gnu
# https://github.com/intel-lab-lkp/linux/commit/ae9a00d0e0375aa2aea7a61dc2894d9d06005f8e
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Andy-Shevchenko/ata-libata-scsi-Refactor-scsi_6_lba_len-with-use-of-get_unaligned_be24/20220726-234746 git checkout ae9a00d0e0375aa2aea7a61dc2894d9d06005f8e
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=mips SHELL=/bin/bash drivers/ata/

If you fix the issue, kindly add following tag where applicable

All errors (new ones prefixed by >>):

>> drivers/ata/libata-scsi.c:1320:29: error: incompatible integer to pointer conversion passing 'const u8' (aka 'const unsigned char') to parameter of type 'const void *' [-Wint-conversion]
           *plba = get_unaligned_be24(cdb[1]) & 0x1fffff;
                                      ^~~~~~
   include/asm-generic/unaligned.h:90:50: note: passing argument to parameter 'p' here
   static inline u32 get_unaligned_be24(const void *p)
                                                    ^

1 error generated.

vim +1320 drivers/ata/libata-scsi.c

1307
1308 /**
1309 * scsi_6_lba_len - Get LBA and transfer length
1310 * @cdb: SCSI command to translate
1311 *
1312 * Calculate LBA and transfer length for 6-byte commands.
1313 *
1314 * RETURNS:
1315 * @plba: the LBA
1316 * @plen: the transfer length
1317 */
1318 static void scsi_6_lba_len(const u8 *cdb, u64 *plba, u32 *plen)
1319 {

> 1320		*plba = get_unaligned_be24(cdb[1]) & 0x1fffff;

1321 *plen = cdb[4];
1322 }
1323

Signature · 2 lines
0-DAY CI Kernel Test Service
https://01.org/lkp
#3 lore raw
In reply to Andy Shevchenko
I love your patch! Perhaps something to improve:

Hi Andy,

I love your patch! Perhaps something to improve:

[auto build test WARNING on linus/master]
[also build test WARNING on v5.19-rc8 next-20220728]
[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/Andy-Shevchenko/ata-libata-scsi-Refactor-scsi_6_lba_len-with-use-of-get_unaligned_be24/20220726-234746
base:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e0dccc3b76fb35bb257b4118367a883073d7390e
config: x86_64-defconfig (https://download.01.org/0day-ci/archive/20220729/[email protected]/config)
compiler: gcc-11 (Debian 11.3.0-3) 11.3.0
reproduce (this is a W=1 build):
        # https://github.com/intel-lab-lkp/linux/commit/ae9a00d0e0375aa2aea7a61dc2894d9d06005f8e
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Andy-Shevchenko/ata-libata-scsi-Refactor-scsi_6_lba_len-with-use-of-get_unaligned_be24/20220726-234746
        git checkout ae9a00d0e0375aa2aea7a61dc2894d9d06005f8e
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/ata/

If you fix the issue, kindly add following tag where applicable

All warnings (new ones prefixed by >>):

drivers/ata/libata-scsi.c: In function 'scsi_6_lba_len':

>> drivers/ata/libata-scsi.c:1320:39: warning: passing argument 1 of 'get_unaligned_be24' makes pointer from integer without a cast [-Wint-conversion]
    1320 |         *plba = get_unaligned_be24(cdb[1]) & 0x1fffff;
         |                                    ~~~^~~
         |                                       |
         |                                       u8 {aka unsigned char}

In file included from ./arch/x86/include/generated/asm/unaligned.h:1,
from drivers/ata/libata-scsi.c:33:
include/asm-generic/unaligned.h:90:50: note: expected 'const void *' but argument is of type 'u8' {aka 'unsigned char'}
90 | static inline u32 get_unaligned_be24(const void *p)
| ~~~~~~~~~~~~^

vim +/get_unaligned_be24 +1320 drivers/ata/libata-scsi.c

1307
1308 /**
1309 * scsi_6_lba_len - Get LBA and transfer length
1310 * @cdb: SCSI command to translate
1311 *
1312 * Calculate LBA and transfer length for 6-byte commands.
1313 *
1314 * RETURNS:
1315 * @plba: the LBA
1316 * @plen: the transfer length
1317 */
1318 static void scsi_6_lba_len(const u8 *cdb, u64 *plba, u32 *plen)
1319 {

> 1320		*plba = get_unaligned_be24(cdb[1]) & 0x1fffff;

1321 *plen = cdb[4];
1322 }
1323

Signature · 2 lines
0-DAY CI Kernel Test Service
https://01.org/lkp
#4 lore raw
In reply to Andy Shevchenko
I love your patch! Perhaps something to improve:

Hi Andy,

I love your patch! Perhaps something to improve:

[auto build test WARNING on linus/master]
[also build test WARNING on v5.19-rc8 next-20220728]
[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/Andy-Shevchenko/ata-libata-scsi-Refactor-scsi_6_lba_len-with-use-of-get_unaligned_be24/20220726-234746
base:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e0dccc3b76fb35bb257b4118367a883073d7390e
config: i386-randconfig-a003 (https://download.01.org/0day-ci/archive/20220729/[email protected]/config)
compiler: gcc-11 (Debian 11.3.0-3) 11.3.0
reproduce (this is a W=1 build):
        # https://github.com/intel-lab-lkp/linux/commit/ae9a00d0e0375aa2aea7a61dc2894d9d06005f8e
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Andy-Shevchenko/ata-libata-scsi-Refactor-scsi_6_lba_len-with-use-of-get_unaligned_be24/20220726-234746
        git checkout ae9a00d0e0375aa2aea7a61dc2894d9d06005f8e
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        make W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/ata/

If you fix the issue, kindly add following tag where applicable

All warnings (new ones prefixed by >>):

drivers/ata/libata-scsi.c: In function 'scsi_6_lba_len':

>> drivers/ata/libata-scsi.c:1320:39: warning: passing argument 1 of 'get_unaligned_be24' makes pointer from integer without a cast [-Wint-conversion]
    1320 |         *plba = get_unaligned_be24(cdb[1]) & 0x1fffff;
         |                                    ~~~^~~
         |                                       |
         |                                       u8 {aka unsigned char}

In file included from ./arch/x86/include/generated/asm/unaligned.h:1,
from drivers/ata/libata-scsi.c:33:
include/asm-generic/unaligned.h:90:50: note: expected 'const void *' but argument is of type 'u8' {aka 'unsigned char'}
90 | static inline u32 get_unaligned_be24(const void *p)
| ~~~~~~~~~~~~^

vim +/get_unaligned_be24 +1320 drivers/ata/libata-scsi.c

1307
1308 /**
1309 * scsi_6_lba_len - Get LBA and transfer length
1310 * @cdb: SCSI command to translate
1311 *
1312 * Calculate LBA and transfer length for 6-byte commands.
1313 *
1314 * RETURNS:
1315 * @plba: the LBA
1316 * @plen: the transfer length
1317 */
1318 static void scsi_6_lba_len(const u8 *cdb, u64 *plba, u32 *plen)
1319 {

> 1320		*plba = get_unaligned_be24(cdb[1]) & 0x1fffff;

1321 *plen = cdb[4];
1322 }
1323

Signature · 2 lines
0-DAY CI Kernel Test Service
https://01.org/lkp