Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3682546pxj; Tue, 15 Jun 2021 06:29:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+KCOGulALWnvmx3JSLRHH+aRVRLTQZ4/SaHDEei86Iq2HsIy6DYaIqlrzrn+iBrrXYdbl X-Received: by 2002:a17:907:38c:: with SMTP id ss12mr21396129ejb.401.1623763776071; Tue, 15 Jun 2021 06:29:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623763776; cv=none; d=google.com; s=arc-20160816; b=SbYOzrQEFAu9DjKyEgsjWKX7yCjS5vSefruwoYoqqe0MXHx4fZLYCqZDxT0mOHJa5p cCoupWZOePB1T5LecR4pzz09LfHAJBNLlEUNz38TC3KPD6THnJCZ/rH/rpRW2jo+M1Bx ysJbVZuUz7He4zOwVX5uaBFgTnd23k2GLN+QtSizr+XhSc4HJ680CWIi9V8JHG/Kx/Dl R7pNJdMgIkUh2Z8Bmd0MtevgefVrIqswcteWgKMc/KcQJnVGkQ2exRD9TYGXUi/BLFVa FVPrH+gQ6F6uLR2+HL2bZ068CouvN301f79i6eT3wmvRCPNyQK61XJwWHx/CkZAtWC7q UXyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9+wXpY/H82TQMYJceCCK5GarrRWjIymFsSn79ihfI/w=; b=ImtAOfL1l7bmNVsbnqoHyzmuzB08vX3gmFOS705TLW/JvjQTZTxTd6luSQL/k2zHmy N6/yB/2EQoC+X6teje9prqGzQOWOfbaWZBzLIBXzB0N+YmMjzEQuQsj6MgAGN4Xk+p+l q+B+ZK7q2wvUUiPLWsTj2YZO9pWJagEp98zaQB4JBhJdcim/DaFawAYWwtlhaT4lJ8vV Nrsk4ARoWcYmXyARAcgnor1GY4lrZC+W6twukgmG7aF7XwYVtggRByxKKGbK5uf08GWO Y/7eC/Nl3ISK6k7Ly/vL/OC6U47vwoXkwve7AI42snfGqJjlmkjiCtwOBpXN410eQEWQ kDdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="Ityiyn/6"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y16si1370076edr.375.2021.06.15.06.29.11; Tue, 15 Jun 2021 06:29:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="Ityiyn/6"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231332AbhFON3p (ORCPT + 99 others); Tue, 15 Jun 2021 09:29:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231316AbhFON3o (ORCPT ); Tue, 15 Jun 2021 09:29:44 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4125FC061574 for ; Tue, 15 Jun 2021 06:27:40 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id u18so13246811pfk.11 for ; Tue, 15 Jun 2021 06:27:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9+wXpY/H82TQMYJceCCK5GarrRWjIymFsSn79ihfI/w=; b=Ityiyn/6rZ6eEobs+2lnH4TKbbZk+VdtN2w2T43meIIZNh9+72wW8S0VDK8goTPM0v VD9NihJYeGETrBdORYc12PZdn+8m79SSBJ6F1LfLiwMAUohS+C8HkRvwkY21VvJTZM8O JQ8rzrFr7pberm347Pyh+hg1b2fiB3MgVNUFQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9+wXpY/H82TQMYJceCCK5GarrRWjIymFsSn79ihfI/w=; b=D+5KiJou/B56qmZNp0CH6tIXEXWAvqbPoPadu15pxbBjyo9enSuz/7uvqE9dIGrr8A OozE3HfzB3mHmMG24UFjjPWf4LAenGSqYy3Eq27rE68wJSNEVqdI2vieYxBXqGVXdPsd QebFw/UuEXu3EeUJKKV2WKcDZR6MczFweRNegbQMwYZlGWshLWiPx8D6nPJACMsC+j/S 2cmanILdHPFjjt9ykZR3oSEwuIf7LyMjXgy35eWiIDywm8IwjQJwueKll66I3W5f5LhG d/sCzPVbq2sXkX/nxJ/J3tRdYfdEfRgyf2bo4A0Q9Az2/RI35yjAqYUbEJveeLktOVRe w8pQ== X-Gm-Message-State: AOAM5323bj54z2+AR2+bdB//X9IGlYW/LJDqkjiVdvK4smYzw2QmD2m7 428eCmJ2L7ZuDW2Y2Kus4rn2ow== X-Received: by 2002:a63:a805:: with SMTP id o5mr22403221pgf.328.1623763659827; Tue, 15 Jun 2021 06:27:39 -0700 (PDT) Received: from localhost ([2401:fa00:95:205:1846:5274:e444:139e]) by smtp.gmail.com with UTF8SMTPSA id p6sm217209pjh.24.2021.06.15.06.27.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Jun 2021 06:27:39 -0700 (PDT) From: Claire Chang To: Rob Herring , mpe@ellerman.id.au, Joerg Roedel , Will Deacon , Frank Rowand , Konrad Rzeszutek Wilk , boris.ostrovsky@oracle.com, jgross@suse.com, Christoph Hellwig , Marek Szyprowski Cc: benh@kernel.crashing.org, paulus@samba.org, "list@263.net:IOMMU DRIVERS" , sstabellini@kernel.org, Robin Murphy , grant.likely@arm.com, xypron.glpk@gmx.de, Thierry Reding , mingo@kernel.org, bauerman@linux.ibm.com, peterz@infradead.org, Greg KH , Saravana Kannan , "Rafael J . Wysocki" , heikki.krogerus@linux.intel.com, Andy Shevchenko , Randy Dunlap , Dan Williams , Bartosz Golaszewski , linux-devicetree , lkml , linuxppc-dev@lists.ozlabs.org, xen-devel@lists.xenproject.org, Nicolas Boichat , Jim Quinlan , tfiga@chromium.org, bskeggs@redhat.com, bhelgaas@google.com, chris@chris-wilson.co.uk, tientzu@chromium.org, daniel@ffwll.ch, airlied@linux.ie, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, jani.nikula@linux.intel.com, jxgao@google.com, joonas.lahtinen@linux.intel.com, linux-pci@vger.kernel.org, maarten.lankhorst@linux.intel.com, matthew.auld@intel.com, rodrigo.vivi@intel.com, thomas.hellstrom@linux.intel.com Subject: [PATCH v10 02/12] swiotlb: Refactor swiotlb_create_debugfs Date: Tue, 15 Jun 2021 21:27:01 +0800 Message-Id: <20210615132711.553451-3-tientzu@chromium.org> X-Mailer: git-send-email 2.32.0.272.g935e593368-goog In-Reply-To: <20210615132711.553451-1-tientzu@chromium.org> References: <20210615132711.553451-1-tientzu@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Split the debugfs creation to make the code reusable for supporting different bounce buffer pools. Signed-off-by: Claire Chang --- kernel/dma/swiotlb.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index c64298e416c8..97c6ad50fdc2 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -661,19 +661,26 @@ bool is_swiotlb_active(void) EXPORT_SYMBOL_GPL(is_swiotlb_active); #ifdef CONFIG_DEBUG_FS +static struct dentry *debugfs_dir; -static int __init swiotlb_create_debugfs(void) +static void swiotlb_create_debugfs_files(struct io_tlb_mem *mem) { - struct io_tlb_mem *mem = io_tlb_default_mem; - - if (!mem) - return 0; - mem->debugfs = debugfs_create_dir("swiotlb", NULL); debugfs_create_ulong("io_tlb_nslabs", 0400, mem->debugfs, &mem->nslabs); debugfs_create_ulong("io_tlb_used", 0400, mem->debugfs, &mem->used); +} + +static int __init swiotlb_create_default_debugfs(void) +{ + struct io_tlb_mem *mem = io_tlb_default_mem; + + debugfs_dir = debugfs_create_dir("swiotlb", NULL); + if (mem) { + mem->debugfs = debugfs_dir; + swiotlb_create_debugfs_files(mem); + } return 0; } -late_initcall(swiotlb_create_debugfs); +late_initcall(swiotlb_create_default_debugfs); #endif -- 2.32.0.272.g935e593368-goog