From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: Kai Vehmanen <kai.vehmanen@linux.intel.com>, alsa-devel@alsa-project.org, tiwai@suse.de Cc: intel-gfx@lists.freedesktop.org, lucas.demarchi@intel.com, amadeuszx.slawinski@linux.intel.com Subject: Re: [Intel-gfx] [PATCH v3] ALSA: hda/i915 - avoid hung task timeout in i915 wait Date: Thu, 10 Mar 2022 13:15:53 +0000 [thread overview] Message-ID: <9cb04727-971d-842f-db79-dcc10d70532b@linux.intel.com> (raw) In-Reply-To: <20220309182439.1053856-1-kai.vehmanen@linux.intel.com> On 09/03/2022 18:24, Kai Vehmanen wrote: > If kernel is built with hung task detection enabled and > CONFIG_DEFAULT_HUNG_TASK_TIMEOUT set to less than 60 seconds, > snd_hdac_i915_init() will trigger the hung task timeout in case i915 is > not available and taint the kernel. > > Use wait_for_completion_killable_timeout() for the wait to > avoid this problem. > > Co-developed-by: Ramalingam C <ramalingam.c@intel.com> > Signed-off-by: Ramalingam C <ramalingam.c@intel.com> > Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> > --- > sound/hda/hdac_i915.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > Changes V2->V3: > - drop the loop and just use > wait_for_completion_killable_timeout() (feedback from Tvrtko Ursulin) > - new approach, so dropped the previous reviewed-by tags > > diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c > index 454474ac5716..efe810af28c5 100644 > --- a/sound/hda/hdac_i915.c > +++ b/sound/hda/hdac_i915.c > @@ -160,8 +160,8 @@ int snd_hdac_i915_init(struct hdac_bus *bus) > if (!IS_ENABLED(CONFIG_MODULES) || > !request_module("i915")) { > /* 60s timeout */ > - wait_for_completion_timeout(&acomp->master_bind_complete, > - msecs_to_jiffies(60 * 1000)); > + wait_for_completion_killable_timeout(&acomp->master_bind_complete, > + msecs_to_jiffies(60 * 1000)); > } > } > if (!acomp->ops) { Works for me, as discussed I think this is more correct. Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Regards, Tvrtko > > base-commit: 3a0099a1909dea6022690b0ae496938dd2e5771c
WARNING: multiple messages have this Message-ID (diff)
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: Kai Vehmanen <kai.vehmanen@linux.intel.com>, alsa-devel@alsa-project.org, tiwai@suse.de Cc: Ramalingam C <ramalingam.c@intel.com>, intel-gfx@lists.freedesktop.org, lucas.demarchi@intel.com, amadeuszx.slawinski@linux.intel.com Subject: Re: [PATCH v3] ALSA: hda/i915 - avoid hung task timeout in i915 wait Date: Thu, 10 Mar 2022 13:15:53 +0000 [thread overview] Message-ID: <9cb04727-971d-842f-db79-dcc10d70532b@linux.intel.com> (raw) In-Reply-To: <20220309182439.1053856-1-kai.vehmanen@linux.intel.com> On 09/03/2022 18:24, Kai Vehmanen wrote: > If kernel is built with hung task detection enabled and > CONFIG_DEFAULT_HUNG_TASK_TIMEOUT set to less than 60 seconds, > snd_hdac_i915_init() will trigger the hung task timeout in case i915 is > not available and taint the kernel. > > Use wait_for_completion_killable_timeout() for the wait to > avoid this problem. > > Co-developed-by: Ramalingam C <ramalingam.c@intel.com> > Signed-off-by: Ramalingam C <ramalingam.c@intel.com> > Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> > --- > sound/hda/hdac_i915.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > Changes V2->V3: > - drop the loop and just use > wait_for_completion_killable_timeout() (feedback from Tvrtko Ursulin) > - new approach, so dropped the previous reviewed-by tags > > diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c > index 454474ac5716..efe810af28c5 100644 > --- a/sound/hda/hdac_i915.c > +++ b/sound/hda/hdac_i915.c > @@ -160,8 +160,8 @@ int snd_hdac_i915_init(struct hdac_bus *bus) > if (!IS_ENABLED(CONFIG_MODULES) || > !request_module("i915")) { > /* 60s timeout */ > - wait_for_completion_timeout(&acomp->master_bind_complete, > - msecs_to_jiffies(60 * 1000)); > + wait_for_completion_killable_timeout(&acomp->master_bind_complete, > + msecs_to_jiffies(60 * 1000)); > } > } > if (!acomp->ops) { Works for me, as discussed I think this is more correct. Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Regards, Tvrtko > > base-commit: 3a0099a1909dea6022690b0ae496938dd2e5771c
next prev parent reply other threads:[~2022-03-10 13:16 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-03-09 18:24 [Intel-gfx] [PATCH v3] ALSA: hda/i915 - avoid hung task timeout in i915 wait Kai Vehmanen 2022-03-09 18:24 ` Kai Vehmanen 2022-03-09 19:59 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for ALSA: hda/i915 - avoid hung task timeout in i915 wait (rev3) Patchwork 2022-03-10 13:15 ` Tvrtko Ursulin [this message] 2022-03-10 13:15 ` [PATCH v3] ALSA: hda/i915 - avoid hung task timeout in i915 wait Tvrtko Ursulin 2022-03-10 13:36 ` [Intel-gfx] " Takashi Iwai 2022-03-10 13:36 ` Takashi Iwai
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=9cb04727-971d-842f-db79-dcc10d70532b@linux.intel.com \ --to=tvrtko.ursulin@linux.intel.com \ --cc=alsa-devel@alsa-project.org \ --cc=amadeuszx.slawinski@linux.intel.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=kai.vehmanen@linux.intel.com \ --cc=lucas.demarchi@intel.com \ --cc=tiwai@suse.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.