From patchwork Thu Aug 24 13:31:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 13364147 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B8A9CC27C40 for ; Thu, 24 Aug 2023 13:31:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xkqYZY+Hh69kZxbc/ZzgmG8PdfiZn08pOTYkhh9Scvw=; b=J0A1PBAjPz7Z9a N2cn146J8DNKgT/1/0u5U0Uu32ds0hPnLNDXoOemqBzf5X6OA3OlzNKOT/pEPHHeGM7W+wG4gcX5A /wEwS5XwmMlijMTco3XWo1NcAjMpTd9GBHqpuFpVac5cjb3pkmiMaJdqKXx5lL0UlBH5resZvPJCh EldLkFDKSNDCRBuFD2UB9ssQFlrKleNnbvgCG2N21s+VWNoe+PUJS7TilRJpeEdw/CYI86QHMvFMc FhF+8EuL4pdwnPKxWGw726gItuQApSvVcIevEyZkSzVE7U0XAyXglmUmHcI6BJuFNCU9HCsgHQjZE ZwNaj5Dg7gzD3/DQDmbA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qZARA-00393U-1Y; Thu, 24 Aug 2023 13:31:48 +0000 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qZAR7-00391a-2Z for linux-riscv@lists.infradead.org; Thu, 24 Aug 2023 13:31:47 +0000 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-31c5a2e8501so3467314f8f.0 for ; Thu, 24 Aug 2023 06:31:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692883901; x=1693488701; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lRbZ/8a2wFTgwFE+Czu2PpLLLzMWLxHTHSPnuA9Gm+o=; b=oYWYvKePLZGjS+ZoEl8nqGnfKWJ/5ZYZqjbab0+kcN0rDQKfC+uPSsnIgWkMRmchaP kmB/bloU4msL5s6GFjkSzVQf8js0C978vVWo4JbuGczsYJ/hiJcB914hx8ipwG2pLE4r 5xV7/f4Hn73bYoAhdKka0EWmDvBuFjYAdFIL+QTaLTz04odlXiv4A1ZxyzykLLfmtDYe ZKWDxm+ZsoNc7WWZC2lUfFzhqCg8jcrKz+Y3S42S1EZz3NHqw0cr+G45BZdYegXPzh12 3c6OYT7W+bmFMjwwWfodGWLxbHSaXz5xU5SccK3v8bNMhYtWEHJSa0F0Rpaz0D6PcFD3 HFig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692883901; x=1693488701; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lRbZ/8a2wFTgwFE+Czu2PpLLLzMWLxHTHSPnuA9Gm+o=; b=fSOR7cSSLGJU4gX1AGIVDcu7fd+YiLvnjcpMO6RggS9KuCmOgRVt7v2RDsy9sSZw9Z FGdagkrvHQHQneZtaOEGXQ3GmKEUUMAokZufB+Oio/WTLUtkVPjZOj1OFFrf/efWYkRz 7oHcY2jSRqmRcc7jVEBRRtAsmsKm8812YCOD7mErASRY48hcAiBw2dSoFSV9fuMDM71b UgkAMC2GXvskboeFWEm/SKWY72+yJRHfsZGkS/gGkmvxDhqjDUhUxq6G7rXHBFt+9MLt BRu1Nl5LS/voGNCDoETI6guB1RiIqeprPa1Yq5sq13iJ+78nZRD3u1H7IL8VU7SyB/+u 1dwQ== X-Gm-Message-State: AOJu0YyQK3NoTfDSSvEGzcdXlNOMYJciubzsuJwGOiGwKveyIub6eeWE lKJGSLLsXMEcNwM9lSnuXx8= X-Google-Smtp-Source: AGHT+IHSeNPDuiAo4mvJL6SeFZqm5Y/OINirWF+gSjBoFG2Ur8fcxnPmq3uvy/x+VkYH3pkNmTQiNA== X-Received: by 2002:a5d:6084:0:b0:31a:d9bc:47a2 with SMTP id w4-20020a5d6084000000b0031ad9bc47a2mr13370813wrt.53.1692883901036; Thu, 24 Aug 2023 06:31:41 -0700 (PDT) Received: from ip-172-31-30-46.eu-west-1.compute.internal (ec2-54-170-241-106.eu-west-1.compute.amazonaws.com. [54.170.241.106]) by smtp.gmail.com with ESMTPSA id h11-20020a5d548b000000b00317e77106dbsm22396112wrv.48.2023.08.24.06.31.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 06:31:39 -0700 (PDT) From: Puranjay Mohan To: paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, pulehui@huawei.com, conor.dooley@microchip.com, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, song@kernel.org, yhs@fb.com, kpsingh@kernel.org, bjorn@kernel.org, bpf@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: puranjay12@gmail.com Subject: [PATCH bpf-next v2 2/3] riscv: implement a memset like function for text Date: Thu, 24 Aug 2023 13:31:34 +0000 Message-Id: <20230824133135.1176709-3-puranjay12@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230824133135.1176709-1-puranjay12@gmail.com> References: <20230824133135.1176709-1-puranjay12@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230824_063145_845880_F51B6DA8 X-CRM114-Status: GOOD ( 14.35 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The BPF JIT needs to write invalid instructions to RX regions of memory to invalidate removed BPF programs. This needs a function like memset() that can work with RX memory. Implement patch_text_set_nosync() which is similar to text_poke_set() of x86. Signed-off-by: Puranjay Mohan --- arch/riscv/include/asm/patch.h | 1 + arch/riscv/kernel/patch.c | 74 ++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/arch/riscv/include/asm/patch.h b/arch/riscv/include/asm/patch.h index 63c98833d510..aa5c1830ea43 100644 --- a/arch/riscv/include/asm/patch.h +++ b/arch/riscv/include/asm/patch.h @@ -7,6 +7,7 @@ #define _ASM_RISCV_PATCH_H int patch_text_nosync(void *addr, const void *insns, size_t len); +int patch_text_set_nosync(void *addr, const int c, size_t len); int patch_text(void *addr, u32 *insns, int ninsns); extern int riscv_patch_in_stop_machine; diff --git a/arch/riscv/kernel/patch.c b/arch/riscv/kernel/patch.c index 465b2eebbc37..24d49999ac1a 100644 --- a/arch/riscv/kernel/patch.c +++ b/arch/riscv/kernel/patch.c @@ -13,6 +13,7 @@ #include #include #include +#include struct patch_insn { void *addr; @@ -53,6 +54,34 @@ static void patch_unmap(int fixmap) } NOKPROBE_SYMBOL(patch_unmap); +static int __patch_insn_set(void *addr, const int c, size_t len) +{ + void *waddr = addr; + bool across_pages = (((uintptr_t) addr & ~PAGE_MASK) + len) > PAGE_SIZE; + int ret; + + /* + * Only two pages can be mapped at a time for writing. + */ + if (len > 2 * PAGE_SIZE) + return -EINVAL; + + if (across_pages) + patch_map(addr + PAGE_SIZE, FIX_TEXT_POKE1); + + waddr = patch_map(addr, FIX_TEXT_POKE0); + + memset(waddr, c, len); + + patch_unmap(FIX_TEXT_POKE0); + + if (across_pages) + patch_unmap(FIX_TEXT_POKE1); + + return 0; +} +NOKPROBE_SYMBOL(__patch_insn_set); + static int __patch_insn_write(void *addr, const void *insn, size_t len) { void *waddr = addr; @@ -95,6 +124,14 @@ static int __patch_insn_write(void *addr, const void *insn, size_t len) } NOKPROBE_SYMBOL(__patch_insn_write); #else +static int __patch_insn_set (void *addr, const int c, size_t len) +{ + memset(addr, c, len); + + return 0; +} +NOKPROBE_SYMBOL(__patch_insn_set); + static int __patch_insn_write(void *addr, const void *insn, size_t len) { return copy_to_kernel_nofault(addr, insn, len); @@ -102,6 +139,43 @@ static int __patch_insn_write(void *addr, const void *insn, size_t len) NOKPROBE_SYMBOL(__patch_insn_write); #endif /* CONFIG_MMU */ +static int patch_insn_set(void *addr, const int c, size_t len) +{ + size_t patched = 0; + size_t size; + int ret = 0; + + /* + * __patch_insn_set() can only work on 2 pages at a time so call it in a + * loop with len <= 2 * PAGE_SIZE. + */ + while (patched < len && !ret) { + size = min_t(size_t, + PAGE_SIZE * 2 - offset_in_page(addr + patched), + len - patched); + ret = __patch_insn_set(addr + patched, c, size); + + patched += size; + } + + return ret; +} +NOKPROBE_SYMBOL(patch_insn_set); + +int patch_text_set_nosync(void *addr, const int c, size_t len) +{ + u32 *tp = addr; + int ret; + + ret = patch_insn_set(tp, c, len); + + if (!ret) + flush_icache_range((uintptr_t) tp, (uintptr_t) tp + len); + + return ret; +} +NOKPROBE_SYMBOL(patch_text_set_nosync); + static int patch_insn_write(void *addr, const void *insn, size_t len) { size_t patched = 0;