From patchwork Fri Oct 28 22:48:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 12581 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1080588wru; Fri, 28 Oct 2022 15:50:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5DBxtXGXArFbDQHTAq82W1sHY6Kqx2wYXKJwTBoSI82jgjGzGkZjOPAqiDP4u4jBiO6U7i X-Received: by 2002:a17:907:2719:b0:782:b261:e9eb with SMTP id w25-20020a170907271900b00782b261e9ebmr1542195ejk.104.1666997430398; Fri, 28 Oct 2022 15:50:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666997430; cv=none; d=google.com; s=arc-20160816; b=B+YD4Bba4INLcrxph31kWyw+6lb/ncKyqt8CuS46o/fVtaVg23fLHUzw0fngZYo/4P 5sPQIailrg80RAHtAjL2ZTAX1bnjjNcdeYyUlC39SVze8u1aeB0hde2JINmGjKAqqibn mZBxCKoe0QRVagabxgsOhfMp2kxMo6H0b6RFtO5Sn/lT/io7mKHmOKFfoKz14BvL16YF ixzkZ0LrH69eygZ4DjmN+m0c9wQawTNfPbSRaQYDeZD2SZapkgI1RJ8q8iPr03J03kAL c+0VUXhtRYN6RrpcNWBOeTIzcoaWanD8T0PwakF79EKVyseLlltCraLkS1dEPAC3V8e9 eATg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=8LWoRkfSMU+CJ60Tm7wanIclajGSfZYvjPsATtyTB9c=; b=t4NzXuHGpn76+NLQh9XlOCRgsrpYCh4Ta3w8msI2di1G6rnAnyG923BeX4ZVY8ayZ4 EmAEtP5MLbTKmONgbAvwLlzohFfGJb0fuiy1DOpPtzxo68SAys2F73Nt0f7BEZs08QLv F3hbfGY2msrAn5xIB22YAzboWu7ks3eh9gnbukJVB2jn7FDvDKefAJFGmheQ6mUEZL4H b8c+yyplBu4MOGM2AzDdxjIBeFZ6Gppkms3z/sXu3jcKneXZkNtJle8o9GRevrZJGfBA mNKsqKq3HPlsIvyaKNy89rm2eCfv1/eLICoFCxLca287w0cxeXFhZ3M3WozwM0LwAZFI N3kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=kEf8pkaq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q31-20020a056402249f00b0044f2fb68fe6si2169739eda.495.2022.10.28.15.50.07; Fri, 28 Oct 2022 15:50:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=kEf8pkaq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S230266AbiJ1WtI (ORCPT + 99 others); Fri, 28 Oct 2022 18:49:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230218AbiJ1WtC (ORCPT ); Fri, 28 Oct 2022 18:49:02 -0400 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2432A1EA55A for ; Fri, 28 Oct 2022 15:48:21 -0700 (PDT) Received: by mail-pl1-x62e.google.com with SMTP id g24so6050763plq.3 for ; Fri, 28 Oct 2022 15:48:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8LWoRkfSMU+CJ60Tm7wanIclajGSfZYvjPsATtyTB9c=; b=kEf8pkaqDLyKKPRro1RzlspOqf9bDj9K9tXuJIfimPasVBVuSbh3nXFfHuKj3Ygv/e Cb2woLyV/0T4hlBWtL+deoHGD9VfD6aKyLYcAQxvNFDXlnQhUFE87y+LQpwOsBtmz5z0 nYqVpW7KVwrtYp/ANLZ6FHgmzrBkDHxNW5lig= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8LWoRkfSMU+CJ60Tm7wanIclajGSfZYvjPsATtyTB9c=; b=dO1RqJX+lDwxwzt16vp+9PAhYna04k4cZXH5Gej9QZ67oRwCw/D1YfqX1UFxqT1cdq mX6noxIrsvXk/zHyound2sqBaHFHG9zWHmx6Vcbh/l+bkqC5kB1jZ0o729oVsq9HdSPW tOn7NE6BKQCUCdQZsB6+YgGGD/a8zDn7qSKAc0Z+0gwO8asAzewpeOe+l7QySdYlx/8B 5X5F7DfTWZVBqVeBYgf6WH13VMbIiannpmD4K+0jfBlacgNEzt0W3Rl7RQ4uGMy+Biyk ltvbk+vQI+79vQHD55JEMtDcTEZdLyHgFZ6qzhBLAtWkaSd00sremUVSOOqqD3WowHzg ATNg== X-Gm-Message-State: ACrzQf2ejmE7J9bqrum6DV8ntJaPgQo//EP7pfumoPxSpq7aotcRbgDy 0+efIZN7CYI9bPl6sOTtZ7djREmG6Z2gYg== X-Received: by 2002:a17:90a:c78a:b0:212:e56b:2b17 with SMTP id gn10-20020a17090ac78a00b00212e56b2b17mr1623176pjb.51.1666997300703; Fri, 28 Oct 2022 15:48:20 -0700 (PDT) Received: from localhost ([2620:15c:9d:2:65f9:c180:249c:190f]) by smtp.gmail.com with UTF8SMTPSA id 1-20020a17090a0e8100b002009db534d1sm3010415pjx.24.2022.10.28.15.48.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 28 Oct 2022 15:48:20 -0700 (PDT) From: Brian Norris To: Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , Xinhui Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, Brian Norris Subject: [PATCH 1/2] drm/amdgpu: Move racy global PMU list into device Date: Fri, 28 Oct 2022 15:48:12 -0700 Message-Id: <20221028224813.1466450-1-briannorris@chromium.org> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog MIME-Version: 1.0 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747973497612024629?= X-GMAIL-MSGID: =?utf-8?q?1747973497612024629?= If there are multiple amdgpu devices, this list processing can be racy. We're really treating this like a per-device list, so make that explicit and remove the global list. Signed-off-by: Brian Norris --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 12 +++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 0e6ddf05c23c..e968b7f2417c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -1063,6 +1063,10 @@ struct amdgpu_device { struct work_struct reset_work; bool job_hang; + +#if IS_ENABLED(CONFIG_PERF_EVENTS) + struct list_head pmu_list; +#endif }; static inline struct amdgpu_device *drm_to_adev(struct drm_device *ddev) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c index 71ee361d0972..24f2055a2f23 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c @@ -23,6 +23,7 @@ #include #include +#include #include "amdgpu.h" #include "amdgpu_pmu.h" @@ -72,9 +73,6 @@ static ssize_t amdgpu_pmu_event_show(struct device *dev, amdgpu_pmu_attr->event_str, amdgpu_pmu_attr->type); } -static LIST_HEAD(amdgpu_pmu_list); - - struct amdgpu_pmu_attr { const char *name; const char *config; @@ -558,7 +556,7 @@ static int init_pmu_entry_by_type_and_add(struct amdgpu_pmu_entry *pmu_entry, pr_info("Detected AMDGPU %d Perf Events.\n", total_num_events); - list_add_tail(&pmu_entry->entry, &amdgpu_pmu_list); + list_add_tail(&pmu_entry->entry, &pmu_entry->adev->pmu_list); return 0; err_register: @@ -579,9 +577,7 @@ void amdgpu_pmu_fini(struct amdgpu_device *adev) { struct amdgpu_pmu_entry *pe, *temp; - list_for_each_entry_safe(pe, temp, &amdgpu_pmu_list, entry) { - if (pe->adev != adev) - continue; + list_for_each_entry_safe(pe, temp, &adev->pmu_list, entry) { list_del(&pe->entry); perf_pmu_unregister(&pe->pmu); kfree(pe->pmu.attr_groups); @@ -623,6 +619,8 @@ int amdgpu_pmu_init(struct amdgpu_device *adev) int ret = 0; struct amdgpu_pmu_entry *pmu_entry, *pmu_entry_df; + INIT_LIST_HEAD(&adev->pmu_list); + switch (adev->asic_type) { case CHIP_VEGA20: pmu_entry_df = create_pmu_entry(adev, AMDGPU_PMU_PERF_TYPE_DF,