From patchwork Tue Jul 20 18:13:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 12389079 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 9C6A7C07E9B for ; Tue, 20 Jul 2021 18:14:13 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 50A736108B for ; Tue, 20 Jul 2021 18:14:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 50A736108B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 055226E3C4; Tue, 20 Jul 2021 18:14:09 +0000 (UTC) Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by gabe.freedesktop.org (Postfix) with ESMTPS id 58B1D6E49C for ; Tue, 20 Jul 2021 18:14:06 +0000 (UTC) Received: by mail-pf1-x42c.google.com with SMTP id y4so195807pfi.9 for ; Tue, 20 Jul 2021 11:14:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fxrOgIujpF8i4wx+EiH358bwMj50Ob54hlyrZAnhxWw=; b=oU2HnYhGE8o2NkgmMyZjIYvpuESvFhw4ZfkgBIuirSkIk9t3bhTEwG8AWOPUYfHeG+ b0ZW5UsDOaAsg+zGuTgJD0+q0nghtv8Xs/83N10CiNLouppM3zKo9hxLq9lWQGmmsm0q ZlDNd8bbSNYEkwgbdvKXJIgqtkqbn3JB3f42uB5bM/EI5KVBqW55DhwHoLTQg18FJQUY HAb7Ktgg9tBoAeydGdxnMakwfF81+865n1/xh46Nj04IXhxiKM36TApHJq/IyLXNInSF LTlQ2fswnlBYuOHYk2yXXlc+UIGvxgvGDyMoRgT1Vj+qvzrfTjNUkQcHsmf5gkHxZejv RYWg== 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=fxrOgIujpF8i4wx+EiH358bwMj50Ob54hlyrZAnhxWw=; b=CBcLz3VleFK2FQgGwBn3KeQvLvvHds8rKC2XYAq0HpXBmZ3m61inSsT0nVw8W7dDqm IKr1yuSCJzcVgynhZAeXuVimb/JoKN5UrRYVLUp6x9d9FU6t6FeOvTEhrDJ39LWZzLdv xoSycIMT90tePSyAeetPmjVx4e7dCkVHXmI0Z879jCY0TNVL8Pot6n+lGl6TreTJ5BAO iSww8/msDbGpln+To6Du3OwGEkAFjoZtW0rySXlx6U2e9jI3s1KTB2MLRSvVa5kuoluG gWBSGOXmi19k2rNldKJS+E3S1cpBGwvgLEJCY6ek9h5OZRQ3+e9lMcvdkuIabq6lQQDu uDRw== X-Gm-Message-State: AOAM533FVz6gFF+yI1baPkyDfVZrWcfHfGXgbY5sAqbSkL7Z+vkOjZaz ZQm/TJIpj/N6gqbGZUH7jY9rVA== X-Google-Smtp-Source: ABdhPJy6RU5PpaNR5Ngfb6/CODW8S2VhgR3uhiR+BF2t6gWjGYM0NGW3IEGx3kQTCl9677N8Mqmz4w== X-Received: by 2002:a63:e250:: with SMTP id y16mr32142980pgj.247.1626804845887; Tue, 20 Jul 2021 11:14:05 -0700 (PDT) Received: from omlet.lan ([134.134.137.86]) by smtp.gmail.com with ESMTPSA id c2sm26436573pgh.82.2021.07.20.11.14.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 11:14:05 -0700 (PDT) From: Jason Ekstrand To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 1/6] drm/i915: Call i915_globals_exit() after i915_pmu_exit() Date: Tue, 20 Jul 2021 13:13:52 -0500 Message-Id: <20210720181357.2760720-2-jason@jlekstrand.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210720181357.2760720-1-jason@jlekstrand.net> References: <20210720181357.2760720-1-jason@jlekstrand.net> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Jason Ekstrand , Tvrtko Ursulin Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" We should tear down in the opposite order we set up. Signed-off-by: Jason Ekstrand Reviewed-by: Daniel Vetter Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 67696d7522718..50ed93b03e582 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -1244,8 +1244,8 @@ static void __exit i915_exit(void) i915_perf_sysctl_unregister(); pci_unregister_driver(&i915_pci_driver); - i915_globals_exit(); i915_pmu_exit(); + i915_globals_exit(); } module_init(i915_init); From patchwork Tue Jul 20 18:13:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 12389081 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 3A276C07E9B for ; Tue, 20 Jul 2021 18:14:16 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 0D5F261029 for ; Tue, 20 Jul 2021 18:14:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D5F261029 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 89C6B6E49C; Tue, 20 Jul 2021 18:14:09 +0000 (UTC) Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3B7DC6E3C4 for ; Tue, 20 Jul 2021 18:14:08 +0000 (UTC) Received: by mail-pj1-x102a.google.com with SMTP id p14-20020a17090ad30eb02901731c776526so2426574pju.4 for ; Tue, 20 Jul 2021 11:14:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lE5imCQIk9KskralIlWDyDnEk557cQKh31aZ6Ny2Za4=; b=m9/3HwEEd72dtO6ViyaBE2hGgSjPTjhsWCsUIQAez/ED9EvvRubwAkbBdMC8BKEUm+ xPdE963DTXq4WT5/QPCsFk0I02xtoJJILdcpHfGvOXVcFbiF6Y+knTV5EJxfHrX44wuy 5gL33d0d0x2iHbd8ULDVJxfqol0P4ystkjOEuuwfLrSq8GGvNCE4whw/vH0BlcQB7SeI i7yXrLKs00CwwA/dZVTqKx0UJrtbKq13wFgultuudS/leUFWRhcib/HbInhqRN188QUo +wsDlUTBE3iLlYPaeuRk6eGGYRzTZEOUmBQT3vWC5m38rwaO7RJEnhXPvVx91/sUUWtf TWBw== 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=lE5imCQIk9KskralIlWDyDnEk557cQKh31aZ6Ny2Za4=; b=WWydj3O5ON3IGKf/DB+4tlqTMWv4k12gUJgPcw1njY8U6p8bZEXaDJbpOQiUQbW3+4 aZuMHuOExLeIjzWvyA4wwz1V0I7ih35muuXc7dY437D5+yTFcJ5Wr+/eB52H8RHkdKo0 orLSExWYUUkOPww9mfY8tAvgr3fVAVLD2D8Z0KGMWfHtBBN/mjUIy+tmgDWMhfbDCbah wiG6eJfATPEiWxWpML3BdgQNBmzpu2ZID+fBMxWG+O6GAPcztbHJvmhLTlmvsla0AY8c gZ/BoqiBYIrVZvns+/9iW9ip09vGq9/9DicbncC7saVqjZN6Er0Ix2P7YMxXvarSvH2T 2aGA== X-Gm-Message-State: AOAM533C2RJ2uaWjnZ530XWx1ZYit9MV6T41U5h0BQH0wM6ozO9a+uUc RE0h5xNt2T8yaiTdyHQOV+bhjY5TSKujoQ== X-Google-Smtp-Source: ABdhPJxP8bR4n6E5cm9kuDPX7RuWfcrhXbfGfM45xb6JYfWKlfhp7nWOnhf9jR331/3up7fydSx/Bw== X-Received: by 2002:a17:90a:5b10:: with SMTP id o16mr30750979pji.76.1626804847846; Tue, 20 Jul 2021 11:14:07 -0700 (PDT) Received: from omlet.lan ([134.134.137.86]) by smtp.gmail.com with ESMTPSA id c2sm26436573pgh.82.2021.07.20.11.14.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 11:14:07 -0700 (PDT) From: Jason Ekstrand To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 2/6] drm/i915: Call i915_globals_exit() if pci_register_device() fails Date: Tue, 20 Jul 2021 13:13:53 -0500 Message-Id: <20210720181357.2760720-3-jason@jlekstrand.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210720181357.2760720-1-jason@jlekstrand.net> References: <20210720181357.2760720-1-jason@jlekstrand.net> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Jason Ekstrand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" In the unlikely event that pci_register_device() fails, we were tearing down our PMU setup but not globals. This leaves a bunch of memory slabs lying around. Signed-off-by: Jason Ekstrand Fixes: 32eb6bcfdda9 ("drm/i915: Make request allocation caches global") Reviewed-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_globals.c | 4 ++-- drivers/gpu/drm/i915/i915_pci.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c index 77f1911c463b8..87267e1d2ad92 100644 --- a/drivers/gpu/drm/i915/i915_globals.c +++ b/drivers/gpu/drm/i915/i915_globals.c @@ -138,7 +138,7 @@ void i915_globals_unpark(void) atomic_inc(&active); } -static void __exit __i915_globals_flush(void) +static void __i915_globals_flush(void) { atomic_inc(&active); /* skip shrinking */ @@ -148,7 +148,7 @@ static void __exit __i915_globals_flush(void) atomic_dec(&active); } -void __exit i915_globals_exit(void) +void i915_globals_exit(void) { GEM_BUG_ON(atomic_read(&active)); diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 50ed93b03e582..4e627b57d31a2 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -1230,6 +1230,7 @@ static int __init i915_init(void) err = pci_register_driver(&i915_pci_driver); if (err) { i915_pmu_exit(); + i915_globals_exit(); return err; } From patchwork Tue Jul 20 18:13:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 12389083 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 DE17DC636C8 for ; Tue, 20 Jul 2021 18:14:18 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 A89646108B for ; Tue, 20 Jul 2021 18:14:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A89646108B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AC74A6E4C1; Tue, 20 Jul 2021 18:14:13 +0000 (UTC) Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by gabe.freedesktop.org (Postfix) with ESMTPS id 87B376E4BB for ; Tue, 20 Jul 2021 18:14:10 +0000 (UTC) Received: by mail-pj1-x1029.google.com with SMTP id d9-20020a17090ae289b0290172f971883bso2443277pjz.1 for ; Tue, 20 Jul 2021 11:14:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6Bgf3LfCzXF1slcjSrqqHmM7ZJEVpU4/xlNF306JlfM=; b=R0/ZDH5HbqHnDvgJSGDAa7vcNBlK2HwzfsefIHPTvzvfTOMarszYwMziZHpkjXvEp7 QieyXLT48wN6ok2lc7MmQn+HCFtcamK03/34bzqqpfVtdlPV5Ue1WmXulVx6Q2KOcTQ3 TD1nQqZBNSPjy9df5SqmNeVMSk4jXxf0fyIB6MrUvDwWpOPiz4wr/SND+2y+mQahtfed yreRBD0b6nDYi49B9aSsw6laKI12XDWOIf1idRMcBuilucKveb0dFqQRS5tC0GiEl0ft nYabssRMt5NAeeGY7yXafYtlCiB5hR61xr3ArZayhoNAZ3SprgP0QlHFZI9I/DcWFSSz cpUw== 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=6Bgf3LfCzXF1slcjSrqqHmM7ZJEVpU4/xlNF306JlfM=; b=ipR+KHyXWl7KDrjs7ZxYSdLhvUT3K9xg+o14UbyhcjWvc1By+2OPnXTCbui7HDRYYs MENyxq3Z0YjHsE5vd6qkxqUCWqjxH+Ek6AObBpAFUKXt/elmou1LVc3s4FYlFRxS5uNh OTDSGI5SYovDAtM/7NCkPyLYK/2MmBqWy+CdmnUd8FtlsRbGHKkkzebhGDvnQSfKn11J VnPSSvpwgkNN3cSYVZh8Y+XXiE47dW0UihcmqpXjVO+xFjjNNJBkk0N4uhmyEqUTXuJE 2F5mHMWLNiaRK3ohWDjPDmu7kRbPABH6xvvUeK0MjT11eQ0nyNx5naJ7rPSks3w2JymP 5icA== X-Gm-Message-State: AOAM533AkXYjRjQLxwEYjdSkaX/vMprwnf1W17YhgDRQIEAHaf6Kdblu +PanWM+t0eUigBBCgqg5h/azqw== X-Google-Smtp-Source: ABdhPJz3XV6wM3s66LTthS5ITAQ40KgCLfAGxYuxm67swXHo1CTXwbSpLCEW8MJBdCPzxfOyYrN6XA== X-Received: by 2002:a17:903:1243:b029:ed:8298:7628 with SMTP id u3-20020a1709031243b02900ed82987628mr24455575plh.11.1626804849957; Tue, 20 Jul 2021 11:14:09 -0700 (PDT) Received: from omlet.lan ([134.134.137.86]) by smtp.gmail.com with ESMTPSA id c2sm26436573pgh.82.2021.07.20.11.14.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 11:14:09 -0700 (PDT) From: Jason Ekstrand To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 3/6] drm/i915: Use a table for i915_init/exit Date: Tue, 20 Jul 2021 13:13:54 -0500 Message-Id: <20210720181357.2760720-4-jason@jlekstrand.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210720181357.2760720-1-jason@jlekstrand.net> References: <20210720181357.2760720-1-jason@jlekstrand.net> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Jason Ekstrand , Tvrtko Ursulin Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" If the driver was not fully loaded, we may still have globals lying around. If we don't tear those down in i915_exit(), we'll leak a bunch of memory slabs. This can happen two ways: use_kms = false and if we've run mock selftests. In either case, we have an early exit from i915_init which happens after i915_globals_init() and we need to clean up those globals. The mock selftests case is especially sticky. The load isn't entirely a no-op. We actually do quite a bit inside those selftests including allocating a bunch of mock objects and running tests on them. Once all those tests are complete, we exit early from i915_init(). Perviously, i915_init() would return a non-zero error code on failure and a zero error code on success. In the success case, we would get to i915_exit() and check i915_pci_driver.driver.owner to detect if i915_init exited early and do nothing. In the failure case, we would fail i915_init() but there would be no opportunity to clean up globals. The most annoying part is that you don't actually notice the failure as part of the self-tests since leaking a bit of memory, while bad, doesn't result in anything observable from userspace. Instead, the next time we load the driver (usually for next IGT test), i915_globals_init() gets invoked again, we go to allocate a bunch of new memory slabs, those implicitly create debugfs entries, and debugfs warns that we're trying to create directories and files that already exist. Since this all happens as part of the next driver load, it shows up in the dmesg-warn of whatever IGT test ran after the mock selftests. While the obvious thing to do here might be to call i915_globals_exit() after selftests, that's not actually safe. The dma-buf selftests call i915_gem_prime_export which creates a file. We call dma_buf_put() on the resulting dmabuf which calls fput() on the file. However, fput() isn't immediate and gets flushed right before syscall returns. This means that all the fput()s from the selftests don't happen until right before the module load syscall used to fire off the selftests returns which is after i915_init(). If we call i915_globals_exit() in i915_init() after selftests, we end up freeing slabs out from under objects which won't get released until fput() is flushed at the end of the module load syscall. The solution here is to let i915_init() return success early and detect the early success in i915_exit() and only tear down globals and nothing else. This way the module loads successfully, regardless of the success or failure of the tests. Because we've not enumerated any PCI devices, no device nodes are created and it's entirely useless from userspace. The only thing the module does at that point is hold on to a bit of memory until we unload it and i915_exit() is called. Importantly, this means that everything from our selftests has the ability to properly flush out between i915_init() and i915_exit() because there is at least one syscall boundary in between. In order to handle all the delicate init/exit cases, we convert the whole thing to a table of init/exit pairs and track the init status in the new init_progress global. This allows us to ensure that i915_exit() always tears down exactly the things that i915_init() successfully initialized. We also allow early-exit of i915_init() without failure by an init function returning > 0. This is useful for nomodeset, and selftests. For the mock selftests, we convert them to always return 1 so we get the desired behavior of the driver always succeeding to load the driver and then properly tearing down the partially loaded driver. Signed-off-by: Jason Ekstrand Cc: Daniel Vetter Cc: Tvrtko Ursulin Reviewed-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_pci.c | 104 ++++++++++++------ drivers/gpu/drm/i915/i915_perf.c | 3 +- drivers/gpu/drm/i915/i915_perf.h | 2 +- drivers/gpu/drm/i915/i915_pmu.c | 4 +- drivers/gpu/drm/i915/i915_pmu.h | 4 +- .../gpu/drm/i915/selftests/i915_selftest.c | 2 +- 6 files changed, 80 insertions(+), 39 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 4e627b57d31a2..64ebd89eae6ce 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -1185,27 +1185,9 @@ static void i915_pci_shutdown(struct pci_dev *pdev) i915_driver_shutdown(i915); } -static struct pci_driver i915_pci_driver = { - .name = DRIVER_NAME, - .id_table = pciidlist, - .probe = i915_pci_probe, - .remove = i915_pci_remove, - .shutdown = i915_pci_shutdown, - .driver.pm = &i915_pm_ops, -}; - -static int __init i915_init(void) +static int i915_check_nomodeset(void) { bool use_kms = true; - int err; - - err = i915_globals_init(); - if (err) - return err; - - err = i915_mock_selftests(); - if (err) - return err > 0 ? 0 : err; /* * Enable KMS by default, unless explicitly overriden by @@ -1222,31 +1204,87 @@ static int __init i915_init(void) if (!use_kms) { /* Silently fail loading to not upset userspace. */ DRM_DEBUG_DRIVER("KMS disabled.\n"); - return 0; + return 1; } - i915_pmu_init(); + return 0; +} - err = pci_register_driver(&i915_pci_driver); - if (err) { - i915_pmu_exit(); - i915_globals_exit(); - return err; +static struct pci_driver i915_pci_driver = { + .name = DRIVER_NAME, + .id_table = pciidlist, + .probe = i915_pci_probe, + .remove = i915_pci_remove, + .shutdown = i915_pci_shutdown, + .driver.pm = &i915_pm_ops, +}; + +static int i915_register_pci_driver(void) +{ + return pci_register_driver(&i915_pci_driver); +} + +static void i915_unregister_pci_driver(void) +{ + pci_unregister_driver(&i915_pci_driver); +} + +static const struct { + int (*init)(void); + void (*exit)(void); +} init_funcs[] = { + { i915_globals_init, i915_globals_exit }, + { i915_mock_selftests, NULL }, + { i915_check_nomodeset, NULL }, + { i915_pmu_init, i915_pmu_exit }, + { i915_register_pci_driver, i915_unregister_pci_driver }, + { i915_perf_sysctl_register, i915_perf_sysctl_unregister }, +}; +static int init_progress; + +static int __init i915_init(void) +{ + int err, i; + + for (i = 0; i < ARRAY_SIZE(init_funcs); i++) { + err = init_funcs[i].init(); + if (err < 0) { + while (i--) { + if (init_funcs[i].exit) + init_funcs[i].exit(); + } + return err; + } else if (err > 0) { + /* + * Early-exit success is reserved for things which + * don't have an exit() function because we have no + * idea how far they got or how to partially tear + * them down. + */ + WARN_ON(init_funcs[i].exit); + + /* + * We don't want to advertise devices with an only + * partially initialized driver. + */ + WARN_ON(i915_pci_driver.driver.owner); + break; + } } - i915_perf_sysctl_register(); + init_progress = i; + return 0; } static void __exit i915_exit(void) { - if (!i915_pci_driver.driver.owner) - return; + int i; - i915_perf_sysctl_unregister(); - pci_unregister_driver(&i915_pci_driver); - i915_pmu_exit(); - i915_globals_exit(); + for (i = init_progress - 1; i >= 0; i--) { + if (init_funcs[i].exit) + init_funcs[i].exit(); + } } module_init(i915_init); diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index b4ec114a4698b..48ddb363b3bda 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c @@ -4483,9 +4483,10 @@ static int destroy_config(int id, void *p, void *data) return 0; } -void i915_perf_sysctl_register(void) +int i915_perf_sysctl_register(void) { sysctl_header = register_sysctl_table(dev_root); + return 0; } void i915_perf_sysctl_unregister(void) diff --git a/drivers/gpu/drm/i915/i915_perf.h b/drivers/gpu/drm/i915/i915_perf.h index 882fdd0a76800..1d1329e5af3ae 100644 --- a/drivers/gpu/drm/i915/i915_perf.h +++ b/drivers/gpu/drm/i915/i915_perf.h @@ -23,7 +23,7 @@ void i915_perf_fini(struct drm_i915_private *i915); void i915_perf_register(struct drm_i915_private *i915); void i915_perf_unregister(struct drm_i915_private *i915); int i915_perf_ioctl_version(void); -void i915_perf_sysctl_register(void); +int i915_perf_sysctl_register(void); void i915_perf_sysctl_unregister(void); int i915_perf_open_ioctl(struct drm_device *dev, void *data, diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c index 34d37d46a1262..eca92076f31d2 100644 --- a/drivers/gpu/drm/i915/i915_pmu.c +++ b/drivers/gpu/drm/i915/i915_pmu.c @@ -1088,7 +1088,7 @@ static int i915_pmu_cpu_offline(unsigned int cpu, struct hlist_node *node) static enum cpuhp_state cpuhp_slot = CPUHP_INVALID; -void i915_pmu_init(void) +int i915_pmu_init(void) { int ret; @@ -1101,6 +1101,8 @@ void i915_pmu_init(void) ret); else cpuhp_slot = ret; + + return 0; } void i915_pmu_exit(void) diff --git a/drivers/gpu/drm/i915/i915_pmu.h b/drivers/gpu/drm/i915/i915_pmu.h index 60f9595f902cd..449057648f39b 100644 --- a/drivers/gpu/drm/i915/i915_pmu.h +++ b/drivers/gpu/drm/i915/i915_pmu.h @@ -147,14 +147,14 @@ struct i915_pmu { }; #ifdef CONFIG_PERF_EVENTS -void i915_pmu_init(void); +int i915_pmu_init(void); void i915_pmu_exit(void); void i915_pmu_register(struct drm_i915_private *i915); void i915_pmu_unregister(struct drm_i915_private *i915); void i915_pmu_gt_parked(struct drm_i915_private *i915); void i915_pmu_gt_unparked(struct drm_i915_private *i915); #else -static inline void i915_pmu_init(void) {} +static inline int i915_pmu_init(void) { return 0; } static inline void i915_pmu_exit(void) {} static inline void i915_pmu_register(struct drm_i915_private *i915) {} static inline void i915_pmu_unregister(struct drm_i915_private *i915) {} diff --git a/drivers/gpu/drm/i915/selftests/i915_selftest.c b/drivers/gpu/drm/i915/selftests/i915_selftest.c index 1bc11c09faef5..935d065725345 100644 --- a/drivers/gpu/drm/i915/selftests/i915_selftest.c +++ b/drivers/gpu/drm/i915/selftests/i915_selftest.c @@ -187,7 +187,7 @@ int i915_mock_selftests(void) err = run_selftests(mock, NULL); if (err) { i915_selftest.mock = err; - return err; + return 1; } if (i915_selftest.mock < 0) { From patchwork Tue Jul 20 18:13:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 12389085 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 8366EC636C8 for ; Tue, 20 Jul 2021 18:14:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 4BA0661029 for ; Tue, 20 Jul 2021 18:14:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4BA0661029 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A34A46E4BB; Tue, 20 Jul 2021 18:14:13 +0000 (UTC) Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6F11B6E4B3 for ; Tue, 20 Jul 2021 18:14:12 +0000 (UTC) Received: by mail-pf1-x429.google.com with SMTP id d12so229419pfj.2 for ; Tue, 20 Jul 2021 11:14:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BhkbkDYY5lvapWHEYykIm8DO+eSuMufmOfIOn+p1+24=; b=ZvSTTs75luozBsuzjjDfqvGvX6rfb4OBotN2TaGX2XDIZCJZPAgy389MySA5VEAcmJ Ss7Cju71+UxJfBD6PeAjdTiPRYMMoIkQ6Fhdvj2n0mxX6H2KYNx9KlvQ3co8elRj65E1 K8xrtozo6FS6E9gF0YOpTX68JEXC2B7p/u4D1Jr0MQpeuh2ndqzXfwYnbf1tqSYtjaoD NfHWEBWEPw7BGFHoFYGBlorl8PB1DqQ8I2gotkY9tBf+xATe5kjq9FvdAs40yFvWyG70 sKIuaTspQkdK8efxswNzuUF6nlDMrnIyrspoKizfVMRCZf10p07EoWszNAWFoKO6lDi0 Gj7A== 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=BhkbkDYY5lvapWHEYykIm8DO+eSuMufmOfIOn+p1+24=; b=IC1vsZ4EXhpH1qVpFsYkcUtbXIibOLuFyO3KcQnNbd1lEcQsinDbrw8yhcImwGjU77 uQXAK+pMIdwpnyVShvXgJxaw34zNLGxprtQdDcSWLFURcjLeRykjX5ocwZRbpj6fdUF1 6ItyL2lnh8l51/BsbWeWMXIgTtd7O7+F0DdGSXbqpHSWft3xkSKzmiuJ9QIgzT0PBfrX 5e0Cc2sTVxqM/C15YtOfcH7/UMbGj39QrHPOYmg0iuKIyZdlCiKR0OHqk/efFFEwzVXs LMxHqWZOVQ93Yp8w1d/8dmkU9PE17xjg+CWPJsRHpk9xLgUOXlrLUUS2ZVv4lnjJTTms UkbQ== X-Gm-Message-State: AOAM532KstfQnmb4ANfkl9LwO8aauk6sH0uLKyZvOGhbZpVp7WEKsbeC QZgQ/iLGEMqbgNC09X+eiCHb4A== X-Google-Smtp-Source: ABdhPJxs1URLIaPpnELGajNiYpfIT/75pNlAQ6CN0HA3PPqOfCijHhXe/LZIfOaf8w4b46ApoYSn8g== X-Received: by 2002:a62:3244:0:b029:308:22b0:52ff with SMTP id y65-20020a6232440000b029030822b052ffmr32463719pfy.68.1626804851975; Tue, 20 Jul 2021 11:14:11 -0700 (PDT) Received: from omlet.lan ([134.134.137.86]) by smtp.gmail.com with ESMTPSA id c2sm26436573pgh.82.2021.07.20.11.14.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 11:14:11 -0700 (PDT) From: Jason Ekstrand To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 4/6] drm/ttm: Force re-init if ttm_global_init() fails Date: Tue, 20 Jul 2021 13:13:55 -0500 Message-Id: <20210720181357.2760720-5-jason@jlekstrand.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210720181357.2760720-1-jason@jlekstrand.net> References: <20210720181357.2760720-1-jason@jlekstrand.net> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Christian_K=C3=B6nig?= , Jason Ekstrand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" If we have a failure, decrement the reference count so that the next call to ttm_global_init() will actually do something instead of assume everything is all set up. Signed-off-by: Jason Ekstrand Fixes: 62b53b37e4b1 ("drm/ttm: use a static ttm_bo_global instance") Reviewed-by: Christian König --- drivers/gpu/drm/ttm/ttm_device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c index 5f31acec3ad76..519deea8e39b7 100644 --- a/drivers/gpu/drm/ttm/ttm_device.c +++ b/drivers/gpu/drm/ttm/ttm_device.c @@ -100,6 +100,8 @@ static int ttm_global_init(void) debugfs_create_atomic_t("buffer_objects", 0444, ttm_debugfs_root, &glob->bo_count); out: + if (ret) + --ttm_glob_use_count; mutex_unlock(&ttm_global_mutex); return ret; } From patchwork Tue Jul 20 18:13:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 12389087 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 D0912C07E95 for ; Tue, 20 Jul 2021 18:14:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 A3F096108B for ; Tue, 20 Jul 2021 18:14:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A3F096108B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6AD656E4D4; Tue, 20 Jul 2021 18:14:19 +0000 (UTC) Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 87CE46E4CA for ; Tue, 20 Jul 2021 18:14:14 +0000 (UTC) Received: by mail-pg1-x52d.google.com with SMTP id o4so18667980pgs.6 for ; Tue, 20 Jul 2021 11:14:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ReIHw+eskmExAvlnepg8gr2vNrQ8gC8vqz4lIfsdf9M=; b=Hz0cL33ubiHisyTzwjnlyjUxG46kLnOukqZ6f4kCsQaBFEU9mt7MUrMjpl3qlQiQrG HYFytFsxxewbXaYKno/TrWlhcBlcwsE7Rbk8h7x4F378nl7zsjzLHmtqqmDBn5TbsF/j esDi1udl3EN8K2guXz52hw5Lb+AgLuVVyYXaKDynZkDg08sfXNAftNhNZ+daQa+3qM4d N6hmFNFIjkt1jeoIKIb2Npk1DjLDoZaXXzHb2PliH+jjCpdq16f6QDx7vnGfgp1Oldqp gMMZqLfKWUW7TEbcXy7il9xxE1ObZTnzUo6IzbknUVa25d/XCr0YnQFGEzC9Y9xNwsWa +gTA== 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=ReIHw+eskmExAvlnepg8gr2vNrQ8gC8vqz4lIfsdf9M=; b=Vqe4y4PeIw6vTlvfaoVmLzq2aQz7dTzgxwNF9UmFlFviD2eTXV+Ztn856ofmMU0Ml6 C79W+NOcoBURLTc/WDYZzMZvBqP6JfI1UzPbbbEvjvmfrZEgXqufAXUrNdBMAEEvcew+ cPQFImzKf/is6melhk5HD8aiG58p8dCncD0STPwfjVYTVnrA+l5F8xIryJTl0nQpLvPX lC8QrXACdjXYkuhSb//K8vffu8HH7f8Chu8EZu6dxjWY4rUjuOarXNU/35xxWg/XpMhT Jv+MF8ejjR2Y8x6ZkwtUEqyfn8/oA8RCuGYZsPLaDOBBQiAKDggOtIfDjvt+NaU4B3JM X6Mw== X-Gm-Message-State: AOAM530u5OFNlJ+M0T8CNOgnYTLGd9QsH2KP17GuB6mpFqX/b12rAtf2 59HUOnleOYn0AifWN4T7bl1qKA== X-Google-Smtp-Source: ABdhPJwZ4OwkDQv3h+FLciZIMUXZoQhY1KGMDFUV0VonL+NXfcJG1HlfU9yqK0jIv31w0uJKIBV0hQ== X-Received: by 2002:a62:d108:0:b029:304:33e5:4dde with SMTP id z8-20020a62d1080000b029030433e54ddemr32926250pfg.74.1626804853725; Tue, 20 Jul 2021 11:14:13 -0700 (PDT) Received: from omlet.lan ([134.134.137.86]) by smtp.gmail.com with ESMTPSA id c2sm26436573pgh.82.2021.07.20.11.14.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 11:14:13 -0700 (PDT) From: Jason Ekstrand To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 5/6] drm/ttm: Initialize debugfs from ttm_global_init() Date: Tue, 20 Jul 2021 13:13:56 -0500 Message-Id: <20210720181357.2760720-6-jason@jlekstrand.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210720181357.2760720-1-jason@jlekstrand.net> References: <20210720181357.2760720-1-jason@jlekstrand.net> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Jason Ekstrand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" We create a bunch of debugfs entries as a side-effect of ttm_global_init() and then never clean them up. This isn't usually a problem because we free the whole debugfs directory on module unload. However, if the global reference count ever goes to zero and then ttm_global_init() is called again, we'll re-create those debugfs entries and debugfs will complain in dmesg that we're creating entries that already exist. This patch fixes this problem by changing the lifetime of the whole TTM debugfs directory to match that of the TTM global state. Signed-off-by: Jason Ekstrand Reviewed-by: Daniel Vetter --- drivers/gpu/drm/ttm/ttm_device.c | 12 ++++++++++++ drivers/gpu/drm/ttm/ttm_module.c | 16 ---------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c index 519deea8e39b7..74e3b460132b3 100644 --- a/drivers/gpu/drm/ttm/ttm_device.c +++ b/drivers/gpu/drm/ttm/ttm_device.c @@ -44,6 +44,8 @@ static unsigned ttm_glob_use_count; struct ttm_global ttm_glob; EXPORT_SYMBOL(ttm_glob); +struct dentry *ttm_debugfs_root; + static void ttm_global_release(void) { struct ttm_global *glob = &ttm_glob; @@ -53,6 +55,7 @@ static void ttm_global_release(void) goto out; ttm_pool_mgr_fini(); + debugfs_remove(ttm_debugfs_root); __free_page(glob->dummy_read_page); memset(glob, 0, sizeof(*glob)); @@ -73,6 +76,13 @@ static int ttm_global_init(void) si_meminfo(&si); + ttm_debugfs_root = debugfs_create_dir("ttm", NULL); + if (IS_ERR(ttm_debugfs_root)) { + ret = PTR_ERR(ttm_debugfs_root); + ttm_debugfs_root = NULL; + goto out; + } + /* Limit the number of pages in the pool to about 50% of the total * system memory. */ @@ -100,6 +110,8 @@ static int ttm_global_init(void) debugfs_create_atomic_t("buffer_objects", 0444, ttm_debugfs_root, &glob->bo_count); out: + if (ret && ttm_debugfs_root) + debugfs_remove(ttm_debugfs_root); if (ret) --ttm_glob_use_count; mutex_unlock(&ttm_global_mutex); diff --git a/drivers/gpu/drm/ttm/ttm_module.c b/drivers/gpu/drm/ttm/ttm_module.c index 997c458f68a9a..7fcdef278c742 100644 --- a/drivers/gpu/drm/ttm/ttm_module.c +++ b/drivers/gpu/drm/ttm/ttm_module.c @@ -72,22 +72,6 @@ pgprot_t ttm_prot_from_caching(enum ttm_caching caching, pgprot_t tmp) return tmp; } -struct dentry *ttm_debugfs_root; - -static int __init ttm_init(void) -{ - ttm_debugfs_root = debugfs_create_dir("ttm", NULL); - return 0; -} - -static void __exit ttm_exit(void) -{ - debugfs_remove(ttm_debugfs_root); -} - -module_init(ttm_init); -module_exit(ttm_exit); - MODULE_AUTHOR("Thomas Hellstrom, Jerome Glisse"); MODULE_DESCRIPTION("TTM memory manager subsystem (for DRM device)"); MODULE_LICENSE("GPL and additional rights"); From patchwork Tue Jul 20 18:13:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 12389089 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 36CE7C636CA for ; Tue, 20 Jul 2021 18:14:26 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 073BF60249 for ; Tue, 20 Jul 2021 18:14:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 073BF60249 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4B6846E4DD; Tue, 20 Jul 2021 18:14:20 +0000 (UTC) Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2F60F6E4CA for ; Tue, 20 Jul 2021 18:14:16 +0000 (UTC) Received: by mail-pf1-x429.google.com with SMTP id j199so206547pfd.7 for ; Tue, 20 Jul 2021 11:14:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E/GP8kKx9GV1KDV40SZ5oe0nrG9fM0ehQJYkajDCId0=; b=KDon7F5ZPiwgQaHfm3hMpY/JQaliLw9fedU3kdG9jnvNbUO8zZTDVqKPd3DMz8KLpN TUZrUrQdrbcq4aMP7z3x+2D+/+3CUyhRvA6g16PTZ/pao1Klyy8c5KezSnscnB0P29xC AH6LbkBy4mrrRHJXIHIzGnn00LQYKDojdVH3wout8MVrv+IqMyV/MnxOxrU0eVpkGi/+ 2gj294Y6kQg79Hlb5ZGbrE6NF82LItuRmKsnuGA/fGQGn6g1pIKEqLCVpXMwhpDRl7G5 dk1cT0I6m3+MsPeGOtVAH7shcY6yzQhofsNDNjjT3QCVJ+06qMEX+zCmg1ditDXLOjsJ dZ+Q== 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=E/GP8kKx9GV1KDV40SZ5oe0nrG9fM0ehQJYkajDCId0=; b=ZYoLpC+wm4ioLinxRNoV3wv0Q0hZzhyMkzDQ08o+iYZxQh29P5+80Ew/aHy/6LDV+5 J2i+pMngA87NUFoJIYLmgOWqDMCMrKqpqOcEjahEi2C3NwJpZCxzGgWqcX4reqmTsDnD 5W2TnxPtFmtATuPDtz+v06PIH12PxCejAcfOIVICMMkUJrCFsawY/8psL+XRVYfHV0dJ +VnpCFklpKx2zPSpNl2jguPfgJDvtqcOaOVmHWi+1QagfgN2xEvjf3aTIykCisNJEer4 mA9kDuur9KjGUSxNFONgwkALV17boCJREwSWfQdDy5Hn5yHZtYrQ/ZsMVY1qhuzAF51M dsUQ== X-Gm-Message-State: AOAM5316s+Y2iViNI9hdWHfIZF7bQ9foEEa9I4tQVAJDQNa5s2aIUMpX prWkYps+vh6xL79ECJcNEesMbw== X-Google-Smtp-Source: ABdhPJwn0kYUAeL+Z4kpVEj9orPCiXFT//zior0KZH89LOvIui0ooTFAGR//tmVPea49cK3Zh1PQLg== X-Received: by 2002:a65:4342:: with SMTP id k2mr19791740pgq.138.1626804855778; Tue, 20 Jul 2021 11:14:15 -0700 (PDT) Received: from omlet.lan ([134.134.137.86]) by smtp.gmail.com with ESMTPSA id c2sm26436573pgh.82.2021.07.20.11.14.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 11:14:15 -0700 (PDT) From: Jason Ekstrand To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 6/6] drm/i915: Make the kmem slab for i915_buddy_block a global Date: Tue, 20 Jul 2021 13:13:57 -0500 Message-Id: <20210720181357.2760720-7-jason@jlekstrand.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210720181357.2760720-1-jason@jlekstrand.net> References: <20210720181357.2760720-1-jason@jlekstrand.net> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matthew Auld , Jason Ekstrand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" There's no reason that I can tell why this should be per-i915_buddy_mm and doing so causes KMEM_CACHE to throw dmesg warnings because it tries to create a debugfs entry with the name i915_buddy_block multiple times. We could handle this by carefully giving each slab its own name but that brings its own pain because then we have to store that string somewhere and manage the lifetimes of the different slabs. The most likely outcome would be a global atomic which we increment to get a new name or something like that. The much easier solution is to use the i915_globals system like we do for every other slab in i915. This ensures that we have exactly one of them for each i915 driver load and it gets neatly created on module load and destroyed on module unload. Using the globals system also means that its now tied into the shrink handler so we can properly respond to low-memory situations. Signed-off-by: Jason Ekstrand Fixes: 88be9a0a06b7 ("drm/i915/ttm: add ttm_buddy_man") Cc: Matthew Auld --- drivers/gpu/drm/i915/i915_buddy.c | 44 ++++++++++++++++++++++------- drivers/gpu/drm/i915/i915_buddy.h | 3 +- drivers/gpu/drm/i915/i915_globals.c | 2 ++ 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_buddy.c b/drivers/gpu/drm/i915/i915_buddy.c index 29dd7d0310c1f..911feedad4513 100644 --- a/drivers/gpu/drm/i915/i915_buddy.c +++ b/drivers/gpu/drm/i915/i915_buddy.c @@ -8,8 +8,14 @@ #include "i915_buddy.h" #include "i915_gem.h" +#include "i915_globals.h" #include "i915_utils.h" +static struct i915_global_buddy { + struct i915_global base; + struct kmem_cache *slab_blocks; +} global; + static struct i915_buddy_block *i915_block_alloc(struct i915_buddy_mm *mm, struct i915_buddy_block *parent, unsigned int order, @@ -19,7 +25,7 @@ static struct i915_buddy_block *i915_block_alloc(struct i915_buddy_mm *mm, GEM_BUG_ON(order > I915_BUDDY_MAX_ORDER); - block = kmem_cache_zalloc(mm->slab_blocks, GFP_KERNEL); + block = kmem_cache_zalloc(global.slab_blocks, GFP_KERNEL); if (!block) return NULL; @@ -34,7 +40,7 @@ static struct i915_buddy_block *i915_block_alloc(struct i915_buddy_mm *mm, static void i915_block_free(struct i915_buddy_mm *mm, struct i915_buddy_block *block) { - kmem_cache_free(mm->slab_blocks, block); + kmem_cache_free(global.slab_blocks, block); } static void mark_allocated(struct i915_buddy_block *block) @@ -85,15 +91,11 @@ int i915_buddy_init(struct i915_buddy_mm *mm, u64 size, u64 chunk_size) GEM_BUG_ON(mm->max_order > I915_BUDDY_MAX_ORDER); - mm->slab_blocks = KMEM_CACHE(i915_buddy_block, SLAB_HWCACHE_ALIGN); - if (!mm->slab_blocks) - return -ENOMEM; - mm->free_list = kmalloc_array(mm->max_order + 1, sizeof(struct list_head), GFP_KERNEL); if (!mm->free_list) - goto out_destroy_slab; + return -ENOMEM; for (i = 0; i <= mm->max_order; ++i) INIT_LIST_HEAD(&mm->free_list[i]); @@ -145,8 +147,6 @@ int i915_buddy_init(struct i915_buddy_mm *mm, u64 size, u64 chunk_size) kfree(mm->roots); out_free_list: kfree(mm->free_list); -out_destroy_slab: - kmem_cache_destroy(mm->slab_blocks); return -ENOMEM; } @@ -161,7 +161,6 @@ void i915_buddy_fini(struct i915_buddy_mm *mm) kfree(mm->roots); kfree(mm->free_list); - kmem_cache_destroy(mm->slab_blocks); } static int split_block(struct i915_buddy_mm *mm, @@ -410,3 +409,28 @@ int i915_buddy_alloc_range(struct i915_buddy_mm *mm, #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) #include "selftests/i915_buddy.c" #endif + +static void i915_global_buddy_shrink(void) +{ + kmem_cache_shrink(global.slab_blocks); +} + +static void i915_global_buddy_exit(void) +{ + kmem_cache_destroy(global.slab_blocks); +} + +static struct i915_global_buddy global = { { + .shrink = i915_global_buddy_shrink, + .exit = i915_global_buddy_exit, +} }; + +int __init i915_global_buddy_init(void) +{ + global.slab_blocks = KMEM_CACHE(i915_buddy_block, 0); + if (!global.slab_blocks) + return -ENOMEM; + + i915_global_register(&global.base); + return 0; +} diff --git a/drivers/gpu/drm/i915/i915_buddy.h b/drivers/gpu/drm/i915/i915_buddy.h index 37f8c42071d12..d8f26706de52f 100644 --- a/drivers/gpu/drm/i915/i915_buddy.h +++ b/drivers/gpu/drm/i915/i915_buddy.h @@ -47,7 +47,6 @@ struct i915_buddy_block { * i915_buddy_alloc* and i915_buddy_free* should suffice. */ struct i915_buddy_mm { - struct kmem_cache *slab_blocks; /* Maintain a free list for each order. */ struct list_head *free_list; @@ -130,4 +129,6 @@ void i915_buddy_free(struct i915_buddy_mm *mm, struct i915_buddy_block *block); void i915_buddy_free_list(struct i915_buddy_mm *mm, struct list_head *objects); +int i915_global_buddy_init(void); + #endif diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c index 87267e1d2ad92..e57102a4c8d16 100644 --- a/drivers/gpu/drm/i915/i915_globals.c +++ b/drivers/gpu/drm/i915/i915_globals.c @@ -8,6 +8,7 @@ #include #include "i915_active.h" +#include "i915_buddy.h" #include "gem/i915_gem_context.h" #include "gem/i915_gem_object.h" #include "i915_globals.h" @@ -87,6 +88,7 @@ static void __i915_globals_cleanup(void) static __initconst int (* const initfn[])(void) = { i915_global_active_init, + i915_global_buddy_init, i915_global_context_init, i915_global_gem_context_init, i915_global_objects_init,