From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B813C3DA79 for ; Fri, 23 Dec 2022 14:47:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236408AbiLWOrs (ORCPT ); Fri, 23 Dec 2022 09:47:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236380AbiLWOro (ORCPT ); Fri, 23 Dec 2022 09:47:44 -0500 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DC2E44950 for ; Fri, 23 Dec 2022 06:47:38 -0800 (PST) Received: by mail-pj1-x102e.google.com with SMTP id n10-20020a17090a73ca00b00225cbc4dfaeso713125pjk.3 for ; Fri, 23 Dec 2022 06:47:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=jJM00YEPG1ZrW968XxjVUE7AX3Hq8AZNHgIKgxgW064=; b=h4v0UjN3sDVaAbgLQVJBvt5BqhmpXNaE+YVi+J42CA3NSUa2CtnA5QypC3zdPhinWm Ew8BcSkDxc/vy/jb1vo5JMq0knvKYDKa7BBzazcI+0ZXj6KnPS4OszH1/FRcr51Fu+7W tbYfsXqQa2Z3SM9RSp4jJNL0CSI9or4j62aFgPHU/9eLexfCMG2zv8oQdJ/Jh+PPAW28 vCO7zhi+ln1BwyC+TMXC2uoMJpEw4djJb1QCFuJvNGkRsySpRrS8CG5A1FviGX7oKWGv D1yaRi0OeM4tOvoXGUYE41PaP33iq9FsROXRuotay1is4PAWjMKrE0CVKWzxDY0gEEE0 6ggg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jJM00YEPG1ZrW968XxjVUE7AX3Hq8AZNHgIKgxgW064=; b=cfKPKgXJIBRwEB9bmEMr4D8o/NXlyrT9ewLporKA8vI3xkXMcJEUKujG5xlxbkjlzE gjsOJpm/xTjoZ1sTNfYmNsE/hbYV8vK6NiFN33AYplP0tloMnvhmM5fYIp/+t3R/sIJK ZOcMUVeF8+wKEpvbnktQdx09wFQBA1KqEzroVSPqKg+dML0u9+Go35mSdYXQfkigGmgo DJgg4rl39aZkUrwKc75q6QZKfOijvVmF4z+508C97QXsCtr2g3MMrqjoepKVJ4Zt7cWs j+Tjmq+BoN0bqn4+BCTcCjef+qPrLsWx6d1dUKAwq9pnP8Ccpt7eJVaVCXr+EtU9AZ+q 0CFw== X-Gm-Message-State: AFqh2kqemmNLdYH6HksAjmzMo4SWBC6h5R0lIQsaZFczi8lhNUj6kcaS VJSQVFllrdJfCNuLahKnsfgv X-Google-Smtp-Source: AMrXdXsjU622IO+mgehF4+9ivq19hzZRf6NBvr+d6kIyOVIcsFXYAOgNrdKUrLOtJXQxhyzCL0rBuQ== X-Received: by 2002:a17:902:ccd0:b0:189:6ab3:9e57 with SMTP id z16-20020a170902ccd000b001896ab39e57mr10742244ple.22.1671806857501; Fri, 23 Dec 2022 06:47:37 -0800 (PST) Received: from thinkpad ([27.111.75.82]) by smtp.gmail.com with ESMTPSA id t14-20020a1709027fce00b0019141c79b1dsm2436193plb.254.2022.12.23.06.47.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Dec 2022 06:47:36 -0800 (PST) Date: Fri, 23 Dec 2022 20:17:31 +0530 From: Manivannan Sadhasivam To: Christoph Hellwig Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Andrew Morton , Uladzislau Rezki , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, iommu@lists.linux.dev Subject: Re: [PATCH 1/2] Revert "remoteproc: qcom_q6v5_mss: map/unmap metadata region before/after use" Message-ID: <20221223144731.GA4587@thinkpad> References: <20221223092703.61927-1-hch@lst.de> <20221223092703.61927-2-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20221223092703.61927-2-hch@lst.de> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Fri, Dec 23, 2022 at 10:27:02AM +0100, Christoph Hellwig wrote: > This reverts commit fc156629b23a21181e473e60341e3a78af25a1d4. > > This commit manages to do three API violations at once: > > - dereference the return value of dma_alloc_attrs with the > DMA_ATTR_NO_KERNEL_MAPPING mapping, which is clearly forbidden and > will do the wrong thing on various dma mapping implementations. The > fact that dma-direct uses a struct page as a cookie is an undocumented > implementation detail > - include dma-map-ops.h and use pgprot_dmacoherent despite a clear > comment documenting that this is not acceptable > - use of the VM_DMA_COHERENT for something that is not the dma-mapping > code > - use of VM_FLUSH_RESET_PERMS for vmap, while it is only supported for > vmalloc > > Signed-off-by: Christoph Hellwig Acked-by: Manivannan Sadhasivam Thanks, Mani > --- > drivers/remoteproc/qcom_q6v5_mss.c | 38 +++++------------------------- > 1 file changed, 6 insertions(+), 32 deletions(-) > > diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c > index fddb63cffee078..a8b141db4de63f 100644 > --- a/drivers/remoteproc/qcom_q6v5_mss.c > +++ b/drivers/remoteproc/qcom_q6v5_mss.c > @@ -10,7 +10,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -933,52 +932,27 @@ static void q6v5proc_halt_axi_port(struct q6v5 *qproc, > static int q6v5_mpss_init_image(struct q6v5 *qproc, const struct firmware *fw, > const char *fw_name) > { > - unsigned long dma_attrs = DMA_ATTR_FORCE_CONTIGUOUS | DMA_ATTR_NO_KERNEL_MAPPING; > - unsigned long flags = VM_DMA_COHERENT | VM_FLUSH_RESET_PERMS; > - struct page **pages; > - struct page *page; > + unsigned long dma_attrs = DMA_ATTR_FORCE_CONTIGUOUS; > dma_addr_t phys; > void *metadata; > int mdata_perm; > int xferop_ret; > size_t size; > - void *vaddr; > - int count; > + void *ptr; > int ret; > - int i; > > metadata = qcom_mdt_read_metadata(fw, &size, fw_name, qproc->dev); > if (IS_ERR(metadata)) > return PTR_ERR(metadata); > > - page = dma_alloc_attrs(qproc->dev, size, &phys, GFP_KERNEL, dma_attrs); > - if (!page) { > + ptr = dma_alloc_attrs(qproc->dev, size, &phys, GFP_KERNEL, dma_attrs); > + if (!ptr) { > kfree(metadata); > dev_err(qproc->dev, "failed to allocate mdt buffer\n"); > return -ENOMEM; > } > > - count = PAGE_ALIGN(size) >> PAGE_SHIFT; > - pages = kmalloc_array(count, sizeof(struct page *), GFP_KERNEL); > - if (!pages) { > - ret = -ENOMEM; > - goto free_dma_attrs; > - } > - > - for (i = 0; i < count; i++) > - pages[i] = nth_page(page, i); > - > - vaddr = vmap(pages, count, flags, pgprot_dmacoherent(PAGE_KERNEL)); > - kfree(pages); > - if (!vaddr) { > - dev_err(qproc->dev, "unable to map memory region: %pa+%zx\n", &phys, size); > - ret = -EBUSY; > - goto free_dma_attrs; > - } > - > - memcpy(vaddr, metadata, size); > - > - vunmap(vaddr); > + memcpy(ptr, metadata, size); > > /* Hypervisor mapping to access metadata by modem */ > mdata_perm = BIT(QCOM_SCM_VMID_HLOS); > @@ -1008,7 +982,7 @@ static int q6v5_mpss_init_image(struct q6v5 *qproc, const struct firmware *fw, > "mdt buffer not reclaimed system may become unstable\n"); > > free_dma_attrs: > - dma_free_attrs(qproc->dev, size, page, phys, dma_attrs); > + dma_free_attrs(qproc->dev, size, ptr, phys, dma_attrs); > kfree(metadata); > > return ret < 0 ? ret : 0; > -- > 2.35.1 > -- மணிவண்ணன் சதாசிவம்