Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <18448ae569e24dfd84e811081ede376f@hihonor.com>
In-Reply-To: <18448ae569e24dfd84e811081ede376f@hihonor.com>
From:   Suren Baghdasaryan <surenb@google.com>
Date:   Tue, 16 May 2023 12:41:56 -0700
Message-ID: <CAJuCfpEMqLUePoqaQYKOK5OTFGHft8igg+NZ-R1qrudNJ5VmSg@mail.gmail.com>
Subject: Re: [PATCH] dma-remap: Use kvmalloc_array/kvfree for larger dma
 memory remap
To:     gaoxu 00016977 <gaoxu2@hihonor.com>
Cc:     "hch@lst.de" <hch@lst.de>,
        "m.szyprowski@samsung.com" <m.szyprowski@samsung.com>,
        "robin.murphy@arm.com" <robin.murphy@arm.com>,
        "iommu@lists.linux.dev" <iommu@lists.linux.dev>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        yipengxiang 00013268 <yipengxiang@hihonor.com>,
        wangbintian 00013160 <bintian.wang@hihonor.com>,
        hanfeng 00012985 <feng.han@hihonor.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Sat, May 6, 2023 at 12:33=E2=80=AFAM gaoxu 00016977 <gaoxu2@hihonor.com>=
 wrote:
>
> If dma_direct_alloc() alloc memory in size of 64MB, the inner function
> dma_common_contiguous_remap() will allocate 128KB memory by invoking
> the function kmalloc_array(). and the kmalloc_array seems to fail to try =
to
> allocate 128KB mem. work around by doing kvmalloc_array instead.

On systems like Android it's not unusual for order 5 allocation to
fail. The change seems safe to me with no downside since kvmalloc will
try kmalloc first.

>
> Signed-off-by: Gao Xu <gaoxu2@hihonor.com>

Reviewed-by: Suren Baghdasaryan <surenb@google.com>

> ---
>  kernel/dma/remap.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/dma/remap.c b/kernel/dma/remap.c index b45266680..275=
96f3b4 100644
> --- a/kernel/dma/remap.c
> +++ b/kernel/dma/remap.c
> @@ -43,13 +43,13 @@ void *dma_common_contiguous_remap(struct page *page, =
size_t size,
>         void *vaddr;
>         int i;
>
> -       pages =3D kmalloc_array(count, sizeof(struct page *), GFP_KERNEL)=
;
> +       pages =3D kvmalloc_array(count, sizeof(struct page *), GFP_KERNEL=
);
>         if (!pages)
>                 return NULL;
>         for (i =3D 0; i < count; i++)
>                 pages[i] =3D nth_page(page, i);
>         vaddr =3D vmap(pages, count, VM_DMA_COHERENT, prot);
> -       kfree(pages);
> +       kvfree(pages);
>
>         return vaddr;
>  }
> --
> 2.17.1
>