Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp339230rwr; Tue, 25 Apr 2023 23:26:10 -0700 (PDT) X-Google-Smtp-Source: AKy350biOHSHuFk4e5wiz6ZaI4vBxlej7tqJv7JcBZ1cfWbdRDF9hF9CNXHjRp5yTCOxcvsujtwS X-Received: by 2002:a17:90a:1b64:b0:24b:56a1:6d0a with SMTP id q91-20020a17090a1b6400b0024b56a16d0amr18260255pjq.1.1682490370555; Tue, 25 Apr 2023 23:26:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682490370; cv=none; d=google.com; s=arc-20160816; b=UUKh4kiUuoqm57ARklcUH7yAaBcR9+Uoqq4RTJjpZtLuv0f+Ow8LI9bconyaMYZCJO 7XnR7cQIrsfTfY+QRq7tUVv8NRduFb4HzF47NnIwYqrQe9L0iNEjWJ4a38TRiAevv9cs RqS9UFHEzDgevl6i3fmaTbyZpNe6IMDvr3d6+3p3p+Jsy+cmoZuMUqwSlmZRhcJPfZK0 pbsHxXB/SAs4XJuylNigzbnEFTjaeJuEoLZNFhOJwXfpe42Tk4UB/3NPZ/NshDqocibP MG1wgjUT8G2NhpTdV99HqQU6eiOdMRMSrYpedTPz5ClOPR2XLj0T5XXZELruvDZPpix+ VJ5g== 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=54QT2qvIeWHdzjZ4EieSD34moWDamE7VGmQ7alnRC98=; b=dH06vcbv7rMXzRtic4NR4Rimrr8q166BpVrWUxtHH9+fywUkEqFcl8TX6U9bR8bxDV lYajQxXUMQM1oInL3nnmO793Qj94RMXmPcSRoaJQucWtCcYJ1d0aADR1RU7hZwbAVah/ iNw4/X3yWhjDeuoCgyJXBTIVM6lEl6ULC12LBrjbDFqZW5mMbMBEZfn10jqfbR5ZL7vm eLoY3Fw7oCk7JGBIOw1CiY71w6tOwRqusVZBor6lDbm07T7vVCqqY5NtMKxQ4XHgKz6n CCiktr9baXsPHaTvBOlwT7EnEGGevBfKWbpHOgizWktNR5GIO5dX52JMhcVRSUnvZIDn aEYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=sF+P8bb8; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k13-20020a170902d58d00b001a6d18a3125si15706474plh.646.2023.04.25.23.25.56; Tue, 25 Apr 2023 23:26:10 -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=@gmail.com header.s=20221208 header.b=sF+P8bb8; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239476AbjDZGRb (ORCPT + 99 others); Wed, 26 Apr 2023 02:17:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239390AbjDZGR3 (ORCPT ); Wed, 26 Apr 2023 02:17:29 -0400 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 292FB2684; Tue, 25 Apr 2023 23:17:29 -0700 (PDT) Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-524c7deb811so508144a12.1; Tue, 25 Apr 2023 23:17:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682489848; x=1685081848; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=54QT2qvIeWHdzjZ4EieSD34moWDamE7VGmQ7alnRC98=; b=sF+P8bb8uMhYrTOmSX99gvg7Hru+61Rlk2NYSAmxAbzFaHJ9SIj7+SjR0pxefdjN5r hFt9x6840LiGIIMysJkU+WbnAdwbMxBdQRsv/pQrZFRnzdw7LUC+D7MPgj8wTiFc/CuG KkXY6/Ys64F/aPaHUC3zG+MRUxVRpg53YaqUDLsd15CspB+8+5RQaMlfn4SbQfjNu0kS dbIa5Kkbv2TcP2OsDQiaFCYdjxrqsfpR7tTz+JtD37h9tS3/rUfWxdRwIjanZySnRYYf uONLqV8nBibPXcOKjU5MrwR8k7x5nIpa3dAiDegXDvl8HbdhPmjxIEtceUBAHzPpomst xVtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682489848; x=1685081848; 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=54QT2qvIeWHdzjZ4EieSD34moWDamE7VGmQ7alnRC98=; b=g34gNDosekFQ8xDn5M0aPVynUl8zVcrvNpvdlWZU8I5P56zWJFhHNjNs0lb2vbgCK+ XKydpOkpMJq/66gegmAapQMN1C9kUiuzt657JywO0sFKygQgD9T+sRmTEwDrcqebywV9 CYZPThI81U0FfaTQkyQJRl90He4yApG7z6pEVshUAss7vN16DU/2MB1lOZNvipaFsvEy B9IlktWyr24lH9C6rHVycPHGFJ8/eFKcxoi+i337RPh5b6Ti65yPWIMDQRN5giTmpgmT wVSpv+1DRQyBrqGxT1tYnsmqyCm8OSsdIBPc1VFQJ7ZzS6sX2vXD8A7ol8CD2kSWLj3z tjTQ== X-Gm-Message-State: AAQBX9fHww3yQuqEedx1h6MOfl5vSzLRGvsJrPHNPv5d3e2Rw3XtllHv IdnOUe4PJ9xuaGFgDEt7P78= X-Received: by 2002:a05:6a20:1608:b0:c0:2875:9e8c with SMTP id l8-20020a056a20160800b000c028759e8cmr25435942pzj.1.1682489848305; Tue, 25 Apr 2023 23:17:28 -0700 (PDT) Received: from olv-ct-22.c.googlers.com.com (217.108.125.34.bc.googleusercontent.com. [34.125.108.217]) by smtp.gmail.com with ESMTPSA id i23-20020aa796f7000000b0063f0068cf6csm7034692pfq.198.2023.04.25.23.17.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Apr 2023 23:17:27 -0700 (PDT) From: Chia-I Wu To: dri-devel@lists.freedesktop.org Cc: stable@vger.kernel.org, Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] drm/amdgpu: add a missing lock for AMDGPU_SCHED Date: Tue, 25 Apr 2023 23:17:14 -0700 Message-ID: <20230426061718.755586-1-olvaffe@gmail.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 mgr->ctx_handles should be protected by mgr->lock. v2: improve commit message Signed-off-by: Chia-I Wu Cc: stable@vger.kernel.org --- drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c index e9b45089a28a6..863b2a34b2d64 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c @@ -38,6 +38,7 @@ static int amdgpu_sched_process_priority_override(struct amdgpu_device *adev, { struct fd f = fdget(fd); struct amdgpu_fpriv *fpriv; + struct amdgpu_ctx_mgr *mgr; struct amdgpu_ctx *ctx; uint32_t id; int r; @@ -51,8 +52,11 @@ static int amdgpu_sched_process_priority_override(struct amdgpu_device *adev, return r; } - idr_for_each_entry(&fpriv->ctx_mgr.ctx_handles, ctx, id) + mgr = &fpriv->ctx_mgr; + mutex_lock(&mgr->lock); + idr_for_each_entry(&mgr->ctx_handles, ctx, id) amdgpu_ctx_priority_override(ctx, priority); + mutex_unlock(&mgr->lock); fdput(f); return 0; -- 2.40.1.495.gc816e09b53d-goog