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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F566C04FE1 for ; Wed, 9 Aug 2023 23:24:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D197D6B0075; Wed, 9 Aug 2023 19:24:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CCA038E0002; Wed, 9 Aug 2023 19:24:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B42A78E0001; Wed, 9 Aug 2023 19:24:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id A71D26B0075 for ; Wed, 9 Aug 2023 19:24:27 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 74E821A0713 for ; Wed, 9 Aug 2023 23:24:27 +0000 (UTC) X-FDA: 81106147374.03.AAC2F30 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf28.hostedemail.com (Postfix) with ESMTP id 5D613C0005 for ; Wed, 9 Aug 2023 23:24:25 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=gm83jILU; spf=pass (imf28.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691623465; a=rsa-sha256; cv=none; b=gtCFJtAZiRiLjMGccXbne4hhO/yWzkJ9WLsW/qXIEB+PelVVO9+WCxklIJkNILYnL9pGrd /sLimbPFetQkbyoTGCRD4SSp7QlkIpGBEX3EuGBqQ78kDd2GIuMqU/bvYIsIziQGl22Ffw aTTtDj+ETSldF6RuR8vknTuky8fV25M= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=gm83jILU; spf=pass (imf28.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691623465; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=IqoPeA6wKcuCb1RtSAVao8nNOFMZCDDFQoFYxZEN+6o=; b=ewQ1q6VdEKZiXUCeBLGQQ9db88AxPD9tXk4/0I4kcrOb30ETTGXZWhQGNVtDWCpy7Cq0bq LnOTjYAhCit5VP90t47cPKwF6/c4idFMAgnwn2ssWVRsJ3e4t0dYqx1ub/ZcJFk8QnpXw/ 0vn9MxGTjFQmm5OF9mo1W8sCEM29tEU= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1bbc06f830aso2664775ad.0 for ; Wed, 09 Aug 2023 16:24:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1691623464; x=1692228264; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IqoPeA6wKcuCb1RtSAVao8nNOFMZCDDFQoFYxZEN+6o=; b=gm83jILUNh6/zUoHxIyJIwVa+3RhunqO72lQbd7nCP8mXnRB6+Q8xAJWnBgKIxVv/Z xK5JgJo0QvTKYA7DYV/AHIrOZ1B5IbILi3JVN3JmDwfaP2D6wMjQlPAjGIWqhmKCPxHi PxK3A+wH/hdiwJiOuTAivkS+xdvLEkANWyAJRr66/sAkUjh3MLlNgn0m5W0nG7o6OBjQ luhey6ythegI/26xUwHqziHB5B2ze0H/YpU4ElAtp4496rPsdLsI1CozqbhwHtNFSo8O P3p726zTROCmGKUUDst8emxPfWRQsLv5dRQ8HWgZZFM2zUtJ0TmIcnWUOoOKiXjhnXHV rYZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691623464; x=1692228264; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IqoPeA6wKcuCb1RtSAVao8nNOFMZCDDFQoFYxZEN+6o=; b=UFnLc3+AEBktCUBBZQC4vCK4KUHCsvJtcgwhzbcVdMFMGw2Gsp0KuxJo0YH4eC4OT/ vEGxzIbROQcvKTTor8YYhrnIkr3Q6kJzeAmslElHE5xZZP26I59EJlTfLiZJeV8urtJF Y28HsNtvnkCWckmJhuFk+uYEAxlPr2ncNdNexAFcRtmP2vARUH0Jbth8DVMOK1ZgmLMP MYaXyzm/+Bj7ss2K8TzYFVzruElqnVEYHjuuA7rCaQcoDF0AJTe6vkueCimkL/15H+QJ vhX11X6N6czDnQ8htPjcDv7TcdS6EANiRiFpLhhyqZRVD0f5szRCn2ojXFUBMyqjPLcn oSrA== X-Gm-Message-State: AOJu0YytvctL6mzLVLFB7FLjJVS2k/1QJMvD0bA1Ne3UWG3svLHWQBWa bYVCjBY8b2kcOqhfii8OHZzbCA9d5MCQe550a3E= X-Google-Smtp-Source: AGHT+IHcvB5aZ1/jH0xEHaj38dn4RpyZuSnSm8co06xmNZJ+mCf4bPmLMzzwfzqyOgM8RXZLwQ3GHw== X-Received: by 2002:a17:902:c101:b0:1b6:9954:2030 with SMTP id 1-20020a170902c10100b001b699542030mr458836pli.8.1691623464252; Wed, 09 Aug 2023 16:24:24 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id l18-20020a170902d35200b001b54d064a4bsm82765plk.259.2023.08.09.16.24.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 16:24:23 -0700 (PDT) From: Charlie Jenkins To: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: charlie@rivosinc.com, conor@kernel.org, paul.walmsley@sifive.com, palmer@rivosinc.com, aou@eecs.berkeley.edu, anup@brainfault.org, konstantin@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, mick@ics.forth.gr, jrtc27@jrtc27.com, rdunlap@infradead.org, alexghiti@rivosinc.com Subject: [PATCH v10 2/4] RISC-V: mm: Add tests for RISC-V mm Date: Wed, 9 Aug 2023 16:22:02 -0700 Message-ID: <20230809232218.849726-3-charlie@rivosinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230809232218.849726-1-charlie@rivosinc.com> References: <20230809232218.849726-1-charlie@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 5D613C0005 X-Stat-Signature: 8eawrh6qh4x6bwt4tonw6cubfdqyxbci X-Rspam-User: X-HE-Tag: 1691623465-789341 X-HE-Meta: U2FsdGVkX1/TGlM/v5n3wpHsa3aYWBxWX9Fy5KjxBE1SuBc80MgKBwA+d1pCTImKL8ylosM8T6UVOwdMAnJIKOZSSnQnin1oYIMKlrahdLh7226mFKLD6RSE2oDeWBngzIo6TAJPBZbNoaKVIl91wYDrFjDc7+PFKBCf+bpD09T9DCReDT76bAWmtVCep1ePxNnturKI4bvNiD020owUabRvtVeq9/K5GDktxzDLxsTsOBK/MAR0lO8laAQ7ZhBbx4YhFp7ixhcMCiB8wx94t4QU0O8ozq3pDlc7jKnbJyMxILEX6KID/SQiIC1P6BkhZjoQc/DZyzcmPqVldGdqUXZT5LcRHHuw3clS9oJvHU7UIhGFSDMIYFjkGnWNzPT8lxJ+exKPD5Osr8Nek9RmdEdM3D1MK+HTtSMITczLO76Z1fLZdlFuAZdb6MQE+RA3rwOtiGG3F1iW3+7SyCIHdZCr36cNVVrOhUtrN7BctfooPmylgnb8PZRtaonBhh48HVChcdRfA5vj52voKi5t38/PIMb2bZBosf+eeksbohnPwyvyT9jO7z1FxfwWjQjKCUOhq3hoVjxtebF6ZgYgsioGHLQTO6AVEBd5LRNzI14JN0ReY8dG8D/mKjHIvmbI0BJMo+mXBb5TgAVA5oWwaSE+IryIWbuXxcrkkWCISm6P6G5jeSPb9KwtUVZUlavqdVSh5hg+TfIgM8grCFiQBPTdL/gfqvJlCkxrK43Uxrx0MCh1sMAU3zgkgCunStC/BYWD9kcD4XUhqb1GOU+PaVzfLl8T2EvbSRGIt2idUA2xbgYFEd5BCyNCGGd8avaNyBSHUJYeXMnx6YgZAUcA0Ou7mJbNsDEVwjvQ18gRbGyP3sIpzG37fyv8slgwaSePMQrtWTzFiaJwZLLP7N9sc23wE6h6ruOtKhf4gFNYdlbaKQMZV1lrbypX6YT+3q69xwG5H+PAwpU4GHLJrmk DavdTiZw LBDe9Ps3FM25kyRNeLzEh9KPLA4x3DvzH3r/j0nn5PomAf8jyNlPaV6FHll0S+K/v8lrUHECS5Lx74G98mmlAZaOni5qXnJpMHLY6p0A3jCF4ZxXt4jBLSbX4qMVrD+KEt5Wmp/uDwMO4hwp9pQbhwp8tEqu/ilGiiatIaDhcfQBAQbHskz9nK2N9aaJqqZppEMJzfmGu6eNQHyQDTiY7SNGxRTP8uzm/8gENfy3EqeQ5BxFZmoPz25lsIiJ1MAXBtgZ10KQ02hc7lAzEJzr+dv2axTE2gc37tw6L+EFtYTu607TUTLrh14Z0/Z4FeE/9171Zsf2iHz4Sr8ByqViYID/DC5GpnMfDs575azAHK/AVpzLYyj55dmbQxv0h4j5Ofi6LyQS7M9f5Uq2plXT6OJgbvF9g41oRkbxZB3htw7+rAxWlrU99cKG+G6YyfQRrduXM X-Bogosity: Ham, tests=bogofilter, spamicity=0.000299, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Add tests that enforce mmap hint address behavior. mmap should default to sv48. mmap will provide an address at the highest address space that can fit into the hint address, unless the hint address is less than sv39 and not 0, then it will return a sv39 address. These tests are split into two files: mmap_default.c and mmap_bottomup.c because a new process must be exec'd in order to change the mmap layout. The run_mmap.sh script sets the stack to be unlimited for the mmap_bottomup.c test which triggers a bottomup layout. Signed-off-by: Charlie Jenkins --- tools/testing/selftests/riscv/Makefile | 2 +- tools/testing/selftests/riscv/mm/.gitignore | 2 + tools/testing/selftests/riscv/mm/Makefile | 15 +++++ .../riscv/mm/testcases/mmap_bottomup.c | 35 ++++++++++ .../riscv/mm/testcases/mmap_default.c | 35 ++++++++++ .../selftests/riscv/mm/testcases/mmap_test.h | 64 +++++++++++++++++++ .../selftests/riscv/mm/testcases/run_mmap.sh | 12 ++++ 7 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/riscv/mm/.gitignore create mode 100644 tools/testing/selftests/riscv/mm/Makefile create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_default.c create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_test.h create mode 100755 tools/testing/selftests/riscv/mm/testcases/run_mmap.sh diff --git a/tools/testing/selftests/riscv/Makefile b/tools/testing/selftests/riscv/Makefile index f4b3d5c9af5b..4a9ff515a3a0 100644 --- a/tools/testing/selftests/riscv/Makefile +++ b/tools/testing/selftests/riscv/Makefile @@ -5,7 +5,7 @@ ARCH ?= $(shell uname -m 2>/dev/null || echo not) ifneq (,$(filter $(ARCH),riscv)) -RISCV_SUBTARGETS ?= hwprobe vector +RISCV_SUBTARGETS ?= hwprobe vector mm else RISCV_SUBTARGETS := endif diff --git a/tools/testing/selftests/riscv/mm/.gitignore b/tools/testing/selftests/riscv/mm/.gitignore new file mode 100644 index 000000000000..5c2c57cb950c --- /dev/null +++ b/tools/testing/selftests/riscv/mm/.gitignore @@ -0,0 +1,2 @@ +mmap_bottomup +mmap_default diff --git a/tools/testing/selftests/riscv/mm/Makefile b/tools/testing/selftests/riscv/mm/Makefile new file mode 100644 index 000000000000..11e0f0568923 --- /dev/null +++ b/tools/testing/selftests/riscv/mm/Makefile @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2021 ARM Limited +# Originally tools/testing/arm64/abi/Makefile + +# Additional include paths needed by kselftest.h and local headers +CFLAGS += -D_GNU_SOURCE -std=gnu99 -I. + +TEST_GEN_FILES := testcases/mmap_default testcases/mmap_bottomup + +TEST_PROGS := testcases/run_mmap.sh + +include ../../lib.mk + +$(OUTPUT)/mm: testcases/mmap_default.c testcases/mmap_bottomup.c testcases/mmap_tests.h + $(CC) -o$@ $(CFLAGS) $(LDFLAGS) $^ diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c b/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c new file mode 100644 index 000000000000..b29379f7e478 --- /dev/null +++ b/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c @@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include +#include + +#include "../../kselftest_harness.h" + +TEST(infinite_rlimit) +{ +// Only works on 64 bit +#if __riscv_xlen == 64 + struct addresses mmap_addresses; + + EXPECT_EQ(BOTTOM_UP, memory_layout()); + + do_mmaps(&mmap_addresses); + + EXPECT_NE(MAP_FAILED, mmap_addresses.no_hint); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_37_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_38_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_46_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_47_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_55_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_56_addr); + + EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.no_hint); + EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_37_addr); + EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_38_addr); + EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_46_addr); + EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_47_addr); + EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_55_addr); + EXPECT_GT(1UL << 56, (unsigned long)mmap_addresses.on_56_addr); +#endif +} + +TEST_HARNESS_MAIN diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_default.c b/tools/testing/selftests/riscv/mm/testcases/mmap_default.c new file mode 100644 index 000000000000..d1accb91b726 --- /dev/null +++ b/tools/testing/selftests/riscv/mm/testcases/mmap_default.c @@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include +#include + +#include "../../kselftest_harness.h" + +TEST(default_rlimit) +{ +// Only works on 64 bit +#if __riscv_xlen == 64 + struct addresses mmap_addresses; + + EXPECT_EQ(TOP_DOWN, memory_layout()); + + do_mmaps(&mmap_addresses); + + EXPECT_NE(MAP_FAILED, mmap_addresses.no_hint); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_37_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_38_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_46_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_47_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_55_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_56_addr); + + EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.no_hint); + EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_37_addr); + EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_38_addr); + EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_46_addr); + EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_47_addr); + EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_55_addr); + EXPECT_GT(1UL << 56, (unsigned long)mmap_addresses.on_56_addr); +#endif +} + +TEST_HARNESS_MAIN diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_test.h b/tools/testing/selftests/riscv/mm/testcases/mmap_test.h new file mode 100644 index 000000000000..9b8434f62f57 --- /dev/null +++ b/tools/testing/selftests/riscv/mm/testcases/mmap_test.h @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _TESTCASES_MMAP_TEST_H +#define _TESTCASES_MMAP_TEST_H +#include +#include +#include + +#define TOP_DOWN 0 +#define BOTTOM_UP 1 + +struct addresses { + int *no_hint; + int *on_37_addr; + int *on_38_addr; + int *on_46_addr; + int *on_47_addr; + int *on_55_addr; + int *on_56_addr; +}; + +static inline void do_mmaps(struct addresses *mmap_addresses) +{ + /* + * Place all of the hint addresses on the boundaries of mmap + * sv39, sv48, sv57 + * User addresses end at 1<<38, 1<<47, 1<<56 respectively + */ + void *on_37_bits = (void *)(1UL << 37); + void *on_38_bits = (void *)(1UL << 38); + void *on_46_bits = (void *)(1UL << 46); + void *on_47_bits = (void *)(1UL << 47); + void *on_55_bits = (void *)(1UL << 55); + void *on_56_bits = (void *)(1UL << 56); + + int prot = PROT_READ | PROT_WRITE; + int flags = MAP_PRIVATE | MAP_ANONYMOUS; + + mmap_addresses->no_hint = + mmap(NULL, 5 * sizeof(int), prot, flags, 0, 0); + mmap_addresses->on_37_addr = + mmap(on_37_bits, 5 * sizeof(int), prot, flags, 0, 0); + mmap_addresses->on_38_addr = + mmap(on_38_bits, 5 * sizeof(int), prot, flags, 0, 0); + mmap_addresses->on_46_addr = + mmap(on_46_bits, 5 * sizeof(int), prot, flags, 0, 0); + mmap_addresses->on_47_addr = + mmap(on_47_bits, 5 * sizeof(int), prot, flags, 0, 0); + mmap_addresses->on_55_addr = + mmap(on_55_bits, 5 * sizeof(int), prot, flags, 0, 0); + mmap_addresses->on_56_addr = + mmap(on_56_bits, 5 * sizeof(int), prot, flags, 0, 0); +} + +static inline int memory_layout(void) +{ + int prot = PROT_READ | PROT_WRITE; + int flags = MAP_PRIVATE | MAP_ANONYMOUS; + + void *value1 = mmap(NULL, sizeof(int), prot, flags, 0, 0); + void *value2 = mmap(NULL, sizeof(int), prot, flags, 0, 0); + + return value2 > value1; +} +#endif /* _TESTCASES_MMAP_TEST_H */ diff --git a/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh b/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh new file mode 100755 index 000000000000..ca5ad7c48bad --- /dev/null +++ b/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 + +original_stack_limit=$(ulimit -s) + +./mmap_default + +# Force mmap_bottomup to be ran with bottomup memory due to +# the unlimited stack +ulimit -s unlimited +./mmap_bottomup +ulimit -s $original_stack_limit -- 2.34.1