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 Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C303DC4332F for ; Wed, 2 Nov 2022 11:07:29 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id C049A3CACC6 for ; Wed, 2 Nov 2022 12:07:27 +0100 (CET) Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [217.194.8.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 40ABA3C9274 for ; Wed, 2 Nov 2022 12:07:00 +0100 (CET) Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 514D31000918 for ; Wed, 2 Nov 2022 12:06:58 +0100 (CET) Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A2AfXqh015005; Wed, 2 Nov 2022 11:06:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=LtOHGWjXeRzrW38Qjt837ywdwmu202ACgFTbLjizKjU=; b=tCix3KzbCDxfBs1hcO+lq0Fe8ZEPKjsvySmL3JWwUM22ESckBei0mXgdlYYKRNRADQrq IWj6YormvUZcLWy8AeIcPgQ/pq+Cirf7Juwo1rdoBPOUIl1Y+gGY7IuFQi9F0WFUu98a szIQ1QD0J2ImGbVZUrFa2Y35olfrVfoafh2aZNKr1Ma7dcHwYCjjvhpmMkyCLJHIHw1F gh2oT8MEL/18Ar1lNcvtXIXYMgtyMJ345hOO+0Ox6QYXYaKi5ys44lgNkxvIy9kfOpLf 0lIhhwNFOIjvGvnobXkZrzLL1qR0wms2Cl5MeXw5v18+X3fdp230wsoqUDvMWm5GHpk5 EQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3kkh3r46de-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 02 Nov 2022 11:06:57 +0000 Received: from m0127361.ppops.net (m0127361.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 2A27G0Td017486; Wed, 2 Nov 2022 11:06:57 GMT Received: from ppma01fra.de.ibm.com (46.49.7a9f.ip4.static.sl-reverse.com [159.122.73.70]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3kkh3r46cc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 02 Nov 2022 11:06:56 +0000 Received: from pps.filterd (ppma01fra.de.ibm.com [127.0.0.1]) by ppma01fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 2A2B5KDY009559; Wed, 2 Nov 2022 11:06:55 GMT Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by ppma01fra.de.ibm.com with ESMTP id 3kgut9cxnr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 02 Nov 2022 11:06:54 +0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 2A2B6pQ3459466 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 2 Nov 2022 11:06:51 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C8888A4066; Wed, 2 Nov 2022 11:06:51 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7C741A4069; Wed, 2 Nov 2022 11:06:48 +0000 (GMT) Received: from tarunpc.ibmuc.com (unknown [9.43.114.53]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 2 Nov 2022 11:06:48 +0000 (GMT) From: Tarun Sahu To: ltp@lists.linux.it Date: Wed, 2 Nov 2022 16:36:36 +0530 Message-Id: <20221102110638.413561-3-tsahu@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221102110638.413561-1-tsahu@linux.ibm.com> References: <20221102110638.413561-1-tsahu@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: usl2hyesNEQiKV7-G85ATesaDzdVdR2K X-Proofpoint-GUID: -ag9U4DSVoknTAj30rt7IVTkpNXPGRuF X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-02_06,2022-11-02_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 mlxscore=0 suspectscore=0 phishscore=0 mlxlogscore=999 spamscore=0 adultscore=0 bulkscore=0 impostorscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211020067 X-Virus-Scanned: clamav-milter 0.102.4 at in-4.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH v4 2/4] Hugetlb: Migrating libhugetlbfs brk_near_huge 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: , Cc: geetika@linux.ibm.com, sbhat@linux.ibm.com, aneesh.kumar@linux.ibm.com, vaibhav@linux.ibm.com, rpalethorpe@suse.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" Migrating the libhugetlbfs/testcases/brk_near_huge.c test Test Description: Certain kernels have a bug where brk() does not perform the same checks that a MAP_FIXED mmap() will, allowing brk() to create a normal page VMA in a hugepage only address region. This can lead to oopses or other badness. Signed-off-by: Tarun Sahu --- runtest/hugetlb | 1 + testcases/kernel/mem/.gitignore | 1 + .../kernel/mem/hugetlb/hugemmap/Makefile | 5 + .../kernel/mem/hugetlb/hugemmap/hugemmap07.c | 138 ++++++++++++++++++ testcases/kernel/mem/hugetlb/lib/hugetlb.h | 3 + 5 files changed, 148 insertions(+) create mode 100644 testcases/kernel/mem/hugetlb/hugemmap/hugemmap07.c diff --git a/runtest/hugetlb b/runtest/hugetlb index f719217ab..f7ff81cb3 100644 --- a/runtest/hugetlb +++ b/runtest/hugetlb @@ -3,6 +3,7 @@ hugemmap02 hugemmap02 hugemmap04 hugemmap04 hugemmap05 hugemmap05 hugemmap06 hugemmap06 +hugemmap07 hugemmap07 hugemmap05_1 hugemmap05 -m hugemmap05_2 hugemmap05 -s hugemmap05_3 hugemmap05 -s -m diff --git a/testcases/kernel/mem/.gitignore b/testcases/kernel/mem/.gitignore index ff2910533..df5256ec8 100644 --- a/testcases/kernel/mem/.gitignore +++ b/testcases/kernel/mem/.gitignore @@ -4,6 +4,7 @@ /hugetlb/hugemmap/hugemmap04 /hugetlb/hugemmap/hugemmap05 /hugetlb/hugemmap/hugemmap06 +/hugetlb/hugemmap/hugemmap07 /hugetlb/hugeshmat/hugeshmat01 /hugetlb/hugeshmat/hugeshmat02 /hugetlb/hugeshmat/hugeshmat03 diff --git a/testcases/kernel/mem/hugetlb/hugemmap/Makefile b/testcases/kernel/mem/hugetlb/hugemmap/Makefile index 2d651b4aa..a368db2b6 100644 --- a/testcases/kernel/mem/hugetlb/hugemmap/Makefile +++ b/testcases/kernel/mem/hugetlb/hugemmap/Makefile @@ -9,3 +9,8 @@ include $(abs_srcdir)/../Makefile.inc include $(top_srcdir)/include/mk/generic_leaf_target.mk hugemmap06: CFLAGS+=-pthread + +hugemmap07: +ifeq ($(ARCH),ppc) + CPPFLAGS += -DPPC_NO_SEGMENTS +endif diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap07.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap07.c new file mode 100644 index 000000000..73ed4b0d6 --- /dev/null +++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap07.c @@ -0,0 +1,138 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later +/* + * Copyright (C) 2005-2006 David Gibson & Adam Litke, IBM Corporation. + * Author: David Gibson & Adam Litke + */ + +/*\ + * + * [Description] + * + * brk() near hugepage: + * Certain kernels have a bug where brk() does not perform the same + * checks that a MAP_FIXED mmap() will, allowing brk() to create a + * normal page VMA in a hugepage only address region. This can lead + * to oopses or other badness. + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include + +#include "hugetlb.h" +#include "tst_safe_stdio.h" + +#define MNTPOINT "hugetlbfs/" +static long hpage_size; +static int huge_fd = -1; + +#ifdef __powerpc64__ +static int arch_has_slice_support(void) +{ + char mmu_type[16]; + FILE *fp; + int ret; + + fp = SAFE_POPEN("cat /proc/cpuinfo | grep MMU | awk '{ print $3}'", "r"); + ret = fscanf(fp, "%s", mmu_type); + pclose(fp); + + if (ret < 0) + tst_brk(TBROK, "Failed to determine MMU type"); + + return strcmp(mmu_type, "Hash") == 0; +} + +static void *next_chunk(void *addr) +{ + if (!arch_has_slice_support()) + return PALIGN(addr, hpage_size); + + if ((unsigned long)addr < 0x100000000UL) + /* 256M segments below 4G */ + return PALIGN(addr, 0x10000000UL); + /* 1TB segments above */ + return PALIGN(addr, 0x10000000000UL); +} +#elif defined(__powerpc__) && !defined(PPC_NO_SEGMENTS) +static void *next_chunk(void *addr) +{ + return PALIGN(addr, 0x10000000UL); +} +#elif defined(__ia64__) +static void *next_chunk(void *addr) +{ + return PALIGN(addr, 0x8000000000000000UL); +} +#else +static void *next_chunk(void *addr) +{ + return PALIGN(addr, hpage_size); +} +#endif + +static void run_test(void) +{ + void *brk0, *hugemap_addr, *newbrk; + char *p; + int err; + + brk0 = sbrk(0); + tst_res(TINFO, "Initial break at %p", brk0); + + hugemap_addr = next_chunk(brk0) + hpage_size; + + p = SAFE_MMAP(hugemap_addr, hpage_size, PROT_READ|PROT_WRITE, + MAP_PRIVATE|MAP_FIXED, huge_fd, 0); + if (p != hugemap_addr) { + tst_res(TFAIL, "mmap() at unexpected address %p instead of %p\n", p, + hugemap_addr); + goto cleanup; + } + + newbrk = next_chunk(brk0) + getpagesize(); + err = brk((void *)newbrk); + if (err == -1) { + /* Failing the brk() is an acceptable kernel response */ + tst_res(TPASS, "Failing the brk is an acceptable response"); + } else { + /* Suceeding the brk() is acceptable if the new memory is + * properly accesible and we don't have a kernel blow up when + * we touch it. + */ + tst_res(TINFO, "New break at %p", newbrk); + memset(brk0, 0, newbrk-brk0); + tst_res(TPASS, "memory is accessible, hence successful brk() is " + "an acceptable response"); + } +cleanup: + SAFE_MUNMAP(p, hpage_size); + err = brk(brk0); + if (err == -1) + tst_brk(TBROK, "Failed to set break at the original position"); +} + +static void setup(void) +{ + hpage_size = SAFE_READ_MEMINFO("Hugepagesize:")*1024; + huge_fd = tst_creat_unlinked(MNTPOINT); +} + +static void cleanup(void) +{ + SAFE_CLOSE(huge_fd); +} + +static struct tst_test test = { + .needs_root = 1, + .mntpoint = MNTPOINT, + .needs_hugetlbfs = 1, + .taint_check = TST_TAINT_D | TST_TAINT_W, + .setup = setup, + .cleanup = cleanup, + .test_all = run_test, + .hugepages = {1, TST_NEEDS}, +}; diff --git a/testcases/kernel/mem/hugetlb/lib/hugetlb.h b/testcases/kernel/mem/hugetlb/lib/hugetlb.h index f75109f3e..1cfeca95a 100644 --- a/testcases/kernel/mem/hugetlb/lib/hugetlb.h +++ b/testcases/kernel/mem/hugetlb/lib/hugetlb.h @@ -20,6 +20,9 @@ #include "old_tmpdir.h" #include "mem.h" +#define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1)) +#define PALIGN(p, a) ((void *)ALIGN((unsigned long)(p), (a))) + #define SHM_RD 0400 #define SHM_WR 0200 #define SHM_RW (SHM_RD|SHM_WR) -- 2.31.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp