Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp298003ybp; Thu, 10 Oct 2019 18:25:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqxYoWxyeQL1pIy+zt41457eaxsPPtLAcks94TzIKhih/U7R/2Mv6nmVQTz1dGQM8UvFuarD X-Received: by 2002:aa7:d687:: with SMTP id d7mr11210615edr.143.1570757143164; Thu, 10 Oct 2019 18:25:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570757143; cv=none; d=google.com; s=arc-20160816; b=0YeyCiAlPjmOPfikBT6pD1H9wy7TJyoQkBBnV8q1U2Ur/HFXSajHpaVa3+IFBhCM/n EOt6e1cBFcNybj6/TmYV6/cEeH/ybX2NLzO1w7Skwj2Y7QXdPAZyNJX60VFCBlbRJ/Qd 9CipvHs/cLI1YfQ4joFinTcgT2y3lK0hSPbOrZxCd+bkt6R6RNqy8B6DK238Dd7hSfsB GNWPleQYWZ0Ktu6hi6rhj+88Dhue1ypZkwWyXEx9Looe6S/URGJ4q4YP6XeZqr3KYd8H VVLI8xI01agtd4gTPwL5QzuUxTBFcL8Me+Bh0JFCqdtXrSZcIuSgkym7UEOkeEVicN/w bZog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=az2QVvBeY3Hsc/ax2t+RGBl2eLhRVoRmMRNJdYbCcN0=; b=GG7Imv0nHeDvzOyrJBlB09FNLOXlEOInCjYjwH1wejrq+NoiCngx+EtkSwSsX/HyyG hYSxICe4ALvc/d2tcpkdRy8HowLEQAeCBy7QSZMQRrR3Gwnz5vOiPJ6MYqUMciWYfumi QLYNcscSii7uJF8f1bdsg/rn/mrEC27Z2P/QalJ+ZtTbFO/nX06KtVnBBw/bNOGbemRQ dqUOmk8i2dlgSVas3K7vsO5l0Sq0SU05uK6+L+hRZzGBq7my81jJLoBOmCiMM+TxHOVs FTP8Wa5Kzyhem7iNuVdLNNQ7UXMIHGoSn/u8VRd85OoAAfWss4PZUjv368n1jWdMaaOe 3zng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@arista.com header.s=googlenew header.b=mlmad6jD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=REJECT dis=NONE) header.from=arista.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u8si4339305edq.84.2019.10.10.18.25.19; Thu, 10 Oct 2019 18:25:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@arista.com header.s=googlenew header.b=mlmad6jD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=REJECT dis=NONE) header.from=arista.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728323AbfJKBYi (ORCPT + 99 others); Thu, 10 Oct 2019 21:24:38 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:45456 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728291AbfJKBYd (ORCPT ); Thu, 10 Oct 2019 21:24:33 -0400 Received: by mail-wr1-f68.google.com with SMTP id r5so9919022wrm.12 for ; Thu, 10 Oct 2019 18:24:32 -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=az2QVvBeY3Hsc/ax2t+RGBl2eLhRVoRmMRNJdYbCcN0=; b=mlmad6jDOr20/Y8B/5KCdoBy7C8NnfUTb7SrLmOJhs27AL+kO2Ezz6a3gIA3peRG8T H7WGQ8vsTgBk5Mx+DevgcoNH2Un7p26O2vH1yQLb34FPSAywsN+pp2FX3goybNDGlxUu YG2GeHDpKzJTHYq+9yH2FHg8bTelV3TcSPxuNS5gPHB74cYvyyjQS5VlF2LooBBiSUh0 Ec3vVFzxvp5p5cQPj6M9zffyKXyzdaU3piX4qP2h1xJzoiE0Fz9TtvYa/lD2hmG54Paj 411+83HA5SSf3IQoH+zmY588f3BoPV2ljdSpv8WvWRdZ9j6cei74vXBFOEyxu6pqCoYh yHxQ== 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=az2QVvBeY3Hsc/ax2t+RGBl2eLhRVoRmMRNJdYbCcN0=; b=QAXwlL+63BK/qaoTbeVtvX5dafT2X35Tz7P81T2Xoy+cFW6tFZB6kOEF5rte5QbnxE 0MTjLjw1nf9ixI1bOaPBYYrEPDuuYSr5Ktx7WjncyltyEqtc5flRjhCmCpoq3vH/2dy6 DAOlXD4l3B/6SaIQbwdZH6qG98ijvbZ+/LN3wnyqWRu7ShO52pf35QjzJN5CtTYq2cl+ Mu9aAPFGDOAfIAepFSAK+aUlr6creT6KcqvPkNRTFZ81HffbyE5l+tTEYiYl2cYqCvhC ocDzLOdYUky7wnUw/FmVNEqIu+2rFSkbDH5VDlixYTtZSpjKzVIZO+ssem3YjRx0/JSl Z/WQ== X-Gm-Message-State: APjAAAX+yLoUts06WdSnpeXzAkbMgw4YQ87H1ALk9rlZVbIzIv6MeF8w ee80scHCOT0aCHR5PDrHVTh5bQUQ/oE= X-Received: by 2002:adf:b781:: with SMTP id s1mr10748843wre.343.1570757071311; Thu, 10 Oct 2019 18:24:31 -0700 (PDT) Received: from localhost.localdomain ([2a02:8084:ea2:c100:228:f8ff:fe6f:83a8]) by smtp.gmail.com with ESMTPSA id l13sm7699795wmj.25.2019.10.10.18.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2019 18:24:30 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, 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, Andrei Vagin Subject: [PATCHv7 30/33] selftests/timens: Add procfs selftest Date: Fri, 11 Oct 2019 02:23:38 +0100 Message-Id: <20191011012341.846266-31-dima@arista.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191011012341.846266-1-dima@arista.com> References: <20191011012341.846266-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 Check that /proc/uptime is correct inside a new time namespace. Output on success: 1..1 ok 1 Passed for /proc/uptime # Pass 1 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0 Output with lack of permissions: 1..1 not ok 1 # SKIP need to run as root Output without support of time namespaces: 1..1 not ok 1 # SKIP Time namespaces are not supported Co-developed-by: Andrei Vagin Signed-off-by: Andrei Vagin Signed-off-by: Dmitry Safonov --- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/procfs.c | 144 ++++++++++++++++++++++ 3 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timens/procfs.c diff --git a/tools/testing/selftests/timens/.gitignore b/tools/testing/selftests/timens/.gitignore index 9b6c8ddac2c8..94ffdd9cead7 100644 --- a/tools/testing/selftests/timens/.gitignore +++ b/tools/testing/selftests/timens/.gitignore @@ -1,3 +1,4 @@ clock_nanosleep +procfs timens timerfd diff --git a/tools/testing/selftests/timens/Makefile b/tools/testing/selftests/timens/Makefile index 801e7ab2f8bf..e4913f2991d4 100644 --- a/tools/testing/selftests/timens/Makefile +++ b/tools/testing/selftests/timens/Makefile @@ -1,4 +1,4 @@ -TEST_GEN_PROGS := timens timerfd clock_nanosleep +TEST_GEN_PROGS := timens timerfd clock_nanosleep procfs CFLAGS := -Wall -Werror -pthread diff --git a/tools/testing/selftests/timens/procfs.c b/tools/testing/selftests/timens/procfs.c new file mode 100644 index 000000000000..43d93f4006b9 --- /dev/null +++ b/tools/testing/selftests/timens/procfs.c @@ -0,0 +1,144 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "log.h" +#include "timens.h" + +/* + * Test shouldn't be run for a day, so add 10 days to child + * time and check parent's time to be in the same day. + */ +#define MAX_TEST_TIME_SEC (60*5) +#define DAY_IN_SEC (60*60*24) +#define TEN_DAYS_IN_SEC (10*DAY_IN_SEC) + +#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) + +static int child_ns, parent_ns; + +static int switch_ns(int fd) +{ + if (setns(fd, CLONE_NEWTIME)) + return pr_perror("setns()"); + + return 0; +} + +static int init_namespaces(void) +{ + char path[] = "/proc/self/ns/time_for_children"; + struct stat st1, st2; + + parent_ns = open(path, O_RDONLY); + if (parent_ns <= 0) + return pr_perror("Unable to open %s", path); + + if (fstat(parent_ns, &st1)) + return pr_perror("Unable to stat the parent timens"); + + if (unshare_timens()) + return -1; + + child_ns = open(path, O_RDONLY); + if (child_ns <= 0) + return pr_perror("Unable to open %s", path); + + if (fstat(child_ns, &st2)) + return pr_perror("Unable to stat the timens"); + + if (st1.st_ino == st2.st_ino) + return pr_err("The same child_ns after CLONE_NEWTIME"); + + if (_settime(CLOCK_BOOTTIME, TEN_DAYS_IN_SEC)) + return -1; + + return 0; +} + +static int read_proc_uptime(struct timespec *uptime) +{ + unsigned long up_sec, up_nsec; + FILE *proc; + + proc = fopen("/proc/uptime", "r"); + if (proc == NULL) { + pr_perror("Unable to open /proc/uptime"); + return -1; + } + + if (fscanf(proc, "%lu.%02lu", &up_sec, &up_nsec) != 2) { + if (errno) { + pr_perror("fscanf"); + return -errno; + } + pr_err("failed to parse /proc/uptime"); + return -1; + } + fclose(proc); + + uptime->tv_sec = up_sec; + uptime->tv_nsec = up_nsec; + return 0; +} + +static int check_uptime(void) +{ + struct timespec uptime_new, uptime_old; + time_t uptime_expected; + double prec = MAX_TEST_TIME_SEC; + + if (switch_ns(parent_ns)) + return pr_err("switch_ns(%d)", parent_ns); + + if (read_proc_uptime(&uptime_old)) + return 1; + + if (switch_ns(child_ns)) + return pr_err("switch_ns(%d)", child_ns); + + if (read_proc_uptime(&uptime_new)) + return 1; + + uptime_expected = uptime_old.tv_sec + TEN_DAYS_IN_SEC; + if (fabs(difftime(uptime_new.tv_sec, uptime_expected)) > prec) { + pr_fail("uptime in /proc/uptime: old %ld, new %ld [%ld]", + uptime_old.tv_sec, uptime_new.tv_sec, + uptime_old.tv_sec + TEN_DAYS_IN_SEC); + return 1; + } + + ksft_test_result_pass("Passed for /proc/uptime\n"); + return 0; +} + +int main(int argc, char *argv[]) +{ + int ret = 0; + + nscheck(); + + ksft_set_plan(1); + + if (init_namespaces()) + return 1; + + ret |= check_uptime(); + + if (ret) + ksft_exit_fail(); + ksft_exit_pass(); + return ret; +} -- 2.23.0