| Message ID | 20220728033026.15952-1-yuzhe@nfschina.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/amdkfd: use time_is_before_jiffies(a + b) to replace "jiffies - a > b" | expand |
Am 2022-07-27 um 23:30 schrieb Yu Zhe: > time_is_before_jiffies deals with timer wrapping correctly. > > Signed-off-by: Yu Zhe <yuzhe@nfschina.com> Thank you. This patch looks good to me. I'm applying it to amd-staging-drm-next. Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> > --- > drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c b/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c > index a9466d154395..34772fe74296 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c > @@ -146,7 +146,7 @@ static void interrupt_wq(struct work_struct *work) > struct kfd_dev *dev = container_of(work, struct kfd_dev, > interrupt_work); > uint32_t ih_ring_entry[KFD_MAX_RING_ENTRY_SIZE]; > - long start_jiffies = jiffies; > + unsigned long start_jiffies = jiffies; > > if (dev->device_info.ih_ring_entry_size > sizeof(ih_ring_entry)) { > dev_err_once(dev->adev->dev, "Ring entry too small\n"); > @@ -156,7 +156,7 @@ static void interrupt_wq(struct work_struct *work) > while (dequeue_ih_ring_entry(dev, ih_ring_entry)) { > dev->device_info.event_interrupt_class->interrupt_wq(dev, > ih_ring_entry); > - if (jiffies - start_jiffies > HZ) { > + if (time_is_before_jiffies(start_jiffies + HZ)) { > /* If we spent more than a second processing signals, > * reschedule the worker to avoid soft-lockup warnings > */
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c b/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c index a9466d154395..34772fe74296 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c @@ -146,7 +146,7 @@ static void interrupt_wq(struct work_struct *work) struct kfd_dev *dev = container_of(work, struct kfd_dev, interrupt_work); uint32_t ih_ring_entry[KFD_MAX_RING_ENTRY_SIZE]; - long start_jiffies = jiffies; + unsigned long start_jiffies = jiffies; if (dev->device_info.ih_ring_entry_size > sizeof(ih_ring_entry)) { dev_err_once(dev->adev->dev, "Ring entry too small\n"); @@ -156,7 +156,7 @@ static void interrupt_wq(struct work_struct *work) while (dequeue_ih_ring_entry(dev, ih_ring_entry)) { dev->device_info.event_interrupt_class->interrupt_wq(dev, ih_ring_entry); - if (jiffies - start_jiffies > HZ) { + if (time_is_before_jiffies(start_jiffies + HZ)) { /* If we spent more than a second processing signals, * reschedule the worker to avoid soft-lockup warnings */
time_is_before_jiffies deals with timer wrapping correctly. Signed-off-by: Yu Zhe <yuzhe@nfschina.com> --- drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)