diff mbox series

blk: avoid divide-by-zero with zero granularity

Message ID 20210112152951.154024-1-fengli@smartx.com (mailing list archive)
State New, archived
Headers show
Series blk: avoid divide-by-zero with zero granularity | expand

Commit Message

Li Feng Jan. 12, 2021, 3:29 p.m. UTC 
If the physical_block_size and io_min is less than a sector, the
'granularity >> SECTOR_SHIFT' will be zero.

Signed-off-by: Li Feng <fengli@smartx.com>
---
 include/linux/blkdev.h | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Feng Li Jan. 12, 2021, 3:34 p.m. UTC | #1 
I'm sorry, ignore this one.

Li Feng <fengli@smartx.com> 于2021年1月12日周二 下午11:30写道：
>
> If the physical_block_size and io_min is less than a sector, the
> 'granularity >> SECTOR_SHIFT' will be zero.
>
> Signed-off-by: Li Feng <fengli@smartx.com>
> ---
>  include/linux/blkdev.h | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index f94ee3089e01..4d029e95adb4 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -1485,6 +1485,10 @@ static inline int queue_alignment_offset(const struct request_queue *q)
>  static inline int queue_limit_alignment_offset(struct queue_limits *lim, sector_t sector)
>  {
>         unsigned int granularity = max(lim->physical_block_size, lim->io_min);
> +       granularity = granularity >> SECTOR_SHIFT;
> +       if (!granularity)
> +               return 0;
> +
>         unsigned int alignment = sector_div(sector, granularity >> SECTOR_SHIFT)
>                 << SECTOR_SHIFT;
>
> --
> 2.29.2
>
kernel test robot Jan. 12, 2021, 6:42 p.m. UTC | #2 
Hi Li,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on block/for-next]
[also build test ERROR on v5.11-rc3 next-20210112]
[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]

url:    https://github.com/0day-ci/linux/commits/Li-Feng/blk-avoid-divide-by-zero-with-zero-granularity/20210112-233454
base:   https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git for-next
config: x86_64-randconfig-c002-20210112 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
reproduce (this is a W=1 build):
        # https://github.com/0day-ci/linux/commit/796e67f6b22f94f155669688e5e08281621b3ee6
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Li-Feng/blk-avoid-divide-by-zero-with-zero-granularity/20210112-233454
        git checkout 796e67f6b22f94f155669688e5e08281621b3ee6
        # save the attached .config to linux build tree
        make W=1 ARCH=x86_64 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   In file included from include/linux/blk-cgroup.h:23,
                    from include/linux/writeback.h:14,
                    from include/linux/memcontrol.h:22,
                    from include/linux/swap.h:9,
                    from include/linux/shmem_fs.h:6,
                    from drivers/gpu/drm/i915/i915_drv.h:49,
                    from <command-line>:
   include/linux/blkdev.h: In function 'queue_limit_alignment_offset':
>> include/linux/blkdev.h:1492:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
    1492 |  unsigned int alignment = sector_div(sector, granularity >> SECTOR_SHIFT)
         |  ^~~~~~~~
   cc1: all warnings being treated as errors


vim +1492 include/linux/blkdev.h

c72758f33784e5e2 Martin K. Petersen 2009-05-22  1484  
e03a72e13648ac62 Martin K. Petersen 2010-01-11  1485  static inline int queue_limit_alignment_offset(struct queue_limits *lim, sector_t sector)
81744ee44ab2845c Martin K. Petersen 2009-12-29  1486  {
81744ee44ab2845c Martin K. Petersen 2009-12-29  1487  	unsigned int granularity = max(lim->physical_block_size, lim->io_min);
796e67f6b22f94f1 Li Feng            2021-01-12  1488  	granularity = granularity >> SECTOR_SHIFT;
796e67f6b22f94f1 Li Feng            2021-01-12  1489  	if (!granularity)
796e67f6b22f94f1 Li Feng            2021-01-12  1490  		return 0;
796e67f6b22f94f1 Li Feng            2021-01-12  1491  
233bde21aa43516b Bart Van Assche    2018-03-14 @1492  	unsigned int alignment = sector_div(sector, granularity >> SECTOR_SHIFT)
233bde21aa43516b Bart Van Assche    2018-03-14  1493  		<< SECTOR_SHIFT;
81744ee44ab2845c Martin K. Petersen 2009-12-29  1494  
b8839b8c55f3fdd6 Mike Snitzer       2014-10-08  1495  	return (granularity + lim->alignment_offset - alignment) % granularity;
c72758f33784e5e2 Martin K. Petersen 2009-05-22  1496  }
c72758f33784e5e2 Martin K. Petersen 2009-05-22  1497  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
kernel test robot Jan. 12, 2021, 9:49 p.m. UTC | #3 
Hi Li,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on block/for-next]
[also build test WARNING on v5.11-rc3 next-20210112]
[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]

url:    https://github.com/0day-ci/linux/commits/Li-Feng/blk-avoid-divide-by-zero-with-zero-granularity/20210112-233454
base:   https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git for-next
config: arm-randconfig-r012-20210112 (attached as .config)
compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 32bcfcda4e28375e5a85268d2acfabcfcc011abf)
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 arm cross compiling tool for clang build
        # apt-get install binutils-arm-linux-gnueabi
        # https://github.com/0day-ci/linux/commit/796e67f6b22f94f155669688e5e08281621b3ee6
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Li-Feng/blk-avoid-divide-by-zero-with-zero-granularity/20210112-233454
        git checkout 796e67f6b22f94f155669688e5e08281621b3ee6
        # save the attached .config to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

   In file included from drivers/ata/ahci_ceva.c:11:
   In file included from include/linux/libata.h:21:
   In file included from include/scsi/scsi_host.h:11:
   In file included from include/linux/blk-mq.h:5:
>> include/linux/blkdev.h:1492:15: warning: ISO C90 forbids mixing declarations and code [-Wdeclaration-after-statement]
           unsigned int alignment = sector_div(sector, granularity >> SECTOR_SHIFT)
                        ^
   drivers/ata/ahci_ceva.c:187:2: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:387:16: note: expanded from macro 'AHCI_SHT'
           .can_queue              = AHCI_MAX_CMDS,                        \
                                     ^~~~~~~~~~~~~
   drivers/ata/ahci_ceva.c:187:2: note: previous initialization is here
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:386:2: note: expanded from macro 'AHCI_SHT'
           ATA_NCQ_SHT(drv_name),                                          \
           ^~~~~~~~~~~~~~~~~~~~~
   include/linux/libata.h:1418:2: note: expanded from macro 'ATA_NCQ_SHT'
           __ATA_BASE_SHT(drv_name),                               \
           ^~~~~~~~~~~~~~~~~~~~~~~~
   include/linux/libata.h:1400:16: note: expanded from macro '__ATA_BASE_SHT'
           .can_queue              = ATA_DEF_QUEUE,                \
                                     ^~~~~~~~~~~~~
   drivers/ata/ahci_ceva.c:187:2: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:391:17: note: expanded from macro 'AHCI_SHT'
           .sdev_attrs             = ahci_sdev_attrs
                                     ^~~~~~~~~~~~~~~
   drivers/ata/ahci_ceva.c:187:2: note: previous initialization is here
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:386:2: note: expanded from macro 'AHCI_SHT'
           ATA_NCQ_SHT(drv_name),                                          \
           ^~~~~~~~~~~~~~~~~~~~~
   include/linux/libata.h:1419:17: note: expanded from macro 'ATA_NCQ_SHT'
           .sdev_attrs             = ata_ncq_sdev_attrs,           \
                                     ^~~~~~~~~~~~~~~~~~
   3 warnings generated.
--
   In file included from drivers/ata/ahci_sunxi.c:19:
   In file included from include/linux/regulator/consumer.h:35:
   In file included from include/linux/suspend.h:5:
   In file included from include/linux/swap.h:9:
   In file included from include/linux/memcontrol.h:22:
   In file included from include/linux/writeback.h:14:
   In file included from include/linux/blk-cgroup.h:23:
>> include/linux/blkdev.h:1492:15: warning: ISO C90 forbids mixing declarations and code [-Wdeclaration-after-statement]
           unsigned int alignment = sector_div(sector, granularity >> SECTOR_SHIFT)
                        ^
   drivers/ata/ahci_sunxi.c:210:2: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:387:16: note: expanded from macro 'AHCI_SHT'
           .can_queue              = AHCI_MAX_CMDS,                        \
                                     ^~~~~~~~~~~~~
   drivers/ata/ahci_sunxi.c:210:2: note: previous initialization is here
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:386:2: note: expanded from macro 'AHCI_SHT'
           ATA_NCQ_SHT(drv_name),                                          \
           ^~~~~~~~~~~~~~~~~~~~~
   include/linux/libata.h:1418:2: note: expanded from macro 'ATA_NCQ_SHT'
           __ATA_BASE_SHT(drv_name),                               \
           ^~~~~~~~~~~~~~~~~~~~~~~~
   include/linux/libata.h:1400:16: note: expanded from macro '__ATA_BASE_SHT'
           .can_queue              = ATA_DEF_QUEUE,                \
                                     ^~~~~~~~~~~~~
   drivers/ata/ahci_sunxi.c:210:2: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:391:17: note: expanded from macro 'AHCI_SHT'
           .sdev_attrs             = ahci_sdev_attrs
                                     ^~~~~~~~~~~~~~~
   drivers/ata/ahci_sunxi.c:210:2: note: previous initialization is here
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:386:2: note: expanded from macro 'AHCI_SHT'
           ATA_NCQ_SHT(drv_name),                                          \
           ^~~~~~~~~~~~~~~~~~~~~
   include/linux/libata.h:1419:17: note: expanded from macro 'ATA_NCQ_SHT'
           .sdev_attrs             = ata_ncq_sdev_attrs,           \
                                     ^~~~~~~~~~~~~~~~~~
   3 warnings generated.
--
   In file included from drivers/ata/ahci_st.c:16:
   In file included from include/linux/libata.h:21:
   In file included from include/scsi/scsi_host.h:11:
   In file included from include/linux/blk-mq.h:5:
>> include/linux/blkdev.h:1492:15: warning: ISO C90 forbids mixing declarations and code [-Wdeclaration-after-statement]
           unsigned int alignment = sector_div(sector, granularity >> SECTOR_SHIFT)
                        ^
   drivers/ata/ahci_st.c:142:2: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:387:16: note: expanded from macro 'AHCI_SHT'
           .can_queue              = AHCI_MAX_CMDS,                        \
                                     ^~~~~~~~~~~~~
   drivers/ata/ahci_st.c:142:2: note: previous initialization is here
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:386:2: note: expanded from macro 'AHCI_SHT'
           ATA_NCQ_SHT(drv_name),                                          \
           ^~~~~~~~~~~~~~~~~~~~~
   include/linux/libata.h:1418:2: note: expanded from macro 'ATA_NCQ_SHT'
           __ATA_BASE_SHT(drv_name),                               \
           ^~~~~~~~~~~~~~~~~~~~~~~~
   include/linux/libata.h:1400:16: note: expanded from macro '__ATA_BASE_SHT'
           .can_queue              = ATA_DEF_QUEUE,                \
                                     ^~~~~~~~~~~~~
   drivers/ata/ahci_st.c:142:2: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:391:17: note: expanded from macro 'AHCI_SHT'
           .sdev_attrs             = ahci_sdev_attrs
                                     ^~~~~~~~~~~~~~~
   drivers/ata/ahci_st.c:142:2: note: previous initialization is here
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:386:2: note: expanded from macro 'AHCI_SHT'
           ATA_NCQ_SHT(drv_name),                                          \
           ^~~~~~~~~~~~~~~~~~~~~
   include/linux/libata.h:1419:17: note: expanded from macro 'ATA_NCQ_SHT'
           .sdev_attrs             = ata_ncq_sdev_attrs,           \
                                     ^~~~~~~~~~~~~~~~~~
   3 warnings generated.
--
   In file included from drivers/ata/pata_platform.c:16:
>> include/linux/blkdev.h:1492:15: warning: ISO C90 forbids mixing declarations and code [-Wdeclaration-after-statement]
           unsigned int alignment = sector_div(sector, granularity >> SECTOR_SHIFT)
                        ^
   1 warning generated.
--
   In file included from drivers/ata/ahci_imx.c:18:
   In file included from include/linux/libata.h:21:
   In file included from include/scsi/scsi_host.h:11:
   In file included from include/linux/blk-mq.h:5:
>> include/linux/blkdev.h:1492:15: warning: ISO C90 forbids mixing declarations and code [-Wdeclaration-after-statement]
           unsigned int alignment = sector_div(sector, granularity >> SECTOR_SHIFT)
                        ^
   drivers/ata/ahci_imx.c:978:2: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:387:16: note: expanded from macro 'AHCI_SHT'
           .can_queue              = AHCI_MAX_CMDS,                        \
                                     ^~~~~~~~~~~~~
   drivers/ata/ahci_imx.c:978:2: note: previous initialization is here
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:386:2: note: expanded from macro 'AHCI_SHT'
           ATA_NCQ_SHT(drv_name),                                          \
           ^~~~~~~~~~~~~~~~~~~~~
   include/linux/libata.h:1418:2: note: expanded from macro 'ATA_NCQ_SHT'
           __ATA_BASE_SHT(drv_name),                               \
           ^~~~~~~~~~~~~~~~~~~~~~~~
   include/linux/libata.h:1400:16: note: expanded from macro '__ATA_BASE_SHT'
           .can_queue              = ATA_DEF_QUEUE,                \
                                     ^~~~~~~~~~~~~
   drivers/ata/ahci_imx.c:978:2: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:391:17: note: expanded from macro 'AHCI_SHT'
           .sdev_attrs             = ahci_sdev_attrs
                                     ^~~~~~~~~~~~~~~
   drivers/ata/ahci_imx.c:978:2: note: previous initialization is here
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:386:2: note: expanded from macro 'AHCI_SHT'
           ATA_NCQ_SHT(drv_name),                                          \
           ^~~~~~~~~~~~~~~~~~~~~
   include/linux/libata.h:1419:17: note: expanded from macro 'ATA_NCQ_SHT'
           .sdev_attrs             = ata_ncq_sdev_attrs,           \
                                     ^~~~~~~~~~~~~~~~~~
   3 warnings generated.
--
   In file included from drivers/ata/ahci_tegra.c:17:
   In file included from include/linux/regulator/consumer.h:35:
   In file included from include/linux/suspend.h:5:
   In file included from include/linux/swap.h:9:
   In file included from include/linux/memcontrol.h:22:
   In file included from include/linux/writeback.h:14:
   In file included from include/linux/blk-cgroup.h:23:
>> include/linux/blkdev.h:1492:15: warning: ISO C90 forbids mixing declarations and code [-Wdeclaration-after-statement]
           unsigned int alignment = sector_div(sector, granularity >> SECTOR_SHIFT)
                        ^
   drivers/ata/ahci_tegra.c:477:2: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:387:16: note: expanded from macro 'AHCI_SHT'
           .can_queue              = AHCI_MAX_CMDS,                        \
                                     ^~~~~~~~~~~~~
   drivers/ata/ahci_tegra.c:477:2: note: previous initialization is here
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:386:2: note: expanded from macro 'AHCI_SHT'
           ATA_NCQ_SHT(drv_name),                                          \
           ^~~~~~~~~~~~~~~~~~~~~
   include/linux/libata.h:1418:2: note: expanded from macro 'ATA_NCQ_SHT'
           __ATA_BASE_SHT(drv_name),                               \
           ^~~~~~~~~~~~~~~~~~~~~~~~
   include/linux/libata.h:1400:16: note: expanded from macro '__ATA_BASE_SHT'
           .can_queue              = ATA_DEF_QUEUE,                \
                                     ^~~~~~~~~~~~~
   drivers/ata/ahci_tegra.c:477:2: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:391:17: note: expanded from macro 'AHCI_SHT'
           .sdev_attrs             = ahci_sdev_attrs
                                     ^~~~~~~~~~~~~~~
   drivers/ata/ahci_tegra.c:477:2: note: previous initialization is here
           AHCI_SHT(DRV_NAME),
           ^~~~~~~~~~~~~~~~~~
   drivers/ata/ahci.h:386:2: note: expanded from macro 'AHCI_SHT'
           ATA_NCQ_SHT(drv_name),                                          \
           ^~~~~~~~~~~~~~~~~~~~~
   include/linux/libata.h:1419:17: note: expanded from macro 'ATA_NCQ_SHT'
           .sdev_attrs             = ata_ncq_sdev_attrs,           \
                                     ^~~~~~~~~~~~~~~~~~
   3 warnings generated.


vim +1492 include/linux/blkdev.h

c72758f33784e5e2 Martin K. Petersen 2009-05-22  1484  
e03a72e13648ac62 Martin K. Petersen 2010-01-11  1485  static inline int queue_limit_alignment_offset(struct queue_limits *lim, sector_t sector)
81744ee44ab2845c Martin K. Petersen 2009-12-29  1486  {
81744ee44ab2845c Martin K. Petersen 2009-12-29  1487  	unsigned int granularity = max(lim->physical_block_size, lim->io_min);
796e67f6b22f94f1 Li Feng            2021-01-12  1488  	granularity = granularity >> SECTOR_SHIFT;
796e67f6b22f94f1 Li Feng            2021-01-12  1489  	if (!granularity)
796e67f6b22f94f1 Li Feng            2021-01-12  1490  		return 0;
796e67f6b22f94f1 Li Feng            2021-01-12  1491  
233bde21aa43516b Bart Van Assche    2018-03-14 @1492  	unsigned int alignment = sector_div(sector, granularity >> SECTOR_SHIFT)
233bde21aa43516b Bart Van Assche    2018-03-14  1493  		<< SECTOR_SHIFT;
81744ee44ab2845c Martin K. Petersen 2009-12-29  1494  
b8839b8c55f3fdd6 Mike Snitzer       2014-10-08  1495  	return (granularity + lim->alignment_offset - alignment) % granularity;
c72758f33784e5e2 Martin K. Petersen 2009-05-22  1496  }
c72758f33784e5e2 Martin K. Petersen 2009-05-22  1497  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
kernel test robot Jan. 12, 2021, 10:57 p.m. UTC | #4 
Hi Li,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on block/for-next]
[also build test WARNING on v5.11-rc3 next-20210112]
[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]

url:    https://github.com/0day-ci/linux/commits/Li-Feng/blk-avoid-divide-by-zero-with-zero-granularity/20210112-233454
base:   https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git for-next
config: microblaze-randconfig-c004-20210112 (attached as .config)
compiler: microblaze-linux-gcc (GCC) 9.3.0
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
        # https://github.com/0day-ci/linux/commit/796e67f6b22f94f155669688e5e08281621b3ee6
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Li-Feng/blk-avoid-divide-by-zero-with-zero-granularity/20210112-233454
        git checkout 796e67f6b22f94f155669688e5e08281621b3ee6
        # save the attached .config to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=microblaze 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

   In file included from include/linux/blk-cgroup.h:23,
                    from include/linux/writeback.h:14,
                    from include/linux/memcontrol.h:22,
                    from include/net/sock.h:53,
                    from include/linux/tcp.h:19,
                    from include/linux/ipv6.h:88,
                    from include/net/ipv6.h:12,
                    from include/net/inetpeer.h:16,
                    from include/net/ip_fib.h:20,
                    from include/net/switchdev.h:13,
                    from net/bridge/br.c:18:
   include/linux/blkdev.h: In function 'queue_limit_alignment_offset':
>> include/linux/blkdev.h:1492:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
    1492 |  unsigned int alignment = sector_div(sector, granularity >> SECTOR_SHIFT)
         |  ^~~~~~~~


vim +1492 include/linux/blkdev.h

c72758f33784e5e2 Martin K. Petersen 2009-05-22  1484  
e03a72e13648ac62 Martin K. Petersen 2010-01-11  1485  static inline int queue_limit_alignment_offset(struct queue_limits *lim, sector_t sector)
81744ee44ab2845c Martin K. Petersen 2009-12-29  1486  {
81744ee44ab2845c Martin K. Petersen 2009-12-29  1487  	unsigned int granularity = max(lim->physical_block_size, lim->io_min);
796e67f6b22f94f1 Li Feng            2021-01-12  1488  	granularity = granularity >> SECTOR_SHIFT;
796e67f6b22f94f1 Li Feng            2021-01-12  1489  	if (!granularity)
796e67f6b22f94f1 Li Feng            2021-01-12  1490  		return 0;
796e67f6b22f94f1 Li Feng            2021-01-12  1491  
233bde21aa43516b Bart Van Assche    2018-03-14 @1492  	unsigned int alignment = sector_div(sector, granularity >> SECTOR_SHIFT)
233bde21aa43516b Bart Van Assche    2018-03-14  1493  		<< SECTOR_SHIFT;
81744ee44ab2845c Martin K. Petersen 2009-12-29  1494  
b8839b8c55f3fdd6 Mike Snitzer       2014-10-08  1495  	return (granularity + lim->alignment_offset - alignment) % granularity;
c72758f33784e5e2 Martin K. Petersen 2009-05-22  1496  }
c72758f33784e5e2 Martin K. Petersen 2009-05-22  1497  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff mbox series

Patch

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index f94ee3089e01..4d029e95adb4 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1485,6 +1485,10 @@  static inline int queue_alignment_offset(const struct request_queue *q)
 static inline int queue_limit_alignment_offset(struct queue_limits *lim, sector_t sector)
 {
 	unsigned int granularity = max(lim->physical_block_size, lim->io_min);
+	granularity = granularity >> SECTOR_SHIFT;
+	if (!granularity)
+		return 0;
+
 	unsigned int alignment = sector_div(sector, granularity >> SECTOR_SHIFT)
 		<< SECTOR_SHIFT;