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 9AE0FEB64DA for ; Tue, 4 Jul 2023 15:37:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1381528008D; Tue, 4 Jul 2023 11:37:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C156280076; Tue, 4 Jul 2023 11:37:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E59C428008E; Tue, 4 Jul 2023 11:37:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id B9C7A280076 for ; Tue, 4 Jul 2023 11:37:12 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 826171A0AC9 for ; Tue, 4 Jul 2023 15:37:12 +0000 (UTC) X-FDA: 80974333104.15.BC3F683 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by imf02.hostedemail.com (Postfix) with ESMTP id 782CE80022 for ; Tue, 4 Jul 2023 15:37:10 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=im9v3tz+; spf=pass (imf02.hostedemail.com: domain of revest@chromium.org designates 209.85.128.44 as permitted sender) smtp.mailfrom=revest@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1688485030; 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=beswSwVGAkwwt+hvsxKunV4bjZ5oFhW4HtgFlCfoMD8=; b=Pm55ENIvbF//djm2IYyRixdakLP0+btTX209rnORbPjjGqfk/L7X13BOXBLiez8yNbE8/I /59v/jZYhew7W3yOx01CquXHQ4uo6M+gMvh7rWFMOjKep0Q/Ea0Nxek1IpugnRsYcAa6QB TqO5nivi012c+UhW9dAGtUGNsF7jRKc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688485030; a=rsa-sha256; cv=none; b=qAbvmlUvie6lL4/in1WFMVXlY+Z241bUPeAin3q5sWSiRLoSX7KqSEPCpY6hzeoccXsBhZ ve3Du6Q3VoxBvKSAgz1TNi2hbfb4tBCEeuwSXGynj9PGJu5cMFlUDRqXDVvNN76XadNbCW cIxXBLO7Waqb23adz2mrt0jmkvvLbg8= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=im9v3tz+; spf=pass (imf02.hostedemail.com: domain of revest@chromium.org designates 209.85.128.44 as permitted sender) smtp.mailfrom=revest@chromium.org; dmarc=pass (policy=none) header.from=chromium.org Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-3fb4146e8ceso70082215e9.0 for ; Tue, 04 Jul 2023 08:37:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1688485029; x=1691077029; 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=beswSwVGAkwwt+hvsxKunV4bjZ5oFhW4HtgFlCfoMD8=; b=im9v3tz+dDQKllRZMfAl2CXof/kWuglwbcaU6I+/SM3taNN9W0TM7sI67nnkl3lDSX 9evAJPoxo2Tv50rEz5lihIj5frPU3Hxo1Et5ixkKvTNtQhQyTA6xiirfJK5+I7SVGHC2 vJhjhWvhzJTSHRPd/yK9QTQbknde3VwTLbMWE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688485029; x=1691077029; 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=beswSwVGAkwwt+hvsxKunV4bjZ5oFhW4HtgFlCfoMD8=; b=iL895JzhnZWe+KuyW+XK43NT2g/GY26qnxlbVYv/V3yHgD9hwUJXDEzMC86IsdLlgs nREY8nzdMj3pa+cqQ9KdyOVMg7PJmc51Dg2MM8V/kWvpQ52UuAze/TyEJspad+pM2MC9 LSC4v5HDH9oeQC/mDpHv3a0oZPRuvMN7ixBMGoxPlu0dJFZFJaqjCUt4qdN4H5x5sqYv pU39uLXdvbCYna7Vo+GrzbRIv79i8R3GCmC5jjZ3g9RUyM7q9tKiENpoXTVkDxiV1OBF wVPvbMrFyrmqUaZIB3eseqXgST/po+K358nqSx7PFVyXaWXKV/lZ6MNSXR/fvC4eiv1b 4LNw== X-Gm-Message-State: ABy/qLa9uM9o4LaBeoYce9X3+NKqoeoXg2231aGRnHe3SWthv2PhLeMb KbBWDLSFsl4cnzT3RhJcwoVPP5msZP1+t4pqRYA= X-Google-Smtp-Source: APBJJlGdWcugyCLxuhlb72LvzlOj5uz7Xrz2PmeD25M8SMc8R/B4axzPNqhXW2AizS/HJbijddnx2A== X-Received: by 2002:a5d:4950:0:b0:313:f7f1:e34c with SMTP id r16-20020a5d4950000000b00313f7f1e34cmr11728009wrs.60.1688485028942; Tue, 04 Jul 2023 08:37:08 -0700 (PDT) Received: from revest.zrh.corp.google.com ([2a00:79e0:9d:6:99b2:81bb:8407:5369]) by smtp.gmail.com with ESMTPSA id b2-20020adfde02000000b0030c4d8930b1sm28538709wrm.91.2023.07.04.08.37.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:37:08 -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, broonie@kernel.org, szabolcs.nagy@arm.com, kpsingh@kernel.org, gthelen@google.com, toiwoton@gmail.com, Florent Revest Subject: [PATCH v3 2/5] kselftest: vm: Fix mdwe's mmap_FIXED test case Date: Tue, 4 Jul 2023 17:36:26 +0200 Message-ID: <20230704153630.1591122-3-revest@chromium.org> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog In-Reply-To: <20230704153630.1591122-1-revest@chromium.org> References: <20230704153630.1591122-1-revest@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: raw4huzkegc3577fp471bgk39gstdhwn X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 782CE80022 X-Rspam-User: X-HE-Tag: 1688485030-192846 X-HE-Meta: U2FsdGVkX1/O0uxWJlnK3aH76uVswkDQ9rAl0Zo5hx1w5xXFIGHStgD6nJZv7w+zaEcRCiFtA15Y8SyeYn3q7VJS1WfDVqIhkto1OJfVX62EFHL6VMX03mqM4oGzns7CWXVRaLxA3ErqNjBtNElqPOICh5bvxlsLHoem3XYGwmBx1/LKvZfgC+IAlVtVyeknNF413HDFbIvMSPsnAihX0khV3hDuJz2g4I5+uawgHuQ61pFan39ZB3TDgruku816R9cr3pSMvSmNzTZDTew/y+UAy7mRguc9zPbXsThf8oWUqMvpOD+bDODo/hHOUCoTWELSL3ImJzYZSKFisAElKMKB495HyKu0IcO7SV0FQWzYcLLsfijxA1A5MMkFuvQurdwU4UclDmJBwQqPCetfgmiEHte/s9PeWSt09zsNqUMG0UrLKPZuS+r63ss1Yx9tRaIlQ9XSKtlfBnImYFlsl4D4cVX/+AoWdxt/ZIXRsgJkNYTFi6ywJcBA9XNYX/qsGYXbf5iM5u5wstQS0L8IcmGxTW8wScjKgHGFq1Hrep8EF38DoTIR7Ko1p+8yIkMcUbPc/hERIe/G7C2QSe/VVcqnPD8SCfTCsXEBJZGt/nrkZxopc2ZIj6bE1xy+IU1u+MEoYNtwbv41h/kU800XOGOGoiid8vanRg9+DMHWHt3CCJ5k0/+JER6u7ifEF3NMwoOvLvn4O6uA37ng+WJK1KEXvtleT+SMJPvWDU03dOug7CIakTC5OIvKZIDJ35/FWeqlzMu7xcsHj5gGUaw7j0MGt6WjzzMoPHBJL/m+4ZWrqq2NQeX8QTnuVzRBOHsbAGtLo+7YHVeVxAWWlL1cSBabEvQloFQbNcjL4xklAKlZk/BUEan5H5TBFOyG7cOL22vuUyeTnGujoED/SVcWZq5Pyw3BELOI2OYcKJ9sS9TXnqni5VfBhXKPz+p8hCzehKYkfbmSfJom1GWhD3/ W7yejBBI 9uB+i8lIcCt490odojzQ+br9prjjoyg6uiTMq67IrWB5OBC/1U+YMRZlOmDOkZ4D41ELbxC1v7vF83/cFbPlCGR91ZSIzvCJf/7Mtsfx6so/FkxAQHUsqNeH7+faCzgdn1wVudmJYE2RfM9QJzcFLZxR7KDUGqQW8hnqhxkOn43HyoL7UVqufRc8wL6ZZyuGDjQYaAxYyKkoOjiAgHyN/3Qldsr0vllBanvOC/iGcpzPhUp+2jfr+9BN6rS69fj+EZR6JMLhRdP2L1sOaPJlozOU3rv36kajiZlJr17nji2LQ8/QEJdO/hqF1LcTh1OGDnF41/+6IjS62unSb5ozcYpJ6thbMp8anxCgAC3FqvX9zvkpF3IxVzeR0/dLMpohePB/qtOWSJV2kMsicNW1Nvh1HMscQulOXbNlVvvyDdg34MZ1hKz8QRI6bTBLXxXv5uVH/anZNdlvUhT+v9DVBNa7QXuvihJGNIvrcubXI7w7clWw= 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 Reviewed-by: David Hildenbrand Fixes: 4cf1fe34fd18 ("kselftest: vm: add tests for memory-deny-write-execute") --- 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) -- 2.41.0.255.g8b1d071c50-goog