From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752079AbdIEQCm (ORCPT ); Tue, 5 Sep 2017 12:02:42 -0400 Received: from mx2.suse.de ([195.135.220.15]:36849 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751979AbdIEQCj (ORCPT ); Tue, 5 Sep 2017 12:02:39 -0400 Date: Tue, 05 Sep 2017 18:02:36 +0200 Message-ID: From: Takashi Iwai To: Sebastian Andrzej Siewior Cc: Takashi Sakamoto , perex@perex.cz, anna-maria@linutronix.de, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@redhat.com, hch@lst.de, keescook@chromium.org, john.stultz@linaro.org, tglx@linutronix.de Subject: Re: [PATCH 23/25 v2] ALSA/dummy: Replace tasklet with softirq hrtimer In-Reply-To: <20170905155351.2xmwyxrirndfwtgo@breakpoint.cc> References: <20170901102537.8066-1-o-takashi@sakamocchi.jp> <19775981-a3f2-5f65-e934-bfe25db62a43@sakamocchi.jp> <20170905155351.2xmwyxrirndfwtgo@breakpoint.cc> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.2 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 05 Sep 2017 17:53:51 +0200, Sebastian Andrzej Siewior wrote: > > From: Thomas Gleixner > > The tasklet is used to defer the execution of snd_pcm_period_elapsed() to > the softirq context. Using the CLOCK_MONOTONIC_SOFT base invokes the timer > callback in softirq context as well which renders the tasklet useless. > > Signed-off-by: Thomas Gleixner > Signed-off-by: Anna-Maria Gleixner > Cc: Jaroslav Kysela > Cc: Takashi Iwai > Cc: Takashi Sakamoto > Cc: alsa-devel@alsa-project.org > [o-takashi: avoid stall due to a call of hrtimer_cancel() on a callback > of hrtimer] > Signed-off-by: Takashi Sakamoto > Signed-off-by: Sebastian Andrzej Siewior > --- > On 2017-09-02 10:19:45 [+0900], Takashi Sakamoto wrote: > > Yep. I request the authors to include this > Thank you for providing a fix. > > v1…v2: merged Takashi Sakamoto fixup of the original patch into v2. > > So this patch now is okay? Note that you can try it by yourself easily, as it's a dummy driver that doesn't need anything special. Just run aplay for that device (e.g. aplay -Dplughw:2 for card#2) can reproduce the original problem. > @@ -394,7 +386,12 @@ static enum hrtimer_restart dummy_hrtimer_callback(struct hrtimer *timer) > dpcm = container_of(timer, struct dummy_hrtimer_pcm, timer); > if (!atomic_read(&dpcm->running)) > return HRTIMER_NORESTART; > - tasklet_schedule(&dpcm->tasklet); > + > + /* In a case of XRUN, this calls .trigger to stop PCM substream. */ As mentioned, the stop happens not only with XRUN but also in a normal situation by draining. Other than that, looks OK to me (but not tested it). thanks, Takashi > + snd_pcm_period_elapsed(dpcm->substream); > + if (!atomic_read(&dpcm->running)) > + return HRTIMER_NORESTART; > + > hrtimer_forward_now(timer, dpcm->period_time); > return HRTIMER_RESTART; > } > @@ -414,14 +411,14 @@ static int dummy_hrtimer_stop(struct snd_pcm_substream *substream) > struct dummy_hrtimer_pcm *dpcm = substream->runtime->private_data; > > atomic_set(&dpcm->running, 0); > - hrtimer_cancel(&dpcm->timer); > + if (!hrtimer_callback_running(&dpcm->timer)) > + hrtimer_cancel(&dpcm->timer); > return 0; > } > > static inline void dummy_hrtimer_sync(struct dummy_hrtimer_pcm *dpcm) > { > hrtimer_cancel(&dpcm->timer); > - tasklet_kill(&dpcm->tasklet); > } > > static snd_pcm_uframes_t > @@ -466,12 +463,10 @@ static int dummy_hrtimer_create(struct snd_pcm_substream *substream) > if (!dpcm) > return -ENOMEM; > substream->runtime->private_data = dpcm; > - hrtimer_init(&dpcm->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); > + hrtimer_init(&dpcm->timer, CLOCK_MONOTONIC_SOFT, HRTIMER_MODE_REL); > dpcm->timer.function = dummy_hrtimer_callback; > dpcm->substream = substream; > atomic_set(&dpcm->running, 0); > - tasklet_init(&dpcm->tasklet, dummy_hrtimer_pcm_elapsed, > - (unsigned long)dpcm); > return 0; > } > > -- > 2.14.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [PATCH 23/25 v2] ALSA/dummy: Replace tasklet with softirq hrtimer Date: Tue, 05 Sep 2017 18:02:36 +0200 Message-ID: References: <20170901102537.8066-1-o-takashi@sakamocchi.jp> <19775981-a3f2-5f65-e934-bfe25db62a43@sakamocchi.jp> <20170905155351.2xmwyxrirndfwtgo@breakpoint.cc> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 9F329267217 for ; Tue, 5 Sep 2017 18:02:38 +0200 (CEST) In-Reply-To: <20170905155351.2xmwyxrirndfwtgo@breakpoint.cc> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Sebastian Andrzej Siewior Cc: alsa-devel@alsa-project.org, keescook@chromium.org, peterz@infradead.org, linux-kernel@vger.kernel.org, mingo@redhat.com, john.stultz@linaro.org, tglx@linutronix.de, Takashi Sakamoto , anna-maria@linutronix.de, hch@lst.de List-Id: alsa-devel@alsa-project.org T24gVHVlLCAwNSBTZXAgMjAxNyAxNzo1Mzo1MSArMDIwMCwKU2ViYXN0aWFuIEFuZHJ6ZWogU2ll d2lvciB3cm90ZToKPiAKPiBGcm9tOiBUaG9tYXMgR2xlaXhuZXIgPHRnbHhAbGludXRyb25peC5k ZT4KPiAKPiBUaGUgdGFza2xldCBpcyB1c2VkIHRvIGRlZmVyIHRoZSBleGVjdXRpb24gb2Ygc25k X3BjbV9wZXJpb2RfZWxhcHNlZCgpIHRvCj4gdGhlIHNvZnRpcnEgY29udGV4dC4gVXNpbmcgdGhl IENMT0NLX01PTk9UT05JQ19TT0ZUIGJhc2UgaW52b2tlcyB0aGUgdGltZXIKPiBjYWxsYmFjayBp biBzb2Z0aXJxIGNvbnRleHQgYXMgd2VsbCB3aGljaCByZW5kZXJzIHRoZSB0YXNrbGV0IHVzZWxl c3MuCj4gCj4gU2lnbmVkLW9mZi1ieTogVGhvbWFzIEdsZWl4bmVyIDx0Z2x4QGxpbnV0cm9uaXgu ZGU+Cj4gU2lnbmVkLW9mZi1ieTogQW5uYS1NYXJpYSBHbGVpeG5lciA8YW5uYS1tYXJpYUBsaW51 dHJvbml4LmRlPgo+IENjOiBKYXJvc2xhdiBLeXNlbGEgPHBlcmV4QHBlcmV4LmN6Pgo+IENjOiBU YWthc2hpIEl3YWkgPHRpd2FpQHN1c2UuY29tPgo+IENjOiBUYWthc2hpIFNha2Ftb3RvIDxvLXRh a2FzaGlAc2FrYW1vY2NoaS5qcD4KPiBDYzogYWxzYS1kZXZlbEBhbHNhLXByb2plY3Qub3JnCj4g W28tdGFrYXNoaTogYXZvaWQgc3RhbGwgZHVlIHRvIGEgY2FsbCBvZiBocnRpbWVyX2NhbmNlbCgp IG9uIGEgY2FsbGJhY2sKPiAgICAgICAgICAgICBvZiBocnRpbWVyXQo+IFNpZ25lZC1vZmYtYnk6 IFRha2FzaGkgU2FrYW1vdG8gPG8tdGFrYXNoaUBzYWthbW9jY2hpLmpwPgo+IFNpZ25lZC1vZmYt Ynk6IFNlYmFzdGlhbiBBbmRyemVqIFNpZXdpb3IgPGJpZ2Vhc3lAbGludXRyb25peC5kZT4KPiAt LS0KPiBPbiAyMDE3LTA5LTAyIDEwOjE5OjQ1IFsrMDkwMF0sIFRha2FzaGkgU2FrYW1vdG8gd3Jv dGU6Cj4gPiBZZXAuIEkgcmVxdWVzdCB0aGUgYXV0aG9ycyB0byBpbmNsdWRlIHRoaXMgCj4gVGhh bmsgeW91IGZvciBwcm92aWRpbmcgYSBmaXguCj4gCj4gdjHigKZ2MjogbWVyZ2VkIFRha2FzaGkg U2FrYW1vdG8gZml4dXAgb2YgdGhlIG9yaWdpbmFsIHBhdGNoIGludG8gdjIuCj4gCj4gU28gdGhp cyBwYXRjaCBub3cgaXMgb2theT8KCk5vdGUgdGhhdCB5b3UgY2FuIHRyeSBpdCBieSB5b3Vyc2Vs ZiBlYXNpbHksIGFzIGl0J3MgYSBkdW1teSBkcml2ZXIKdGhhdCBkb2Vzbid0IG5lZWQgYW55dGhp bmcgc3BlY2lhbC4gIEp1c3QgcnVuIGFwbGF5IGZvciB0aGF0IGRldmljZQooZS5nLiBhcGxheSAt RHBsdWdodzoyIGZvciBjYXJkIzIpIGNhbiByZXByb2R1Y2UgdGhlIG9yaWdpbmFsCnByb2JsZW0u Cgo+IEBAIC0zOTQsNyArMzg2LDEyIEBAIHN0YXRpYyBlbnVtIGhydGltZXJfcmVzdGFydCBkdW1t eV9ocnRpbWVyX2NhbGxiYWNrKHN0cnVjdCBocnRpbWVyICp0aW1lcikKPiAgCWRwY20gPSBjb250 YWluZXJfb2YodGltZXIsIHN0cnVjdCBkdW1teV9ocnRpbWVyX3BjbSwgdGltZXIpOwo+ICAJaWYg KCFhdG9taWNfcmVhZCgmZHBjbS0+cnVubmluZykpCj4gIAkJcmV0dXJuIEhSVElNRVJfTk9SRVNU QVJUOwo+IC0JdGFza2xldF9zY2hlZHVsZSgmZHBjbS0+dGFza2xldCk7Cj4gKwo+ICsJLyogSW4g YSBjYXNlIG9mIFhSVU4sIHRoaXMgY2FsbHMgLnRyaWdnZXIgdG8gc3RvcCBQQ00gc3Vic3RyZWFt LiAqLwoKQXMgbWVudGlvbmVkLCB0aGUgc3RvcCBoYXBwZW5zIG5vdCBvbmx5IHdpdGggWFJVTiBi dXQgYWxzbyBpbiBhIG5vcm1hbApzaXR1YXRpb24gYnkgZHJhaW5pbmcuCgpPdGhlciB0aGFuIHRo YXQsIGxvb2tzIE9LIHRvIG1lIChidXQgbm90IHRlc3RlZCBpdCkuCgoKdGhhbmtzLAoKVGFrYXNo aQoKCj4gKwlzbmRfcGNtX3BlcmlvZF9lbGFwc2VkKGRwY20tPnN1YnN0cmVhbSk7Cj4gKwlpZiAo IWF0b21pY19yZWFkKCZkcGNtLT5ydW5uaW5nKSkKPiArCQlyZXR1cm4gSFJUSU1FUl9OT1JFU1RB UlQ7Cj4gKwo+ICAJaHJ0aW1lcl9mb3J3YXJkX25vdyh0aW1lciwgZHBjbS0+cGVyaW9kX3RpbWUp Owo+ICAJcmV0dXJuIEhSVElNRVJfUkVTVEFSVDsKPiAgfQo+IEBAIC00MTQsMTQgKzQxMSwxNCBA QCBzdGF0aWMgaW50IGR1bW15X2hydGltZXJfc3RvcChzdHJ1Y3Qgc25kX3BjbV9zdWJzdHJlYW0g KnN1YnN0cmVhbSkKPiAgCXN0cnVjdCBkdW1teV9ocnRpbWVyX3BjbSAqZHBjbSA9IHN1YnN0cmVh bS0+cnVudGltZS0+cHJpdmF0ZV9kYXRhOwo+ICAKPiAgCWF0b21pY19zZXQoJmRwY20tPnJ1bm5p bmcsIDApOwo+IC0JaHJ0aW1lcl9jYW5jZWwoJmRwY20tPnRpbWVyKTsKPiArCWlmICghaHJ0aW1l cl9jYWxsYmFja19ydW5uaW5nKCZkcGNtLT50aW1lcikpCj4gKwkJaHJ0aW1lcl9jYW5jZWwoJmRw Y20tPnRpbWVyKTsKPiAgCXJldHVybiAwOwo+ICB9Cj4gIAo+ICBzdGF0aWMgaW5saW5lIHZvaWQg ZHVtbXlfaHJ0aW1lcl9zeW5jKHN0cnVjdCBkdW1teV9ocnRpbWVyX3BjbSAqZHBjbSkKPiAgewo+ ICAJaHJ0aW1lcl9jYW5jZWwoJmRwY20tPnRpbWVyKTsKPiAtCXRhc2tsZXRfa2lsbCgmZHBjbS0+ dGFza2xldCk7Cj4gIH0KPiAgCj4gIHN0YXRpYyBzbmRfcGNtX3VmcmFtZXNfdAo+IEBAIC00NjYs MTIgKzQ2MywxMCBAQCBzdGF0aWMgaW50IGR1bW15X2hydGltZXJfY3JlYXRlKHN0cnVjdCBzbmRf cGNtX3N1YnN0cmVhbSAqc3Vic3RyZWFtKQo+ICAJaWYgKCFkcGNtKQo+ICAJCXJldHVybiAtRU5P TUVNOwo+ICAJc3Vic3RyZWFtLT5ydW50aW1lLT5wcml2YXRlX2RhdGEgPSBkcGNtOwo+IC0JaHJ0 aW1lcl9pbml0KCZkcGNtLT50aW1lciwgQ0xPQ0tfTU9OT1RPTklDLCBIUlRJTUVSX01PREVfUkVM KTsKPiArCWhydGltZXJfaW5pdCgmZHBjbS0+dGltZXIsIENMT0NLX01PTk9UT05JQ19TT0ZULCBI UlRJTUVSX01PREVfUkVMKTsKPiAgCWRwY20tPnRpbWVyLmZ1bmN0aW9uID0gZHVtbXlfaHJ0aW1l cl9jYWxsYmFjazsKPiAgCWRwY20tPnN1YnN0cmVhbSA9IHN1YnN0cmVhbTsKPiAgCWF0b21pY19z ZXQoJmRwY20tPnJ1bm5pbmcsIDApOwo+IC0JdGFza2xldF9pbml0KCZkcGNtLT50YXNrbGV0LCBk dW1teV9ocnRpbWVyX3BjbV9lbGFwc2VkLAo+IC0JCSAgICAgKHVuc2lnbmVkIGxvbmcpZHBjbSk7 Cj4gIAlyZXR1cm4gMDsKPiAgfQo+ICAKPiAtLSAKPiAyLjE0LjEKPiAKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWxzYS1kZXZlbCBtYWlsaW5nIGxpc3QK QWxzYS1kZXZlbEBhbHNhLXByb2plY3Qub3JnCmh0dHA6Ly9tYWlsbWFuLmFsc2EtcHJvamVjdC5v cmcvbWFpbG1hbi9saXN0aW5mby9hbHNhLWRldmVsCg==