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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 18466C76186 for ; Wed, 24 Jul 2019 20:09:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DEF2B20665 for ; Wed, 24 Jul 2019 20:09:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998983; bh=GfGjMnWLUUSxT6IFd61blMI2JbmrwLzDJpqgTbFUelA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TxjzBkPbVjctAOv4FKF26WzJu6SJcjYWz97qE74QDA8GbtxZySCkaddz8DH4jO/1C XDU7SjROf4YlaZN5AwEUuKUwPMaoBBxLCXmqkZONtFmXeftV8kfsbfwAori/d9wOm0 CkArgD7HNMauPGEHTd1Vl3MC7NXLWEUTnbh4AkLI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405228AbfGXUAZ (ORCPT ); Wed, 24 Jul 2019 16:00:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:48456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404700AbfGXUAY (ORCPT ); Wed, 24 Jul 2019 16:00:24 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 569CC2147A; Wed, 24 Jul 2019 20:00:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998423; bh=GfGjMnWLUUSxT6IFd61blMI2JbmrwLzDJpqgTbFUelA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JuCqAy9KXS5jt73tOoTm8TqahOmZ5d21eTCHtaybNMKCeNOB6Ku4z+ZaXyxlOMExT Z9aei6nzzBSTuqCAbVruz43Yz5+tdoirgxfmR1NDMFtxVkU//IjtGoKvdA5h57UpVJ FeodlQIRSbTaRgECMUioGM+9y5gZooQ9K13lo7pk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexander Shishkin , Andy Shevchenko , Ammy Yi Subject: [PATCH 5.1 360/371] intel_th: msu: Fix single mode with disabled IOMMU Date: Wed, 24 Jul 2019 21:21:52 +0200 Message-Id: <20190724191751.188213558@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191724.382593077@linuxfoundation.org> References: <20190724191724.382593077@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alexander Shishkin commit 918b8646497b5dba6ae82d4a7325f01b258972b9 upstream. Commit 4e0eaf239fb3 ("intel_th: msu: Fix single mode with IOMMU") switched the single mode code to use dma mapping pages obtained from the page allocator, but with IOMMU disabled, that may lead to using SWIOTLB bounce buffers and without additional sync'ing, produces empty trace buffers. Fix this by using a DMA32 GFP flag to the page allocation in single mode, as the device supports full 32-bit DMA addressing. Signed-off-by: Alexander Shishkin Fixes: 4e0eaf239fb3 ("intel_th: msu: Fix single mode with IOMMU") Reviewed-by: Andy Shevchenko Reported-by: Ammy Yi Cc: stable Link: https://lore.kernel.org/r/20190621161930.60785-4-alexander.shishkin@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- drivers/hwtracing/intel_th/msu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/hwtracing/intel_th/msu.c +++ b/drivers/hwtracing/intel_th/msu.c @@ -632,7 +632,7 @@ static int msc_buffer_contig_alloc(struc goto err_out; ret = -ENOMEM; - page = alloc_pages(GFP_KERNEL | __GFP_ZERO, order); + page = alloc_pages(GFP_KERNEL | __GFP_ZERO | GFP_DMA32, order); if (!page) goto err_free_sgt;