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 77915C3A59B for ; Thu, 15 Aug 2019 16:38:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D8052133F for ; Thu, 15 Aug 2019 16:38:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="HbJr4BM+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732071AbfHOQip (ORCPT ); Thu, 15 Aug 2019 12:38:45 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:51080 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731913AbfHOQin (ORCPT ); Thu, 15 Aug 2019 12:38:43 -0400 Received: by mail-wm1-f67.google.com with SMTP id v15so1791788wml.0 for ; Thu, 15 Aug 2019 09:38:42 -0700 (PDT) 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=xONtgxOFu1xrUbT6IwdYairnJYyUH1iSMsXkpOYAQlQ=; b=HbJr4BM+041kn+K3gvXA4KUJqzMWAkU8fRQl9clSzT0AQr9wEblmvtDHqCN7u5fDFQ SaMSxzn/KgV9KH/nNg1bORWN66EXqgJJoII8V02kDV19UyqPHPQ9aHRJfLBkzSX9F1ko jZIibEOpYkbTz18EWiWLUZ6BWXXk7bKPaNHSKxSXoqLL15GJeEgkhsxhWWpoA+gET3yX 9GfI36QECNCZpLZOamZOowYC7wCXC0oOOCW1AiP/FXlwvikIH6KSZ0kWnYfbNR5557bL OoTGiyYa+tlMmgndKlKwTnmrn5UXiTIZ0xbuThzjwnrOvic8SBvdAz/TxeIGik9C2rJV QljQ== 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=xONtgxOFu1xrUbT6IwdYairnJYyUH1iSMsXkpOYAQlQ=; b=OZq1IOMqUBxbXDPSZBbKWD7ZirBtdwuioZMvVliAq+zxv9ZVmCHW/huobca39hH3ED biFSpWUPB2titJ5UjCJUbBrSiaK35IoKb1dN4IjX/GIdDonvbWKC2HQgDOaRo/fGANiT MYJCvdZTh/luqjHKCmJ7noVBtG4Gmh/aXuwpXTjcNZ5c6jCU1T4oIsUiDIw2jryr+x0z ilMHiDGJ6Xa64uTcJXNtRR3kN5iF5gwgUqVkY3tPWWgka8FoOADw3WOooQ2WWlXH+Pfd oZdhksNpIDhpIMo+NVFlYT1qX7itGaDiC446uk2/aggB+l02IU2SID7VlX08fORRFapt q/YA== X-Gm-Message-State: APjAAAV9tSkxceCFs4ewK3QfzqxAaAldFHKJMzNvNYff8fsL8nuAi4WS bA+v3Hr2TDAimD3NfPMNEWXJisT7U94= X-Google-Smtp-Source: APXvYqy7v38pksCIboirEHgRL0NUyJuIQTraHRC8JFyKFWlKHVrAOUtqPPAamxKjwC2dEAuOAqQ4aw== X-Received: by 2002:a1c:790d:: with SMTP id l13mr3457943wme.49.1565887121240; Thu, 15 Aug 2019 09:38:41 -0700 (PDT) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id f7sm5755046wrf.8.2019.08.15.09.38.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2019 09:38:40 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Andrei Vagin , Dmitry Safonov , Adrian Reber , 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: [PATCHv6 02/36] timens: Add timens_offsets Date: Thu, 15 Aug 2019 17:38:02 +0100 Message-Id: <20190815163836.2927-3-dima@arista.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190815163836.2927-1-dima@arista.com> References: <20190815163836.2927-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 Introduce offsets for time namespace. They will contain an adjustment needed to convert clocks to/from host's. Allocate one page for each time namespace that will be premapped into userspace among vvar pages. A new namespace is created with the same offsets as the time namespace of the current process. Signed-off-by: Andrei Vagin Co-developed-by: Dmitry Safonov Signed-off-by: Dmitry Safonov --- MAINTAINERS | 1 + include/linux/time_namespace.h | 18 ++++++++++++++++++ include/linux/timens_offsets.h | 10 ++++++++++ kernel/time_namespace.c | 16 ++++++++++++++-- 4 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 include/linux/timens_offsets.h diff --git a/MAINTAINERS b/MAINTAINERS index 97b7737f5aba..527aee1e616f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12899,6 +12899,7 @@ S: Maintained F: fs/timerfd.c F: include/linux/timer* F: include/linux/time_namespace.h +F: include/linux/timens_offsets.h F: kernel/time_namespace.c F: kernel/time/*timer* diff --git a/include/linux/time_namespace.h b/include/linux/time_namespace.h index 9507ed7072fe..334c1a1c6607 100644 --- a/include/linux/time_namespace.h +++ b/include/linux/time_namespace.h @@ -8,6 +8,7 @@ #include #include #include +#include struct user_namespace; extern struct user_namespace init_user_ns; @@ -39,6 +40,21 @@ static inline void put_time_ns(struct time_namespace *ns) kref_put(&ns->kref, free_time_ns); } +static inline void timens_add_monotonic(struct timespec64 *ts) +{ + struct timens_offsets *ns_offsets = current->nsproxy->time_ns->offsets; + + if (ns_offsets) + *ts = timespec64_add(*ts, ns_offsets->monotonic); +} + +static inline void timens_add_boottime(struct timespec64 *ts) +{ + struct timens_offsets *ns_offsets = current->nsproxy->time_ns->offsets; + + if (ns_offsets) + *ts = timespec64_add(*ts, ns_offsets->boottime); +} #else static inline struct time_namespace *get_time_ns(struct time_namespace *ns) @@ -64,6 +80,8 @@ static inline int timens_on_fork(struct nsproxy *nsproxy, struct task_struct *ts return 0; } +static inline void timens_add_monotonic(struct timespec64 *ts) {} +static inline void timens_add_boottime(struct timespec64 *ts) {} #endif #endif /* _LINUX_TIMENS_H */ diff --git a/include/linux/timens_offsets.h b/include/linux/timens_offsets.h new file mode 100644 index 000000000000..e93aabaa5e45 --- /dev/null +++ b/include/linux/timens_offsets.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_TIME_OFFSETS_H +#define _LINUX_TIME_OFFSETS_H + +struct timens_offsets { + struct timespec64 monotonic; + struct timespec64 boottime; +}; + +#endif diff --git a/kernel/time_namespace.c b/kernel/time_namespace.c index 8fd8384b7261..394a9e168e7c 100644 --- a/kernel/time_namespace.c +++ b/kernel/time_namespace.c @@ -14,6 +14,7 @@ #include #include #include +#include static struct ucounts *inc_time_namespaces(struct user_namespace *ns) { @@ -47,6 +48,7 @@ static struct time_namespace *clone_time_ns(struct user_namespace *user_ns, { struct time_namespace *ns; struct ucounts *ucounts; + struct page *page; int err; err = -ENOSPC; @@ -59,15 +61,24 @@ static struct time_namespace *clone_time_ns(struct user_namespace *user_ns, if (!ns) goto fail_dec; + page = alloc_page(GFP_KERNEL | __GFP_ZERO); + if (!page) + goto fail_free; + ns->offsets = page_address(page); + if (old_ns->offsets) + memcpy(ns->offsets, old_ns->offsets, sizeof(struct timens_offsets)); + BUILD_BUG_ON(sizeof(*ns->offsets) > PAGE_SIZE); + err = ns_alloc_inum(&ns->ns); if (err) - goto fail_free; + goto fail_page; ns->ucounts = ucounts; ns->ns.ops = &timens_operations; ns->user_ns = get_user_ns(user_ns); return ns; - +fail_page: + free_page((unsigned long)ns->offsets); fail_free: kfree(ns); fail_dec: @@ -95,6 +106,7 @@ void free_time_ns(struct kref *kref) struct time_namespace *ns; ns = container_of(kref, struct time_namespace, kref); + free_page((unsigned long)ns->offsets); dec_time_namespaces(ns->ucounts); put_user_ns(ns->user_ns); ns_free_inum(&ns->ns); -- 2.22.0