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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 4DBA1C35247 for ; Tue, 4 Feb 2020 15:14:12 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 026E820730 for ; Tue, 4 Feb 2020 15:14:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 026E820730 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C048986AD4; Tue, 4 Feb 2020 15:14:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aP-F22TaDuH5; Tue, 4 Feb 2020 15:14:11 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 1375986A2E; Tue, 4 Feb 2020 15:14:11 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 06B65C0177; Tue, 4 Feb 2020 15:14:11 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 8AC92C0174 for ; Tue, 4 Feb 2020 15:14:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 79A368513B for ; Tue, 4 Feb 2020 15:14:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lAFt-ibe3O2C for ; Tue, 4 Feb 2020 15:14:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by fraxinus.osuosl.org (Postfix) with ESMTP id B881884F58 for ; Tue, 4 Feb 2020 15:14:08 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 09B8B101E; Tue, 4 Feb 2020 07:14:08 -0800 (PST) Received: from [10.1.196.37] (e121345-lin.cambridge.arm.com [10.1.196.37]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8C7C43F52E; Tue, 4 Feb 2020 07:14:07 -0800 (PST) Subject: Re: [PATCH 2/2] dma-direct: improve DMA mask overflow reporting To: Christoph Hellwig , Konrad Rzeszutek Wilk References: <20200204063205.652456-1-hch@lst.de> <20200204063205.652456-3-hch@lst.de> From: Robin Murphy Message-ID: Date: Tue, 4 Feb 2020 15:14:06 +0000 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20200204063205.652456-3-hch@lst.de> Content-Language: en-GB Cc: iommu@lists.linux-foundation.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On 04/02/2020 6:32 am, Christoph Hellwig wrote: > Remove the unset dma_mask case as that won't get into mapping calls > anymore, and also report the other errors unconditonally and with a > slightly improved message. Remove the now pointless report_addr helper. > > Signed-off-by: Christoph Hellwig > --- > kernel/dma/direct.c | 22 ++++++++-------------- > 1 file changed, 8 insertions(+), 14 deletions(-) > > diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c > index 82ad50aaf42c..04f308a47fc3 100644 > --- a/kernel/dma/direct.c > +++ b/kernel/dma/direct.c > @@ -23,18 +23,6 @@ > */ > unsigned int zone_dma_bits __ro_after_init = 24; > > -static void report_addr(struct device *dev, dma_addr_t dma_addr, size_t size) > -{ > - if (!dev->dma_mask) { > - dev_err_once(dev, "DMA map on device without dma_mask\n"); > - } else if (*dev->dma_mask >= DMA_BIT_MASK(32) || dev->bus_dma_limit) { > - dev_err_once(dev, > - "overflow %pad+%zu of DMA mask %llx bus limit %llx\n", > - &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit); > - } > - WARN_ON_ONCE(1); > -} > - > static inline dma_addr_t phys_to_dma_direct(struct device *dev, > phys_addr_t phys) > { > @@ -371,7 +359,10 @@ dma_addr_t dma_direct_map_page(struct device *dev, struct page *page, > if (swiotlb_force != SWIOTLB_NO_FORCE) > return swiotlb_map(dev, phys, size, dir, attrs); > > - report_addr(dev, dma_addr, size); > + dev_err_once(dev, > + "DMA addr %pad+%zu overflow (mask %llx, bus limit %llx).\n", > + &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit); > + WARN_ON_ONCE(1); Or even dev_WARN_ONCE() to make them even simpler? Robin. > return DMA_MAPPING_ERROR; > } > > @@ -409,7 +400,10 @@ dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr, > dma_addr_t dma_addr = paddr; > > if (unlikely(!dma_capable(dev, dma_addr, size, false))) { > - report_addr(dev, dma_addr, size); > + dev_err_once(dev, > + "DMA addr %pad+%zu overflow (mask %llx, bus limit %llx).\n", > + &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit); > + WARN_ON_ONCE(1); > return DMA_MAPPING_ERROR; > } > > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu