From patchwork Mon Oct 10 21:04:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 9369963 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1DC5E60487 for ; Mon, 10 Oct 2016 21:04:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 012A028D7A for ; Mon, 10 Oct 2016 21:04:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E965A28D73; Mon, 10 Oct 2016 21:04:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, URIBL_BLACK autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5328F28D73 for ; Mon, 10 Oct 2016 21:04:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bthkg-0003Iu-OY; Mon, 10 Oct 2016 21:04:50 +0000 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bthke-0003IO-Bw for linux-rockchip@lists.infradead.org; Mon, 10 Oct 2016 21:04:49 +0000 Received: by mail-pa0-x22b.google.com with SMTP id qn10so1160375pac.2 for ; Mon, 10 Oct 2016 14:04:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=fstM/1vzc+1ifWHavWG/BI1Xhh4zb+i3jQXs6tpvTjA=; b=VclddcXh6teEzy0Fw2CxGZ4pCPzJGbpscWBVzlhJUoCjnrqM7MgAUkpddTQ1Q0EeSy 4ZvXvf5Iy6afPyUZc/ZTORD+Sz75jQ2CyrxvB/06KsL1FYulmonnwl449FE3/WLDmtm8 ya1fTNpwk033eSNwn59l0nwp5MKs75BpgYRx4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fstM/1vzc+1ifWHavWG/BI1Xhh4zb+i3jQXs6tpvTjA=; b=VpgupLNZaRj6HgoZ3nyF54F4ypCB1qvTNGP5STc3OzHjolWktC1yP7llaZM+8nCrZW TpL7Rf8hetn0crTnVvO5KDumkBPFPl61hVabE3A5Tmg2QR5XACibczvK4MklEP+algcl M02FTB2bPHcDKERzQlzvIkw7FAsgMZGWd3SkKiJIhbNrp3ZXdBWOx3hqFvuUWcmHj7By TyJ/VT5rA6IZ+un8AW+AIwhPK5KHVKgTd/mnX75gSvQ8wRlnaAQLmALAhsZ1ddxJngM6 4BuYa489qhgI0IteetrCy/pM3PUyisH+KX+BQf3B/kSGGfMhhJQrJhTn0ltbUCjl252m +xwQ== X-Gm-Message-State: AA6/9RmeqvWAXFFzl1Vu8LOdeKOYFgDMCU+NkVx/aEj19DhpYNWPN+XeUAVlMFV2bZNYRMLh X-Received: by 10.66.16.74 with SMTP id e10mr389565pad.148.1476133467276; Mon, 10 Oct 2016 14:04:27 -0700 (PDT) Received: from chromelab4.mtv.corp.google.com ([100.98.62.8]) by smtp.gmail.com with ESMTPSA id e4sm62189551pas.21.2016.10.10.14.04.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Oct 2016 14:04:26 -0700 (PDT) From: Douglas Anderson To: Thomas Gleixner , John Stultz Subject: [PATCH v2] timers: Fix usleep_range() in the context of wake_up_process() Date: Mon, 10 Oct 2016 14:04:02 -0700 Message-Id: <1476133442-17757-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161010_140448_496953_999A7F5E X-CRM114-Status: GOOD ( 17.41 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangtao@rock-chips.com, briannorris@chromium.org, Douglas Anderson , Andreas Mohr , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, tony.xie@rock-chips.com MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Users of usleep_range() expect that it will _never_ return in less time than the minimum passed parameter. However, nothing in any of the code ensures this. Specifically: usleep_range() => do_usleep_range() => schedule_hrtimeout_range() => schedule_hrtimeout_range_clock() just ends up calling schedule() with an appropriate timeout set using the hrtimer. If someone else happens to wake up our task then we'll happily return from usleep_range() early. msleep() already has code to handle this case since it will loop as long as there was still time left. usleep_range() had no such loop. The problem is is easily demonstrated with a small bit of test code: static int usleep_test_task(void *data) { atomic_t *done = data; ktime_t start, end; start = ktime_get(); usleep_range(50000, 100000); end = ktime_get(); pr_info("Requested 50000 - 100000 us. Actually slept for %llu us\n", (unsigned long long)ktime_to_us(ktime_sub(end, start))); atomic_set(done, 1); return 0; } static void run_usleep_test(void) { struct task_struct *t; atomic_t done; atomic_set(&done, 0); t = kthread_run(usleep_test_task, &done, "usleep_test_task"); while (!atomic_read(&done)) { wake_up_process(t); udelay(1000); } kthread_stop(t); } If you run the above code without this patch you get things like: Requested 50000 - 100000 us. Actually slept for 967 us If you run the above code _with_ this patch, you get: Requested 50000 - 100000 us. Actually slept for 50001 us Presumably this problem was not detected before because: - It's not terribly common to use wake_up_process() directly. - Other ways for processes to wake up are not typically mixed with usleep_range(). - There aren't lots of places that use usleep_range(), since many people call either msleep() or udelay(). Reported-by: Tao Huang Signed-off-by: Douglas Anderson Reviewed-by: Brian Norris Reviewed-by: Andreas Mohr Reviewed-by: Guenter Roeck --- Changes in v2: - Fixed stupid bug that snuck in before posting - Use ktime_before - Remove delta from the loop NOTE: Tested against 4.4 tree w/ backports. I'm trying to get myself up and running with mainline again to test there now but it might be a little while. Hopefully this time I don't shoot myself in the foot. kernel/time/timer.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 32bf6f75a8fe..219439efd56a 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1898,12 +1898,28 @@ EXPORT_SYMBOL(msleep_interruptible); static void __sched do_usleep_range(unsigned long min, unsigned long max) { + ktime_t now, end; ktime_t kmin; u64 delta; + int ret; - kmin = ktime_set(0, min * NSEC_PER_USEC); + now = ktime_get(); + end = ktime_add_us(now, min); delta = (u64)(max - min) * NSEC_PER_USEC; - schedule_hrtimeout_range(&kmin, delta, HRTIMER_MODE_REL); + do { + kmin = ktime_sub(end, now); + ret = schedule_hrtimeout_range(&kmin, delta, HRTIMER_MODE_REL); + + /* + * If schedule_hrtimeout_range() returns 0 then we actually + * hit the timeout. If not then we need to re-calculate the + * new timeout ourselves. + */ + if (ret == 0) + break; + + now = ktime_get(); + } while (ktime_before(now, end)); } /**