From patchwork Thu Aug 2 19:58:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Battersby X-Patchwork-Id: 10554097 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 B9811174A for ; Thu, 2 Aug 2018 19:58:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5E6B2AAA1 for ; Thu, 2 Aug 2018 19:58:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A964E2B2B4; Thu, 2 Aug 2018 19:58:08 +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=unavailable 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 4C6802AAA1 for ; Thu, 2 Aug 2018 19:58:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 731C76B000A; Thu, 2 Aug 2018 15:58:07 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6E26A6B000C; Thu, 2 Aug 2018 15:58:07 -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 5D1596B000D; Thu, 2 Aug 2018 15:58:07 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt0-f198.google.com (mail-qt0-f198.google.com [209.85.216.198]) by kanga.kvack.org (Postfix) with ESMTP id 344F86B000A for ; Thu, 2 Aug 2018 15:58:07 -0400 (EDT) Received: by mail-qt0-f198.google.com with SMTP id i9-v6so2538791qtj.3 for ; Thu, 02 Aug 2018 12:58:07 -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=QH1IIg0CaNqSGBNxYjpd2D1uslcpAwDjwG+aYibniNg=; b=BW6oRw4N2AAAe+ioly/H4iPvar4gdgi+WWwyXTGP8etWjBO89ijRJfhqFi2ymNJsme tm8CIpJ8nGbOhGEAkBKKGRHSGcVBOh6U/UJjUxrTk/nI80L1EHh7+09bskKBxD7AJ8by OWKfXC0TkOuGJ10wmlQ7kBcH5CZLZv7ZA3CUUmSi6HuHl3yZNbz4p/Eh5Poe3ATwePJA e6bcqN0B4vTPM0kXG+PH2hIh852Q2bsfCRvklzaVTQnItflmQMF6vhnWGCf7s6UtKqT1 lSGp9SA5tbPeTflKhmnhVD9dWhBFIDDP+80NaNIm72HSORNNlrMAYQ6Jpog6IZ+KT2yi 6CDQ== 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: AOUpUlGJCJ8M6j3SnT3btbXMjbid2fIq2TCzyJnPl2FhnkUfNFKl254J BDHNoCemKRwBEtOQ4VdklGDIYyTem9GIKuxFYQcdUQKxsyUHNy1Km298aJ546iQn9aitbJ45XFh JbrDYRJrK5jciVA7JsJFWq4UZbEp1dW9PERo41dGGh7ZkyeFO5lC/b+bn5zXLve66Mg== X-Received: by 2002:a0c:f94e:: with SMTP id i14-v6mr904084qvo.73.1533239887007; Thu, 02 Aug 2018 12:58:07 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdCT0Q58o3e3ZdvLzn/DX47ukz2997JK5XxsevlFlqsrtiYkJ8v2FcCKfYAHu20G8dfJOKz X-Received: by 2002:a0c:f94e:: with SMTP id i14-v6mr904053qvo.73.1533239886449; Thu, 02 Aug 2018 12:58:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533239886; cv=none; d=google.com; s=arc-20160816; b=RTAQYGTlZF2wSWBKRFnvrrhm+lL3q9Fj9qGqi7ywjsdnnor955qxEaNG4l6Z+vnHns hRo0eChBB+cBxYO/oTmI1J8vWdHZDSsRLOZdVI6LwvOXVxzzpUjFzw08SX+XxSCQf3u0 jPAN9P3g6xtCxAdxgUuAmydeuYy/+Edvf1/geyW9c3UwhRzPm29UaTDmvRf7GfoMt3Z+ 71mWbv/uv5i6BchUMVXDHTtFDlTysqinbfbu8PCz+OGWFKiYLcTzvzdbMzQdveLF6vug AJc7XtIwD3n1kbv3RYAE72giwIdM+mxs8oMX5Dvp/5Q5GuJaq0tEyyzBvVj/nkScbK7n 037g== 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=QH1IIg0CaNqSGBNxYjpd2D1uslcpAwDjwG+aYibniNg=; b=IsIFTcgc88QEPq1BudNYp6Tj6SnwLP8ymm8e6NpnBfKf1Ls007u85M1NOm/zw21fOi kN135Z3rYEJ0LYexyPVKphDoULXz2UvDwC4M1C5urmKmFYBy2pRhi5/fnBdJw0DvUU+5 xZDdT1kv/s+ZtSYuhbtuKWY5JBWTnKNd4aCsDAEGvITKCTtTYYH9YeG7illShj8lFLPz vAx47HImrM52ZGV95R0mpD2ZurEDl9WKqaC+EZdZf8yybcLd6CpH5xVHZi0IWEUAniFP oaGMexjZ/TnrlsVyk0OtZPvfpAlSs60wGPnc4Xb+ndMPCuq19JdY8Oxi1U/plm+89fxp 4NMQ== 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 t34-v6si2690540qth.151.2018.08.02.12.58.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Aug 2018 12:58:06 -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: 1533239884-0fb3b01fb33f5950001-v9ZeMO Received: from cybernetics.com ([10.157.1.126]) by mail.cybernetics.com with ESMTP id a0tb9ZvUiGIb8fnH (version=SSLv3 cipher=DES-CBC3-SHA bits=112 verify=NO); Thu, 02 Aug 2018 15:58:04 -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 8317835; Thu, 02 Aug 2018 15:58:04 -0400 From: Tony Battersby Subject: [PATCH v2 3/9] dmapool: cleanup dma_pool_destroy 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 3/9] dmapool: cleanup dma_pool_destroy Message-ID: <924a1e83-285a-a258-ed45-ad035411bd83@cybernetics.com> Date: Thu, 2 Aug 2018 15:58:04 -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: 1533239884 X-Barracuda-Encrypted: DES-CBC3-SHA X-Barracuda-URL: https://10.157.1.122:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 2073 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 a small amount of code duplication between dma_pool_destroy() and pool_free_page() in preparation for adding more code without having to duplicate it. No functional changes. Signed-off-by: Tony Battersby --- linux/mm/dmapool.c.orig 2018-08-02 09:59:15.000000000 -0400 +++ linux/mm/dmapool.c 2018-08-02 10:01:26.000000000 -0400 @@ -249,13 +249,22 @@ static inline bool is_page_busy(struct d static void pool_free_page(struct dma_pool *pool, struct dma_page *page) { + void *vaddr = page->vaddr; dma_addr_t dma = page->dma; + list_del(&page->page_list); + + if (is_page_busy(page)) { + dev_err(pool->dev, + "dma_pool_destroy %s, %p busy\n", + pool->name, vaddr); + /* leak the still-in-use consistent memory */ + } else { #ifdef DMAPOOL_DEBUG - memset(page->vaddr, POOL_POISON_FREED, pool->allocation); + memset(vaddr, POOL_POISON_FREED, pool->allocation); #endif - dma_free_coherent(pool->dev, pool->allocation, page->vaddr, dma); - list_del(&page->page_list); + dma_free_coherent(pool->dev, pool->allocation, vaddr, dma); + } kfree(page); } @@ -269,6 +278,7 @@ static void pool_free_page(struct dma_po */ void dma_pool_destroy(struct dma_pool *pool) { + struct dma_page *page; bool empty = false; if (unlikely(!pool)) @@ -284,19 +294,10 @@ void dma_pool_destroy(struct dma_pool *p device_remove_file(pool->dev, &dev_attr_pools); mutex_unlock(&pools_reg_lock); - while (!list_empty(&pool->page_list)) { - struct dma_page *page; - page = list_entry(pool->page_list.next, - struct dma_page, page_list); - if (is_page_busy(page)) { - 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); - } else - pool_free_page(pool, page); + while ((page = list_first_entry_or_null(&pool->page_list, + struct dma_page, + page_list))) { + pool_free_page(pool, page); } kfree(pool);