From patchwork Fri Sep 29 21:11:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sami Tolvanen X-Patchwork-Id: 13404843 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 C4A1DE71D56 for ; Fri, 29 Sep 2023 21:12:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 49ABC8E000B; Fri, 29 Sep 2023 17:12:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 44A6C8E000A; Fri, 29 Sep 2023 17:12:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2EB1A8E000B; Fri, 29 Sep 2023 17:12:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 1D3348E000A for ; Fri, 29 Sep 2023 17:12:06 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id F0395405A5 for ; Fri, 29 Sep 2023 21:12:05 +0000 (UTC) X-FDA: 81290882610.16.4508633 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf16.hostedemail.com (Postfix) with ESMTP id 1F1CA180011 for ; Fri, 29 Sep 2023 21:12:02 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=qsmBK5TH; spf=pass (imf16.hostedemail.com: domain of 3oT0XZQwKCKgaIUQbWTdIVMVOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--samitolvanen.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3oT0XZQwKCKgaIUQbWTdIVMVOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--samitolvanen.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1696021923; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=19scQT+vZguMbMPGvwbswmmwWeMyYkP13y1R8IKgsdo=; b=NL6W4zRU4HXM4FGmhjjt/0/S+yOim0pp4x4QudY6QEDLy5lQQHU82td07W6PpwQi0TG/hR tp4DD8eF8weqkxW9lskUCaUVNJl37KG32gQODM/leMrtNYXof/jpa8Hsxy7uqj6oQllP3P w1AesMvBt0DZcYHVwGEg2F82Hfh+Te4= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=qsmBK5TH; spf=pass (imf16.hostedemail.com: domain of 3oT0XZQwKCKgaIUQbWTdIVMVOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--samitolvanen.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3oT0XZQwKCKgaIUQbWTdIVMVOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--samitolvanen.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696021923; a=rsa-sha256; cv=none; b=du+ziWt71lkRhQumw834eZ9Ep6FfaQn6z9w+wF85QJYUTgURNNCAUYDaEaRNS4uURA6Yrq ca6t2Fx0tF/3xPsSQCjkP4LZ1o6Ne63ZRYAQNNYlYhKMkry6l9UXjqJlqVC5oEB+sJUAqv r8+hmq7v7Ji7QbKz4LEFbQ55ChHZhis= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-1c625a7c507so101652925ad.2 for ; Fri, 29 Sep 2023 14:12:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1696021922; x=1696626722; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=19scQT+vZguMbMPGvwbswmmwWeMyYkP13y1R8IKgsdo=; b=qsmBK5THV3suNN9acb6EUPHXx58oQ37ADI0BgkUfLrg+yxlJqt8TeX3aPMKZ7Q/0GD m+n8WLh4AUe3Ud+MGfts2lUBWfxtH2VtGNW9Lv/n/FiQJR3u25D2t2drmAuYZUNRN50S XDStz8a5KijhAaFcwsa3AhDEpYAreR+jep5SiX3NfOLV8D+43Br2UsctbvCBwdieCDca +civTFynPklt3Hr7p7808PoNP3i+LIePM56waMXsx9l6Ww9z8fSdpxgWNkTZ2xtKBrD4 6QufSJVzckoDPhftTSpc0KgU0SsUlh7B6H/oUSSeTrxYX3pNXJjViozEg2W52IcTK6ts trzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696021922; x=1696626722; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=19scQT+vZguMbMPGvwbswmmwWeMyYkP13y1R8IKgsdo=; b=Ka3HxiM2l6/YIWFkLo/1+OfV12yoRgWROavQvE764jVZ58N8pu3AUhrOPtugKkVbsd Y0fVR/mJAbUclp9nsjC9P2c6dyp9xswk8mZfL/Bymqy6xd8WFVManN3fp2t/yUP3YJN1 TKhb54npTVgABKgZrDGAqKtXiuCADdinWoT8LU7+iGB4lvTTzjMBEofkcAa15kpHcJzr zMQixtY24sJcgSOgtiwacwH3i6+hBlXua54GH4RXTcN3t6SVxZiCfJqpDpY331D7aGQj ekdJovJon62pel1l2E7jaK+OgLs3hf/AzTye2r75jOF6EVXD2id/8moVVzWJ75D89Ax6 OS7w== X-Gm-Message-State: AOJu0YzI7h7pt62iUuwBC4nLRlWb8A994dkTBsIgsrP4F1KzMjkHP0MT DmjkgW2XVchQpHZ8wuECnxdat+XOFKpBQrZYEIk= X-Google-Smtp-Source: AGHT+IEu8pWqkhn949EN2w2MEEmF4sIQU2CD0ztiPLeuQl+OuKcbvmbHD9LpYfISQSvkmvSO3SxPVHDUipdN2Hi1oC8= X-Received: from samitolvanen.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:4f92]) (user=samitolvanen job=sendgmr) by 2002:a17:903:1c8:b0:1c6:d25:8730 with SMTP id e8-20020a17090301c800b001c60d258730mr75155plh.0.1696021921796; Fri, 29 Sep 2023 14:12:01 -0700 (PDT) Date: Fri, 29 Sep 2023 21:11:58 +0000 In-Reply-To: <20230929211155.3910949-4-samitolvanen@google.com> Mime-Version: 1.0 References: <20230929211155.3910949-4-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=1191; i=samitolvanen@google.com; h=from:subject; bh=MSLQAq+u1Gq1vqQPv1L24OvfGxs9lQjVrKINsuZaDko=; b=owEB7QES/pANAwAKAUy19oSLvFbuAcsmYgBlFz2bXFheIUWsMCgpXroYNEMEHJSzh7lHXZPhb Ah07CUmBI2JAbMEAAEKAB0WIQQ1zPtjsoPW0663g5RMtfaEi7xW7gUCZRc9mwAKCRBMtfaEi7xW 7oPqC/9r2/xEbO/XFpLcUfW8kI4zwGyW+1Bc7PLy9I1XUD02QER16SuVa1TjN8rJQPDmOMsvTB5 T5jEE8zHkuv5iPAUTq/yfdsqgq7Z9o7WUqulun2nOY9Z455ZDOwLvbCIfEXhOthriqRBjm08Kd8 068lN/FADXcZatUB50UlQahfJo08fLC7oUQ5xDGv0aXR6pnqONVNs/F1FhlysA15ZmM0HVhJePX 6NcJ3HNNPyvbDbeafLIysEsEirdqqDLbxHXo6W0v7OFcevxKffQom+ZUD8w0SlBJsnrgLSQYfrL 4SDgYPIT3RgVrVY58SpSU/IrpswNMkcW1oGV+VpuE8vh5HfISvX0Y/jFIK76jIL1xM9gdG/5oKD xSBdaJPOnpK9Gcze/0uC08IM5oubP3raIy1qzWvrbWFce1KlRfKgkHLVVNp7KcJmqHe0lhZqoI4 gKx2VGQd8AOM+C9TUeca+0u6bNkxxIvvO6e8Zupt2MkaleKzO1xxv6N14XGwr2/VkIpsg= X-Mailer: git-send-email 2.42.0.582.g8ccd20d70d-goog Message-ID: <20230929211155.3910949-6-samitolvanen@google.com> Subject: [PATCH 2/2] riscv: mm: Update mmap_rnd_bits_max From: Sami Tolvanen To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Andrew Morton , Kees Cook Cc: linux-mm@kvack.org, linux-riscv@lists.infradead.org, llvm@lists.linux.dev, linux-kernel@vger.kernel.org, Sami Tolvanen X-Rspamd-Queue-Id: 1F1CA180011 X-Rspam-User: X-Stat-Signature: 9hg7twofczyiukaes547f467qmnhapg5 X-Rspamd-Server: rspam01 X-HE-Tag: 1696021922-32201 X-HE-Meta: U2FsdGVkX19kQgdDJnfqDG5CuX9oAeGwQ5E5b1YRwVWUBTeybv8XVvf3EE2Q6QZmWiuFBFagmrIj6QNJ7McF8ROftBmZ/CJNIv41E+62CET6H91JUXzSSHWu0OAIKqBB3psiUO968xTKzYxmjxN0WSS0P1D2OzuyRZurL/gDyJCMX2oqQ2JMfIoc3mgccG3gAVvpXjZgVJBztho/V9oL15jwTOd3ASKlG+286Feey6r8jDJSlJBVpRFoLGE0oFTf5TBoK88l1RxLz55SFXYxfKRMn309Pf5kANjjHB+hHN4ge+yEPJCoGEOinzewq8JJWxYKRGn+7VxpkYn1Rw+gm+JH10nZ23Fe9dqLJP3iBpD5d0/13/tTRVcsXmyGJPZW75Wdmracb7WJKzjH9z7BzCShkMIWu8/6MLbLJGyT98lZ537/bKmR2hrXILOTrXj0ExQORM292D4Qbmuog7S/ePKSJlUVpszMMjbW5zPwMcj6FebfKtsn+TfN5scoZ6AyHO+f6Tq4xgNQkWkNfHokVxoeIaoNiS4fGjKDuR01gX/By5SIPnoVKXIQmN4GJ1SP1YhoXkf9DdeZf/sV53+YAOBecE9U9qQ3C6OeWkx0eA+yEw+uhD72h008Uu79c9Wua8cWpakTWZ8J035XoReBM7xdAudSuK3bjMdA5pOmw369WP0LtRMS42YteBXZgErvHB9ZmDZcKQidrYKnY/kA7MbjDxfiSH+YSy9+yd+7JyuZWv2pYBab5upMjb6V3zj0naYa0iocLE5m9bd09bEQGYa/ohppIFjy40amgn4ux4ZAIIK+0CnHIRC3OhTzJYzwGz+UqtOTCr+EyjUeNTrKQXveHBUCs8cDO8XpAYnJov2JxeA3P+3Jqb0dbBzncwOtRQ3ocbv1hL38Qu8JD2YagDv25bLBTmCx2DfEbHQ4fwj7tBZ3tB38ECqb3sUzUvwGXyI/9s/RK+rL2tMmEGJ ctZpCB3H YD2jH1JcKGxKiCpGMJwk3PcoDisfYwSwP1abF4yrtC6DWfKa/tE3aX5D/kgVF1RrRSOT8CNRYq7drtRS+okxNP5z+aAb3r811OZrbDXF5NGx8mIEUvcN0mfac3u1z8Z5XTz5aaUGP0j6TVPJNkSQZpir615GzIullGs5pBkQ8YF0caJUpbMrfXudfaZG4MApqMvx7OAi1Xz1ZyRYRwvYE1DAq3vrSwTkjddr2lMhoBWK0gZvv2TpXBos1ovw4EQHWdBRXtuagXzxP6sNTswRFnYK5R8kDw1T0beMYEOfukQKWw4nRtZKGcPW+dLYk+xo+4C4O2KjOZAnhpzlQNS273px+mXzc0CgmMuhMezj+nhX8lFhJMRrjxthtFRKjba7vGRQ+0uvkzuTQ1t9+xNdQyL2ce6ObtpNj0JiuhSuhbnb+UXJSl33wmcCDdkh97qxRAgnvagrstYYTsGb9YU9ho644AL5Rur1uIl4wmbWOwuveMT9tKoRwAYvYWHwpV9a+AmEBWRRye8qcEvDDTkibKnpygS5g8jI/FBeyR+ofb/aR7pXuREwwMHtOGyznqq61fvwfhBsDCUIATgZ+9r1VFSw9rTSXLL6xk9EZ6BqtvbuJJne2POhTJnmIBQZWha/qbok15Oow1WwBhjZpWEFkApNOhzxFkNH2AgZetk0XOvfZAr+AQZwYrRyxte37JYsmrW/MtOywqobq380= 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: ARCH_MMAP_RND_BITS_MAX is based on Sv39, which leaves a few potential bits of mmap randomness on the table if we end up enabling 4/5-level paging. Update mmap_rnd_bits_max to take the final address space size into account. This increases mmap_rnd_bits_max from 24 to 33 with Sv48/57. Signed-off-by: Sami Tolvanen Reviewed-by: Kees Cook --- arch/riscv/mm/init.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 0798bd861dcb..ff8d21a6cb2d 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -762,6 +762,11 @@ static int __init print_no5lvl(char *p) } early_param("no5lvl", print_no5lvl); +static void __init set_mmap_rnd_bits_max(void) +{ + mmap_rnd_bits_max = MMAP_VA_BITS - PAGE_SHIFT - 3; +} + /* * There is a simple way to determine if 4-level is supported by the * underlying hardware: establish 1:1 mapping in 4-level page table mode @@ -1071,6 +1076,7 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa) #if defined(CONFIG_64BIT) && !defined(CONFIG_XIP_KERNEL) set_satp_mode(dtb_pa); + set_mmap_rnd_bits_max(); #endif /*