From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F197736BCF1 for ; Tue, 24 Feb 2026 09:22:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.194 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771924959; cv=none; b=tjp84rPr5RUHgy42vkdK/jUKeCVoQs2iiusRcKe3D0ElZJpkrUeOmNBG0JCOwy+5rv0fIctoUXeDr3jFPewFtOSQWy5FZdt5xHT1svfd03rWoFMT9gVzKhC9davvQXgyMEUj9Z380hPI63Vi11R7B7suwPMbnLN+IIxIcZdnUD4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771924959; c=relaxed/simple; bh=//m8dH3bHSjki//i9VjUuOHfUAtffvLarIX5CXsBeds=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E7DbgeIaM+ZaWB2ToNQ9cGG4v2tDHjtPLlir6dqiGhEatni+6Y4nRtlypJIwyUx1vtVl6RRcZ75jTF9jkqxnuDPtBqAM1v+5w+n/s4LEKvsjplSCha5o3+ktGOfwN5ZlNxJ9eMdISddUzROmt7frP2Vmy9M+H3Z3rmqOBYhtZ2U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lVfvXqIR; arc=none smtp.client-ip=209.85.214.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lVfvXqIR" Received: by mail-pl1-f194.google.com with SMTP id d9443c01a7336-2ab232cc803so25786415ad.3 for ; Tue, 24 Feb 2026 01:22:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771924956; x=1772529756; darn=vger.kernel.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=dpLKOE0cSQ+70LbrawdOonDNbKPUoXYYa3UgZRxOrKk=; b=lVfvXqIR/kNBvdjwiRF/wycVqVRkYyad2JExmTTCItTm+AJ+CvPkRExMgiwTgj7c58 qygeSR5CjMKa9RNyAxFkKhzdzH2e1rsAjATXbAHX09e65KQZbLdBImChgowNnz+fzTBm c3Nq/Yd3uy1yiIHac7JBgwE/KHYdCG6OruP9DBAexv7h0s4FsHSOkpOLw4+afxdRqBme 9NRd+XI8BqXuD7iKYWOR9oGBCBUZXJaNzSf0WydbWS5QPVC8qrj9W9XJGfV3jh52yqxT HnG1KiYTJzWpGXM1anVCq8WAGGWcU9Fm0sNO3TaIrK3Vi6gzdnQBYidsZgnop2WAhVLr 0JPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771924956; x=1772529756; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=dpLKOE0cSQ+70LbrawdOonDNbKPUoXYYa3UgZRxOrKk=; b=akkpr+F6aXpLZowIx4vBGY1aWfLatn/FiYdJxrJHeepjhI6DBxhJMVlb3D8q4L3jKE B5erw4qnxgaOWvqnMIw9v5sFMWlcmhYedaoFF4QwI3i2xDerf/0aG4N/O99hSwDNUjF3 mLrEgJ4YWoOlGGTpJKysFyb5vmiQL2uYHQFIgcdt/oqqyVSsLn8vfWt9kELy0ZAMiqlE sakfxImNWTgp+GOPu/esO10axJQ7EtTTxztzR2qA9GqmACfQkiR/0sgsmqxTEhSXYqSl wzFRT4ez1sP9WmJnVE02klL67Xw5gMuVa0Uv4nBvet8XuIdAQAaSk9pR/37uF+LZsIjO inFQ== X-Forwarded-Encrypted: i=1; AJvYcCUPx3D8MqMJ0wkqBZCH85bZtVM2Rxdvb2kFxBnnADkdjIcTby3BEs0wK1/xVjEeOXsMuJS2kYpZvgIDB0o=@vger.kernel.org X-Gm-Message-State: AOJu0YzHk8P9EzGg0KCZ7PicPlL2M4iVaXHvy43kI8Fk36WLmU7GmJuI gdScXaB1j3Lp+ZpuvHvB5RAGqRWzDHzel2WkdK1jvD8CoSXUG3Q/k4tn X-Gm-Gg: ATEYQzzu252JoSpBH7brs89NxOPm4n4NISRAaKvm9xGkuJ3pGcFuremSY62Eum0JhyN 045xOoevUpDEEcMGoRTd0qX6q2H7eiXkMv1VjJxAEQNrwUUjYx+8l7rKBwiFaSDWCgWXVFqtg07 trsqDTvEofxjQh7bepIOZPAy8bQ7nDBkRFClmsdXhb+qyohNx3ckpkDELlka104ZznkFge6T6F1 XbI88xUubOCWI2ogosLflOeEkGeCnfXIXivdlUSLlt8mcD0mK6/e+KP01Ib+xiYV21ki8DpLcj1 M13HilsZ9wb5GNqbzlKohJiH8WDIY7VarfxWMHhzyofbCncWlBHz/KwAuk0g+FaoXc84PZS8PIv uRX+eOg8LZSsMIKJ0q9llNEHT6IL36w935EI7KOdwWXgmfipIoXjV51tS48emQ1cT0s1Je7t0qB 3J7BCv6bOBddVndfaYrOyI X-Received: by 2002:a17:902:ecc6:b0:2aa:f469:fa23 with SMTP id d9443c01a7336-2ad74419efemr91872495ad.4.1771924956249; Tue, 24 Feb 2026 01:22:36 -0800 (PST) Received: from 7940hx ([103.173.155.241]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ad7500e2b2sm97181695ad.52.2026.02.24.01.22.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Feb 2026 01:22:35 -0800 (PST) From: Menglong Dong X-Google-Original-From: Menglong Dong To: ast@kernel.org, iii@linux.ibm.com Cc: daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, bpf@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next v2 1/3] bpf,s390: introduce emit_store_stack_imm64() for trampoline Date: Tue, 24 Feb 2026 17:22:06 +0800 Message-ID: <20260224092208.1395085-2-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260224092208.1395085-1-dongml2@chinatelecom.cn> References: <20260224092208.1395085-1-dongml2@chinatelecom.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Introduce a helper to store 64-bit immediate on the trampoline stack with a help of a register. Signed-off-by: Menglong Dong Acked-by: Ilya Leoshkevich --- v2: - keep LGHI as it was --- arch/s390/net/bpf_jit_comp.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c index 579461d471bb..76c80d75184f 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c @@ -2506,6 +2506,13 @@ static void load_imm64(struct bpf_jit *jit, int dst_reg, u64 val) EMIT6_IMM(0xc00d0000, dst_reg, val); } +static void emit_store_stack_imm64(struct bpf_jit *jit, int tmp_reg, int stack_off, u64 imm) +{ + load_imm64(jit, tmp_reg, imm); + /* stg %tmp_reg,stack_off(%r15) */ + EMIT6_DISP_LH(0xe3000000, 0x0024, tmp_reg, REG_0, REG_15, stack_off); +} + static int invoke_bpf_prog(struct bpf_tramp_jit *tjit, const struct btf_func_model *m, struct bpf_tramp_link *tlink, bool save_ret) @@ -2520,10 +2527,7 @@ static int invoke_bpf_prog(struct bpf_tramp_jit *tjit, * run_ctx.cookie = tlink->cookie; */ - /* %r0 = tlink->cookie */ - load_imm64(jit, REG_W0, tlink->cookie); - /* stg %r0,cookie_off(%r15) */ - EMIT6_DISP_LH(0xe3000000, 0x0024, REG_W0, REG_0, REG_15, cookie_off); + emit_store_stack_imm64(jit, REG_W0, cookie_off, tlink->cookie); /* * if ((start = __bpf_prog_enter(p, &run_ctx)) == 0) @@ -2743,13 +2747,8 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, * arg_cnt = m->nr_args; */ - if (flags & BPF_TRAMP_F_IP_ARG) { - /* %r0 = func_addr */ - load_imm64(jit, REG_0, (u64)func_addr); - /* stg %r0,ip_off(%r15) */ - EMIT6_DISP_LH(0xe3000000, 0x0024, REG_0, REG_0, REG_15, - tjit->ip_off); - } + if (flags & BPF_TRAMP_F_IP_ARG) + emit_store_stack_imm64(jit, REG_0, tjit->ip_off, (u64)func_addr); /* lghi %r0,nr_bpf_args */ EMIT4_IMM(0xa7090000, REG_0, nr_bpf_args); /* stg %r0,arg_cnt_off(%r15) */ -- 2.53.0