From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751611AbdFIUMg (ORCPT ); Fri, 9 Jun 2017 16:12:36 -0400 Received: from mail-he1eur01on0127.outbound.protection.outlook.com ([104.47.0.127]:47664 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751538AbdFIUMd (ORCPT ); Fri, 9 Jun 2017 16:12:33 -0400 Authentication-Results: zytor.com; dkim=none (message not signed) header.d=none;zytor.com; dmarc=none action=none header.from=virtuozzo.com; Date: Fri, 9 Jun 2017 13:12:06 -0700 From: Andrei Vagin To: tip-bot for Jacob Shin Cc: linux-tip-commits@vger.kernel.org, peterz@infradead.org, john.stultz@linaro.org, mingo@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, Cyrill Gorcunov Subject: Re: [tip:timers/core] posix-timers: Zero settings value in common code Message-ID: <20170609201156.GB21491@outlook.office365.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.8.0 (2017-02-23) X-Originating-IP: [4.16.175.162] X-ClientProxiedBy: SG2PR0199CA0002.apcprd01.prod.exchangelabs.com (2a01:111:e400:588d::12) To VI1PR08MB0751.eurprd08.prod.outlook.com (2a01:111:e400:5a04::13) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR08MB0751: X-MS-Office365-Filtering-Correlation-Id: d541cb59-6124-425e-f71e-08d4af73db9d X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:VI1PR08MB0751; X-Microsoft-Exchange-Diagnostics: 1;VI1PR08MB0751;3:8kyL912DwYdHJtcR1SZTnAAq5/L/0CNpYx5+o5oL78MO4KddNSLzTw0woxvkneuJVggiQcM+j2RD8gOyqm17qFe518k4zLtsPd/acil8JTwQtOfCy+TRbbXvFOmRSnNbdKWm5bgzu2AMxL61urtLUWiFvb4FOKtxcTTm9SvMqcUaR0LD4fLlOK8V3moV+MNTWKv5lYjKzCj3Ll4L92FBebZYTS8pYREWYDx84Az9LYwz3LzR6rnDh5hC3JhmLJunqkjwz6d3h07IxFH1UKU1xFz6aRVKqZ/nRpU6J1Q0SAVWEAFO+ynAThYnsU64nybiaUvZpC1fPjNor/6X5C9IVA==;25:kEj+jwod404osC/0rknY3B8MTa1ymrEDFY6n208mRbY8Uk/4xIj8vXOs6OBM+nE6wUo+nxVyBnx+JiXKbkYzaim7AMcD25VNm+dPzKCC3Y3nO1xwNPQo2XMkXfu+IDDrSxvvzoHS2bVUgp1RXRzaYOSzGhbYW/JHXnJqkGr3c4+FqkaDg4u3IH+gDpcTnUkEvqsGs5we62CWlWlmEWaTmYZynXYSpgI1nbWY/RcoxE6Fsc7aiKHWJGM62oiYyh3JDUD2VHAoRPGejG3yXiNGY/wWiuYkaziFou6ikEwdHqfz45p6X0S9C37Zs5mBNM61URnQGjZw939u03bfep/CBS9pLKaYyvKpDHZBDX2njFf6qMH/bdLaimmqeqqxVGl1c9nUn3dJNjRC7+0EbuOX2HFFwJZLGtiVuGLL9NgEJp+n9iP5HijE9TYAYMRKNnYqVlkdZDd3G4h0K9avSY6dV1IZN3Ff1YUwDIVA55FKqRU= X-Microsoft-Exchange-Diagnostics: 1;VI1PR08MB0751;31:xani8mdmKveZNU8vLllHiQXf6sB08aq2Pu4X5LN5X19SiTB/82A1Shk2oODqRz7LclAFPUKE3JUFXGLwKcNcsrMoo5qwW0goiJo9bMBwAiXL72Au7su8seBI3aYGr0QCLdxqcpXeHsDi6WYrzALZUcZE7qs0tP8IpQcaTEV4O39yLD/TkFjidS795KdCF4GIwDCTmY8Szw0Xxmjjpk+5UJcR1L3LYAergSdtwPqUQe0=;20:u0fomtGh0oTVM2GYP9SdLi2B3vMISv27S3YwZP+hB3iyNwhIjFw+nv1EjuM5Zxke8V5DNauFt386JO9RVp8ezcBowXtVON0Apu3DOXZHwMMyz6kqTDy3qqDdcmpUuPcLxTqbIRzjnYJDH1IHHrb3j9GS4/4b2BycS0Erk82EXvpXovOAuxbh7/7XkH1w1pXaw7dgUaA0NWC10ri1aOhIJX7CVTxSCSMZimTHGvNGrfDuWMFFSx2UhJUWUqM5AJPx2LZbCaLs9fXPKiBIUUz4VCpoQ8AzB7RnSBfwmbFaiqXruE3Sj3851YhGkE6XCxhVBsuS3VkB20mxrPcFemmag+FDj3vIm9k9bCvjaKLRWHgyvkP+Y0wKd/L/vPRLbzRKxMolt7ADM0zTPFD5i8oF7QcQJzL0mTbwIOSclvWQwuI= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(166708455590820)(42068640409301)(84791874153150); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(100000703101)(100105400095)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(20161123564025)(20161123555025)(20161123562025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:VI1PR08MB0751;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:VI1PR08MB0751; X-Microsoft-Exchange-Diagnostics: =?koi8-r?Q?1;VI1PR08MB0751;4:mQZ8lm7dnKyz4jbZdk9OFIQtYLTCel1JxmGN+TSeZJQ+?= =?koi8-r?Q?9IdwF7fvwk+BBv0pxZ4RT+IFLH2Eju5oBWPQP9Q13ry9CJ06ZXCbdzJ0KRaSDG?= =?koi8-r?Q?o4qUJ9pPP2358miSZ/P7bx4c0h5STtJ3ncdGl2a2szoXBgPN2213m/qLc7exLx?= =?koi8-r?Q?po8UF+fESDMbNV4W+JllbUoZ7oj7KjOKe3xlm89G+0QQiq70txHrU1K/VYhKG0?= =?koi8-r?Q?GEQalykkx6j1XJMNWaJmpJuk3IMIAfM3QEYe3/Sr0meJ4nKltqhVr8hzLdKso/?= =?koi8-r?Q?F+8aMR4XM8NILToTLonYMGr+nz7j2xFDCnfz0S98bnTptACr7zHOqi3gotTRqs?= =?koi8-r?Q?iSsp9b214aU1ahEvdoFq7w7awljEYc0tWTxTZ8NlPnYW2oh3IO6UVM5YOG3Ppi?= =?koi8-r?Q?RSM0mOcGe33HeG+Gi0jnQ/1IrQOgyTrk2dFon7CwpogzcdyepqR8E0kqg9IOnQ?= =?koi8-r?Q?zharIdvMzJDE/dmHuTdpbGssnUYEfxP+vatktzJ0EJcGjEvgW1U6EsLnAx44my?= =?koi8-r?Q?oerJXyK958sxhQZ8LlmP2PW52EKvoyVO4LQwP11ualj7wEE3aA/hgztejH5hEX?= =?koi8-r?Q?yGoEhw1+RilEv+8NPv1IKCiaSCp2oLn5vvskap9+DSNS+A63+tZyvZBwCXr4M1?= =?koi8-r?Q?Cw3uZ0xEzqbx2aWOk7+qTI3v3FmAoBvMo7ihtwXBYX2RbmX5oJYld2slCAZn2i?= =?koi8-r?Q?7dnPpbA1RWlrft86Vqiu6SkCENlHzGLa10NcRz+aO+GMay4Ia6I9zywiC2vbde?= =?koi8-r?Q?9XbhCuVtBf2Fw1a53AuLtRRnvQPTMNWybau37+glCSMbN35cbYGUV38Lp9nM9y?= =?koi8-r?Q?LfvpPsT8Wd8Pborw20G1oWEvrP7Tu33/rN4QjC1XKSGUMuZArDxau/yTN368Zj?= =?koi8-r?Q?mH0I/cbTXpkgAZpSs1b/6ipigFZ6+w6IWl63rreogFwADxlxoiRsHR4XAJvvwY?= =?koi8-r?Q?B7qCDdtxf4PoKvHdjt9wFAWGRsgev1v6Zn9IYRJFSd2pTcP+Ly36ex4XQahEzv?= =?koi8-r?Q?ML7bSV6yC5ztG+48qWp+74xXhYBERKyRtC6N8Mvf+6Uhnt+gbS0v7DF/4gNCXj?= =?koi8-r?Q?jnVDhIdwKvXWg/gT4w0uS0L+ouoxhBxn/kFZJQBAnCrIFq4jMcFxpDvFU9miEz?= =?koi8-r?Q?eQbki4QZk/HE85mcC0PsNE10yWx0DXIH2JwMp6LIZcAJ8hxNiXo6dQSuyp/r99?= =?koi8-r?Q?Y096bqUShz1PvM7BRV4OIkFARVuAMzMGbEbrXUb9L2ZptNYJDd7mhhrNHp?= X-Forefront-PRVS: 03333C607F X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(39410400002)(39400400002)(39830400002)(39450400003)(24454002)(7736002)(47776003)(966005)(81166006)(1076002)(86362001)(33656002)(189998001)(42186005)(38730400002)(107886003)(6246003)(110136004)(6506006)(478600001)(305945005)(25786009)(3846002)(8676002)(66066001)(5660300001)(50986999)(76176999)(23686003)(6306002)(4326008)(37156001)(9686003)(53936002)(229853002)(55016002)(6916009)(2950100002)(6666003)(53416004)(2906002)(1720100001)(54356999)(18370500001);DIR:OUT;SFP:1102;SCL:1;SRVR:VI1PR08MB0751;H:outlook.office365.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?koi8-r?Q?1;VI1PR08MB0751;23:kfQgQPhAGiqLfb8IF7FeKwJA+/VGe8tnVplm1ehApE3?= =?koi8-r?Q?ZiuYAM4Wv9Riqy+eOfYNkTF72QVttFia9r4CNhqgEmyh9GcPQrB7B49Qno0M2F?= =?koi8-r?Q?dnGbK0WUtI+rgRLRTDs8M1CSSKSROn6c/Ce5IzJ7PFNZRdCUtEkSxcEqLgVYv9?= =?koi8-r?Q?TZdGpMyxskNWUe0g0vJwHvHkntW8phJ4MKgORiKp/G+8mNJFA76aTueoHvhjff?= =?koi8-r?Q?yrwvVXiWj7C98HdT2/VYtnCCmMwXnhJAIvo8p0z79QJYIlGBA5MBj44i1RhjP5?= =?koi8-r?Q?hB/Zsh+TJHgKzo21eUB7PvC6V+VFfWTJ8K2qQB0bON/HlK7OB7bzZOSBvTuE81?= =?koi8-r?Q?Sj5AaVsE6fEIkae93/gy6s1zkpJBgAS1nMSjJFJfktsm3EDGVxsMcdCrp4MVCT?= =?koi8-r?Q?MMPBn1RhtlINHS7kOrVxhQxgwS4aI2nqyR5LvlKYjbkxGbgPxhb0oooQL4ZfLp?= =?koi8-r?Q?Du3bvW5AnCILH0trOQFmCfLbp0CZDERB3YmcjB9Ik6r6vvx6auxJtGrYesE6hk?= =?koi8-r?Q?7+vXR5+PpPTxPkLpBNn7EjAvSxugZt/Np5sEZw8tKxz7RfcrdaDGQnK34rnv6a?= =?koi8-r?Q?GsPHTjZ1cKphNkLQu0j4kSvWxeyxskuOH1bc5lxA1mUkeJuoKGWCuskVTQKyuP?= =?koi8-r?Q?n/PUQBPITIRIlfbr2doiVZybMy+mxIx5zpGLi/toZx+8U5PoxH/XeNVX1PPTN4?= =?koi8-r?Q?VVTUKczvBqHoHjb/+YAY3wRbqISiuGODcrffGs+Knp28eHCYowMe0GKiSUFR+p?= =?koi8-r?Q?11B/J/5GIzW7/Zj9fC8Rwb3bzFFRSHMxgWIyrJ1/UC8/+ATuVyKfQWgEZRde1H?= =?koi8-r?Q?2rtUqTmTgJecSo/Bxwjo70quqhx4NqznXdGs6PY4WOF2DY3iRx7KZgcvjSgIYE?= =?koi8-r?Q?KNn382jHRRMsjadU4BkuZQSltj/D3i+ZnhqNhptFJAieqDW1CN6+d+M+UnFco0?= =?koi8-r?Q?5X6r8AKTbD4slqW5YFgIsU9EpDooSiM3nUN0ZgGmO5T2r2EKoclpv+HlzubGkY?= =?koi8-r?Q?qLshxOXC3acBCXdiuZrXyKn5QwDz/KH4Q2IyaGberodcLbnOxUrTrI3HTxkKzs?= =?koi8-r?Q?9ml2fDjBiRrucBnbmQ1lLJte2SyROrYSQcxiAz+5MOccaYusKsuRrnS?= X-Microsoft-Exchange-Diagnostics: 1;VI1PR08MB0751;6:fHxG7KJIP1P3N6Ohq1VkdHbinzl6FzBD7BjuV8wZnGv+sr5cMakl21IiM+xP2yaakp4W0h/i0R12S3KbPYyxVbbwQI+LwYuMVqIJz61S8HlVlVO+5XLtSGOtY9AVq26vzFHGeJyzQbyHoXcMLv+RK2upW4eol3bfkheHbRShomRRowt4BFIIx7wEmw2ZWFH1wmudpJyOx/ZGyVrVnz3WbEtepn0Aae9peRUrNdN9v/JGecM7HuhzaPTTKrDqCB98TJsa9LsQtibr7sg0G6Td2Ljswk6VtVRGBl23pE/TaHUVRnvEifIg0EL9rqB3JInD98Sr4/Lz7qHzZOWO1wug/IkOigUFr6mXS+CRK/ZBsbIXcVLkhlXWErvJjevGvHf0jkoQquF4+/07KypG6M8dVkJl2H8HCXqE0gfEQQKi7YTsPnfrJENraRluO8/0wYQr9uvWBcvA1jrgYsAUOQvYkKNaWobMWif4xNMv5Fsg9/thJKCWXfsTTMx6B5RoYnQGTjoGAaIsF/6U8JYgUp8Xqw== X-Microsoft-Exchange-Diagnostics: 1;VI1PR08MB0751;5:TYp3PEi49GdulQBhWIyzzwQ9C2DpqJk9u9dj1/jl3G75anc2FHyYjInf7crlaJHmwMX5Xt6QQvLU7DBmVqRgLm/twpaQSEX3c9+6GPyIdUq4vQqEkDovHxsnz/ZWOVd3hP+CM9KkaLRmVmo8A3WXuzjXfj+EzHn8G300GlgUyeOps6Qd3NoBp38HC9TsV3AO9KNPGXS/9pp2W8x9oq+PVnwOQK7P5sAcQh4fF9QpdE4qUepyJVfvOCEoSgLomTD89EuniR6EaBepFIHhY7Og8g3LO+sE50ETX5dD9HVh27BYmBphjz3uc8nPO5e7nvCiikwEwBKrRSaIwmTR6hKOiPrsP6TiPZNFDsLpWc/YRyMNc89YQdgy0VZv0V5b2rH1yPcJojx1fxb/KgsNuqXydMv0HiUCHmihzrrAisJVzN1w5rpzwsO61QyqX8HGc4eb8dPunkplIIbKvp9alQXM6wcgmVWm5EfvHDeMPtphKETP9Dw6NNq5S2Y+XOVv2vwH;24:cUCdCLhxqSHiLxl+L1bwTqQ6/LRH2vMmO8mrxMdVnO6RiLRmza5pdBHN8VpuABAYUcXT9pUEdeyLcwqD4ZsJm13dQ9FQD4JXPWY8WSu2za8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;VI1PR08MB0751;7:lo9x9qCr0jEWyR2qo5NKerS0LdZmh7xorFZ7n99GIEzH6bfy9vrIoDB6niSG9UCcsmzCQL4mEQPvAw8qyimhZ+6pCOtbrVw9HgTcGfpDcZ908jABt0OJtxqOBgrAwXdmHL4YZ3r3Or3M0EZO4qnBvCffDGKgaqqBgjhrJwlsaGfSUTGYiZrzFHcAiSuq0dk+3fXEh+WiZP5wQD957OTNUsQAAXqbH2/eNejGYV2yI8P0GmpiJTc+BPSL8eVjCTScZpQeHbKfoM1cDuN7bN6zSKv6IKyGQpKk6aq1RQPa+/Q4YeBqFdJwc0iRVza/DZnvEzyShZ9Y+elk+sq6GXVPxA==;20:vYQFR4N6sK6p9oPzr/mCyE3BCYq165wVoQvPVfBw5N7SeTgpTBbgLM/aFoCRqXbPhsUitftVYGP8PRGu4dI6lbD30LH7vjA/CFbb7DDHPwvvgcvgSa5yoWK8EGq0MzAPkfgIqrArHefwXkEX8jerQbyyXp6EEiK8PcOx0pJGttE= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2017 20:12:26.9400 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB0751 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello Thomas, This patch breaks one of our CRIU tests: https://github.com/xemul/criu/blob/master/test/zdtm/static/posix_timers.c#L145 python /root/git/main/criu/test/zdtm.py run -t zdtm/static/posix_timers --iter 0 ====================== Run zdtm/static/posix_timers in h ======================= Start test ./posix_timers --pidfile=posix_timers.pid --outfile=posix_timers.out Send the 15 signal to 24 Wait for zdtm/static/posix_timers(24) to die for 0.100000 ############## Test zdtm/static/posix_timers FAIL at result check ############## Test output: ================================ 22:39:39.573: 24: ( start) boottime 12 boottime-coarse 12 total_sleep_time 0 22:39:39.602: 24: ( end) boottime 12 boottime-coarse 12 total_sleep_time 0 22:39:39.603: 24: FAIL: posix_timers.c:145: REALTIME (oneshot): timer became periodic 22:39:39.603: 24: FAIL: posix_timers.c:145: MONOTONIC (oneshot): timer became periodic 22:39:39.603: 24: FAIL: posix_timers.c:145: BOOTTIME (oneshot): timer became periodic <<< ================================ === Run 1/1 ================ zdtm/static/posix_timers ##################################### FAIL ##################################### This test sets a timer and then check that it is set correctly. And with this patch, we see that timer_settime returns incorrect data. 2447 timer_settime(10, 0, {it_interval={tv_sec=0, tv_nsec=0}, it_value={tv_sec=2147483, tv_nsec=647000000}}, NULL) = 0 .... 2519 timer_settime(10, 0, {it_interval={tv_sec=0, tv_nsec=0}, it_value={tv_sec=0, tv_nsec=0}}, 2509 <... exit_group resumed>) = ? 2519 <... timer_settime resumed> {it_interval={tv_sec=-1861316067, tv_nsec=18446645490300239488}, it_value={tv_sec=-1852565060, tv_nsec=133}}) = 0 Thanks, Andrei On Mon, Jun 05, 2017 at 01:21:46AM -0700, tip-bot for Jacob Shin wrote: > Commit-ID: eabdec04385376d560078992710104cc7be2ce1b > Gitweb: http://git.kernel.org/tip/eabdec04385376d560078992710104cc7be2ce1b > Author: Thomas Gleixner > AuthorDate: Tue, 30 May 2017 23:15:51 +0200 > Committer: Thomas Gleixner > CommitDate: Sun, 4 Jun 2017 15:40:28 +0200 > > posix-timers: Zero settings value in common code > > Zero out the settings struct in the common code so the callbacks do not > have to do it themself. > > Signed-off-by: Thomas Gleixner > Cc: Peter Zijlstra > Cc: John Stultz > Link: http://lkml.kernel.org/r/20170530211657.200870713@linutronix.de > --- > kernel/time/posix-cpu-timers.c | 5 +---- > kernel/time/posix-timers.c | 3 +-- > 2 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c > index 96c833a..cb4a4eb 100644 > --- a/kernel/time/posix-cpu-timers.c > +++ b/kernel/time/posix-cpu-timers.c > @@ -719,10 +719,8 @@ static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec64 *itp > */ > itp->it_interval = ns_to_timespec64(timer->it.cpu.incr); > > - if (timer->it.cpu.expires == 0) { /* Timer not armed at all. */ > - itp->it_value.tv_sec = itp->it_value.tv_nsec = 0; > + if (!timer->it.cpu.expires) > return; > - } > > /* > * Sample the clock to take the difference with the expiry time. > @@ -746,7 +744,6 @@ static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec64 *itp > * Call the timer disarmed, nothing else to do. > */ > timer->it.cpu.expires = 0; > - itp->it_value = ns_to_timespec64(timer->it.cpu.expires); > return; > } else { > cpu_timer_sample_group(timer->it_clock, p, &now); > diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c > index 48f6c37..0332f7a 100644 > --- a/kernel/time/posix-timers.c > +++ b/kernel/time/posix-timers.c > @@ -645,8 +645,6 @@ common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting) > struct timespec64 ts64; > bool sig_none; > > - memset(cur_setting, 0, sizeof(*cur_setting)); > - > sig_none = (timr->it_sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_NONE; > iv = timr->it_interval; > > @@ -705,6 +703,7 @@ SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id, > if (!timr) > return -EINVAL; > > + memset(&cur_setting64, 0, sizeof(cur_setting64)); > kc = timr->kclock; > if (WARN_ON_ONCE(!kc || !kc->timer_get)) > ret = -EINVAL;