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 6C424C43217 for ; Fri, 4 Nov 2022 16:26:11 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id E36143CB013 for ; Fri, 4 Nov 2022 17:26:09 +0100 (CET) Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) (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 EB7823CAF73 for ; Fri, 4 Nov 2022 17:25:45 +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-7.smtp.seeweb.it (Postfix) with ESMTPS id C774320039A for ; Fri, 4 Nov 2022 17:25:44 +0100 (CET) Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A4FBue3020898; Fri, 4 Nov 2022 16:25:43 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=jT/8Vxob4x6+D2hwpnsqvueHo8KouCV1Vbs72jdTB5A=; b=tkrwCkNhXbTSJlT0kWJsAoHonHAVOLwcTY6bSdkhAQJiQtOiuRikU5R8tfvi/fbrs70n EPdn/I9maUNVCmrrzHEjrAPfkn7SN2DIep+7HbIeiyPbrYmYKY4Id30CxQp0nyZpQQkr L2DSLnbcWWUrVTle/6x0cp64Rz3mAvxahBFjvcJyLsSwPIo1BqloDQr53da00bi5NZDb UQpm0sHyk8EGNyZpcb8WFgJ968E+2yNfUfOW8aTTb48cZqDBVFsWbbGT38M8Yenuig1l o7g7wrFkHiP0rXveUiy7v3cHkAxWayND8edQi0RG+VNSaI4MEsIz8y4jgyAN6YTstayA 6A== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3kmpjrd933-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Nov 2022 16:25:42 +0000 Received: from m0098417.ppops.net (m0098417.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 2A4DfDQP001726; Fri, 4 Nov 2022 16:25:42 GMT Received: from ppma05fra.de.ibm.com (6c.4a.5195.ip4.static.sl-reverse.com [149.81.74.108]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3kmpjrd91v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Nov 2022 16:25:42 +0000 Received: from pps.filterd (ppma05fra.de.ibm.com [127.0.0.1]) by ppma05fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 2A4G5LQ4021998; Fri, 4 Nov 2022 16:25:40 GMT Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by ppma05fra.de.ibm.com with ESMTP id 3kjepedqwa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Nov 2022 16:25:39 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 2A4GPa2i21692746 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 4 Nov 2022 16:25:36 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AFECC4C046; Fri, 4 Nov 2022 16:25:36 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4F3CE4C040; Fri, 4 Nov 2022 16:25:33 +0000 (GMT) Received: from tarunpc.ibmuc.com (unknown [9.43.23.48]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 4 Nov 2022 16:25:32 +0000 (GMT) From: Tarun Sahu To: ltp@lists.linux.it Date: Fri, 4 Nov 2022 21:55:09 +0530 Message-Id: <20221104162511.28658-3-tsahu@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221104162511.28658-1-tsahu@linux.ibm.com> References: <20221104162511.28658-1-tsahu@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: QIgo-aW35BJJ7bdZM0_NoApphiAQlUqz X-Proofpoint-ORIG-GUID: 2UVjlUksIX2aS_M6xcSEASJfL7atK3nU X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-04_11,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 spamscore=0 priorityscore=1501 bulkscore=0 malwarescore=0 impostorscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211040104 X-Virus-Scanned: clamav-milter 0.102.4 at in-7.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH v8 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/hugemmap07.c | 133 ++++++++++++++++++ testcases/kernel/mem/hugetlb/lib/hugetlb.h | 2 + 4 files changed, 137 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/hugemmap07.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap07.c new file mode 100644 index 000000000..bd0fb440a --- /dev/null +++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap07.c @@ -0,0 +1,133 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later +/* + * Copyright (C) 2005-2006 David Gibson & Adam Litke, IBM Corporation. + * Author: David Gibson & Adam Litke + */ + +/*\ + * + * [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. + */ + +#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]; + + SAFE_FILE_LINES_SCANF("/proc/cpuinfo", "MMU : %16s", 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__) +static void *next_chunk(void *addr) +{ + if (tst_kernel_bits() == 32) + return PALIGN(addr, hpage_size); + else + 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 at %p is an acceptable response", + newbrk); + } 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(MEMINFO_HPAGE_SIZE)*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..a4300f40f 100644 --- a/testcases/kernel/mem/hugetlb/lib/hugetlb.h +++ b/testcases/kernel/mem/hugetlb/lib/hugetlb.h @@ -20,6 +20,8 @@ #include "old_tmpdir.h" #include "mem.h" +#define PALIGN(p, a) ((void *)LTP_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