From patchwork Thu May 4 17:09:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florent Revest X-Patchwork-Id: 13231422 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 97290C7EE25 for ; Thu, 4 May 2023 17:10:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DF0A4280003; Thu, 4 May 2023 13:10:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D7994280002; Thu, 4 May 2023 13:10:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C19E0280003; Thu, 4 May 2023 13:10:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by kanga.kvack.org (Postfix) with ESMTP id 8B8CB280002 for ; Thu, 4 May 2023 13:10:11 -0400 (EDT) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-3f1763ee8f8so5894365e9.1 for ; Thu, 04 May 2023 10:10:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1683220211; x=1685812211; 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=P3QYW4dMv2fssbqcmbr7kPwxf8O4yB5nA1oU7n1NpuI=; b=D7x4fa+X6qIEzk2IbZ+D0fz5GhTgakeCXE+E81V7L4crHzOUgGASrNmikW+8iJh6Lp M1n6L4lENTLNeOLhBvCOq7Kq+mXd93sRdO8S61OdMearQDPJkCAv7Q+7Bh7n2mXiDfYh UHQAZtPHV+bXdXq/fi6Bp3nU8BvBD8blOwy0E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683220211; x=1685812211; 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=P3QYW4dMv2fssbqcmbr7kPwxf8O4yB5nA1oU7n1NpuI=; b=Nj592oMrFrzfB6NpgKaoXmE4k/955p+S3MXSk1GGqoKE0itrzfL4UjLMUADleFxQAt +O/vyPNKESbL0WQJPgg13JQbbaX1yZByk6yDSEeCsI68AGdrP9lqjWNv2FVgLuVPmXJo 0ZOfCbEJcYv4GF/67n5TD3D+drgcJrLzzGWKBeB//rLI3mYwfcm4GYDOCnB+3OOC0ArM kJyYvI5Leh8rZL1XWr5wFN3LBL1J2tneHUQkHx8cciW1qzIAe6bpDgQrpJJlXPwoEDaB w+DHgzTl+qSLalNjh21UJ5cPrix9nTkDkGETciiniISOBK36PnD5Kjzg71UZo1BYQ0jh uUtg== X-Gm-Message-State: AC+VfDxNC86732xwySkWW4UEewU3bVa1R23miuyCgABMK1q1Vdt0EKuw TEGZwp6eNw79zOOHSA2ccoKv6A== X-Google-Smtp-Source: ACHHUZ7sjcdpMxdHjUAJRoWkPdEa2XxXYPE4S9LIyfl8w/5h6/1ytolBNPYIlZqeNzyAuvye4I8eIQ== X-Received: by 2002:a1c:740d:0:b0:3ef:6819:b2ad with SMTP id p13-20020a1c740d000000b003ef6819b2admr265910wmc.37.1683220210796; Thu, 04 May 2023 10:10:10 -0700 (PDT) Received: from revest.zrh.corp.google.com ([2a00:79e0:9d:6:c740:f74d:132c:ca99]) by smtp.gmail.com with ESMTPSA id q3-20020a1cf303000000b003f3157988f8sm5447895wmq.26.2023.05.04.10.10.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 May 2023 10:10:10 -0700 (PDT) From: Florent Revest To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, catalin.marinas@arm.com, anshuman.khandual@arm.com, joey.gouly@arm.com, mhocko@suse.com, keescook@chromium.org, david@redhat.com, peterx@redhat.com, izbyshev@ispras.ru, nd@arm.com, broonie@kernel.org, szabolcs.nagy@arm.com, Florent Revest Subject: [PATCH 2/4] kselftest: vm: Fix mdwe's mmap_FIXED test case Date: Thu, 4 May 2023 19:09:40 +0200 Message-ID: <20230504170942.822147-3-revest@chromium.org> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog In-Reply-To: <20230504170942.822147-1-revest@chromium.org> References: <20230504170942.822147-1-revest@chromium.org> MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: I checked with the original author, the mmap_FIXED test case wasn't properly tested and fails. Currently, it maps two consecutive (non overlapping) pages and expects the second mapping to be denied by MDWE but these two pages have nothing to do with each other so MDWE is actually out of the picture here. What the test actually intended to do was to remap a virtual address using MAP_FIXED. However, this operation unmaps the existing mapping and creates a new one so the va is backed by a new page and MDWE is again out of the picture, all remappings should succeed. This patch keeps the test case to make it clear that this situation is expected to work. Signed-off-by: Florent Revest --- tools/testing/selftests/mm/mdwe_test.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/mm/mdwe_test.c b/tools/testing/selftests/mm/mdwe_test.c index d0954c657feb..91aa9c3099e7 100644 --- a/tools/testing/selftests/mm/mdwe_test.c +++ b/tools/testing/selftests/mm/mdwe_test.c @@ -168,13 +168,10 @@ TEST_F(mdwe, mmap_FIXED) self->p = mmap(NULL, self->size, PROT_READ, self->flags, 0, 0); ASSERT_NE(self->p, MAP_FAILED); - p = mmap(self->p + self->size, self->size, PROT_READ | PROT_EXEC, + /* MAP_FIXED unmaps the existing page before mapping which is allowed */ + p = mmap(self->p, self->size, PROT_READ | PROT_EXEC, self->flags | MAP_FIXED, 0, 0); - if (variant->enabled) { - EXPECT_EQ(p, MAP_FAILED); - } else { - EXPECT_EQ(p, self->p); - } + EXPECT_EQ(p, self->p); } TEST_F(mdwe, arm64_BTI)