From patchwork Sat Dec 10 01:37:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Oberritter X-Patchwork-Id: 8754 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1RZBsJ-0003EL-6E; Sat, 10 Dec 2011 02:37:15 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp id 1RZBsI-0005vo-Di; Sat, 10 Dec 2011 02:37:14 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753191Ab1LJBhH (ORCPT + 4 others); Fri, 9 Dec 2011 20:37:07 -0500 Received: from ffm.saftware.de ([83.141.3.46]:47963 "EHLO ffm.saftware.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751978Ab1LJBhG (ORCPT ); Fri, 9 Dec 2011 20:37:06 -0500 Received: from localhost (localhost [127.0.0.1]) by ffm.saftware.de (Postfix) with ESMTP id 783EC2C171C; Sat, 10 Dec 2011 02:37:03 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at ffm.saftware.de Received: from ffm.saftware.de ([127.0.0.1]) by localhost (ffm.saftware.de [127.0.0.1]) (amavisd-new, port 10024) with LMTP id qPgRsWRY5o9f; Sat, 10 Dec 2011 02:37:02 +0100 (CET) Message-ID: <4EE2B7BC.9090501@linuxtv.org> Date: Sat, 10 Dec 2011 02:37:00 +0100 From: Andreas Oberritter User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:8.0) Gecko/20111124 Thunderbird/8.0 MIME-Version: 1.0 To: Mauro Carvalho Chehab CC: Devin Heitmueller , Antti Palosaari , linux-media@vger.kernel.org Subject: [PATCH] DVB: dvb_frontend: fix delayed thread exit References: <1323454852-7426-1-git-send-email-mchehab@redhat.com> <4EE252E5.2050204@iki.fi> <4EE25A3C.9040404@redhat.com> <4EE25CB4.3000501@iki.fi> <4EE287A9.3000502@redhat.com> <4EE29BA6.1030909@redhat.com> <4EE29D1A.6010900@redhat.com> In-Reply-To: <4EE29D1A.6010900@redhat.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.12.10.12715 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MOZILLA_MSGID 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __USER_AGENT 0' X-LSpam-Score: -6.9 (------) X-LSpam-Report: No, score=-6.9 required=5.0 tests=BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5 autolearn=ham On 10.12.2011 00:43, Mauro Carvalho Chehab wrote: > On 09-12-2011 21:37, Mauro Carvalho Chehab wrote: >> On 09-12-2011 20:33, Devin Heitmueller wrote: >>> On Fri, Dec 9, 2011 at 5:11 PM, Mauro Carvalho Chehab >>> wrote: >>>>> Could someone explain reason for that? >>>> >>>> >>>> I dunno, but I think this needs to be fixed, at least when the frontend >>>> is opened with O_NONBLOCK. >>> >>> Are you doing the drx-k firmware load on dvb_init()? That could >>> easily take 4 seconds. >> >> No. The firmware were opened previously. > > Maybe the delay is due to this part of dvb_frontend.c: > > static int dvb_mfe_wait_time = 5; > ... > int mferetry = (dvb_mfe_wait_time << 1); > > mutex_unlock (&adapter->mfe_lock); > while (mferetry-- && (mfedev->users != -1 || > mfepriv->thread != NULL)) { > if(msleep_interruptible(500)) { > if(signal_pending(current)) > return -EINTR; > } > } I haven't looked at the mfe code, but in case it's waiting for the frontend thread to exit, there's a problem that causes the thread not to exit immediately. Here's a patch that's been sitting in my queue for a while: --- Signed-off-by: Andreas Oberritter -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c index 7784d74..6823c2b 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c 2011-09-07 12:32:24.000000000 +0200 +++ a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c 2011-09-13 15:55:48.865742791 +0200 @@ -514,7 +514,7 @@ return 1; if (fepriv->dvbdev->writers == 1) - if (time_after(jiffies, fepriv->release_jiffies + + if (time_after_eq(jiffies, fepriv->release_jiffies + dvb_shutdown_timeout * HZ)) return 1; @@ -2070,12 +2070,15 @@ dprintk ("%s\n", __func__); - if ((file->f_flags & O_ACCMODE) != O_RDONLY) + if ((file->f_flags & O_ACCMODE) != O_RDONLY) { fepriv->release_jiffies = jiffies; + mb(); + } ret = dvb_generic_release (inode, file); if (dvbdev->users == -1) { + wake_up(&fepriv->wait_queue); if (fepriv->exit != DVB_FE_NO_EXIT) { fops_put(file->f_op); file->f_op = NULL;