From: Tommi Rantala <tt.rantala@gmail.com>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH v2] syscalls/setrlimit03.c: read /proc/sys/fs/nr_open for RLIMIT_NOFILE limit
Date: Thu, 31 Jan 2019 19:49:00 +0200 [thread overview]
Message-ID: <20190131174900.11052-1-tt.rantala@gmail.com> (raw)
From: Tommi Rantala <tommi.t.rantala@nokia.com>
Since kernel v2.6.25 RLIMIT_NOFILE limit is no longer hardcoded to
NR_OPEN, but can be set via /proc/sys/fs/nr_open, see kernel commit
9cfe015aa424b3c003baba3841a60dd9b5ad319b ("get rid of NR_OPEN and
introduce a sysctl_nr_open").
nr_open default value is 1024*1024, so setrlimit03 has been passing fine
on new kernels, only "unexpectedly succeeding" if nr_open is set to some
larger value.
Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
testcases/kernel/syscalls/setrlimit/setrlimit03.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/testcases/kernel/syscalls/setrlimit/setrlimit03.c b/testcases/kernel/syscalls/setrlimit/setrlimit03.c
index 29b52aa7f..12455fe05 100644
--- a/testcases/kernel/syscalls/setrlimit/setrlimit03.c
+++ b/testcases/kernel/syscalls/setrlimit/setrlimit03.c
@@ -35,7 +35,10 @@
# define NR_OPEN (1024*1024)
#endif
+#define NR_OPEN_PATH "/proc/sys/fs/nr_open"
+
static struct rlimit rlim1, rlim2;
+static unsigned int nr_open = NR_OPEN;
static struct tcase {
struct rlimit *rlimt;
@@ -51,7 +54,10 @@ static void verify_setrlimit(unsigned int n)
TEST(setrlimit(RLIMIT_NOFILE, tc->rlimt));
if (TST_RET != -1) {
- tst_res(TFAIL, "call succeeded unexpectedly");
+ tst_res(TFAIL, "call succeeded unexpectedly "
+ "(nr_open=%u rlim_cur=%lu rlim_max=%lu)", nr_open,
+ (unsigned long)(tc->rlimt->rlim_cur),
+ (unsigned long)(tc->rlimt->rlim_max));
return;
}
@@ -65,10 +71,13 @@ static void verify_setrlimit(unsigned int n)
static void setup(void)
{
+ if (!access(NR_OPEN_PATH, F_OK))
+ SAFE_FILE_SCANF(NR_OPEN_PATH, "%u", &nr_open);
+
SAFE_GETRLIMIT(RLIMIT_NOFILE, &rlim1);
rlim2.rlim_max = rlim1.rlim_cur;
rlim2.rlim_cur = rlim1.rlim_max + 1;
- rlim1.rlim_max = NR_OPEN + 1;
+ rlim1.rlim_max = nr_open + 1;
}
static struct tst_test test = {
--
2.19.2
next reply other threads:[~2019-01-31 17:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-31 17:49 Tommi Rantala [this message]
2019-02-06 12:02 ` [LTP] [PATCH v2] syscalls/setrlimit03.c: read /proc/sys/fs/nr_open for RLIMIT_NOFILE limit Cyril Hrubis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190131174900.11052-1-tt.rantala@gmail.com \
--to=tt.rantala@gmail.com \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox