From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 04400139D1E for ; Tue, 23 Jul 2024 07:58:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721721528; cv=none; b=qPEkBrrtwJGMyp8ez5OoTUGV64vbAI1p69LnRptezWLIcJa0umYvwfVmbiGj440ollUOp3QgCIds+SUtQuaB9i3vUPl9KiWAJyrvg3PQ/EWcB8iO7/0HjeSp8BM2zMKJnCGBPfOdt1M8fdl9G7k0NKmKvQxhncvigP24kMmc3yY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721721528; c=relaxed/simple; bh=tezqmdqLpOCk2emgmI+9gn8rvoTmkjtnvW43uwEZ2Is=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=LwCl+lwoYxOSeSXbxN5DNPlpCB8eSZppz1/FM1FlO3+0SQzkFOdDaIGc1Dcn5M4sd7J3nJaoJbxuix0Yza3kk7QYKc+Zb7OvILGJi5e+dTjjpaS3vLv/CD9Caj8sXtCQYYDNBAxRd/4BfBsRwA69G4uYgkkMlUfSokDiQjvQnko= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ursulin.net; spf=none smtp.mailfrom=ursulin.net; dkim=pass (2048-bit key) header.d=ursulin-net.20230601.gappssmtp.com header.i=@ursulin-net.20230601.gappssmtp.com header.b=GU+DSSzm; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ursulin.net Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ursulin.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ursulin-net.20230601.gappssmtp.com header.i=@ursulin-net.20230601.gappssmtp.com header.b="GU+DSSzm" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4277a5ed48bso38814925e9.2 for ; Tue, 23 Jul 2024 00:58:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20230601.gappssmtp.com; s=20230601; t=1721721525; x=1722326325; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=umNAcUqJdRtZr0xF+y+QGLOd2nx2R4lw7z6ws/NwhSI=; b=GU+DSSzmKp6n3OGxgRpdIsfFz/RSGkESr+465j0LwcUR5Am22d/WMtvfnh/FAyT+ly gHsnBLqvqmp+jwf6XGFr8syetZcY9mYwkSeuOpTiMal9ZQT3ij+OepU2E3sNHfv+bDQJ 19rtfTpwL6u7ljRQdOjE4Jb2Edn5PEiME+fwIbviKnqon/NG97U3HQBSL8+VIJdRGSRl J1znv9lLdx5G74KVcY+x3T68aIWIliv2/U6ojayulWz4Yh+EfzAlkCE0mghTGBu65xc2 psF2YUFP2IH9ZOUBfYjlS1vyCRcAQjSn0jyaldkbW6IrblBQAgklM8w4lT72MJT+MUWn 5CNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721721525; x=1722326325; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=umNAcUqJdRtZr0xF+y+QGLOd2nx2R4lw7z6ws/NwhSI=; b=YrYkJwf8SkULTGumrFLqMS2umUcK77oz4WxrR8UqJNeUl7HYOSU+B0GDEMcFx39fne 5KAYRBLEibvsMxuteoJC7Je2u1xFjyvWtB1sShdqeIOtWwBumiLGxqybpdYVJeNP1kHA yzpX9YrvYJGH3zQhed1YhKU4P7KhZdOj4RZfRsdTKe24i8urmDx8IH9QFZ3cPWuPcyDr L27anCDiOJIBurXxoaH2VXEkPEyav6z6XaJJzlb3vkKfz2PtBxerjDP3P0WfN0IsW/kw tLGy6wUSjguAYJtbt70vrrJ8s/o3lwk8gFIEySvVS3EZ9PBFTSl8BJEx2Qr3tbPKYP21 7YHg== X-Forwarded-Encrypted: i=1; AJvYcCXeHwrIK27StoRIISgHg1BByBZ/WpEecyw7i5Fz4z76ocFq+t28nSJoNOJ2I7vjAM5uUR3e7vxsqSMXgaDYKM+hY5fjfwMfxfUazv0+VDCfpg== X-Gm-Message-State: AOJu0Yx4AFbxr49MzMkZznDJ9tPAIhyT+++mVchFMqYozBJDHwWFj9fC uqcJLM8vchsLuhzQGYGC3fwAAiZe+TAY59dvWJfT43Ndm4Vf1rOn1nhaL2lXz5A= X-Google-Smtp-Source: AGHT+IGh5SVVErDKpfRMcH320xfK+fubRln8dcW8PmujwZANOvUs4TjqYpr90bWsiVfeAm0f4OBdVA== X-Received: by 2002:a05:600c:1e02:b0:427:9dad:181d with SMTP id 5b1f17b1804b1-427efe253afmr5775285e9.11.1721721524176; Tue, 23 Jul 2024 00:58:44 -0700 (PDT) Received: from [192.168.0.101] ([84.69.19.168]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427d2a947fasm186525585e9.43.2024.07.23.00.58.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 23 Jul 2024 00:58:43 -0700 (PDT) Message-ID: <1fa79ff6-9ab0-4b2f-a776-c90f7ce23a80@ursulin.net> Date: Tue, 23 Jul 2024 08:58:43 +0100 Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 5/7] drm/i915/pmu: Let resource survive unbind To: Lucas De Marchi , intel-gfx@lists.freedesktop.org, linux-perf-users@vger.kernel.org Cc: Tvrtko Ursulin , dri-devel@lists.freedesktop.org, Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , linux-kernel@vger.kernel.org References: <20240722210648.80892-1-lucas.demarchi@intel.com> <20240722210648.80892-6-lucas.demarchi@intel.com> Content-Language: en-GB From: Tvrtko Ursulin In-Reply-To: <20240722210648.80892-6-lucas.demarchi@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 22/07/2024 22:06, Lucas De Marchi wrote: > There's no need to free the resources during unbind. Since perf events > may still access them due to open events, it's safer to free them when > dropping the last i915 reference. > > Signed-off-by: Lucas De Marchi > --- > drivers/gpu/drm/i915/i915_pmu.c | 21 ++++++++++++++++----- > 1 file changed, 16 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c > index b5d14dd318e4..8708f905f4f4 100644 > --- a/drivers/gpu/drm/i915/i915_pmu.c > +++ b/drivers/gpu/drm/i915/i915_pmu.c > @@ -5,6 +5,7 @@ > */ > > #include > +#include > > #include "gt/intel_engine.h" > #include "gt/intel_engine_pm.h" > @@ -1152,6 +1153,17 @@ static void free_event_attributes(struct i915_pmu *pmu) > pmu->pmu_attr = NULL; > } > > +static void free_pmu(struct drm_device *dev, void *res) > +{ > + struct i915_pmu *pmu = res; > + struct drm_i915_private *i915 = pmu_to_i915(pmu); > + > + free_event_attributes(pmu); > + kfree(pmu->base.attr_groups); > + if (IS_DGFX(i915)) > + kfree(pmu->name); > +} > + > static int i915_pmu_cpu_online(unsigned int cpu, struct hlist_node *node) > { > struct i915_pmu *pmu = hlist_entry_safe(node, typeof(*pmu), cpuhp.node); > @@ -1302,6 +1314,9 @@ void i915_pmu_register(struct drm_i915_private *i915) > if (ret) > goto err_unreg; > > + if (drmm_add_action_or_reset(&i915->drm, free_pmu, pmu)) > + goto err_unreg; Is i915_pmu_unregister_cpuhp_state missing on this error path? Regards, Tvrtko > + > return; > > err_unreg: > @@ -1336,11 +1351,7 @@ void i915_pmu_unregister(struct drm_i915_private *i915) > hrtimer_cancel(&pmu->timer); > > i915_pmu_unregister_cpuhp_state(pmu); > - > perf_pmu_unregister(&pmu->base); > + > pmu->base.event_init = NULL; > - kfree(pmu->base.attr_groups); > - if (IS_DGFX(i915)) > - kfree(pmu->name); > - free_event_attributes(pmu); > }