netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Run proc's static-file tests in a container.

Browse Source 
Some /proc files are static in gVisor, but can be updated in native
linux. To test the values of these files, move them to a separate test
and run it using "container" tag to avoid faulty comparisons in native.

Since a separate IPC namespace is used, update shm comparisons to check
the actual value, not an interval.
This commit is contained in:
Zyad A. Ali
2021-09-24 14:15:23 +02:00
parent 861c6c8977
commit 057a9843b8
4 changed files with 99 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/syscalls/BUILD
+5
View File
@@ -433,6 +433,11 @@ syscall_test(
test = "//test/syscalls/linux:proc_test",
)
syscall_test(
tags = ["container"],
test = "//test/syscalls/linux:proc_defaults_test",
)
syscall_test(
test = "//test/syscalls/linux:proc_net_test",
)
test/syscalls/linux/BUILD
+14
View File
@@ -1792,6 +1792,20 @@ cc_binary(
],
)
cc_binary(
name = "proc_defaults_test",
testonly = 1,
srcs = ["proc_defaults.cc"],
linkstatic = 1,
deps = [
"@com_google_absl//absl/strings",
gtest,
"//test/util:fs_util",
"//test/util:test_main",
"//test/util:test_util",
],
)
cc_binary(
name = "proc_net_test",
testonly = 1,
test/syscalls/linux/proc.cc
+2 -51
View File
@@ -17,7 +17,6 @@
#include <fcntl.h>
#include <limits.h>
#include <linux/magic.h>
#include <linux/sem.h>
#include <sched.h>
#include <signal.h>
#include <stddef.h>
@@ -47,8 +46,6 @@
#include <utility>
#include <vector>
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "absl/container/node_hash_set.h"
#include "absl/strings/ascii.h"
#include "absl/strings/match.h"
@@ -62,6 +59,8 @@
#include "absl/synchronization/notification.h"
#include "absl/time/clock.h"
#include "absl/time/time.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "test/util/capability_util.h"
#include "test/util/cleanup.h"
#include "test/util/file_descriptor.h"
@@ -2453,54 +2452,6 @@ TEST(ProcFilesystems, Bug65172365) {
ASSERT_FALSE(proc_filesystems.empty());
}
TEST(ProcFilesystems, PresenceOfShmMaxMniAll) {
uint64_t shmmax = 0;
uint64_t shmall = 0;
uint64_t shmmni = 0;
std::string proc_file;
proc_file = ASSERT_NO_ERRNO_AND_VALUE(GetContents("/proc/sys/kernel/shmmax"));
ASSERT_FALSE(proc_file.empty());
ASSERT_TRUE(absl::SimpleAtoi(proc_file, &shmmax));
proc_file = ASSERT_NO_ERRNO_AND_VALUE(GetContents("/proc/sys/kernel/shmall"));
ASSERT_FALSE(proc_file.empty());
ASSERT_TRUE(absl::SimpleAtoi(proc_file, &shmall));
proc_file = ASSERT_NO_ERRNO_AND_VALUE(GetContents("/proc/sys/kernel/shmmni"));
ASSERT_FALSE(proc_file.empty());
ASSERT_TRUE(absl::SimpleAtoi(proc_file, &shmmni));
ASSERT_GT(shmmax, 0);
ASSERT_GT(shmall, 0);
ASSERT_GT(shmmni, 0);
ASSERT_LE(shmall, shmmax);
// These values should never be higher than this by default, for more
// information see uapi/linux/shm.h
ASSERT_LE(shmmax, ULONG_MAX - (1UL << 24));
ASSERT_LE(shmall, ULONG_MAX - (1UL << 24));
}
TEST(ProcFilesystems, PresenceOfSem) {
uint32_t semmsl = 0;
uint32_t semmns = 0;
uint32_t semopm = 0;
uint32_t semmni = 0;
std::string proc_file;
proc_file = ASSERT_NO_ERRNO_AND_VALUE(GetContents("/proc/sys/kernel/sem"));
ASSERT_FALSE(proc_file.empty());
std::vector<absl::string_view> sem_limits =
absl::StrSplit(proc_file, absl::ByAnyChar("\t"), absl::SkipWhitespace());
ASSERT_EQ(sem_limits.size(), 4);
ASSERT_TRUE(absl::SimpleAtoi(sem_limits[0], &semmsl));
ASSERT_TRUE(absl::SimpleAtoi(sem_limits[1], &semmns));
ASSERT_TRUE(absl::SimpleAtoi(sem_limits[2], &semopm));
ASSERT_TRUE(absl::SimpleAtoi(sem_limits[3], &semmni));
ASSERT_EQ(semmsl, SEMMSL);
ASSERT_EQ(semmns, SEMMNS);
ASSERT_EQ(semopm, SEMOPM);
ASSERT_EQ(semmni, SEMMNI);
}
// Check that /proc/mounts is a symlink to self/mounts.
TEST(ProcMounts, IsSymlink) {
auto link = ASSERT_NO_ERRNO_AND_VALUE(ReadLink("/proc/mounts"));
test/syscalls/linux/proc_defaults.cc
+78
View File
@@ -0,0 +1,78 @@
// Copyright 2021 The gVisor Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include <linux/sem.h>
#include <linux/shm.h>
#include "absl/strings/numbers.h"
#include "absl/strings/str_split.h"
#include "gtest/gtest.h"
#include "test/util/fs_util.h"
#include "test/util/test_util.h"
namespace gvisor {
namespace testing {
namespace {
TEST(ProcDefaults, PresenceOfShmMaxMniAll) {
uint64_t shmmax = 0;
uint64_t shmall = 0;
uint64_t shmmni = 0;
std::string proc_file;
proc_file = ASSERT_NO_ERRNO_AND_VALUE(GetContents("/proc/sys/kernel/shmmax"));
ASSERT_FALSE(proc_file.empty());
ASSERT_TRUE(absl::SimpleAtoi(proc_file, &shmmax));
proc_file = ASSERT_NO_ERRNO_AND_VALUE(GetContents("/proc/sys/kernel/shmall"));
ASSERT_FALSE(proc_file.empty());
ASSERT_TRUE(absl::SimpleAtoi(proc_file, &shmall));
proc_file = ASSERT_NO_ERRNO_AND_VALUE(GetContents("/proc/sys/kernel/shmmni"));
ASSERT_FALSE(proc_file.empty());
ASSERT_TRUE(absl::SimpleAtoi(proc_file, &shmmni));
ASSERT_EQ(shmmax, SHMMAX);
ASSERT_EQ(shmall, SHMALL);
ASSERT_EQ(shmmni, SHMMNI);
ASSERT_LE(shmall, shmmax);
// These values should never be higher than this by default, for more
// information see uapi/linux/shm.h
ASSERT_LE(shmmax, ULONG_MAX - (1UL << 24));
ASSERT_LE(shmall, ULONG_MAX - (1UL << 24));
}
TEST(ProcDefaults, PresenceOfSem) {
uint32_t semmsl = 0;
uint32_t semmns = 0;
uint32_t semopm = 0;
uint32_t semmni = 0;
std::string proc_file;
proc_file = ASSERT_NO_ERRNO_AND_VALUE(GetContents("/proc/sys/kernel/sem"));
ASSERT_FALSE(proc_file.empty());
std::vector<absl::string_view> sem_limits =
absl::StrSplit(proc_file, absl::ByAnyChar("\t"), absl::SkipWhitespace());
ASSERT_EQ(sem_limits.size(), 4);
ASSERT_TRUE(absl::SimpleAtoi(sem_limits[0], &semmsl));
ASSERT_TRUE(absl::SimpleAtoi(sem_limits[1], &semmns));
ASSERT_TRUE(absl::SimpleAtoi(sem_limits[2], &semopm));
ASSERT_TRUE(absl::SimpleAtoi(sem_limits[3], &semmni));
ASSERT_EQ(semmsl, SEMMSL);
ASSERT_EQ(semmns, SEMMNS);
ASSERT_EQ(semopm, SEMOPM);
ASSERT_EQ(semmni, SEMMNI);
}
} // namespace
} // namespace testing
} // namespace gvisor