From patchwork Thu Apr 28 13:29:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Wang X-Patchwork-Id: 1623665 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=hDIgFmHi; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KpxLf2mtCz9s0B for ; Thu, 28 Apr 2022 23:30:02 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id BB6AE3CA6B8 for ; Thu, 28 Apr 2022 15:29:59 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [IPv6:2001:4b78:1:20::4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 2880B3C9802 for ; Thu, 28 Apr 2022 15:29:57 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 3EE691001452 for ; Thu, 28 Apr 2022 15:29:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1651152596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cvw+HMXFrXFF+eCky+3Xq731LnusWlIsAig+O3UTbsM=; b=hDIgFmHiwy5OvTDzE/u36+VXwIxIa2eMDNwdwLnrJNocflV5C5Dl5YxGVusuTGGKzZMMnv zrbJbDvAtNZZrKZhjOKJJ6XPny03TfOFLBlMA4sy8wVXXnt4/f+96WJEtwDAOl/fAxpVv2 Av290fE3ry37MUapWVBIkVpuNLuRhU8= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-656-f2P86nhGNZaC3DqFTYUs8A-1; Thu, 28 Apr 2022 09:29:54 -0400 X-MC-Unique: f2P86nhGNZaC3DqFTYUs8A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A05D63804521 for ; Thu, 28 Apr 2022 13:29:54 +0000 (UTC) Received: from liwang-laptop.redhat.com (ovpn-12-133.pek2.redhat.com [10.72.12.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA98640F9D68 for ; Thu, 28 Apr 2022 13:29:53 +0000 (UTC) From: Li Wang To: ltp@lists.linux.it Date: Thu, 28 Apr 2022 21:29:48 +0800 Message-Id: <20220428132949.11719-2-liwang@redhat.com> In-Reply-To: <20220428132949.11719-1-liwang@redhat.com> References: <20220428132949.11719-1-liwang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=liwang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Virus-Scanned: clamav-milter 0.102.4 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-4.smtp.seeweb.it Subject: [LTP] [RFC PATCH 2/3] memfd_create03: make use of new .request_hugepages X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" To get rid of some failures like: memfd_create03.c:179: TINFO: --TESTING PAGE SIZE OF CREATED FILE-- memfd_create03.c:184: TINFO: memfd_create() succeeded memfd_create03.c:47: TBROK: mmap((nil),1048576,2,2,3,0) failed: ENOMEM (12) Signed-off-by: Li Wang --- .../syscalls/memfd_create/memfd_create03.c | 77 ++----------------- 1 file changed, 7 insertions(+), 70 deletions(-) diff --git a/testcases/kernel/syscalls/memfd_create/memfd_create03.c b/testcases/kernel/syscalls/memfd_create/memfd_create03.c index 036182f0a..400a56854 100644 --- a/testcases/kernel/syscalls/memfd_create/memfd_create03.c +++ b/testcases/kernel/syscalls/memfd_create/memfd_create03.c @@ -32,14 +32,6 @@ #include #include -#define TOTAL_HP_PATH "/proc/sys/vm/nr_hugepages" -#define MEMINFO_PATH "/proc/meminfo" -#define FREE_HP "HugePages_Free:\t%ld" -#define DEFAULT_HPS "Hugepagesize:\t%ld kB" - -static int hugepages_allocated; -static long og_total_pages; - static void *check_huge_mmapable(int fd, unsigned long size) { void *mem; @@ -88,7 +80,7 @@ static void test_def_pagesize(int fd) long hps; void *mem; - SAFE_FILE_LINES_SCANF(MEMINFO_PATH, DEFAULT_HPS, &hps); + hps = SAFE_READ_MEMINFO("Hugepagesize:"); hps = hps << 10; unmap_size = hps / 4; mem = check_huge_mmapable(fd, hps); @@ -128,8 +120,8 @@ static void test_max_hugepages(int fd) void *mem; void *new_mem; - SAFE_FILE_LINES_SCANF(MEMINFO_PATH, FREE_HP, &free_pages); - SAFE_FILE_LINES_SCANF(MEMINFO_PATH, DEFAULT_HPS, &hps); + free_pages = SAFE_READ_MEMINFO("HugePages_Free:"); + hps = SAFE_READ_MEMINFO("Hugepagesize:"); hps = hps << 10; mem = check_huge_mmapable(fd, free_pages * hps); @@ -188,68 +180,13 @@ static void memfd_huge_controller(unsigned int n) SAFE_CLOSE(fd); } -static void setup(void) -{ - char buf[8]; - int fd; - long free_pages; - long total_pages; - - if (access(MEMINFO_PATH, F_OK) || - access("/sys/kernel/mm/hugepages", F_OK) || - access(TOTAL_HP_PATH, F_OK)) - tst_brk(TCONF, "Huge page is not supported"); - - SAFE_FILE_LINES_SCANF(MEMINFO_PATH, FREE_HP, &free_pages); - if (free_pages > 0) - return; - - SAFE_FILE_LINES_SCANF(TOTAL_HP_PATH, "%ld", &og_total_pages); - sprintf(buf, "%ld", og_total_pages + 1); - - fd = SAFE_OPEN(TOTAL_HP_PATH, O_RDWR | O_TRUNC); - - if (write(fd, buf, strlen(buf)) == -1) - tst_brk(TCONF | TERRNO, - "write() fail: Hugepage allocation failed"); - - SAFE_CLOSE(fd); - - SAFE_FILE_LINES_SCANF(TOTAL_HP_PATH, "%ld", &total_pages); - if (total_pages != (og_total_pages + 1)) - tst_brk(TCONF, "Hugepage allocation failed"); - - hugepages_allocated = 1; -} - -static void cleanup(void) -{ - char buf[8]; - int fd; - long total_pages; - - if (hugepages_allocated == 0) - return; - - sprintf(buf, "%ld", og_total_pages); - - fd = SAFE_OPEN(TOTAL_HP_PATH, O_RDWR | O_TRUNC); - - if (write(fd, buf, strlen(buf)) == -1) - tst_brk(TCONF | TERRNO, "Clean-up failed: write() failed"); - - SAFE_CLOSE(fd); - - SAFE_FILE_LINES_SCANF(TOTAL_HP_PATH, "%ld", &total_pages); - if (og_total_pages != total_pages) - tst_brk(TCONF, "Clean-up failed"); -} - static struct tst_test test = { - .setup = setup, .test = memfd_huge_controller, .tcnt = ARRAY_SIZE(tcases), .needs_root = 1, .min_kver = "4.14", - .cleanup = cleanup, + .request_hugepages = (struct tst_hugepage []){ + {1, TST_ENFORCED}, + {} + }, };