Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: pkohFmPOH8jGFaBnuRtQYOJAwT1yZYdHKnAaaf0cEcFLYjQjzgyAZyskDow1GTfsrbzzLQj4lk
 xd5kGfJwmn29OjCQ7C+Oz911tdBEZTDrf+BfsfWpe2dj5zjqa2HZIAae2dKNpUxxzvYEtzv1/I
 qSX2+qizv5uE3lwCQ1E4O/R2sssHmNSrnteMw4nfFNGt8bOL2m5ohE8KJl3l50kxxWJUgNpEfC
 hFMlu75k6ReSITlPplPq/1/Abyqmv6b3FVBR1TsTrFsf0lg5etTRcPVdDP9eG0j63duHfkU7N6
 67k=
From:   Anup Patel <anup.patel@wdc.com>
To:     Palmer Dabbelt <palmer@dabbelt.com>,
        Paul Walmsley <paul.walmsley@sifive.com>,
        Albert Ou <aou@eecs.berkeley.edu>
Cc:     Atish Patra <atish.patra@wdc.com>,
        Alistair Francis <Alistair.Francis@wdc.com>,
        Anup Patel <anup@brainfault.org>,
        linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org,
        Anup Patel <anup.patel@wdc.com>, stable@vger.kernel.org
Subject: [PATCH] RISC-V: Don't mark init section as non-executable
Date:   Sun, 31 May 2020 15:27:48 +0530
Message-Id: <20200531095748.753388-1-anup.patel@wdc.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from wdc.com (106.51.23.166) by MA1PR01CA0165.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:71::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.19 via Frontend Transport; Sun, 31 May 2020 09:58:19 +0000
X-Mailer: git-send-email 2.25.1
X-Originating-IP: [106.51.23.166]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 9ff3046d-b957-4e24-0645-08d80549273b
X-MS-TrafficTypeDiagnostic: DM6PR04MB6428:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <DM6PR04MB6428E31490D026936C2D96D68D8D0@DM6PR04MB6428.namprd04.prod.outlook.com>
WDCIPOUTBOUND: EOP-TRUE
X-MS-Oob-TLC-OOBClassifiers: OLM:2958;
X-Forefront-PRVS: 0420213CCD
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 7qHAwdE3hfGGzB/8keXLCdMwR0805uvXzU4kicJe6WYBzYadwPf8lX3r8OuXtlYW/bCZelNE2xuSADMl+vru9bHmFFIBthghNww74CVF0XicocT2i6RJVquSkxNC5nfLXv8tF+YmWSdASqlvHeIspKPn9LgJmNT27GUBWecAH/mMBxdyndViv09ibLahoJpXeVh5Xk/JtV3Hlsck2V1s+ofDcqCUH2V1QeD3i+d1B+6UhYCJfojpaOrNcq2d0sge0rMKpVSjISBsTFqRXiOLvjTm8WLpjkHIc1tt7y9iIUEK5TSQjiIlAN57DBi/f05NeEnkxhOGJydjMski3Zw7qA==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR04MB6201.namprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(396003)(136003)(346002)(366004)(39860400002)(376002)(54906003)(316002)(110136005)(66556008)(66946007)(66476007)(4326008)(478600001)(16526019)(186003)(55236004)(26005)(8676002)(55016002)(7696005)(8936002)(52116002)(1076003)(83380400001)(6666004)(2616005)(956004)(5660300002)(44832011)(86362001)(2906002)(36756003)(8886007)(1006002);DIR:OUT;SFP:1102;
X-MS-Exchange-AntiSpam-MessageData: q/feNfY+y1coQjy3ZtgYACeJbd/G3fCaF7qH3u1S5hn++w6buJ0q6svTnYxXhaYchbGUtOu5+KhiMS0KdnKqAfyDXlvhp0tuUuUDNfZx2HUa0+iHXNH21jnJlEZ4ySZPLqyodS6I+WoJyoSmYQNqhf+wAr4Nk444ZECqO3n7sW7S89n1xfg+6CCc9Hg50o7uwkmDqTUjy29rk54/Y5JzCJUP+csVCcEb23y9kDM07VOhwmBYtR/b5Yu0U/oS+ZRk0Pgw6PTB4+x2J4vSb4yQ8AklNcsM9Qz1oPdF1p+60ij40tDfDwCOLj4zQNXwzWpMN6mNQYqSnL3pl5zT4wlvfAX1VQhCc5Z63KGJaupjwZwQPibjSmPRXWsYTOqZ0tyXTR7wR/l3/wVahlF4zCoZInauaOtNtoyJ3G3ShLjnuQGe7f+MKLkL6WoVQVKVDfSrdfm/5Sxg2yUaocikMBGscaSmAIABhafszf7BnCkDjug=
X-OriginatorOrg: wdc.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9ff3046d-b957-4e24-0645-08d80549273b
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2020 09:58:22.6103
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Cvi0R49p4GwC6QTtzZM+PildpKgxdvNtdg4MErxcymnhUrfb70MCIiU8Zaxrb/BhkRq18OGnBmxp9JM7HbwJkw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6428
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The head text section (i.e. _start, secondary_start_sbi, etc) and the
init section fall under same page table level-1 mapping.

Currently, the runtime CPU hotplug is broken because we are marking
init section as non-executable which in-turn marks head text section
as non-executable.

Further investigating other architectures, it seems marking the init
section as non-executable is redundant because the init section pages
are anyway poisoned and freed.

To fix broken runtime CPU hotplug, we simply remove the code marking
the init section as non-executable.

Fixes: d27c3c90817e ("riscv: add STRICT_KERNEL_RWX support")
Cc: stable@vger.kernel.org
Signed-off-by: Anup Patel <anup.patel@wdc.com>
---
 arch/riscv/mm/init.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 736de6c8739f..e0f8ccab8a41 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -482,11 +482,6 @@ static void __init setup_vm_final(void)
 
 void free_initmem(void)
 {
-	unsigned long init_begin = (unsigned long)__init_begin;
-	unsigned long init_end = (unsigned long)__init_end;
-
-	/* Make the region as non-execuatble. */
-	set_memory_nx(init_begin, (init_end - init_begin) >> PAGE_SHIFT);
 	free_initmem_default(POISON_FREE_INITMEM);
 }
 
-- 
2.25.1