From patchwork Wed Dec 13 13:40:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 177988 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp7782003dys; Wed, 13 Dec 2023 05:41:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IGNcj5DyRIkTOQ5X4dd41BvEIlxzHLaLwMsZTU5AH7t4CgwV0zSJQfqD1wce+yLXbh6SBvP X-Received: by 2002:a05:6359:6318:b0:170:5e1f:f50d with SMTP id sf24-20020a056359631800b001705e1ff50dmr5811937rwb.58.1702474908633; Wed, 13 Dec 2023 05:41:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702474908; cv=none; d=google.com; s=arc-20160816; b=AwwSYGl9hP1PsftcC9B2VA57OEuPhePwlgGbXtR10zXmqpv0m1RnzMIApTtLzJ7Rfx c9rjz8SSa6UdQAfWaOFpxyVeTMWbpDwHg+jAR9OFz7P7Y7vsxbzHWhlwb582PamQArcY WEHeigVAoOqdxsvuxQSmKk/Det33YmzHcRlUxEapwdIiVtge4ZyfUuncgWsItV0x/n+p uBbifnHh4Anfcw4uCaTlJo/dyYNVFgznwiHt4UkKKicJplxe7hNXBqYX34F3/p5pFvXy JYN1+JJ4ikWnayQoFPulAsdbm7J1D0xNIsCfMe3HOcIvq8PqqMU7jKnhtsCnc1iQCgUi DdkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YQ49MRAnZaoKSqZNsnflibhrI2GDBa//jCKbcK+lB+o=; fh=RgqxsqY9ZqOlmURAWdfBjrEjJW7RWbnj6JWJVJqXgtM=; b=NDDsqmp62XxdmrGwaoCs+nAx/uauAxbbNn6ZF3Oi/Soko+eYR7QxpO0jxTQ9yttTsh u8sIz80fZGzgYOMBEysPXz/scqUx4uON7F02vOuptudtwBLGFGsq5W6qOjC5oZ56Qc8S K2SCVPRsQVYuBhFNSXps/ini1VU2G2b/EFLs87p1to5T0hQgFW2Bm/m8X5Uxli7IH4xF P5CKVRoq/J0xyCDlq5jIG/5Vo0Jx6flkyQKVComWuR2bgFvH3xSalmHP87oDlrcLXXJm ftOGzpc5tYLikddfYSWU8tymVszr8hxQ8jnA8n9ynqVCVYHtCA+9Qn9SNa2QCMnnRdZ2 YB0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=eZ6eGpEu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id j4-20020a654304000000b005c661efffd0si9357649pgq.754.2023.12.13.05.41.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 05:41:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=eZ6eGpEu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id EC7E5807E409; Wed, 13 Dec 2023 05:41:45 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233560AbjLMNlh (ORCPT + 99 others); Wed, 13 Dec 2023 08:41:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233511AbjLMNld (ORCPT ); Wed, 13 Dec 2023 08:41:33 -0500 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E88EF5 for ; Wed, 13 Dec 2023 05:41:39 -0800 (PST) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3363ebb277bso372257f8f.2 for ; Wed, 13 Dec 2023 05:41:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1702474898; x=1703079698; darn=vger.kernel.org; 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=YQ49MRAnZaoKSqZNsnflibhrI2GDBa//jCKbcK+lB+o=; b=eZ6eGpEurp11HPKzhLqCy/FIwIvrgmvRNkqTxnNllZt0+89VSoYQ9hmtkcJeH+eezp KkNopDSGu7/Olrr3OgKy5Ys1X1vCszIWDIYR8uF3X2SDuzU4y9dglBBF9RlopNAx/ZKB 3+y7MKVlCKSwPhXKWsuu0KzvwpKn32+/kQ5topk09kApy/Rp5fyrusJqUzysiY5o0tdl 0r47XK0NKRQDK7u4fWFBW2RH7OiCi1ZeFY7wjmBXuMYUqbMQhtS811WPvbgQU6U8Hvg0 swZzQq1D3dl9OM0cVgyHGGLgrbAOA8VGLlz46+9MoQMqCVsGkfDgHQFC//gzj9RdqD7H 5vpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702474898; x=1703079698; 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=YQ49MRAnZaoKSqZNsnflibhrI2GDBa//jCKbcK+lB+o=; b=vJnWroRjVkS+lyAnPPprFgEI+qZtTvPtWiTRVbsS2mgJlo5C2qThK9m6689kKRKFxM mwZ75c/himJ7kTte2QQQIDp11V97qkYnfuBMF3jIBZUpAUtycd8AVsXwdV1TEazqLIuk FMIUkgLBoADv6ylyyBLe1usMcpgYs+3mecjKSPmD/cKwnGPQ41tbTM2QmC2g6q8CrhU2 AoJABghQIvHHV/VRiEUpNusEBfliUOsRmENp8ia088/P3Wxyf5Ww/l1ulPg+gc2vdg0P sNsyqHi0GWI3ceC04f7q263BuiXbiNzQvFDawiMVzaEr270EctG/xFeJCYdex/Y0/Dnq zTCg== X-Gm-Message-State: AOJu0YxFlHXCNSn3g4Z3F7SGn8/PG51gIEd+wfG22QKfgK3NMMJQrEyY bHQUbnXtDBYQQqj5BHRUb6MICgEb/jUDuAfW10w= X-Received: by 2002:a7b:c4ca:0:b0:40c:386b:9356 with SMTP id g10-20020a7bc4ca000000b0040c386b9356mr3819421wmk.72.1702474897639; Wed, 13 Dec 2023 05:41:37 -0800 (PST) Received: from alex-rivos.ba.rivosinc.com (amontpellier-656-1-456-62.w92-145.abo.wanadoo.fr. [92.145.124.62]) by smtp.gmail.com with ESMTPSA id bd21-20020a05600c1f1500b0040c25abd724sm23043332wmb.9.2023.12.13.05.41.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 05:41:37 -0800 (PST) From: Alexandre Ghiti To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Vincent Chen , Zong Li , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Alexandre Ghiti Subject: [PATCH -fixes 1/2] riscv: Fix module_alloc() that did not reset the linear mapping permissions Date: Wed, 13 Dec 2023 14:40:26 +0100 Message-Id: <20231213134027.155327-2-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231213134027.155327-1-alexghiti@rivosinc.com> References: <20231213134027.155327-1-alexghiti@rivosinc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 13 Dec 2023 05:41:46 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785174329789818791 X-GMAIL-MSGID: 1785174329789818791 After unloading a module, we must reset the linear mapping permissions, see the example below: Before unloading a module: 0xffffaf809d65d000-0xffffaf809d6dc000 0x000000011d65d000 508K PTE . .. .. D A G . . W R V 0xffffaf809d6dc000-0xffffaf809d6dd000 0x000000011d6dc000 4K PTE . .. .. D A G . . . R V 0xffffaf809d6dd000-0xffffaf809d6e1000 0x000000011d6dd000 16K PTE . .. .. D A G . . W R V 0xffffaf809d6e1000-0xffffaf809d6e7000 0x000000011d6e1000 24K PTE . .. .. D A G . X . R V After unloading a module: 0xffffaf809d65d000-0xffffaf809d6e1000 0x000000011d65d000 528K PTE . .. .. D A G . . W R V 0xffffaf809d6e1000-0xffffaf809d6e7000 0x000000011d6e1000 24K PTE . .. .. D A G . X W R V The last mapping is not reset and we end up with WX mappings in the linear mapping. So add VM_FLUSH_RESET_PERMS to our module_alloc() definition. Fixes: 0cff8bff7af8 ("riscv: avoid the PIC offset of static percpu data in module beyond 2G limits") Signed-off-by: Alexandre Ghiti --- arch/riscv/kernel/module.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c index aac019ed63b1..862834bb1d64 100644 --- a/arch/riscv/kernel/module.c +++ b/arch/riscv/kernel/module.c @@ -894,7 +894,8 @@ void *module_alloc(unsigned long size) { return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, GFP_KERNEL, - PAGE_KERNEL, 0, NUMA_NO_NODE, + PAGE_KERNEL, VM_FLUSH_RESET_PERMS, + NUMA_NO_NODE, __builtin_return_address(0)); } #endif From patchwork Wed Dec 13 13:40:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 177989 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp7782523dys; Wed, 13 Dec 2023 05:42:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IHRjrcm0JZTZzl1008GQh6M+6TvBOrY1gvPfkK/DsJR84da/v62CGlzZHJJqpNIJElT+Ff6 X-Received: by 2002:a05:6a20:4306:b0:190:38cf:15b5 with SMTP id h6-20020a056a20430600b0019038cf15b5mr12030754pzk.20.1702474968626; Wed, 13 Dec 2023 05:42:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702474968; cv=none; d=google.com; s=arc-20160816; b=TkH+oXoGKMErDxjr6soCyMOUXAiKm6TITinlm4HCqESItq9d4a6E4kYqfQQWQMoXFq 8f2dEGuo3l5nrtm4k8SpCFCSbBHSRvB1wVlI/Ba0HQMuZMcockm/YRtR0a9efbI5nxTn mlvHE2jFgY46qFHJhuhfzWxjv+kb7JDn0qwMO5EkRRfzvtX2TqA2KTebqwws5IFT9V4u oeNyCkKrSE2tkTCvJO4M9aj53BSOG/BMlbOHXoyErqNo6irYTY2CCQFUO7Od0XputhmL /s4Lmctu8p1Z7aVaMJJHJCDEoqhkCLwXGYUHYEXVVt2337Pqw5PxSIobkvqPr0m7hcz/ MhDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gB+51HnZ1EhLqxZjb5NMil26fuA19Nyv7p+UCHztgCI=; fh=RgqxsqY9ZqOlmURAWdfBjrEjJW7RWbnj6JWJVJqXgtM=; b=Bjgbqbr6jEfsTF8eUz6FLIWmafga8kDEWoqmCqQNBa4VAGkv4DmxgSfThQ+YUvo/Ck yL+I2q66d8son3msEqTvq4+876zH2bB9vxQxxrkFnJUt97wymjzOOkwK+C0G2KVxMs6j E0BZJG0E20X8RQYD14sEJUDHLqdo/LD2vPaacK+7B+whQs5JTUYMEEjRZYw62dR9htiw vaX96Lnv0mt7Fo9Jic7/vvX2x5EWUa8BYrqyk/mrBfE3AsnD4fjuH+Tss4t9SAq31cop KxY713QO7A63JcKbfAGggE0wESXO9hVcGXca4nmNXOuVteaujlVWtclZSjrUG+f+0/QF 3lfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=XjtPyqXa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id z14-20020a63c04e000000b005c6b4e4abe2si9737811pgi.169.2023.12.13.05.42.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 05:42:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=XjtPyqXa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 9344E80C2472; Wed, 13 Dec 2023 05:42:47 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233511AbjLMNmi (ORCPT + 99 others); Wed, 13 Dec 2023 08:42:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233465AbjLMNmh (ORCPT ); Wed, 13 Dec 2023 08:42:37 -0500 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1901695 for ; Wed, 13 Dec 2023 05:42:44 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40c236624edso68565785e9.1 for ; Wed, 13 Dec 2023 05:42:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1702474962; x=1703079762; darn=vger.kernel.org; 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=gB+51HnZ1EhLqxZjb5NMil26fuA19Nyv7p+UCHztgCI=; b=XjtPyqXajYNJFRAYFLLQcIDg+K/zRzkddvXWVyWin6SoI1e6HSj5mfVYtiyhL3xiXb EC/eTzMe9ZsY2BHfkKGKX9URtdDJffx/jJjonm9hI4lAiDBKMKO3W+wOWvCks+SmmNHr ofJqcteN+B4r6su1mchbS4z6xzhltDtvtjxai5yYDWZ8Uk1cacjef58Ycyjha92p0OQ8 TeKQ+643v/H9iRc9JExiKIGHQwLzszqcAiHStR5jwtNI0vto19jghmLa5iXoeu69z+Qv 2w37LUQP8jxjN/4//Cflw3AdGRs6DiVE4aWTsjQbBKy9IaDbyuuyzo4EuuqjsHs5uco4 TXzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702474962; x=1703079762; 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=gB+51HnZ1EhLqxZjb5NMil26fuA19Nyv7p+UCHztgCI=; b=IAqw1Ua/Iwww+tVFTwZd5vru3eQ2+VCRahJNsQoUbIK7NuMjeAS3WpGbVvyn1ScNzu Wsl8mExfPRO4y9w2rQQJb21JsLZ7dagrzYgPwC/JmObJA23z5c7Usmjxn1hF+Bjts9FQ fZzMpPk2IGvNRyTOeuUMPwNpCM5ueWLV3fdx2Mqg2W6ZgoFnrOusmSa0suSSeOrAr1F/ 6BdkG6pJ4VHNEvmssCR+Vgh7YyRYmdZtsIznkAyUkRVM832d9e8oRj2s4gIV8lMKgnO0 5rKwd2W+htoH6nP/KutN/up9yVXYdMaKVygZWLJEqhdNlZYA7tEfUZVB9cZhCQKIHysE Yqyg== X-Gm-Message-State: AOJu0YwNzYYcrIayVwifTPtmBZImCLUm/wzl0Ccvq7LGlSG15b9PY2Cs Zsy0mJyHBeppy15uadJE0XyslQ== X-Received: by 2002:a05:600c:35d6:b0:40b:5e21:cc40 with SMTP id r22-20020a05600c35d600b0040b5e21cc40mr4337934wmq.107.1702474962563; Wed, 13 Dec 2023 05:42:42 -0800 (PST) Received: from alex-rivos.ba.rivosinc.com (amontpellier-656-1-456-62.w92-145.abo.wanadoo.fr. [92.145.124.62]) by smtp.gmail.com with ESMTPSA id t15-20020a05600c198f00b0040c4620b9fasm11988105wmq.11.2023.12.13.05.42.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 05:42:42 -0800 (PST) From: Alexandre Ghiti To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Vincent Chen , Zong Li , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Alexandre Ghiti Subject: [PATCH -fixes 2/2] riscv: Fix set_direct_map_default_noflush() to reset _PAGE_EXEC Date: Wed, 13 Dec 2023 14:40:27 +0100 Message-Id: <20231213134027.155327-3-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231213134027.155327-1-alexghiti@rivosinc.com> References: <20231213134027.155327-1-alexghiti@rivosinc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Dec 2023 05:42:47 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785174393060977110 X-GMAIL-MSGID: 1785174393060977110 When resetting the linear mapping permissions, we must make sure that we clear the X bit so that do not end up with WX mappings (since we set PAGE_KERNEL). Fixes: 395a21ff859c ("riscv: add ARCH_HAS_SET_DIRECT_MAP support") Signed-off-by: Alexandre Ghiti --- arch/riscv/mm/pageattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/mm/pageattr.c b/arch/riscv/mm/pageattr.c index 96cbda683936..01398fee5cf8 100644 --- a/arch/riscv/mm/pageattr.c +++ b/arch/riscv/mm/pageattr.c @@ -383,7 +383,7 @@ int set_direct_map_invalid_noflush(struct page *page) int set_direct_map_default_noflush(struct page *page) { return __set_memory((unsigned long)page_address(page), 1, - PAGE_KERNEL, __pgprot(0)); + PAGE_KERNEL, __pgprot(_PAGE_EXEC)); } #ifdef CONFIG_DEBUG_PAGEALLOC