From patchwork Tue Aug 7 16:46:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Battersby X-Patchwork-Id: 10558909 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 55BC314E5 for ; Tue, 7 Aug 2018 16:46:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 45CD32A621 for ; Tue, 7 Aug 2018 16:46:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 383E22A6AF; Tue, 7 Aug 2018 16:46:23 +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 CCD6C2A621 for ; Tue, 7 Aug 2018 16:46:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 06B9E6B0008; Tue, 7 Aug 2018 12:46:22 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 043E16B000A; Tue, 7 Aug 2018 12:46:22 -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 E9A336B000C; Tue, 7 Aug 2018 12:46:21 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk0-f197.google.com (mail-qk0-f197.google.com [209.85.220.197]) by kanga.kvack.org (Postfix) with ESMTP id C0AFE6B0008 for ; Tue, 7 Aug 2018 12:46:21 -0400 (EDT) Received: by mail-qk0-f197.google.com with SMTP id 17-v6so17276387qkz.15 for ; Tue, 07 Aug 2018 09:46:21 -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:to:from :subject:message-id:date:user-agent:mime-version :content-transfer-encoding:content-language; bh=/Y+T8Euumkx2WMsRvhpHY8+YGLSTwy7S6ZHoxPHvzZE=; b=KH2bm9v4SAkcuKYZ2fs/XFpQDZ6NeRkc8O+IlWlHE/hIQRB65zydIk0Urgfq79oklF L62pVMfc6kQVPTojerzvTALsNuK8BBUYi424V0GrCjIuVawp5ZSZ0a36HN2p6zl2IrLR obsE17gJsWfxs6ZzX8UTfEKDCru+B7YXfJsQdjs/zfSGd99+4xJ3OqaWIUZUYFVC4hCb uL5uLI6NV1yjZrye1tMPc/YYr5TgBlFe0AY6VupTFkh3yaMBBOnAfHubL8xJFD59jaWg dOYDzxSPU2pzlzMadTcxzgOrHVhpM6CWBN4QLRybAk/EmYpTuxuQbca1uyLkQb422Zyq +4UA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of btv1==757ef7a2255==tonyb@cybernetics.com designates 173.71.130.66 as permitted sender) smtp.mailfrom="btv1==757ef7a2255==tonyb@cybernetics.com" X-Gm-Message-State: AOUpUlHhpaP37IxYF/wEuqSchMa8vc2bmpDgsX2jYDJAXzhK/rUAqepn 5xSfSHfHjUeSfiUU33nge5+OQF9Nc1Ln/upUC51/OAK6ICwqsyIpWjS2uYWP0v1th3/f2UwsdKE /pjC5/x9z7XDlboPq7/l+ScpJPXPcbBTISZPxbPqFrORoawMP1pPHGirU0IoxiDQqhg== X-Received: by 2002:ac8:27f4:: with SMTP id x49-v6mr19851771qtx.422.1533660381558; Tue, 07 Aug 2018 09:46:21 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcs+LAmz6hKcKiS1sbKceUbFsMnAWcLdtAJYKyr/0vRGlDRwfsXlP9uJhrrZRtchS0hB638 X-Received: by 2002:ac8:27f4:: with SMTP id x49-v6mr19851716qtx.422.1533660380618; Tue, 07 Aug 2018 09:46:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533660380; cv=none; d=google.com; s=arc-20160816; b=utAbGMGAhuVSYxkgPyiyt21PXZ1E0y8PZCqU1YCo5BcHLYYxDfi0sHTV9R7qbMQL1M aUH3TkpYGsCwzRXwAfINQdBokV1417df3p381PtiA46YEVyHGUAYJDDkuHzpbuWKGqaU w7AKjDC16/5+75xmhHKbIFLC2HiowwTGy0GIF+ENifMLfnPXfkPoqulXpyjeHsYdqjPW qCKtzrm/wJGXc3dz2QbOboYiTB18P4pYVkIQUX9Qa/7cyjrIrpuy5Cvbv71E0NuxNqQf 7NGQ7ny3+WqQRR6gLuw/lUuTOsG+Uf+BYj5XG7Zvq34Q7AWGJ8XuzEI+GSEOvY3ma7Kt QqwA== 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:subject:from:to:arc-authentication-results; bh=/Y+T8Euumkx2WMsRvhpHY8+YGLSTwy7S6ZHoxPHvzZE=; b=gQVdj0XHZI3bwcYR/aEAQsZeWGp+PBsznXLK9vWNPxbNO+3v1E+o14QvwGPOzLTLZx RxjL1ve1dlJKj8rpKudApXdcpk0D1aPT6XMgmn0mMXVX02PRNejvPD1xc3bZkZu8M1nr GoNHTh8wdewRZeVLjnmc4eS2FfrJybHqeluwJrvXta0HhpKPJkEBWoLgH4z05R1Ha6LU veEgUlcN7GTENZdwoOqsHxqOnL0vCrYhbH3OjmA0sJYCrM9V1cnoO9CVRROzqyWwD8Nk bQ6X0urjcC2N8EGz1l2cFRQE2BsdBJTIlhZNFSKZDaBpRjN6KtCVLo8KERHseOO2IJJ6 umLw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of btv1==757ef7a2255==tonyb@cybernetics.com designates 173.71.130.66 as permitted sender) smtp.mailfrom="btv1==757ef7a2255==tonyb@cybernetics.com" Received: from mail.cybernetics.com (mail.cybernetics.com. [173.71.130.66]) by mx.google.com with ESMTPS id 9-v6si1848731qkv.364.2018.08.07.09.46.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Aug 2018 09:46:20 -0700 (PDT) Received-SPF: pass (google.com: domain of btv1==757ef7a2255==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==757ef7a2255==tonyb@cybernetics.com designates 173.71.130.66 as permitted sender) smtp.mailfrom="btv1==757ef7a2255==tonyb@cybernetics.com" X-ASG-Debug-ID: 1533660378-0fb3b01fb342b850001-v9ZeMO Received: from cybernetics.com ([10.157.1.126]) by mail.cybernetics.com with ESMTP id 1q7UScR8LZmYJ9oQ (version=SSLv3 cipher=DES-CBC3-SHA bits=112 verify=NO); Tue, 07 Aug 2018 12:46:18 -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 8324855; Tue, 07 Aug 2018 12:46:18 -0400 To: Matthew Wilcox , Christoph Hellwig , Marek Szyprowski , Sathya Prakash , Chaitra P B , Suganath Prabu Subramani , "iommu@lists.linux-foundation.org" , "linux-mm@kvack.org" , "linux-scsi@vger.kernel.org" , "MPT-FusionLinux.pdl@broadcom.com" From: Tony Battersby Subject: [PATCH v3 03/10] dmapool: cleanup dma_pool_destroy Message-ID: <9fb39095-4dd8-877a-b857-649e76fedd59@cybernetics.com> X-ASG-Orig-Subj: [PATCH v3 03/10] dmapool: cleanup dma_pool_destroy Date: Tue, 7 Aug 2018 12:46:18 -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: 1533660378 X-Barracuda-Encrypted: DES-CBC3-SHA X-Barracuda-URL: https://10.157.1.122:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 2099 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 --- No changes since v2. --- 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);