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 73A07C433EF for ; Fri, 6 May 2022 18:07:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347739AbiEFSL2 (ORCPT ); Fri, 6 May 2022 14:11:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345716AbiEFSL0 (ORCPT ); Fri, 6 May 2022 14:11:26 -0400 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3311D6A03B for ; Fri, 6 May 2022 11:07:43 -0700 (PDT) Received: by mail-pg1-x535.google.com with SMTP id g184so4204824pgc.1 for ; Fri, 06 May 2022 11:07:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=oeCi0WJlUlmAdUeOo2uz48KTn4E3vAZHoMZo0EAAkuM=; b=Gg5ruBm21DzYEMBQr5TEYEc1ZQ7fUIgBCnTB6MXv3XeOLGNCg7AK+0aaUv6X+C40FB C1AgAN7/vfAEFz4C/EyjuyR88RWUdMSq/FXBwWFCXhdOWL8IPNPkzGYF+pCIin34BV0Q UT8Y3bBcpR7hia7BFnmou2ARRH3YINHkaijaw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=oeCi0WJlUlmAdUeOo2uz48KTn4E3vAZHoMZo0EAAkuM=; b=kBK49MLT6ySaD4MUpxK2hC2aAubHAGM4dz66IjGvP26CAbIMZQv5qWrs2vgaFjkiny THVtbKSCy5fYUZthDpWQlbr0eElHzC87EW2EydoqGclvQZFLO/yhmZfvfyKBtIUcAxvZ SPYko97QoXGozpdAf8XLm6/1i/p7hATopx9DgKSTvdsQut/poZttHDPy5T70RnD34viJ skCMWdWl2FhVNm6g6gsErO+m/F/2FJYxf2ermudZEkHTv7h2Xiz0eXsoSwU+iHVGZMUd aPntZ1ly8T8tpaSheO7EEhNsWOIEAxHRmf3dmP0q1xIjVOwMDwH1HPyUgeZ9POqXqfuq lghw== X-Gm-Message-State: AOAM532R6Zg/ThW2ItP5ZgFD5hEQ2VyGS+wuwgYc3BXXd2i225pcMsMo wAAaXc5xhmZt4Uw991/IpDqPUMJByfMCSQ== X-Google-Smtp-Source: ABdhPJyUzAvAcObjVB4Zo5k4rHClZd9eDGKJQyfMV136Sx5Gz+UmKUekLEwGYz0lD6keoGn5yEv++A== X-Received: by 2002:aa7:8888:0:b0:50f:2e7a:76b7 with SMTP id z8-20020aa78888000000b0050f2e7a76b7mr4747567pfe.48.1651860462705; Fri, 06 May 2022 11:07:42 -0700 (PDT) Received: from localhost ([2620:15c:202:201:5605:d5cd:699b:1b26]) by smtp.gmail.com with UTF8SMTPSA id y10-20020a170902d64a00b0015e8d4eb2d8sm2031674plh.290.2022.05.06.11.07.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 May 2022 11:07:42 -0700 (PDT) Date: Fri, 6 May 2022 11:07:41 -0700 From: Matthias Kaehlcke To: Sibi Sankar Cc: bjorn.andersson@linaro.org, arnd@arndb.de, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, sboyd@kernel.org, agross@kernel.org, linux-remoteproc@vger.kernel.org, mathieu.poirier@linaro.org Subject: Re: [PATCH] remoteproc: qcom_q6v5_mss: map/unmap metadata region before/after use Message-ID: References: <1651845086-16535-1-git-send-email-quic_sibis@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1651845086-16535-1-git-send-email-quic_sibis@quicinc.com> Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org On Fri, May 06, 2022 at 07:21:26PM +0530, Sibi Sankar wrote: > The application processor accessing the dynamically assigned metadata > region after assigning it to the remote Q6 would lead to an XPU violation. > Fix this by un-mapping the metadata region post firmware header copy. The > metadata region is freed only after the modem Q6 is done with fw header > authentication. > > Signed-off-by: Sibi Sankar Should this have a 'Fixes:' tag? > --- > drivers/remoteproc/qcom_q6v5_mss.c | 43 +++++++++++++++++++++++++++++++------- > 1 file changed, 35 insertions(+), 8 deletions(-) > > diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c > index af217de75e4d..eb34a258b67b 100644 > --- a/drivers/remoteproc/qcom_q6v5_mss.c > +++ b/drivers/remoteproc/qcom_q6v5_mss.c > @@ -10,6 +10,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -932,27 +933,52 @@ 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; > + 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; > dma_addr_t phys; > void *metadata; > int mdata_perm; > int xferop_ret; > size_t size; > - void *ptr; > + void *vaddr; > + int count; > int ret; > + int i; > > metadata = qcom_mdt_read_metadata(fw, &size, fw_name, qproc->dev); > if (IS_ERR(metadata)) > return PTR_ERR(metadata); > > - ptr = dma_alloc_attrs(qproc->dev, size, &phys, GFP_KERNEL, dma_attrs); > - if (!ptr) { > - kfree(metadata); > + page = dma_alloc_attrs(qproc->dev, size, &phys, GFP_KERNEL, dma_attrs); > + if (!page) { > dev_err(qproc->dev, "failed to allocate mdt buffer\n"); > - return -ENOMEM; > + ret = -ENOMEM; > + goto free_metadata; > + } > + > + count = PAGE_ALIGN(size) >> PAGE_SHIFT; > + pages = kmalloc_array(count, sizeof(struct page *), GFP_KERNEL); > + if (!pages) { > + ret = -ENOMEM; > + goto free_metadata; > } > > - memcpy(ptr, metadata, size); > + for (i = 0; i < count; i++) > + pages[i] = nth_page(page, i); > + > + vaddr = vmap(pages, count, flags, dma_pgprot(qproc->dev, PAGE_KERNEL, dma_attrs)); > + kfree(pages); > + if (!vaddr) { > + dev_err(qproc->dev, "unable to map memory region: %pa+%zx\n", &phys, size); > + ret = -EBUSY; > + goto free_metadata; > + } > + > + memcpy(vaddr, metadata, size); > + > + vunmap(vaddr); > > /* Hypervisor mapping to access metadata by modem */ > mdata_perm = BIT(QCOM_SCM_VMID_HLOS); > @@ -982,7 +1008,8 @@ 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, ptr, phys, dma_attrs); > + dma_free_attrs(qproc->dev, size, page, phys, dma_attrs); > +free_metadata: > kfree(metadata); > > return ret < 0 ? ret : 0; > -- > 2.7.4 >