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 3BE0DC4345F for ; Mon, 15 Apr 2024 10:43:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7A3736B0083; Mon, 15 Apr 2024 06:43:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 752746B0087; Mon, 15 Apr 2024 06:43:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 619A86B0088; Mon, 15 Apr 2024 06:43:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4162E6B0083 for ; Mon, 15 Apr 2024 06:43:39 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E8263140559 for ; Mon, 15 Apr 2024 10:43:38 +0000 (UTC) X-FDA: 82011430116.10.ACC13A6 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf25.hostedemail.com (Postfix) with ESMTP id 97997A0010 for ; Mon, 15 Apr 2024 10:43:36 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=GwGuQ4aH; spf=none (imf25.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=peterz@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713177817; 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=sHN9K6TMgi0EQGirMl9LJrLTL74puiAUj6pDWO1mbbg=; b=KFhAvPId1eb81bSiGCGrx1BmQlRyTjBSkJhHw1AIrZd9BraTrDgNXsbRbKyLNL8PkYn6tR 2V6XvcBgV4+ZRRuDtvdwXKQPxGrFOVt2Qg7UqURqmxS/DvWo37eit2qdVsyK7+eXvSLu7k jW0kK6C4DlLsRFnt1ZQsrmLD7XTtDNI= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=GwGuQ4aH; spf=none (imf25.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=peterz@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713177817; a=rsa-sha256; cv=none; b=mAcNzBAW79ASScMBLQDZLfj/01d7IJ8yUCd9aABkSztmRd4QGXdnV91F0SPN9udoQ9/teA WRjVALUmNx1N7ePa4TieUwuyoV7PEX0fACazZlyxEVfUvotLZ/ulu4JqSzi920W4GGLr9H xFOEJ9HNGM4ot0cO6NCTpDp1Wrv8iLo= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=sHN9K6TMgi0EQGirMl9LJrLTL74puiAUj6pDWO1mbbg=; b=GwGuQ4aHjE28h3DMQEljrl12S9 k7qbRgAehAWmB1KZsKYRkIe5T4YmQ/IK7K1/tscLIiWM+Frzf3BTbHghy00qu8vsdYndUrZk657/5 7U6MObgQX8Hy2DTMmRYPlPtuplIcSQak3GNH/5HdZ6q2oAguSRJjpD+LaJ9a87To/HWlTYLJ9YvvV DlPdjGnZeeuN/uKeKILlCHLcOLy+D7L1I3Tkf+oPOF+MhpDr74c6GfylqnVH3luQcSx0xGQC7Rr+F /Pi5v1/cfv4gkg/y9fqk5azH4jFf+jsMj8+XJZsS62wcfAHMmEcUQTu5cq8eADVZRA0kd303q26id Ns2I29PA==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rwJnx-0000000FWHZ-0CDf; Mon, 15 Apr 2024 10:43:22 +0000 Received: by noisy.programming.kicks-ass.net (Postfix, from userid 1000) id ACBA530040C; Mon, 15 Apr 2024 12:43:16 +0200 (CEST) Date: Mon, 15 Apr 2024 12:43:16 +0200 From: Peter Zijlstra To: Mike Rapoport 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: <20240415104316.GI40213@noisy.programming.kicks-ass.net> References: <20240411160526.2093408-1-rppt@kernel.org> <20240411160526.2093408-6-rppt@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240411160526.2093408-6-rppt@kernel.org> X-Rspamd-Queue-Id: 97997A0010 X-Rspam-User: X-Stat-Signature: cniay4zui6wo9mdp5fmqf9ctsdb9hcye X-Rspamd-Server: rspam01 X-HE-Tag: 1713177816-834717 X-HE-Meta: U2FsdGVkX1/Paeg/2OEoq0K8Fr3hCZjTaT0r33gPzh9lI+khPM+hl4YVgeRFNrwKYtU58edVunIC9N7G6tig2LeqTkr4cFHLU30HBNMqWnAW62LO034vy61px7rMTL7sTAmKUCBqKxW9IvF6GleScyAmUhq1cUZoMW2u1yYE7uF8ttrs+asc8/QfxupU4gx+O7kPsk9qVLF/NxTEUdw6BD35W/uqjrac2qYujijOq3sMRi3PuTnoQCuaEmq6ex3sxN7uRB3QhkT6g60u0A6eHSx94F4Ot9RIRvvFtvAppQdl50dUKXsD8RkHtGOZzcT5VC2j9RlODTH+MOnPaRWqFOXTUh84sou8vog0Fq44X6FY5yVHXuQFYIJr7V0Hwj8B6AyMO5dqCV+iXN102HlWvLq+vKLO4O9ejpdXyzGgO+6husOemVVGxnit/rkAXoxWfQl5VC8I1Ii0sATsePs27LD8Dvs0YXDVwOtNLJtfDwFZi80G05AVh0uKwz7SDCGax4foscml/uUW+J1orSZ6v96HnchqF7kDTo1G4iSQq+ml4eGskR7D5t6fIvpVgAOIy2vMQBGjJjpXnvkyoKyBd/O8UJFoq5NX0goD6X3N+h5/J5ryZfAM4RBhSWBGiMy5hiVqM19UkjCEGpnQ9sRpqdcm5rpmK6Hzacc/EOLdzm1FLNs8Qpvz5sqgaN7KoBCn/GzXsSg5KV1qu2WprMEuY3KZK3hgkQvDXoiBMxUtgJxCNymxj+A8l+wk8dIjSPGAxASZwBuQOQ4qZECCgwEQpOCH62cXpnDHyqbAJisYg4GuZ+ZkgFx85rMi6405Wu0brVbVTH3SUeh4gdT9PQ2VNU8Yc93cFAE6qVT0GbJYQ98yfiACnLK0OlzpSRnkiRWypDz3Mxxznz0fzqyqOGKIq4Y9tNy9it4EGxGr9UiNPaDwGHihI7VXg6yr1KphLvl3mS4DIzgQrM5nDF4KQAi NR6uz7/n t62T/5NPEtAbrh2ftjOQlqwGNrqZdKtvhHQZKcJaI+HlPbxZq1fuGQys3nuplPv08Nfgy49X0hDTy6ZQal3thOsHRR9psLk1GkyuMhHoiLlpuKtdj54UDj09F29ePv32eNJh1ximhq5fp7DY= 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 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 > > - 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. > 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).