From patchwork Thu Apr 4 11:42:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 13617611 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 95E64CD1296 for ; Thu, 4 Apr 2024 11:42:55 +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=n0H1YMpvfgz8mcZwaDF3k9wWu2nNHMaY+wgxC/ENBdg=; b=ej4wIebd9vNOnO h91FykxGDq9y1eLLM7XlRXhzbJamRkD0QxMIi2So/INf15RUUH0eutin/utLW/i6dx8nZNnFl4DLd 8AvLYzDyNol0+jEx/Ao9wULpcYkGI2D6a/+a0iMyRZbdWeTez2ihezvEXBgLuq5qJTp3mlI3S77ZG sApOuPPCJwkhzS9uccBbnxyIT4z+trKuhj4/Iy7KRtGma5PoQ/ch9+6wKFxM3rPokn7OoVckCUIA8 wPYkiMVy56zrQ+4M1uCxe8EOC96KX9KJNSlSfrZhITT8xKQs+j4OmcC0h59GzR+TS7Rm47DtUnC5W EA60FK/MDubfa+/F+1FA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsLUZ-00000002PF7-0YAo; Thu, 04 Apr 2024 11:42:51 +0000 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsLUW-00000002PCt-0QjZ for linux-riscv@lists.infradead.org; Thu, 04 Apr 2024 11:42:49 +0000 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4162ad25c23so3116215e9.2 for ; Thu, 04 Apr 2024 04:42:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712230965; x=1712835765; darn=lists.infradead.org; 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=OBpxRZ3MJIcd7NAv7MGq7cr29bRjoQSHr/33JsmvHrE=; b=gn/T8myNUF1JSyGq4Nla1jursbElfyuK+oGqPlHNLwsrzhhywDxqLhEGAvNl6esrZj dLjNRCBaJUBb216Wzlh5STCb8AO3xgPHyJrWlf1RyqtWHiK01iWX5ikfq0PbMrZWk3gG 6rhcr7WhwPIjycictD+p6QrQaBxp+30BGYx5kCPUOJs4z/2cyAZno1LmRxvCpntp6wvf 5Pqhr99O7vvcJEPW+PH4lJC9TE4DPnvzhTnRfhUhBpqjHj0daPwMjQO6P2fTN4WLpEB1 61q466FzpYA/uHjAbr5aUinVqQR1aQ1/fYXHsGNXeITQsYVdt5Q5q9iyoutzRpEjzdlt d0yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712230965; x=1712835765; 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=OBpxRZ3MJIcd7NAv7MGq7cr29bRjoQSHr/33JsmvHrE=; b=OlHKLSGKCgwMfL1BaQH9GWDgbXqyhIlQC0f+Ta/YL9O153NVlRWEAgsb9CVUda6EG5 /VzobWDPGOig5qdDN0KgAmq9fYTwSMIa2XqskkQqV7UAmehwo+r/8L5apnhFZz+rr3lZ OZtiLD4KvFlMmjpb11AoUDMrPUfkuTRlRQMIjAel+L23OyRhMpTGHjZ06t/XZ7o2yuf8 +g5e5ObdqTNYkTN8xvY5svgpW716PiaAUGHpnjraCgrfDyWonbmgs9wUdCAPlOC5PDo+ +NAD7/WxfgE9BExRWSgoKHwYgw/0/g5MW/w4i+PR9ufLRpsuexir7S48uDkQhDwirpJT fkzA== X-Forwarded-Encrypted: i=1; AJvYcCX/6nKcG/0R85US3GgocCnd6Q9+gn85ihNW+CpPi41P3SdHT+ooFl4a93DaPY7YlI+LVI98F55aNjIrJPQh4YeWuR3MIIfY2hXaMjkCOZPc X-Gm-Message-State: AOJu0YxquN02zp7WvdzcOTZzs+d/O3yonKmTKWGpfVGSx8+8pLZLuggC RN15YJg+9c3IGX3VVhDV1IJ5rTDbIwjb7xcbG3MravJGarws3diO X-Google-Smtp-Source: AGHT+IFAPWMxNe4GVfIC6LRICc1d9X5xANtb8PN3uV2cg2QAC3WE59MFFVdGIL+Hd3zDV06z5yaLfw== X-Received: by 2002:a05:600c:287:b0:414:6865:b5bc with SMTP id 7-20020a05600c028700b004146865b5bcmr1829278wmk.28.1712230965536; Thu, 04 Apr 2024 04:42:45 -0700 (PDT) Received: from localhost (54-240-197-231.amazon.com. [54.240.197.231]) by smtp.gmail.com with ESMTPSA id n17-20020a05600c4f9100b0041624540918sm2438600wmq.9.2024.04.04.04.42.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2024 04:42:45 -0700 (PDT) From: Puranjay Mohan To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Luke Nelson , Xi Wang , Paul Walmsley , Palmer Dabbelt , Albert Ou , bpf@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Pu Lehui Cc: puranjay12@gmail.com Subject: [PATCH bpf-next v4 2/2] bpf,riscv: Implement bpf_addr_space_cast instruction Date: Thu, 4 Apr 2024 11:42:03 +0000 Message-Id: <20240404114203.105970-3-puranjay12@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240404114203.105970-1-puranjay12@gmail.com> References: <20240404114203.105970-1-puranjay12@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240404_044248_191660_456026BE X-CRM114-Status: GOOD ( 12.38 ) 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 LLVM generates bpf_addr_space_cast instruction while translating pointers between native (zero) address space and __attribute__((address_space(N))). The addr_space=0 is reserved as bpf_arena address space. rY = addr_space_cast(rX, 0, 1) is processed by the verifier and converted to normal 32-bit move: wX = wY rY = addr_space_cast(rX, 1, 0) has to be converted by JIT. Tested-by: Björn Töpel Tested-by: Pu Lehui Acked-by: Björn Töpel Reviewed-by: Pu Lehui Signed-off-by: Puranjay Mohan --- arch/riscv/net/bpf_jit.h | 1 + arch/riscv/net/bpf_jit_comp64.c | 14 ++++++++++++++ arch/riscv/net/bpf_jit_core.c | 1 + 3 files changed, 16 insertions(+) diff --git a/arch/riscv/net/bpf_jit.h b/arch/riscv/net/bpf_jit.h index 8a47da08dd9c..5fc374ed98ea 100644 --- a/arch/riscv/net/bpf_jit.h +++ b/arch/riscv/net/bpf_jit.h @@ -82,6 +82,7 @@ struct rv_jit_context { unsigned long flags; int stack_size; u64 arena_vm_start; + u64 user_vm_start; }; /* Convert from ninsns to bytes. */ diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c index a4c8e1e6c1e2..15e482f2c657 100644 --- a/arch/riscv/net/bpf_jit_comp64.c +++ b/arch/riscv/net/bpf_jit_comp64.c @@ -1081,6 +1081,15 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx, /* dst = src */ case BPF_ALU | BPF_MOV | BPF_X: case BPF_ALU64 | BPF_MOV | BPF_X: + if (insn_is_cast_user(insn)) { + emit_mv(RV_REG_T1, rs, ctx); + emit_zextw(RV_REG_T1, RV_REG_T1, ctx); + emit_imm(rd, (ctx->user_vm_start >> 32) << 32, ctx); + emit(rv_beq(RV_REG_T1, RV_REG_ZERO, 4), ctx); + emit_or(RV_REG_T1, rd, RV_REG_T1, ctx); + emit_mv(rd, RV_REG_T1, ctx); + break; + } if (imm == 1) { /* Special mov32 for zext */ emit_zextw(rd, rd, ctx); @@ -2024,3 +2033,8 @@ bool bpf_jit_supports_ptr_xchg(void) { return true; } + +bool bpf_jit_supports_arena(void) +{ + return true; +} diff --git a/arch/riscv/net/bpf_jit_core.c b/arch/riscv/net/bpf_jit_core.c index 9ab739b9f9a2..8a69d6d81e32 100644 --- a/arch/riscv/net/bpf_jit_core.c +++ b/arch/riscv/net/bpf_jit_core.c @@ -81,6 +81,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) } ctx->arena_vm_start = bpf_arena_get_kern_vm_start(prog->aux->arena); + ctx->user_vm_start = bpf_arena_get_user_vm_start(prog->aux->arena); ctx->prog = prog; ctx->offset = kcalloc(prog->len, sizeof(int), GFP_KERNEL); if (!ctx->offset) {