Re: [PATCH v13 5/7] io-uring: add sqpoll support for napi busy poll

[Stefan Roesch <shr@devkernel.io>]

Jens Axboe <axboe@kernel.dk> writes:

> On 5/18/23 6:11?PM, kernel test robot wrote:
>> Hi Stefan,
>>
>> kernel test robot noticed the following build errors:
>>
>> [auto build test ERROR on d2b7fa6174bc4260e496cbf84375c73636914641]
>>
>> url:    https://github.com/intel-lab-lkp/linux/commits/Stefan-Roesch/net-split-off-__napi_busy_poll-from-napi_busy_poll/20230519-054117
>> base:   d2b7fa6174bc4260e496cbf84375c73636914641
>> patch link:    https://lore.kernel.org/r/20230518211751.3492982-6-shr%40devkernel.io
>> patch subject: [PATCH v13 5/7] io-uring: add sqpoll support for napi busy poll
>> config: powerpc-allnoconfig
>> compiler: powerpc-linux-gcc (GCC) 12.1.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/intel-lab-lkp/linux/commit/8d324fedc325505406b6ea808d5d7a7cacb321a5
>>         git remote add linux-review https://github.com/intel-lab-lkp/linux
>>         git fetch --no-tags linux-review Stefan-Roesch/net-split-off-__napi_busy_poll-from-napi_busy_poll/20230519-054117
>>         git checkout 8d324fedc325505406b6ea808d5d7a7cacb321a5
>>         # save the config file
>>         mkdir build_dir && cp config build_dir/.config
>>         COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=powerpc olddefconfig
>>         COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=powerpc SHELL=/bin/bash
>>
>> If you fix the issue, kindly add following tag where applicable
>> | Reported-by: kernel test robot <lkp@intel.com>
>> | Closes: https://lore.kernel.org/oe-kbuild-all/202305190745.UK8QQ6fw-lkp@intel.com/
>>
>> All errors (new ones prefixed by >>):
>>
>>    In file included from io_uring/sqpoll.c:18:
>>    io_uring/sqpoll.c: In function '__io_sq_thread':
>>>> io_uring/napi.h:81:39: error: expected expression before 'do'
>>       81 | #define io_napi_sqpoll_busy_poll(ctx) do {} while (0)
>>          |                                       ^~
>>    io_uring/sqpoll.c:198:32: note: in expansion of macro 'io_napi_sqpoll_busy_poll'
>>      198 |                         ret += io_napi_sqpoll_busy_poll(ctx);
>>          |                                ^~~~~~~~~~~~~~~~~~~~~~~~
>>
>
> That's my fault, didn't look closely enough. But let's fold this one into
> patch 3, to get proper types for !CONFIG_NET_RX_BUSY_POLL.
>
>
> diff --git a/io_uring/napi.h b/io_uring/napi.h
> index 69c1970cbecc..64d07317866b 100644
> --- a/io_uring/napi.h
> +++ b/io_uring/napi.h
> @@ -60,39 +60,43 @@ static inline void io_napi_add(struct io_kiocb *req)
>  	__io_napi_add(ctx, req->file);
>  }
>
> -#else
> +#else /* CONFIG_NET_RX_BUSY_POLL */
>
>  static inline void io_napi_init(struct io_ring_ctx *ctx)
>  {
>  }
> -
>  static inline void io_napi_free(struct io_ring_ctx *ctx)
>  {
>  }
> -
>  static inline int io_register_napi(struct io_ring_ctx *ctx, void __user *arg)
>  {
>  	return -EOPNOTSUPP;
>  }
> -
>  static inline int io_unregister_napi(struct io_ring_ctx *ctx, void __user *arg)
>  {
>  	return -EOPNOTSUPP;
>  }
> -
>  static inline bool io_napi(struct io_ring_ctx *ctx)
>  {
>  	return false;
>  }
> -
>  static inline void io_napi_add(struct io_kiocb *req)
>  {
>  }
> +static inline void io_napi_adjust_timeout(struct io_ring_ctx *ctx,
> +					  struct io_wait_queue *iowq,
> +					  struct timespec64 *ts)
> +{
> +}
> +static inline void io_napi_busy_loop(struct io_ring_ctx *ctx,
> +				     struct io_wait_queue *iowq)
> +{
> +}
> +static inline int io_napi_sqpoll_busy_poll(struct io_ring_ctx *ctx)
> +{
> +	return 0;
> +}
>
> -#define io_napi_adjust_timeout(ctx, iowq, ts) do {} while (0)
> -#define io_napi_busy_loop(ctx, iowq) do {} while (0)
> -#define io_napi_sqpoll_busy_poll(ctx) do {} while (0)
> -
> -#endif
> +#endif /* CONFIG_NET_RX_BUSY_POLL */
>
>  #endif

I'll make the above fix in the next version.