From patchwork Mon Jan 23 13:46:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 47159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1618086wrn; Mon, 23 Jan 2023 05:49:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXtlAZScMT/Zmd5pYo5MpelTGi7uCEGSvGA7HayXQTb7BTkALqK1PDHET3dosB8nHWrDYisi X-Received: by 2002:a17:906:918:b0:877:7199:88df with SMTP id i24-20020a170906091800b00877719988dfmr16385671ejd.33.1674481766712; Mon, 23 Jan 2023 05:49:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674481766; cv=none; d=google.com; s=arc-20160816; b=kBtsZvc8Ijrvuj577qnDAc5ZYVsvAcHs/9hu2D4VED35z5qmEDFXouE+CKeUGVfAiB VU6sszlz060tK8xTrLfEcYiWK35G1foutmOwXrBegFKFS1YLF7Rd1i41xdnF88lwR3ve nYakUK8WaphEES48BhQAsFZ9RaPNSZShsxF0WEf74pScdp1oxtAfTfB9UIQtDwPhEwdZ +FPZvqQmnCF8Z8FxoovZfT05o2OmDqYIHZulUIRQIde57JfmPmuzqwSYdC4TPmh362hw vl4gsarczSUMWBGIAYPgoEPhtleFOFLW31oKJ7RlW1NhzknkclXr5Kjp0Wz8QIq7gZtr hp/g== 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; bh=TE9/JcNb2iulFWfIDzdiRr+9nen9Xt0XGhINGFEM7a0=; b=T7sq7pHWFoEz/38bFThv6xDDsb+cxW++LYl5K5WF1XogGg9nHJz0ZaKwiRbomY6lwv AQv+rsPaRkLXKtetEpGaJuUbQQC0sRQHYGGdpU2gNxTOfXcAPmVtkwU1BlXfMKQZjaGn N83guwbUBP4yOgLMUkDzv18h1BjR7LLtQ/BYMyNEHbLT6o3dmPO81T0SmaVg8Zfyugvm De3mpnvGtNzOn30NWaY/BXwVsBaTOpEMNZ2yDPdc5zxcUfhaaubNg6Y2pfrJIS4ST/YU cYVHUYstt3c094L+AgJUQXk0LmqbIhPpm3o5bGO0JoLsB4j2Jb8VWysAKp5lKUvI9h5t qpRg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id di8-20020a170906730800b0085b4d436b4dsi16262485ejc.987.2023.01.23.05.49.03; Mon, 23 Jan 2023 05:49:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231614AbjAWNqx (ORCPT + 99 others); Mon, 23 Jan 2023 08:46:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231938AbjAWNqh (ORCPT ); Mon, 23 Jan 2023 08:46:37 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D8A51265BA; Mon, 23 Jan 2023 05:46:27 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5BCE6165C; Mon, 23 Jan 2023 05:47:09 -0800 (PST) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C5A4D3F64C; Mon, 23 Jan 2023 05:46:25 -0800 (PST) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org Cc: catalin.marinas@arm.com, lenb@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, mark.rutland@arm.com, mhiramat@kernel.org, ndesaulniers@google.com, ojeda@kernel.org, peterz@infradead.org, rafael.j.wysocki@intel.com, revest@chromium.org, robert.moore@intel.com, rostedt@goodmis.org, will@kernel.org Subject: [PATCH v3 6/8] arm64: patching: Add aarch64_insn_write_literal_u64() Date: Mon, 23 Jan 2023 13:46:01 +0000 Message-Id: <20230123134603.1064407-7-mark.rutland@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123134603.1064407-1-mark.rutland@arm.com> References: <20230123134603.1064407-1-mark.rutland@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755821392888442666?= X-GMAIL-MSGID: =?utf-8?q?1755821392888442666?= In subsequent patches we'll need to atomically write to a naturally-aligned 64-bit literal embedded within the kernel text. Add a helper for this. For consistency with other text patching code we use copy_to_kernel_nofault(), which is atomic for naturally-aligned accesses up to 64-bits. Signed-off-by: Mark Rutland Cc: Catalin Marinas Cc: Florent Revest Cc: Masami Hiramatsu Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Will Deacon --- arch/arm64/include/asm/patching.h | 2 ++ arch/arm64/kernel/patching.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/arch/arm64/include/asm/patching.h b/arch/arm64/include/asm/patching.h index 6bf5adc56295..68908b82b168 100644 --- a/arch/arm64/include/asm/patching.h +++ b/arch/arm64/include/asm/patching.h @@ -7,6 +7,8 @@ int aarch64_insn_read(void *addr, u32 *insnp); int aarch64_insn_write(void *addr, u32 insn); +int aarch64_insn_write_literal_u64(void *addr, u64 val); + int aarch64_insn_patch_text_nosync(void *addr, u32 insn); int aarch64_insn_patch_text(void *addrs[], u32 insns[], int cnt); diff --git a/arch/arm64/kernel/patching.c b/arch/arm64/kernel/patching.c index 33e0fabc0b79..b4835f6d594b 100644 --- a/arch/arm64/kernel/patching.c +++ b/arch/arm64/kernel/patching.c @@ -88,6 +88,23 @@ int __kprobes aarch64_insn_write(void *addr, u32 insn) return __aarch64_insn_write(addr, cpu_to_le32(insn)); } +noinstr int aarch64_insn_write_literal_u64(void *addr, u64 val) +{ + u64 *waddr; + unsigned long flags; + int ret; + + raw_spin_lock_irqsave(&patch_lock, flags); + waddr = patch_map(addr, FIX_TEXT_POKE0); + + ret = copy_to_kernel_nofault(waddr, &val, sizeof(val)); + + patch_unmap(FIX_TEXT_POKE0); + raw_spin_unlock_irqrestore(&patch_lock, flags); + + return ret; +} + int __kprobes aarch64_insn_patch_text_nosync(void *addr, u32 insn) { u32 *tp = addr;