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 81816D36108 for ; Tue, 5 Nov 2024 19:05:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 02A216B0099; Tue, 5 Nov 2024 14:05:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F1C5E6B009A; Tue, 5 Nov 2024 14:05:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DE4DB6B009B; Tue, 5 Nov 2024 14:05:26 -0500 (EST) 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 BFF846B0099 for ; Tue, 5 Nov 2024 14:05:26 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 7D2EA813FE for ; Tue, 5 Nov 2024 19:05:26 +0000 (UTC) X-FDA: 82752968172.07.CBAB76C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf07.hostedemail.com (Postfix) with ESMTP id 3D698400B8 for ; Tue, 5 Nov 2024 19:03:48 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ndFUDxiZ; spf=pass (imf07.hostedemail.com: domain of nathan@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=nathan@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730833292; 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=Xv5HZHkAeuUPzpx5exucBGSesbPuj/Cq+qgRbmyI9bs=; b=AjqTPtN3IBGE/mg0rMxxJo6ynY7Z7q9B8TJ/JO7NQn/dAmlj8Rz4hxXwPPfpdj1PqiaBFk JS8umb3nxodJ0O2Oh1C7pPW8ZCY/zOvtHc5fdw7tmO1y7XjOw7B3EtVJPz/nvxQxJ8k8Tq tkefRCkHZM+jDjixjFlesj3VVoDgRJ4= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ndFUDxiZ; spf=pass (imf07.hostedemail.com: domain of nathan@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=nathan@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730833292; a=rsa-sha256; cv=none; b=Kc5cgr+vajFPBtEh2tdMsTbeVvUv0AqmMcE2t3csk7LTVOwoO/pAbULHrxbqE6cnwJgCBF yV10R3/8uWyULnw3NLYkxk6PjbXcy3IwsToyWUmCkUSCNf7keTS6yvh9MSATXPbcsChD+f qtAOSFWphmeW9MP3/YCKALDvc+YBTu0= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 09E375C4357; Tue, 5 Nov 2024 19:03:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14183C4CECF; Tue, 5 Nov 2024 19:04:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730833472; bh=uoF4ZbISUkj3LBJVbm7mjK2pNt272UgYSEG9wAikNJE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ndFUDxiZpHd3P71EA4Dtdpamj3S+pD0a2NSCYEIkT703any4R0lrK0H/JhQd4Hv2S hAfH0p9N7ObDyDDis1fM3KZKbcT6xDBcyV1iwhCKpgr5eJTjsn996Jr680vAO44Otj drCVf6YoRKOceIQN9knu/aAssyHKuocecyBZr/vNKZiP9PdCl8g8D3PbpLRYGfT7S3 8Jxa1hlnrGJeQdCliPqKl36JEkEIgDaJdtPl3tXojvE85kFpWmMnDAcr4PjH7oX62l V8Za49Z9doiMVqhjlWd7GWzNdgnAXYy87njYhKhjV/rXdMfHzibVSbsFtDSY64+oSA zKXctAOfMY/4A== Date: Tue, 5 Nov 2024 12:04:27 -0700 From: Nathan Chancellor To: Mike Rapoport Cc: Andrew Morton , Luis Chamberlain , Andreas Larsson , Andy Lutomirski , Ard Biesheuvel , Arnd Bergmann , Borislav Petkov , Brian Cain , Catalin Marinas , Christoph Hellwig , Christophe Leroy , Dave Hansen , Dinh Nguyen , Geert Uytterhoeven , Guo Ren , Helge Deller , Huacai Chen , Ingo Molnar , Johannes Berg , John Paul Adrian Glaubitz , Kent Overstreet , "Liam R. Howlett" , Mark Rutland , Masami Hiramatsu , Matt Turner , Max Filippov , Michael Ellerman , Michal Simek , Oleg Nesterov , Palmer Dabbelt , Peter Zijlstra , Richard Weinberger , Russell King , Song Liu , Stafford Horne , Steven Rostedt , Suren Baghdasaryan , Thomas Bogendoerfer , Thomas Gleixner , Uladzislau Rezki , Vineet Gupta , Will Deacon , bpf@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-trace-kernel@vger.kernel.org, linux-um@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev, sparclinux@vger.kernel.org, x86@kernel.org Subject: Re: [PATCH v7 6/8] x86/module: prepare module loading for ROX allocations of text Message-ID: <20241105190427.GA2903209@thelio-3990X> References: <20241023162711.2579610-1-rppt@kernel.org> <20241023162711.2579610-7-rppt@kernel.org> <20241104232741.GA3843610@thelio-3990X> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 3D698400B8 X-Stat-Signature: 3dfok6kpmb9qugqmmmshmuqa8irggcfd X-Rspam-User: X-HE-Tag: 1730833428-914238 X-HE-Meta: U2FsdGVkX19c6XRkxE0rNL37tGCSPK9hJToIuxIRkFwuAyBwQjj85p8hhcqn4zhMDzMx5mSYLoGBF3OLSedaU9IK+GU6rFSnUQ+MHmElIsfC+fcsmCaq+KA7Hx9CgnMxAGCFNmB7SEJ8gVw7e8vtV055YMV+TtSbnDebNSld2Io6N9BxXy4FPGlGXGGqIsM6V5ULJ2fxcH8n/8D6yLkTif2xE2gKIDBSdnr/uNaM4uHYZQOCSV7b8VqvLyKX7sqMhLt43zPZ0fiStxIlFDMcG7ZhhQ3oxAGdGGjPT/G1eLewQBYo1Xpy4s89BpFLOas0DOpU9KS/IDsG870gUDiGpCX/+8m8zib6s6n7tJPoP0Rn7CmaSOAmoWJKLC7oUyJ/6Hh/ZFehp8bVrlossCvUqeUBT2z9ERXHnAa39L7LtcO3OHt+lrvgGBDX7JqaM/aEOKhH1PRiOsNp+0HacH3EAPpWAsSsxFBl5rfJU8ZmpZn4EK9fl2rgdBzNyRt9Ch7sCcy8qSTMmt+BaNEWfv7luAywu7nIV//CuKZzBCor2zlDkJbHyriJalxWMVw3KjFKlSS0l8JeK2tEwfsm7EiDFFAXVJ8oj5E9TsUGd5iof6octWu+vnpIphOuE82W2z0GWwYo5oeCEVovTqDZzwmYyII7PL++WLNDPs6UmC0snEc3Gpx7nlozWHru5rj1Kfikmwp+nTg4A7TRa96NjeZAY44IzXI6V7OPgvyzwuQH1ZRrBc5kcNSFwe/dfAeYKKLj5mEdnuQz40WMbyAPAhBGAjP6q+JV3KWmMj3Us1+HYfyinuTMpcOHPdUkcsEIxCNyqcSfHp1EhT8t1guKTQuV1opRGMb8gYFotT7P8me3y9Q1ezf5GkNLwyuDMaiVBqj9ab7mr46oTf09ot6YeTHEkb7KCLgmvt/n9Z22FkEkGNlIST5dG5c5Hn1h4xdIBuua8MRarMXhkJDCcUD7ycM 5Wj3rC/p NPnadjIMoBcjCSfvthd1z20xjvMZhYrVuc1R/X0IYd/NZumIqdkSCV4tQ+P1EMCYSsAmw5h1eHw8ys3vtbQzu2EW7A2UhhIjmmjdfQfFpdgZf87HY+ae+gMvDPMHVt27WoBa3HeiIp2RaWzwbKHycIVgWvKtZ9RDDqlUKUn8RQuVuJtlJN5Uzs0lv3GDnmq6yjDQGKs8l/xBMc1vle8XCrfNV6dlRZAONFk7LReJLQ547dK0RqYDe+/pDZBrbclQ5kigN4Q6EAEe5GIMoor7YduErCXEqCClUGc2Tlr/HU4dn4navKz+bbqD3QxeAznTMb+7k 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: List-Subscribe: List-Unsubscribe: On Tue, Nov 05, 2024 at 09:02:26AM +0200, Mike Rapoport wrote: > There's a silly mistake in cfi_rewrite_endbr() in that commit, the patch > below should fix it. Can you please test? Yup, that was it! All my machines boot with this diff applied on top of next-20241105, so with that fixed, I think we are all good here. Tested-by: Nathan Chancellor > diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c > index 3407efc26528..243843e44e89 100644 > --- a/arch/x86/kernel/alternative.c > +++ b/arch/x86/kernel/alternative.c > @@ -1241,7 +1241,7 @@ static void cfi_rewrite_endbr(s32 *start, s32 *end, struct module *mod) > void *addr = (void *)s + *s; > void *wr_addr = module_writable_address(mod, addr); > > - poison_endbr(addr+16, wr_addr, false); > + poison_endbr(addr + 16, wr_addr + 16, false); > } > } Cheers, Nathan