Re: next/master bisection: baseline.login on r8a77960-ulcb
From: Guillaume Tucker
Date: Tue Feb 23 2021 - 05:00:16 EST
Hi Christoph,
Please see the bisection report below about a boot failure on
r8a77960-ulcb on next-20210222.
Reports aren't automatically sent to the public while we're
trialing new bisection features on kernelci.org but this one
looks valid.
The log shows a kernel panic, more details can be found here:
https://kernelci.org/test/case/id/6034bde034504edc9faddd2c/
Please let us know if you need any help to debug the issue or try
a fix on this platform.
Best wishes,
Guillaume
On 23/02/2021 02:02, KernelCI bot wrote:
> * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
> * This automated bisection report was sent to you on the basis *
> * that you may be involved with the breaking commit it has *
> * found. No manual investigation has been done to verify it, *
> * and the root cause of the problem may be somewhere else. *
> * *
> * If you do send a fix, please include this trailer: *
> * Reported-by: "kernelci.org bot" <bot@xxxxxxxxxxxx> *
> * *
> * Hope this helps! *
> * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
>
> next/master bisection: baseline.login on r8a77960-ulcb
>
> Summary:
> Start: 37dfbfbdca66 Add linux-next specific files for 20210222
> Plain log: https://storage.kernelci.org/next/master/next-20210222/arm64/defconfig/clang-10/lab-baylibre/baseline-r8a77960-ulcb.txt
> HTML log: https://storage.kernelci.org/next/master/next-20210222/arm64/defconfig/clang-10/lab-baylibre/baseline-r8a77960-ulcb.html
> Result: 567d877f9a7d swiotlb: refactor swiotlb_tbl_map_single
>
> Checks:
> revert: PASS
> verify: PASS
>
> Parameters:
> Tree: next
> URL: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> Branch: master
> Target: r8a77960-ulcb
> CPU arch: arm64
> Lab: lab-baylibre
> Compiler: clang-10
> Config: defconfig
> Test case: baseline.login
>
> Breaking commit found:
>
> -------------------------------------------------------------------------------
> commit 567d877f9a7d6bf4e4bf0ecd6de23fec8039b123
> Author: Christoph Hellwig <hch@xxxxxx>
> Date: Thu Feb 4 11:08:35 2021 +0100
>
> swiotlb: refactor swiotlb_tbl_map_single
>
> Split out a bunch of a self-contained helpers to make the function easier
> to follow.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> Acked-by: Jianxiong Gao <jxgao@xxxxxxxxxx>
> Tested-by: Jianxiong Gao <jxgao@xxxxxxxxxx>
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
>
> diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
> index b38b1553c466..381c24ef1ac1 100644
> --- a/kernel/dma/swiotlb.c
> +++ b/kernel/dma/swiotlb.c
> @@ -468,134 +468,133 @@ static void swiotlb_bounce(phys_addr_t orig_addr, phys_addr_t tlb_addr,
> }
> }
>
> -phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, phys_addr_t orig_addr,
> - size_t mapping_size, size_t alloc_size,
> - enum dma_data_direction dir, unsigned long attrs)
> -{
> - dma_addr_t tbl_dma_addr = phys_to_dma_unencrypted(hwdev, io_tlb_start);
> - unsigned long flags;
> - phys_addr_t tlb_addr;
> - unsigned int nslots, stride, index, wrap;
> - int i;
> - unsigned long mask;
> - unsigned long offset_slots;
> - unsigned long max_slots;
> - unsigned long tmp_io_tlb_used;
> -
> - if (no_iotlb_memory)
> - panic("Can not allocate SWIOTLB buffer earlier and can't now provide you with the DMA bounce buffer");
> -
> - if (mem_encrypt_active())
> - pr_warn_once("Memory encryption is active and system is using DMA bounce buffers\n");
> +#define slot_addr(start, idx) ((start) + ((idx) << IO_TLB_SHIFT))
>
> - if (mapping_size > alloc_size) {
> - dev_warn_once(hwdev, "Invalid sizes (mapping: %zd bytes, alloc: %zd bytes)",
> - mapping_size, alloc_size);
> - return (phys_addr_t)DMA_MAPPING_ERROR;
> - }
> -
> - mask = dma_get_seg_boundary(hwdev);
> +/*
> + * Carefully handle integer overflow which can occur when boundary_mask == ~0UL.
> + */
> +static inline unsigned long get_max_slots(unsigned long boundary_mask)
> +{
> + if (boundary_mask == ~0UL)
> + return 1UL << (BITS_PER_LONG - IO_TLB_SHIFT);
> + return nr_slots(boundary_mask + 1);
> +}
>
> - tbl_dma_addr &= mask;
> +static unsigned int wrap_index(unsigned int index)
> +{
> + if (index >= io_tlb_nslabs)
> + return 0;
> + return index;
> +}
>
> - offset_slots = nr_slots(tbl_dma_addr);
> +/*
> + * Find a suitable number of IO TLB entries size that will fit this request and
> + * allocate a buffer from that IO TLB pool.
> + */
> +static int find_slots(struct device *dev, size_t alloc_size)
> +{
> + unsigned long boundary_mask = dma_get_seg_boundary(dev);
> + dma_addr_t tbl_dma_addr =
> + phys_to_dma_unencrypted(dev, io_tlb_start) & boundary_mask;
> + unsigned int max_slots = get_max_slots(boundary_mask);
> + unsigned int nslots = nr_slots(alloc_size), stride = 1;
> + unsigned int index, wrap, count = 0, i;
> + unsigned long flags;
>
> - /*
> - * Carefully handle integer overflow which can occur when mask == ~0UL.
> - */
> - max_slots = mask + 1
> - ? nr_slots(mask + 1)
> - : 1UL << (BITS_PER_LONG - IO_TLB_SHIFT);
> + BUG_ON(!nslots);
>
> /*
> * For mappings greater than or equal to a page, we limit the stride
> * (and hence alignment) to a page size.
> */
> - nslots = nr_slots(alloc_size);
> if (alloc_size >= PAGE_SIZE)
> - stride = (1 << (PAGE_SHIFT - IO_TLB_SHIFT));
> - else
> - stride = 1;
> + stride <<= (PAGE_SHIFT - IO_TLB_SHIFT);
>
> - BUG_ON(!nslots);
> -
> - /*
> - * Find suitable number of IO TLB entries size that will fit this
> - * request and allocate a buffer from that IO TLB pool.
> - */
> spin_lock_irqsave(&io_tlb_lock, flags);
> -
> if (unlikely(nslots > io_tlb_nslabs - io_tlb_used))
> goto not_found;
>
> - index = ALIGN(io_tlb_index, stride);
> - if (index >= io_tlb_nslabs)
> - index = 0;
> - wrap = index;
> -
> + index = wrap = wrap_index(ALIGN(io_tlb_index, stride));
> do {
> - while (iommu_is_span_boundary(index, nslots, offset_slots,
> - max_slots)) {
> - index += stride;
> - if (index >= io_tlb_nslabs)
> - index = 0;
> - if (index == wrap)
> - goto not_found;
> - }
> -
> /*
> * If we find a slot that indicates we have 'nslots' number of
> * contiguous buffers, we allocate the buffers from that slot
> * and mark the entries as '0' indicating unavailable.
> */
> - if (io_tlb_list[index] >= nslots) {
> - int count = 0;
> -
> - for (i = index; i < (int) (index + nslots); i++)
> - io_tlb_list[i] = 0;
> - for (i = index - 1;
> - io_tlb_offset(i) != IO_TLB_SEGSIZE - 1 &&
> - io_tlb_list[i]; i--)
> - io_tlb_list[i] = ++count;
> - tlb_addr = io_tlb_start + (index << IO_TLB_SHIFT);
> -
> - /*
> - * Update the indices to avoid searching in the next
> - * round.
> - */
> - io_tlb_index = ((index + nslots) < io_tlb_nslabs
> - ? (index + nslots) : 0);
> -
> - goto found;
> + if (!iommu_is_span_boundary(index, nslots,
> + nr_slots(tbl_dma_addr),
> + max_slots)) {
> + if (io_tlb_list[index] >= nslots)
> + goto found;
> }
> - index += stride;
> - if (index >= io_tlb_nslabs)
> - index = 0;
> + index = wrap_index(index + stride);
> } while (index != wrap);
>
> not_found:
> - tmp_io_tlb_used = io_tlb_used;
> -
> spin_unlock_irqrestore(&io_tlb_lock, flags);
> - if (!(attrs & DMA_ATTR_NO_WARN) && printk_ratelimit())
> - dev_warn(hwdev, "swiotlb buffer is full (sz: %zd bytes), total %lu (slots), used %lu (slots)\n",
> - alloc_size, io_tlb_nslabs, tmp_io_tlb_used);
> - return (phys_addr_t)DMA_MAPPING_ERROR;
> + return -1;
> +
> found:
> + for (i = index; i < index + nslots; i++)
> + io_tlb_list[i] = 0;
> + for (i = index - 1;
> + io_tlb_offset(i) != IO_TLB_SEGSIZE - 1 &&
> + io_tlb_list[i]; i--)
> + io_tlb_list[i] = ++count;
> +
> + /*
> + * Update the indices to avoid searching in the next round.
> + */
> + if (index + nslots < io_tlb_nslabs)
> + io_tlb_index = index + nslots;
> + else
> + io_tlb_index = 0;
> io_tlb_used += nslots;
> +
> spin_unlock_irqrestore(&io_tlb_lock, flags);
> + return index;
> +}
> +
> +phys_addr_t swiotlb_tbl_map_single(struct device *dev, phys_addr_t orig_addr,
> + size_t mapping_size, size_t alloc_size,
> + enum dma_data_direction dir, unsigned long attrs)
> +{
> + unsigned int index, i;
> + phys_addr_t tlb_addr;
> +
> + if (no_iotlb_memory)
> + panic("Can not allocate SWIOTLB buffer earlier and can't now provide you with the DMA bounce buffer");
> +
> + if (mem_encrypt_active())
> + pr_warn_once("Memory encryption is active and system is using DMA bounce buffers\n");
> +
> + if (mapping_size > alloc_size) {
> + dev_warn_once(dev, "Invalid sizes (mapping: %zd bytes, alloc: %zd bytes)",
> + mapping_size, alloc_size);
> + return (phys_addr_t)DMA_MAPPING_ERROR;
> + }
> +
> + index = find_slots(dev, alloc_size);
> + if (index == -1) {
> + if (!(attrs & DMA_ATTR_NO_WARN))
> + dev_warn_ratelimited(dev,
> + "swiotlb buffer is full (sz: %zd bytes), total %lu (slots), used %lu (slots)\n",
> + alloc_size, io_tlb_nslabs, io_tlb_used);
> + return (phys_addr_t)DMA_MAPPING_ERROR;
> + }
>
> /*
> * Save away the mapping from the original address to the DMA address.
> * This is needed when we sync the memory. Then we sync the buffer if
> * needed.
> */
> - for (i = 0; i < nslots; i++)
> - io_tlb_orig_addr[index+i] = orig_addr + (i << IO_TLB_SHIFT);
> + for (i = 0; i < nr_slots(alloc_size); i++)
> + io_tlb_orig_addr[index + i] = slot_addr(orig_addr, i);
> +
> + tlb_addr = slot_addr(io_tlb_start, index);
> if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC) &&
> (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL))
> swiotlb_bounce(orig_addr, tlb_addr, mapping_size, DMA_TO_DEVICE);
> -
> return tlb_addr;
> }
> -------------------------------------------------------------------------------
>
>
> Git bisection log:
>
> -------------------------------------------------------------------------------
> git bisect start
> # good: [d99676af540c2dc829999928fb81c58c80a1dce4] Merge tag 'drm-next-2021-02-19' of git://anongit.freedesktop.org/drm/drm
> git bisect good d99676af540c2dc829999928fb81c58c80a1dce4
> # bad: [37dfbfbdca66834bc0f64ec9b35e09ac6c8898da] Add linux-next specific files for 20210222
> git bisect bad 37dfbfbdca66834bc0f64ec9b35e09ac6c8898da
> # bad: [25c1843cc6b3d64ce774ce7f1dc649ca3109a4c5] Merge remote-tracking branch 'block/for-next'
> git bisect bad 25c1843cc6b3d64ce774ce7f1dc649ca3109a4c5
> # good: [705552a85bfda7f2b0a3922b318d74fcc8368fd6] Merge remote-tracking branch 'btrfs/for-next'
> git bisect good 705552a85bfda7f2b0a3922b318d74fcc8368fd6
> # good: [eed3cd1a28b4a41ca25b8f5fbd86449be8ac3216] Merge remote-tracking branch 'v4l-dvb-next/master'
> git bisect good eed3cd1a28b4a41ca25b8f5fbd86449be8ac3216
> # bad: [366e8fe73e13244686604662ddcc70aa14a3e0e6] Merge remote-tracking branch 'rdma/for-next'
> git bisect bad 366e8fe73e13244686604662ddcc70aa14a3e0e6
> # good: [5120bf0a5fc15dec210a0fe0f39e4a256bb6e349] RDMA/rxe: Correct skb on loopback path
> git bisect good 5120bf0a5fc15dec210a0fe0f39e4a256bb6e349
> # good: [ffc46af1757e05652e17c47e4aa2a01bf5aaf3ad] Merge remote-tracking branch 'thermal/thermal/linux-next'
> git bisect good ffc46af1757e05652e17c47e4aa2a01bf5aaf3ad
> # good: [229557230c760e25b6af79709aa85d30de4c8500] RDMA/hns: Remove unused member and variable of CMDQ
> git bisect good 229557230c760e25b6af79709aa85d30de4c8500
> # good: [2b5715fc17386a6223490d5b8f08d031999b0c0b] RDMA/srp: Fix support for unpopulated and unbalanced NUMA nodes
> git bisect good 2b5715fc17386a6223490d5b8f08d031999b0c0b
> # bad: [e952d9a1bc204109a21f7dbedddedc110a33baf1] swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single
> git bisect bad e952d9a1bc204109a21f7dbedddedc110a33baf1
> # good: [c7fbeca757fe74135d8b6a4c8ddaef76f5775d68] swiotlb: factor out an io_tlb_offset helper
> git bisect good c7fbeca757fe74135d8b6a4c8ddaef76f5775d68
> # good: [ca10d0f8e530600ec63c603dbace2c30927d70b7] swiotlb: clean up swiotlb_tbl_unmap_single
> git bisect good ca10d0f8e530600ec63c603dbace2c30927d70b7
> # bad: [567d877f9a7d6bf4e4bf0ecd6de23fec8039b123] swiotlb: refactor swiotlb_tbl_map_single
> git bisect bad 567d877f9a7d6bf4e4bf0ecd6de23fec8039b123
> # first bad commit: [567d877f9a7d6bf4e4bf0ecd6de23fec8039b123] swiotlb: refactor swiotlb_tbl_map_single
> -------------------------------------------------------------------------------
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#7292): https://groups.io/g/kernelci-results/message/7292
> Mute This Topic: https://groups.io/mt/80842441/924702
> Group Owner: kernelci-results+owner@xxxxxxxxx
> Unsubscribe: https://groups.io/g/kernelci-results/unsub [guillaume.tucker@xxxxxxxxxxxxx]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>