From patchwork Thu Aug 2 19:57:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Battersby X-Patchwork-Id: 10554091 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F039C1708 for ; Thu, 2 Aug 2018 19:57:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E93642C186 for ; Thu, 2 Aug 2018 19:57:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCEF42C1A9; Thu, 2 Aug 2018 19:57:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 551392C186 for ; Thu, 2 Aug 2018 19:57:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6BD1E6B0006; Thu, 2 Aug 2018 15:57:32 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 66CB76B0008; Thu, 2 Aug 2018 15:57:32 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 55C8E6B000A; Thu, 2 Aug 2018 15:57:32 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt0-f197.google.com (mail-qt0-f197.google.com [209.85.216.197]) by kanga.kvack.org (Postfix) with ESMTP id 24F7C6B0006 for ; Thu, 2 Aug 2018 15:57:32 -0400 (EDT) Received: by mail-qt0-f197.google.com with SMTP id j11-v6so2534343qtp.0 for ; Thu, 02 Aug 2018 12:57:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:subject :to:message-id:date:user-agent:mime-version :content-transfer-encoding:content-language; bh=9BS29YX+U1LrTpod6pA1tEtD8WGt4UQXC5nY7xETXAU=; b=r1jtohE6YvJF4BrG8lVi8t3Fl+t0f7+YMqVCeCtRrClY2E6TwkdkQ8qtrrVjxi4eHr FB6tnK8OdkH72ol/ihOK6kNxL745WaQTIIjDaxBnNAevdT3yPmXhad10zZr0aAIyBjLC T02bp1Ky4PMHiiBWjYGgQyx1OE+HCNsUz2kZxefu7uffLLBaVQb6Ud/+8LUbnn1sx5vT Q6mi1mwnx5mNmmKCCA7+qy5OVztajIuO6moUULynokfHAGgsmdzjAj3mNzs1JStwZ3ES Kxcuh07mA9ToozRx/zDPvE4HLNqrBkfoebyvlhWWGFLCh8OsxA77xlaNTA/26BhM/sf3 sMLA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of btv1==75224751413==tonyb@cybernetics.com designates 173.71.130.66 as permitted sender) smtp.mailfrom="btv1==75224751413==tonyb@cybernetics.com" X-Gm-Message-State: AOUpUlF51q4Sbblr+06qIuUyZ6ea29nKncGuA6+TI5dI8/QlLiAq3lkB H+bTot/nkjJ20zPSll0OFfoiGgZBLXpPlGvTEJt0A/IbHSqNjD+rGJV/Hl/YTNml1bGZoQzcfyb PN2Zmar6CxGQb1BIdy9DHoeF4ocVpzyOSLxHhXEX2xWBr/CSAZGEDs8roZjGMRXV9VA== X-Received: by 2002:a37:f50f:: with SMTP id l15-v6mr882068qkk.251.1533239851920; Thu, 02 Aug 2018 12:57:31 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf0wbOMi0S7JzRVPoV7RQGHSdltEUkM79vHHnKMcMVIGgRbTRXT5MGv6MSTvWzm+Vk5o0U8 X-Received: by 2002:a37:f50f:: with SMTP id l15-v6mr882026qkk.251.1533239851095; Thu, 02 Aug 2018 12:57:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533239851; cv=none; d=google.com; s=arc-20160816; b=JXqfrzqOZGGENfijNM81Ds/uz9R+OuzMZGakRp6+i0KO1wCesvoQEgFrwCUykd8qXs DEpzy0oFm5UvU51LROhCBZh9UwJtR4HYna5DvbiD/Pe2RWPWhHMhHF0Ftqc2YfQ3uuh6 pkhiPOmVnlW0rx6+Ad8PGz1RCy1KMoJHIJjw/OTRjuA9xeXLNu2yxtTbuedApqUXCMtj 4qju4OzMev+1vIDhVHEn71+cm+vW+TwFFWyu1ynZsMvWNXhkQyzA4Ip+z+OmfJI90RGP p8l6CWyjBPupfyiH7U23WgHfW2zA643vEqB0xdXanQkWWNLXbJbd3TbsegYUvyc4fner jfHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-language:content-transfer-encoding:mime-version:user-agent :date:message-id:to:subject:from:arc-authentication-results; bh=9BS29YX+U1LrTpod6pA1tEtD8WGt4UQXC5nY7xETXAU=; b=E5dg9y81GbVic72kHUKPp+8mu6+NdbKqxHlmL4ckRee1r+mmiZSw3vOr4kAw20SAFt vylPtj5Da5k5uIg3nuorl4UhHOfGnqgwTgArOCO7rNjbyy4x/jt6xec8Pnc7Fwh1mz6F 7HkqbIRCfO3p6p/n7xTSBPOyAvdkpdi2JfV6TTGTjZ72OJYjgIAgSvQRc40qd+VY0Ama NUxJI/gDqcTz0q/6fEZlJwGVRHjpQJmBixbu0KV2NSk3VZiTkb7JS/KbZ3ZBElt9o3lo bR2HLwHerjG00S3dM3/VPI09iYawTpARHsYblLc0QiT8TAFuw7BvvcfSmMsamcAemCWG 7TZw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of btv1==75224751413==tonyb@cybernetics.com designates 173.71.130.66 as permitted sender) smtp.mailfrom="btv1==75224751413==tonyb@cybernetics.com" Received: from mail.cybernetics.com (mail.cybernetics.com. [173.71.130.66]) by mx.google.com with ESMTPS id u186-v6si2793887qkd.81.2018.08.02.12.57.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Aug 2018 12:57:31 -0700 (PDT) Received-SPF: pass (google.com: domain of btv1==75224751413==tonyb@cybernetics.com designates 173.71.130.66 as permitted sender) client-ip=173.71.130.66; Authentication-Results: mx.google.com; spf=pass (google.com: domain of btv1==75224751413==tonyb@cybernetics.com designates 173.71.130.66 as permitted sender) smtp.mailfrom="btv1==75224751413==tonyb@cybernetics.com" X-ASG-Debug-ID: 1533239849-0fb3b01fb33f5930001-v9ZeMO Received: from cybernetics.com ([10.157.1.126]) by mail.cybernetics.com with ESMTP id ClQEcugQvUhx27fP (version=SSLv3 cipher=DES-CBC3-SHA bits=112 verify=NO); Thu, 02 Aug 2018 15:57:29 -0400 (EDT) X-Barracuda-Envelope-From: tonyb@cybernetics.com X-ASG-Whitelist: Client Received: from [10.157.2.224] (account tonyb HELO [192.168.200.1]) by cybernetics.com (CommuniGate Pro SMTP 5.1.14) with ESMTPSA id 8317831; Thu, 02 Aug 2018 15:57:28 -0400 From: Tony Battersby Subject: [PATCH v2 2/9] dmapool: cleanup error messages To: Matthew Wilcox , Christoph Hellwig , Marek Szyprowski , Sathya Prakash , Chaitra P B , Suganath Prabu Subramani , iommu@lists.linux-foundation.org, linux-mm , linux-scsi@vger.kernel.org, MPT-FusionLinux.pdl@broadcom.com X-ASG-Orig-Subj: [PATCH v2 2/9] dmapool: cleanup error messages Message-ID: Date: Thu, 2 Aug 2018 15:57:28 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 Content-Language: en-US X-Barracuda-Connect: UNKNOWN[10.157.1.126] X-Barracuda-Start-Time: 1533239849 X-Barracuda-Encrypted: DES-CBC3-SHA X-Barracuda-URL: https://10.157.1.122:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 3366 X-Virus-Scanned: by bsmtpd at cybernetics.com X-Barracuda-BRTS-Status: 1 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Remove code duplication in error messages. It is now safe to pas a NULL dev to dev_err(), so the checks to avoid doing so are no longer necessary. Example: Error message with dev != NULL: mpt3sas 0000:02:00.0: dma_pool_destroy chain pool, (____ptrval____) busy Same error message with dev == NULL before patch: dma_pool_destroy chain pool, (____ptrval____) busy Same error message with dev == NULL after patch: (NULL device *): dma_pool_destroy chain pool, (____ptrval____) busy Signed-off-by: Tony Battersby --- linux/mm/dmapool.c.orig 2018-08-02 09:54:25.000000000 -0400 +++ linux/mm/dmapool.c 2018-08-02 09:57:58.000000000 -0400 @@ -289,13 +289,9 @@ void dma_pool_destroy(struct dma_pool *p page = list_entry(pool->page_list.next, struct dma_page, page_list); if (is_page_busy(page)) { - if (pool->dev) - dev_err(pool->dev, - "dma_pool_destroy %s, %p busy\n", - pool->name, page->vaddr); - else - pr_err("dma_pool_destroy %s, %p busy\n", - pool->name, page->vaddr); + dev_err(pool->dev, + "dma_pool_destroy %s, %p busy\n", + pool->name, page->vaddr); /* leak the still-in-use consistent memory */ list_del(&page->page_list); kfree(page); @@ -357,13 +353,9 @@ void *dma_pool_alloc(struct dma_pool *po for (i = sizeof(page->offset); i < pool->size; i++) { if (data[i] == POOL_POISON_FREED) continue; - if (pool->dev) - dev_err(pool->dev, - "dma_pool_alloc %s, %p (corrupted)\n", - pool->name, retval); - else - pr_err("dma_pool_alloc %s, %p (corrupted)\n", - pool->name, retval); + dev_err(pool->dev, + "dma_pool_alloc %s, %p (corrupted)\n", + pool->name, retval); /* * Dump the first 4 bytes even if they are not @@ -418,13 +410,9 @@ void dma_pool_free(struct dma_pool *pool page = pool_find_page(pool, dma); if (!page) { spin_unlock_irqrestore(&pool->lock, flags); - if (pool->dev) - dev_err(pool->dev, - "dma_pool_free %s, %p/%lx (bad dma)\n", - pool->name, vaddr, (unsigned long)dma); - else - pr_err("dma_pool_free %s, %p/%lx (bad dma)\n", - pool->name, vaddr, (unsigned long)dma); + dev_err(pool->dev, + "dma_pool_free %s, %p/%lx (bad dma)\n", + pool->name, vaddr, (unsigned long)dma); return; } @@ -432,13 +420,9 @@ void dma_pool_free(struct dma_pool *pool #ifdef DMAPOOL_DEBUG if ((dma - page->dma) != offset) { spin_unlock_irqrestore(&pool->lock, flags); - if (pool->dev) - dev_err(pool->dev, - "dma_pool_free %s, %p (bad vaddr)/%pad\n", - pool->name, vaddr, &dma); - else - pr_err("dma_pool_free %s, %p (bad vaddr)/%pad\n", - pool->name, vaddr, &dma); + dev_err(pool->dev, + "dma_pool_free %s, %p (bad vaddr)/%pad\n", + pool->name, vaddr, &dma); return; } { @@ -449,12 +433,9 @@ void dma_pool_free(struct dma_pool *pool continue; } spin_unlock_irqrestore(&pool->lock, flags); - if (pool->dev) - dev_err(pool->dev, "dma_pool_free %s, dma %pad already free\n", - pool->name, &dma); - else - pr_err("dma_pool_free %s, dma %pad already free\n", - pool->name, &dma); + dev_err(pool->dev, + "dma_pool_free %s, dma %pad already free\n", + pool->name, &dma); return; } }