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 43998C4345F for ; Mon, 15 Apr 2024 17:05:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D764F6B00A4; Mon, 15 Apr 2024 13:05:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D27FC6B00A5; Mon, 15 Apr 2024 13:05:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BEF406B00A6; Mon, 15 Apr 2024 13:05:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 9E5BC6B00A4 for ; Mon, 15 Apr 2024 13:05:29 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 5FB7B1606EF for ; Mon, 15 Apr 2024 17:05:29 +0000 (UTC) X-FDA: 82012392378.13.5BBBA93 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf15.hostedemail.com (Postfix) with ESMTP id A3933A002F for ; Mon, 15 Apr 2024 17:05:27 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=eA4Y4x6L; spf=pass (imf15.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713200727; 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=jMkJQsuyofl49eBsJIbfYXPbxVppRwI7ZtbFCbtgk4k=; b=6Ki8MEhXsk6nBGcCYi3jSDyswjqiQ1amVIA+Q7UOL0PRksIL2jiCWG3lfGb3xiGi9SKSNj rgZKCHzak6K6eHI5oip8ZcVZVY1Rt88lddVOPJ5JF+5wT8Mkib4nd7ZPApSa/e6RxBSsXK 0SAhW0sJ743CUIZH0Qk6us4jzRaC7nk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713200727; a=rsa-sha256; cv=none; b=qBw8AfZXQPJzQmoYgxq+H1gVMMiYf5JE+X+jx7NiatEesGmAuzESk2HIdshDJPNqBiJ+Sd ld4tuAey68CXKae8zvGo346Zdp1um5k74BhVBvuRFkdEBDophD0fkz43DmzKE3aWXTkV4i yBDGvjLT3ULflbK62cQGWC/Br8y4BKg= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=eA4Y4x6L; spf=pass (imf15.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id BB0A760ECF; Mon, 15 Apr 2024 17:05:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A9EB7C2BD10; Mon, 15 Apr 2024 17:05:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713200726; bh=brTfnO2VyUJAmFmt0xYsxELn1GfIqBydjJY5MAA2GwI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=eA4Y4x6LpKDmJlhsFuCKUKDWszVPc0aMol9ibBC4zWuhXiukyHzmx+wctUQDy9YcO SgrxzhBVYrKzoib5nD4pxj58Yru3AKozTZkN+TvcG/88RKgokKwWdJ7ot3KrqKc7Eq DUMXngRm3Kt+F/W7nD5rsdsyrXI/SKwSE27eJw0RyuFsxXe2CY8Th13OWBhzodIeFI g3IfMeClHVfNPTzOpcIibEz/rTBRU3MdIzMovL+lADX98nFVYDJgBcU0E0gUS/Sp3y NkyrAJJ3bphAZ5D3Vr/0URqS2QdYx5P8qEukDaFoUJqWeYw/1mketQaU4aGKwRL5Ma kNnuFlXqLWYaw== Date: Mon, 15 Apr 2024 20:04:13 +0300 From: Mike Rapoport To: Peter Zijlstra Cc: linux-kernel@vger.kernel.org, Andrew Morton , Andy Lutomirski , Arnd Bergmann , Catalin Marinas , Christoph Hellwig , Helge Deller , Lorenzo Stoakes , Luis Chamberlain , Mark Rutland , Masami Hiramatsu , Mathieu Desnoyers , Michael Ellerman , Palmer Dabbelt , Russell King , Song Liu , Steven Rostedt , Thomas Gleixner , Uladzislau Rezki , Will Deacon , bpf@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-trace-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, x86@kernel.org Subject: Re: [RFC PATCH 5/7] x86/module: perpare module loading for ROX allocations of text Message-ID: References: <20240411160526.2093408-1-rppt@kernel.org> <20240411160526.2093408-6-rppt@kernel.org> <20240415104316.GI40213@noisy.programming.kicks-ass.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240415104316.GI40213@noisy.programming.kicks-ass.net> X-Rspamd-Queue-Id: A3933A002F X-Rspam-User: X-Stat-Signature: kjsgojbj34posi3pgojwgtrr9ugftosu X-Rspamd-Server: rspam03 X-HE-Tag: 1713200727-463866 X-HE-Meta: U2FsdGVkX1+oo/IpfPBTKQIEp5ZUOtxGwmUrOCk48DQn/z2a0oX6RAgZ5KYHNHUXYo7CzF/b9JMSGO9pKk3DCUd50XCyeiPTmJn6KRVbe4+ZLa5CtFdh76J3QDFK8E6laXmYW83+wyyd/UqZOiSsn7M9P7r+QIAKseF7VzMOuOu3usOq6ePt/iQggnTYjBuwB7i/qsfhgjGPzOj1o/Ga7Xu3gdZ9vxt/ytEt2TsWG/hYuOqo+1LyNYihufbXyUwGa0Og/BotkLa8Xg8CaXARPzgQI3MxCgao8yLqogzxdwnA+NoCOEZBMKfStmjH46c5ZJ4I82BESwTYp8pwo7I15CZlbNjG8KhQgaZZmq04+eM4lnK0R+UqMMO+StsveUXerwMs6QdSluhzkVrci6XTUXSg3zUev5OADai4HJXY0C4eo69M0MbNdPqHS4FHY5Y6OqsFtZAmSq8R6qeWit6GfDy2UkQU/Ctw/eVbd6pFcRnEhewDvulVRIdqdOXlkpF8lbGEZoHJ7/ZSmmtQUYfAdFfeDFj14wHDlUy5AGIq78Y4jgPzhUE0RwLkL4g7Mu5Ftj2j7fMDlXz9qme2OOJgk9NU6hyMfA1hmWk4VcXHzZTEPraOvHD9eX28fBt27u/4rTAfttky8hZYUET6cAQ7iPUCLzZG0b2CNiv+biZD84cy0URetxuGU67wqhl+IlDjXU/dUtNfuzqaV//7QBO9ixIPuC02AlYUu6YWTAMKROScvBubB7nchyJrNewIJE17p+npIHPmQE5AubU33RkhbKIApaGXkg3rDHWg8697rziqBP9AXfBHR6MidrVOZakq03SbW2AoIhWCa6G/HoxZ/zvDIHhWdXQqjuEpqusDTOdaeVmDnwHPP+74EEx0ha3Z0hix8ciH4U5Mq1r/8g2lymQuGZwNeP/vsxnob8FF3ki0nOqfKTwdlBmGeZBWMDytO+crO5A5eodX82/SpTY vFetzlqj V27b3PaICiO+cTQO3QktDuF8zhAIbtS/A0zDDZlDLN2j4bsQjzLnBqbdMXgHrwLfbbFimB7SZ2ZMy9kyms7sI7GS8u1g6AyWOLHxAZ/Eci68nYoGg6SvFPI/Gh+LpJAtRcEAOQKgHBP2Lf8A6gx2tb7s2vxTKfUZWQnW2SyIAMDBb4eXuXud9UbF2XfpbmA0cA04S 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 Mon, Apr 15, 2024 at 12:43:16PM +0200, Peter Zijlstra wrote: > On Thu, Apr 11, 2024 at 07:05:24PM +0300, Mike Rapoport wrote: > > diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c > > index 45a280f2161c..b4d6868df573 100644 > > --- a/arch/x86/kernel/alternative.c > > +++ b/arch/x86/kernel/alternative.c > > > @@ -504,17 +513,17 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start, > > * patch if feature is *NOT* present. > > */ > > if (!boot_cpu_has(a->cpuid) == !(a->flags & ALT_FLAG_NOT)) { > > - optimize_nops_inplace(instr, a->instrlen); > > + optimize_nops_inplace(wr_instr, a->instrlen); > > continue; > > } > > > > - DPRINTK(ALT, "feat: %d*32+%d, old: (%pS (%px) len: %d), repl: (%px, len: %d) flags: 0x%x", > > + DPRINTK(ALT, "feat: %d*32+%d, old: (%px (%px) len: %d), repl: (%px (%px), len: %d) flags: 0x%x", > > a->cpuid >> 5, > > a->cpuid & 0x1f, > > - instr, instr, a->instrlen, > > - replacement, a->replacementlen, a->flags); > > + instr, wr_instr, a->instrlen, > > + replacement, wr_replacement, a->replacementlen, a->flags); > > I think this, and I've found printing both address handy when I debugged it, but no strong feelings here. > > > > - memcpy(insn_buff, replacement, a->replacementlen); > > + memcpy(insn_buff, wr_replacement, a->replacementlen); > > insn_buff_sz = a->replacementlen; > > > > if (a->flags & ALT_FLAG_DIRECT_CALL) { > > @@ -528,11 +537,11 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start, > > > > apply_relocation(insn_buff, a->instrlen, instr, replacement, a->replacementlen); > > > > - DUMP_BYTES(ALT, instr, a->instrlen, "%px: old_insn: ", instr); > > + DUMP_BYTES(ALT, wr_instr, a->instrlen, "%px: old_insn: ", instr); > > this, want to remain as is. here wr_instr is the buffer to dump: DUMP_BYTES(type, buf, len, fmt, args...) rather than an address, which remained 'instr'. > > DUMP_BYTES(ALT, replacement, a->replacementlen, "%px: rpl_insn: ", replacement); > > DUMP_BYTES(ALT, insn_buff, insn_buff_sz, "%px: final_insn: ", instr); > > > > - text_poke_early(instr, insn_buff, insn_buff_sz); > > + text_poke_early(wr_instr, insn_buff, insn_buff_sz); > > } > > > > kasan_enable_current(); > > The rationale being that we then print an address that can be correlated > to the kernel image (provided one either kills kaslr or adjusts for it). -- Sincerely yours, Mike.