From nobody Thu Dec 18 08:43:00 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 773EEC6FA82 for ; Fri, 2 Sep 2022 13:38:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237576AbiIBNia (ORCPT ); Fri, 2 Sep 2022 09:38:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236255AbiIBNh4 (ORCPT ); Fri, 2 Sep 2022 09:37:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43D8F124872; Fri, 2 Sep 2022 06:16:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BC034621EC; Fri, 2 Sep 2022 12:36:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BECE6C433C1; Fri, 2 Sep 2022 12:36:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662122201; bh=qPtMQN6i7xa1IWnEibQFMTsGeomTP4hM3LBvwPWuPms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U2jlOZHXz8AA371DAKf5q5T4a/s6WJ7G+oS9VoXACN3U6+Pfzbk+9OMFUMxFzjHym 2S+lxB9b31Z2gJ+VHaFhsLjVzr+2qHlZm/xYe0bHlO2203ViRIy5NBhB3+YvxRsI/z B1a2zeON6/2oYpq82p23u/9oApXbyIhzPQNA92ns= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Felix Kuehling , Alex Deucher , Sasha Levin , Xiaogang Chen Subject: [PATCH 5.19 44/72] drm/amdkfd: Handle restart of kfd_ioctl_wait_events Date: Fri, 2 Sep 2022 14:19:20 +0200 Message-Id: <20220902121406.223114522@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220902121404.772492078@linuxfoundation.org> References: <20220902121404.772492078@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Felix Kuehling [ Upstream commit bea9a56afbc4b5a41ea579b8b0dc5e189b439504 ] When kfd_ioctl_wait_events needs to restart due to a signal, we need to update the timeout to account for the time already elapsed. We also need to undo auto_reset of events that have signaled already, so that the restarted ioctl will be able to count those signals again. This fixes infinite hangs when kfd_ioctl_wait_events is interrupted by a signal. Signed-off-by: Felix Kuehling Reviewed-and-tested-by: Xiaogang Chen Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 24 ++++++++++++------------ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd= /amdkfd/kfd_chardev.c index 1c7016958d6d9..bfca17ca399c6 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c @@ -814,7 +814,7 @@ static int kfd_ioctl_wait_events(struct file *filp, str= uct kfd_process *p, err =3D kfd_wait_on_events(p, args->num_events, (void __user *)args->events_ptr, (args->wait_for_all !=3D 0), - args->timeout, &args->wait_result); + &args->timeout, &args->wait_result); =20 return err; } diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_events.c b/drivers/gpu/drm/amd/= amdkfd/kfd_events.c index 4df9c36146ba9..cbc20d779e5aa 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c @@ -895,7 +895,8 @@ static long user_timeout_to_jiffies(uint32_t user_timeo= ut_ms) return msecs_to_jiffies(user_timeout_ms) + 1; } =20 -static void free_waiters(uint32_t num_events, struct kfd_event_waiter *wai= ters) +static void free_waiters(uint32_t num_events, struct kfd_event_waiter *wai= ters, + bool undo_auto_reset) { uint32_t i; =20 @@ -904,6 +905,9 @@ static void free_waiters(uint32_t num_events, struct kf= d_event_waiter *waiters) spin_lock(&waiters[i].event->lock); remove_wait_queue(&waiters[i].event->wq, &waiters[i].wait); + if (undo_auto_reset && waiters[i].activated && + waiters[i].event && waiters[i].event->auto_reset) + set_event(waiters[i].event); spin_unlock(&waiters[i].event->lock); } =20 @@ -912,7 +916,7 @@ static void free_waiters(uint32_t num_events, struct kf= d_event_waiter *waiters) =20 int kfd_wait_on_events(struct kfd_process *p, uint32_t num_events, void __user *data, - bool all, uint32_t user_timeout_ms, + bool all, uint32_t *user_timeout_ms, uint32_t *wait_result) { struct kfd_event_data __user *events =3D @@ -921,7 +925,7 @@ int kfd_wait_on_events(struct kfd_process *p, int ret =3D 0; =20 struct kfd_event_waiter *event_waiters =3D NULL; - long timeout =3D user_timeout_to_jiffies(user_timeout_ms); + long timeout =3D user_timeout_to_jiffies(*user_timeout_ms); =20 event_waiters =3D alloc_event_waiters(num_events); if (!event_waiters) { @@ -971,15 +975,11 @@ int kfd_wait_on_events(struct kfd_process *p, } =20 if (signal_pending(current)) { - /* - * This is wrong when a nonzero, non-infinite timeout - * is specified. We need to use - * ERESTARTSYS_RESTARTBLOCK, but struct restart_block - * contains a union with data for each user and it's - * in generic kernel code that I don't want to - * touch yet. - */ ret =3D -ERESTARTSYS; + if (*user_timeout_ms !=3D KFD_EVENT_TIMEOUT_IMMEDIATE && + *user_timeout_ms !=3D KFD_EVENT_TIMEOUT_INFINITE) + *user_timeout_ms =3D jiffies_to_msecs( + max(0l, timeout-1)); break; } =20 @@ -1020,7 +1020,7 @@ int kfd_wait_on_events(struct kfd_process *p, event_waiters, events); =20 out_unlock: - free_waiters(num_events, event_waiters); + free_waiters(num_events, event_waiters, ret =3D=3D -ERESTARTSYS); mutex_unlock(&p->event_mutex); out: if (ret) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/am= dkfd/kfd_priv.h index 2585d6e61d422..c6eec54b8102f 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h @@ -1314,7 +1314,7 @@ void kfd_event_free_process(struct kfd_process *p); int kfd_event_mmap(struct kfd_process *process, struct vm_area_struct *vma= ); int kfd_wait_on_events(struct kfd_process *p, uint32_t num_events, void __user *data, - bool all, uint32_t user_timeout_ms, + bool all, uint32_t *user_timeout_ms, uint32_t *wait_result); void kfd_signal_event_interrupt(u32 pasid, uint32_t partial_id, uint32_t valid_id_bits); --=20 2.35.1