Re: [linux-nvme:nvme-6.4-rc4-pull 5/5] drivers/nvme/host/core.c:1202:51: error: 'struct nvme_request' has no member named 'start_time'

[Uday Shankar <ushankar@purestorage.com>]

On Wed, May 31, 2023 at 05:27:59AM +0800, kernel test robot wrote:
> tree:   git://git.infradead.org/nvme.git nvme-6.4-rc4-pull
> head:   f041d3b83aea7e76e4dfc6591954d6dfe506dbdb
> commit: f041d3b83aea7e76e4dfc6591954d6dfe506dbdb [5/5] nvme: improve handling of long keep alives
> config: arm64-defconfig (https://download.01.org/0day-ci/archive/20230531/202305310532.V3y3hWXI-lkp@intel.com/config)
> compiler: aarch64-linux-gcc (GCC) 12.3.0
> reproduce (this is a W=1 build):
>         mkdir -p ~/bin
>         wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
>         chmod +x ~/bin/make.cross
>         git remote add linux-nvme git://git.infradead.org/nvme.git
>         git fetch --no-tags linux-nvme nvme-6.4-rc4-pull
>         git checkout f041d3b83aea7e76e4dfc6591954d6dfe506dbdb
>         # save the config file
>         mkdir build_dir && cp config build_dir/.config
>         COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.3.0 ~/bin/make.cross W=1 O=build_dir ARCH=arm64 olddefconfig
>         COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.3.0 ~/bin/make.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/bash drivers/nvme/host/
> 
> 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/202305310532.V3y3hWXI-lkp@intel.com/
> 
> All errors (new ones prefixed by >>):
> 
>    drivers/nvme/host/core.c: In function 'nvme_keep_alive_end_io':
> >> drivers/nvme/host/core.c:1202:51: error: 'struct nvme_request' has no member named 'start_time'
>     1202 |         unsigned long rtt = jiffies - nvme_req(rq)->start_time;
>          |                                                   ^~

My bad, I only tested this with CONFIG_NVME_MULTIPATH set, in which case
the field exists and we don't see the error. The following change should
fix this up. Keith, can you squash this with f041d3b83aea in nvme.git?

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 601dc5f9ac58..bf8d76de5299 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1197,7 +1197,7 @@ static enum rq_end_io_ret nvme_keep_alive_end_io(struct request *rq,
        struct nvme_ctrl *ctrl = rq->end_io_data;
        unsigned long flags;
        bool startka = false;
-       unsigned long rtt = jiffies - nvme_req(rq)->start_time;
+       unsigned long rtt = jiffies - (rq->deadline - rq->timeout);
        unsigned long delay = nvme_keep_alive_work_period(ctrl);

        /*