From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3228C43331 for ; Tue, 12 Nov 2019 01:29:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B910121D7F for ; Tue, 12 Nov 2019 01:29:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="UF4LzP8u" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726983AbfKLB3e (ORCPT ); Mon, 11 Nov 2019 20:29:34 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:36546 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727254AbfKLB1v (ORCPT ); Mon, 11 Nov 2019 20:27:51 -0500 Received: by mail-wm1-f68.google.com with SMTP id c22so1216819wmd.1 for ; Mon, 11 Nov 2019 17:27:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1nBTHy/xxCdgq9VX3BOGXRLXKQPYvIloWH+7YU/thyM=; b=UF4LzP8uwlLDqP+WSoW/loK7YhgAK4GYuKRO11rlEX7fRJ8mBUIE6GfkAGqAAcnNvn v+grtwmBc+PAOrCKJLphWdm9SmJkQ4FfCqur9ZBCJKe0/8wPe1HFjxFDG3cjRhvcnfvU ptYCNVgW8T/HsImr3vVD76jf59REuJ8Va+d0K152qqrlUNEWYiE8J+GGzhk9TWABHP/Y OSVjNDfTpR1Ca7DpmpZFmkEomtOHTChVZjyNp22iFPcL6Uvd+6QaXoSmL0+/bIXENyNN SOQYkSbpwrIA7COuUsn5dokpDn7sK2f5nsi82BRO5Tn998zRsvqRZjVSa2DTPudCBacG axrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1nBTHy/xxCdgq9VX3BOGXRLXKQPYvIloWH+7YU/thyM=; b=ptisGa9YBLNmWUXOE/GMjT1gmd5xEXVzJZztjF13eAcJHdAYVqQdeyMruDdgjmtXa9 OEtqRk/LJQUVvh7aO96vfAivY3/nf+bLfdRVGoQxQuLfWAHTXcDcUiHDl6sh/3UAsx/q cFcosHzeZ6Mu1VxU470wAzUfWGPywB5aBmD9zZkcsEOhZg58uNQp/m6OMfqOPDoODH2d ZmZfl+jNSYIG/xF6Mck3Tf9UY7IS2IebwJjgCRjH+Gb0P3Cyzruj5oNfuzSucezTPBxy 78qzN7YLUpUx0IUaL9op7hQpp0SfqqhtMl65OF8agugVqD7LVi/05dEYtO3MMFN+k/lG 9Vxw== X-Gm-Message-State: APjAAAXlQ9nJ+F8OWVuoicCeFbLp4oZlKlpeIfyuRaAFOSljvqE4R/8j fa1HiFKhvOuHyT5bVTJ/VN0+0Uccmhw= X-Google-Smtp-Source: APXvYqzRo66use8kzeT8+3JOJx8BVcg9fZNDbkUhrCd41/6tzxcHW+kS9pCEDdkXXePM+lNMjlXQFA== X-Received: by 2002:a1c:8086:: with SMTP id b128mr1511715wmd.104.1573522069211; Mon, 11 Nov 2019 17:27:49 -0800 (PST) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id u187sm1508096wme.15.2019.11.11.17.27.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2019 17:27:48 -0800 (PST) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Andrei Vagin , Dmitry Safonov , Adrian Reber , Andrei Vagin , Andy Lutomirski , Arnd Bergmann , Christian Brauner , Cyrill Gorcunov , "Eric W. Biederman" , "H. Peter Anvin" , Ingo Molnar , Jann Horn , Jeff Dike , Oleg Nesterov , Pavel Emelyanov , Shuah Khan , Thomas Gleixner , Vincenzo Frascino , containers@lists.linux-foundation.org, criu@openvz.org, linux-api@vger.kernel.org, x86@kernel.org Subject: [PATCHv8 13/34] timerfd: Make timerfd_settime() time namespace aware Date: Tue, 12 Nov 2019 01:27:02 +0000 Message-Id: <20191112012724.250792-14-dima@arista.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191112012724.250792-1-dima@arista.com> References: <20191112012724.250792-1-dima@arista.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrei Vagin timerfd_settime() accepts an absolute value of the expiration time if TFD_TIMER_ABSTIME is specified. This value is in task's time namespace and has to be converted to the host's time namespace. Signed-off-by: Andrei Vagin Co-developed-by: Dmitry Safonov Signed-off-by: Dmitry Safonov --- fs/timerfd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/timerfd.c b/fs/timerfd.c index 48305ba41e3c..f9da5752a79e 100644 --- a/fs/timerfd.c +++ b/fs/timerfd.c @@ -26,6 +26,7 @@ #include #include #include +#include struct timerfd_ctx { union { @@ -196,6 +197,8 @@ static int timerfd_setup(struct timerfd_ctx *ctx, int flags, } if (texp != 0) { + if (flags & TFD_TIMER_ABSTIME) + texp = timens_ktime_to_host(clockid, texp); if (isalarm(ctx)) { if (flags & TFD_TIMER_ABSTIME) alarm_start(&ctx->t.alarm, texp); -- 2.24.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Safonov Subject: [PATCHv8 13/34] timerfd: Make timerfd_settime() time namespace aware Date: Tue, 12 Nov 2019 01:27:02 +0000 Message-ID: <20191112012724.250792-14-dima@arista.com> References: <20191112012724.250792-1-dima@arista.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20191112012724.250792-1-dima@arista.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Andrei Vagin , Dmitry Safonov , Adrian Reber , Andrei Vagin , Andy Lutomirski , Arnd Bergmann , Christian Brauner , Cyrill Gorcunov , "Eric W. Biederman" , "H. Peter Anvin" , Ingo Molnar , Jann Horn , Jeff Dike , Oleg Nesterov , Pavel Emelyanov , Shuah Khan , Thomas Gleixner , Vincenzo Frascino , containers@lists.linux-foundation.org, criu@openvz.org, linux-api List-Id: linux-api@vger.kernel.org From: Andrei Vagin timerfd_settime() accepts an absolute value of the expiration time if TFD_TIMER_ABSTIME is specified. This value is in task's time namespace and has to be converted to the host's time namespace. Signed-off-by: Andrei Vagin Co-developed-by: Dmitry Safonov Signed-off-by: Dmitry Safonov --- fs/timerfd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/timerfd.c b/fs/timerfd.c index 48305ba41e3c..f9da5752a79e 100644 --- a/fs/timerfd.c +++ b/fs/timerfd.c @@ -26,6 +26,7 @@ #include #include #include +#include struct timerfd_ctx { union { @@ -196,6 +197,8 @@ static int timerfd_setup(struct timerfd_ctx *ctx, int flags, } if (texp != 0) { + if (flags & TFD_TIMER_ABSTIME) + texp = timens_ktime_to_host(clockid, texp); if (isalarm(ctx)) { if (flags & TFD_TIMER_ABSTIME) alarm_start(&ctx->t.alarm, texp); -- 2.24.0