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;
Message-ID: <f889f994-d2cd-fedc-8c95-9c8501037809@amd.com>
Date:   Wed, 26 Apr 2023 13:05:33 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.10.0
Subject: Re: [PATCH v2] drm/amdgpu: add a missing lock for AMDGPU_SCHED
Content-Language: en-US
To:     Chia-I Wu <olvaffe@gmail.com>, dri-devel@lists.freedesktop.org
Cc:     stable@vger.kernel.org, Alex Deucher <alexander.deucher@amd.com>,
        "Pan, Xinhui" <Xinhui.Pan@amd.com>,
        David Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>, amd-gfx@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
References: <20230426061718.755586-1-olvaffe@gmail.com>
From:   =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>
In-Reply-To: <20230426061718.755586-1-olvaffe@gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OEtaU1lCb004M1JPQmxUU1krbzdMNWhsdmRPdi9PeEw3dFZnVWtDQ1ZnVTFn?=
 =?utf-8?B?VEJHWlhPUktZQUI5VlFSVjlSTGhteS9yWmZJWUl0VFIxbm1XNEpiNS8yQUt0?=
 =?utf-8?B?S3JVMWdMSUsyZDNYNmd4SSs4NkwrRGEzdmxFWEs5OXpacStuSHlQNG9iZ0lp?=
 =?utf-8?B?cXRzMXlGZzVDTWhXakVJTU9SN1lra3BBUTBTSDZPSzBTT0F3ejJNN0FYbnBi?=
 =?utf-8?B?OHBPT3BxVUFocHEwdGpoOUF2aHk5RWZuRERZZUp2Q0wzNnp0ZnN5WVhjNFBo?=
 =?utf-8?B?eWZZbWNPV2dNMTdyaWRkNGgxMDBBZnBTYmNFdTlrejBBNStEeXpHeXpoY2pF?=
 =?utf-8?B?UkpsQ0tTT1gwNkxVd2EzdGo5NGxaL1FzQ3crQ1piNTJUUnlJMEVvTTdHNXFS?=
 =?utf-8?B?Rk5vRFBTbTF2ZnlNWjFJcjBwL2g4ajYzQ2NhWWtmdlJGdXhxTWZzaFhCa01r?=
 =?utf-8?B?a2dkRU1vWFZ3K25XZzNUOVBTcmxhVlQ0QTZJaGU0S0ZUSjVySWdpRG1KR1JI?=
 =?utf-8?B?TTVVa3psY2RhT1hGQjh4Q0F6ZXdvV1kyUVZPajcvQm5NMXRac0Zmc28yWkRF?=
 =?utf-8?B?dE1IaVBXTGFtVytTd01ubUFlTVRyL3pzWmxrWFpoZGFlU2NpcWkzT0dBNUpz?=
 =?utf-8?B?azVJQXVUbCs0dkNFQmlQeHNWaTFoZDdmbU9iQ3BxdWhRditrL0lZbldzRVNz?=
 =?utf-8?B?MG11U25qM2ZhYk1UaHNXckVya2tybjBZYUMwaE11Y2VibnVXS0dicW5MNWlz?=
 =?utf-8?B?QUlLT1k1bXcwZDQrellnWU5lSFZFWlBkdEZSc2Y1V1EvLzVoQ043Ri80U2lM?=
 =?utf-8?B?OUpBOGlBclVtWmI3eGtsd1IrVWRIc3ozZXYyVE5FSzBJMEhlQUhNYVlnZFkz?=
 =?utf-8?B?NisxUHlhMitDMmpnVlM2WndKNFI0YldPQUY3NFJJbUJkOGFkWXR4YkFrZy9u?=
 =?utf-8?B?ZGNSTnVvWGRxWVFMaUFKNkIway8zcGlIUnc0V2QzU2VGN21ZZTg4VlZWem5D?=
 =?utf-8?B?YzRxWEY2VndjUUE2M0FlVG82VDJTUmlUTHZiLzNmY1RSeVMwc3JGWExNNmdU?=
 =?utf-8?B?bVdFZ2M4c1N3WWIxVFROQ3J4U0Zxd0JtNVoyYmMvck1xQ3R2WlVMUkxPanI5?=
 =?utf-8?B?b3FoQnVxcG1uMlIvdWY1NCtEdTlac0ZrVzRnL1BtMFhqemhHRVNYMkU1VGRG?=
 =?utf-8?B?MktsVDNVa1c1bFVGSi80cmpjb0MreTB5VkkxMjEvVDZVOVFQQWJVNE1yaXds?=
 =?utf-8?B?Y1NwSEFuZTJoZG9QSTNQME1aNFR6YXdiNHpvZ2NVcnlQK2pqY0EzWkVzb09q?=
 =?utf-8?B?ajZpQ0htRmV6WkRSdEljRmRENEtEMTZBMXR5WURzVVhQMEtTQnV4QVMySGE4?=
 =?utf-8?B?aUpEekpFM3NNS3g3UU02cHRxNGFoQVdIbTN2S1EzRDJGSGZwT2RvMytYN0tj?=
 =?utf-8?B?Z29ZK2cyaGRWckFzb3dnRklCOUExcnVZcllOVzJGbDBwVzkwZkkrSk1YY25P?=
 =?utf-8?B?alI3emVtT2xwOW9hdXlRaTZZQjVHbkF3dFVHT0ljVWhzdmFQT1RlMHI4WHRD?=
 =?utf-8?B?SEdaVmV6S3BRZEcrMVpMdFlSaTZCQnoxbFFHUkdtWUVaKzJleFUzNHZGVzNW?=
 =?utf-8?B?alpkMmNHUHI2UmF2ZnlDOG1WVGhNa2cvdUNZQTFrMUVmbWt0Y3BScnNBdk9G?=
 =?utf-8?B?YnBUSFhXN1F2ajB3Z0ZpWlliRThmakloWURSaU5YQ2VrU3piNnloanZJZ2Qx?=
 =?utf-8?B?N1I2bUdBTTNOWEpoUGJKMFZOY0d6em9wc1MzMFZGZnRuK2VJeEsyTzdDWWVn?=
 =?utf-8?B?MmZ4ZFBGWTZPdElaWFJ1NFVFNVhzczgzWHBwYWVvbE4vU2gvNmRIZjJMSjRG?=
 =?utf-8?B?V0xyQmFnUUpZVm4ycjFKcm9vbWJZWXd0TzN2Y1B2YUNpaXovdGtoQjY5b1lU?=
 =?utf-8?B?dVp0RGNNRExxNVViRmU1akZaTzNmMmR1Mm15R2VLZFRuY1FPY0tDZ1ZmdTRm?=
 =?utf-8?B?OCtVVHFLQWcxUnp4V0cydkNMR2R2UUhvRStnbGtzaGFHNmZTZWNGQWVGVHVv?=
 =?utf-8?B?L2RZYURqMGw3SWY1R1d6WHd6U0JiR0tpN2RkRmpFMVdpWXNzSGFORFBzZmFn?=
 =?utf-8?Q?tLcc=3D?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f44389a1-bcbf-4dcf-e8f6-08db46462a8b
X-MS-Exchange-CrossTenant-AuthSource: BN8PR12MB3587.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2023 11:05:38.0692
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: zdsUST/Vq1M2Y2+f3XC6TkK/KKPFFRMISH+2Fd4WshqEnQGXo7LSzkfxMt98Pe+Y
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5797
X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,NICE_REPLY_A,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Am 26.04.23 um 08:17 schrieb Chia-I Wu:
> mgr->ctx_handles should be protected by mgr->lock.
>
> v2: improve commit message
>
> Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
> Cc: stable@vger.kernel.org

Please don't manually CC stable@vger.kernel.org while sending patches 
out, let us maintainers push that upstream with the appropriate tag and 
Greg picking it up from there.

A Fixes tag and figuring out to which stable versions this needs to be 
backported are nice to have as well, but Alex and I can take care of 
that as well.

Apart from that the technical side of the patch is Reviewed-by: 
Christian König <christian.koenig@amd.com>.

Regards,
Christian.

> ---
>   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;