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 ABCD8C77B7D for ; Wed, 17 May 2023 15:05:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 57A4E900008; Wed, 17 May 2023 11:05:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5041E900003; Wed, 17 May 2023 11:05:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 37BCD900008; Wed, 17 May 2023 11:05:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 296BB900003 for ; Wed, 17 May 2023 11:05:01 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id BC504AE00C for ; Wed, 17 May 2023 15:05:00 +0000 (UTC) X-FDA: 80800069560.08.6E30B79 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by imf05.hostedemail.com (Postfix) with ESMTP id 290021002FB for ; Wed, 17 May 2023 15:03:50 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=TBK4OSB6; spf=pass (imf05.hostedemail.com: domain of revest@chromium.org designates 209.85.128.52 as permitted sender) smtp.mailfrom=revest@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684335831; a=rsa-sha256; cv=none; b=sepXMxl14hS+3tIH3PaoqBBcFUAU1anKYHFEnZwJz2U1pOHkV5G7TUXc6H5QKlcG7MrJyb 8GU0G/M6/nF9Ggbr449OKeUMc14gW5CSofYXWwf3DD85hLcb37PhRnGR0dFkYsFmfsdF+E C0KaOhMpJ5NXrperGHaS2Jc3MWccl8g= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=TBK4OSB6; spf=pass (imf05.hostedemail.com: domain of revest@chromium.org designates 209.85.128.52 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=1684335831; 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=Cfh3GE7IWMNsnxpLZpSEij25ZLJGjbedQ1hG+0yiDYk=; b=H3QhUyGMLHYEn5l6lO/1BSLHiFiaTkASBTmSNiRQbIbdgWjHDqHSGyd7z+Ar2iaVx6QAKD rdcm3bY8AGQZr2wqWnvmfZwHmJHBZqX0ZqiZp+hhPJkAtxTeSS8qsTPCxw2w3xK5U+EVUJ piizcDcTc/XYypcQZvhtUkO8Sxk11ks= Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-3f4249b7badso9407265e9.3 for ; Wed, 17 May 2023 08:03:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1684335829; x=1686927829; 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=Cfh3GE7IWMNsnxpLZpSEij25ZLJGjbedQ1hG+0yiDYk=; b=TBK4OSB65hONFNWvZypUGnx7S8WLlWfYWTq7/K+E9K+S8Su0GdBk6u6iGCqrsSrKG7 GqW6tBLQWziSzCi6z0EemnxyB+m/nKMEsmMfHGQ51NphG3FFy8IWI/ZDoiWu+0+j9qHS J3G4o2dX78bFaRnun6CZnrH+uMpsoOvIf6WsM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684335829; x=1686927829; 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=Cfh3GE7IWMNsnxpLZpSEij25ZLJGjbedQ1hG+0yiDYk=; b=HXorQmtrMF8K1yTfx2ytKh8i+HCyc4dpRLeXQWLP5u/7SC2AFQ7IPKKonhLiMkqgpm hTRyu5xM+LG7JsbeiEozmhk6l8FkvGdx1jT5w7ElSaPNmjlVuL/eGZq77LqF9O64Xtwq iBed7lFyfObvc0fJf6vEOYrStwZ/FQoGAIpocSANre/s19cmlo8+l3lioodb2k9A7Iqj VAM4DTuIDQ/7fYPeUzq0bc+oFaDNY5x4r21FW9hv1pFOWWOJ2eVLlcwln2Kij7WWWohc KKppxKpuGx5bfbJmm8BbjXE2dP1oziFTU4Op1M0xcUkGK4SRUTcMWNcscyGl7Rm5h4/R bEag== X-Gm-Message-State: AC+VfDyiKITECAN7u+a6aOofHwUipWrm410Uya9k9+BncW9lQ8L+UEYz eum/e+IRqFhpZMZTF9M1onf6CQ== X-Google-Smtp-Source: ACHHUZ4BRxwoghBUU+IFL+ZJtsWoSYF2p3g8nvOhl3yyyU/th6R/Oov+Ul9D08ODS1HBQAF1HRdzMA== X-Received: by 2002:adf:fa03:0:b0:2f9:4fe9:74bb with SMTP id m3-20020adffa03000000b002f94fe974bbmr791746wrr.40.1684335828943; Wed, 17 May 2023 08:03:48 -0700 (PDT) Received: from revest.zrh.corp.google.com ([2a00:79e0:9d:6:e223:a0c2:d2c:c371]) by smtp.gmail.com with ESMTPSA id e17-20020adffd11000000b003047ea78b42sm3038211wrr.43.2023.05.17.08.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 08:03:48 -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 v2 2/5] kselftest: vm: Fix mdwe's mmap_FIXED test case Date: Wed, 17 May 2023 17:03:18 +0200 Message-ID: <20230517150321.2890206-3-revest@chromium.org> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog In-Reply-To: <20230517150321.2890206-1-revest@chromium.org> References: <20230517150321.2890206-1-revest@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: 3ax3bpt87mi19zp5q5ecx4khhq3q6ikc X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 290021002FB X-HE-Tag: 1684335830-725833 X-HE-Meta: U2FsdGVkX1/souaA8OebzquCvvLKIiAe6dUpSOUSHgTVgDSwb4fJXrqgGNqlaj2XntHJIwuMf3Z7LPUC2K9qycL3CMw1uWCKslNT3kXTGFTLL7C+tsFSkWOHrFk65wDmzfVS/kSi8MWqDO1Oh6OvZn7SounSj+5TFgUmoRb9uN+5fgWFn/QQE3yKqZhTHDMFcInulhjm+BHMApHP3dEoWoxgzQsqxE8MNHkZZk5oLD0gjGe1FQzAPAof1oBHP9X48B6rJ8rcy4SOlVsnlWVD27Hvm18Vla0P+gJhJqUo9wjGUntjl2gwRR271ppoDGJAxDIClrsc3pwqxdtFzOAvR/vkMDcHNv4ouaJfVoEs38pXeGP0WWskxfJNJGh04cNL6USZo9ggQpWuiv1Xy12YemdEtgEDbWSm30aMgl6HFRGoS85rR212HTcfpcwPpHxIMMUJfdD5GY7X5WvzLgeYbVWD93Gq1HMR+FHgCd/m30zhTRQeNTfHP+lSBMsCQXIlYcxlAdZD7Ds8FOl82Xk+0mi5OPQ5VivtqlOb8rtqgpASY23qWNgNnSx0qvopfqsCLNmN5SMirtdR7mvNlTg2+yXIpfvkd7lBppSBx1XWtNqWHurHzJL3gWRchnI8FOhC6lnP3GafUt+Pg74SZWMAzd3rUJVIPt/sgprzj+wEPrhfJ5MWARCDHk3wiUtwP8CwlNfn9RPT3OUjzK0RQRDBr5gguvJOl/tnMv15Y5ATVvDfOJWm4M137pb0ZoDQwVtDFppVFuW4YVtAoj7wQFTK+kYLwUwYgbom62BfoVNroxGjQAf3gi26Kg2gNizkw7eAHTLvQTtmx1r4U5r5SldK/k1ctu3XLZQHOrzPvqVzeTOouB8QPkR0gSOzxUa8R6fM+l0hKGSo/18kIbYwecLQzJAKGYlw3ywL6tCUvNqWnPcBAnk8bp47fVjkpaej213NK3m2ZPygr3/rq6ILake rSNEW5fu +42BUYndrHoxILgQoKAaaGF0Tja4Z6L+3SVZhonNY9P8tD6aGS5BITMOrbW74kTtB17twGFmg4O14ivtmYAqVdqkLUOUeSHcJ4IWwCXqRZki872hbAtiu74EsQXBaXAcnndR+o8WcuRQVb7QkhgBhznNdnqbx9nf8oTmeH1X2IwO3pYCOBzPXCMwnin21UdSGOILThfdCRebJj7423/PAmtK4jrOrDn9QbfWXXvTSyDouf9IhiWLUfadlyRW5sfxaVo+5tm0hsEuxoq2a1s7JGYkWuUbXptcqE22BetuP5qAlwxu3aDawUkuEgUe5lQ3RzAa9HxY7Hru6Av7wXChyCCJOoW4Xc0W3FNPSz/lfsypm/BrM8TGFdUN9HsP2gCHTus+FvzYN2ZHu1zDXM1WBABuFN7uiEvu2wfFT+uhiUqYcpupeQ0o2YAJy5+0iJ/GpGBtdOcaMgelcvT8= 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 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.40.1.606.ga4b1b128d6-goog