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 X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 275F8C43387 for ; Thu, 20 Dec 2018 09:26:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EB45C217D7 for ; Thu, 20 Dec 2018 09:26:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545297990; bh=Lbsn0y2K4GPq8b515/r6Q5R0/3hy/tteM0ybF8qjsZU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=c5pYncRuiLh3NkG4jIsN5HQiP9nk0E1PBmlBnzGNAXoVMSvRy5n5v6CdCOBpaIMH1 2GYmE4//MMvIWHUDIGlQA+ZgPWbvNNWtXe80E9c7Op2gX8KmUvq6Kqe6nJXcN9Px0f icPGlOZFNQG7HTRwp++Ly+g1zO7oQLYuS55AAiOw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732112AbeLTJ02 (ORCPT ); Thu, 20 Dec 2018 04:26:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:54730 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727975AbeLTJ00 (ORCPT ); Thu, 20 Dec 2018 04:26:26 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EB3C5217D7; Thu, 20 Dec 2018 09:26:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545297985; bh=Lbsn0y2K4GPq8b515/r6Q5R0/3hy/tteM0ybF8qjsZU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ksFiRRxroLmZVl4Mk5Pfc8mPItpZxPBpk5tacsGucQCg7k1B4OdZ6TQaeUrOErtSy 3XKlr1bCLja2y88ne/itfggbK11mwTJuVY9xRwTN+wx0KncmbjAF3kXU2eOc0JBtvn 1yckHwZ8aqoFcYIMsCnoos9Mu0y+VnMHIeDhiKIM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Will Deacon , Robin Murphy , Catalin Marinas Subject: [PATCH 4.14 05/72] arm64: dma-mapping: Fix FORCE_CONTIGUOUS buffer clearing Date: Thu, 20 Dec 2018 10:18:04 +0100 Message-Id: <20181220085922.549434449@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181220085922.332225035@linuxfoundation.org> References: <20181220085922.332225035@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Robin Murphy commit 3238c359acee4ab57f15abb5a82b8ab38a661ee7 upstream. We need to invalidate the caches *before* clearing the buffer via the non-cacheable alias, else in the worst case __dma_flush_area() may write back dirty lines over the top of our nice new zeros. Fixes: dd65a941f6ba ("arm64: dma-mapping: clear buffers allocated with FORCE_CONTIGUOUS flag") Cc: # 4.18.x- Acked-by: Will Deacon Signed-off-by: Robin Murphy Signed-off-by: Catalin Marinas Signed-off-by: Greg Kroah-Hartman --- arch/arm64/mm/dma-mapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -633,9 +633,9 @@ static void *__iommu_alloc_attrs(struct prot, __builtin_return_address(0)); if (addr) { - memset(addr, 0, size); if (!coherent) __dma_flush_area(page_to_virt(page), iosize); + memset(addr, 0, size); } else { iommu_dma_unmap_page(dev, *handle, iosize, 0, attrs); dma_release_from_contiguous(dev, page,