From patchwork Wed Oct 4 11:09:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 148228 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id hf10csp49571vqb; Wed, 4 Oct 2023 04:09:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHkts5gy/CnyXH6hxsK/NJYQVYAswGVLPniuElXO2t+oIzNYEjZx2ByydOZ2eFbEBbwC/QY X-Received: by 2002:a05:6a21:197:b0:149:122b:6330 with SMTP id le23-20020a056a21019700b00149122b6330mr2449910pzb.10.1696417771146; Wed, 04 Oct 2023 04:09:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696417771; cv=none; d=google.com; s=arc-20160816; b=Ot3SV38IV+eWimbluvoAOSVqDdgbVcoUS+v9st9luNR2YHRCM41iZC9JNbOS+Zwxxs BhhhFP8RFtRWoVCV+0u6jnF4ec336GSc5FyPTswQKkaw3yr5prEGUaK+Riir7jc0u2PV aukpyVSuBSPvLFkCBQQ1+SHw3EjrAXceXyJpG+b8oUbvkxp1yWtI15DnGmY58w8scFDy GAWL75rNPtiHYeSvgyYeov8maKHEihqMYHecax+kvao88B5ns8MdEGehmpBw0HEigb6w YMoxQsj7f9Y3i1mgwce+lTI0OIaScZ9ndusLpNK5fgL6EIabW+04//lpSA3ChFixsiKd bXKA== 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 :dkim-signature; bh=9W9J2swDGgBMYiF9qzR4GOSQT01aaOdyanGj9uJR0mk=; fh=/UNXTIfFp0fgz3rl4VoLh3ydFCKzOjrDknRp1ueer+4=; b=oJbj54pUAhuM23oLYu3xbi8pVpjaG96/RZlMc6dI57iaW06Zvjf5B+pOcd79ARQQFz fuON3PWqa7hbeCNVtSyELPXln/1B+My7DQ9bOOi2qdk0ITcNczSDN/TV01UdU8Sc7aSZ EQgPIoQEWYbiLqhHFHbNgCl6AmjHpxDYbhoZAn624toeTfjgQ5Qn+JC0ALTPlLHgin62 9g0/GusTI74gjgBrLokrlXqcZ4CtoqPYzUKzVGggBp+cz+FSKPJ+UpzajTgIg0Bvvryc EBS86PNi1CHvGZFSfBgQGtfiT/KeAsQ9VfWv/s2DWNJxVuwAXt+gAflwWX0Y3zrMIIg6 JmNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=A2+JdAq5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id c18-20020a630d12000000b00585a61651ecsi3450601pgl.318.2023.10.04.04.09.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 04:09:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=A2+JdAq5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 2ADA5820E538; Wed, 4 Oct 2023 04:09:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242205AbjJDLJZ (ORCPT + 18 others); Wed, 4 Oct 2023 07:09:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242200AbjJDLJX (ORCPT ); Wed, 4 Oct 2023 07:09:23 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE0A3A1; Wed, 4 Oct 2023 04:09:20 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C585C433C9; Wed, 4 Oct 2023 11:09:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696417760; bh=jGyGtT5hAh42qtvFtybeGnz3fQgWG1+/lAX0yi2x8O8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A2+JdAq5zMOxCIhi934DYXVOPUrdLAN0OhjgKkaF8dg3YRTPwRl1F3pfkomGYZgAQ EqzxEdPjNQwzhw7+Nz2HIQIEO05y1Ly1RhqO3Rxqh7444Wr7O16K8h/1YGcTL2Q2Pp 6fYLNDX8mP90Stu3hpAAvpIykIDKAgihGY5cJqAGPXMFIpeLC85BTVWAYhtlwi7EdQ oh79sWjywQtALxIeAYreihREuB3lq2vDSgsrxxPK9D/Wc8Ghv0vrupLdrcOOFnjt6T WIqTb/NAoYWRS/DxRyb1GSMMvnMWl7y1oYN1zAhM7iHDTSmpAJ2sJM6RwsugbKY1Ft vut536vQASvAg== From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Mykola Lysenko , bpf@vger.kernel.org, netdev@vger.kernel.org Cc: Alexandre Ghiti , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Sami Tolvanen Subject: [PATCH bpf 1/3] libbpf: Fix syscall access arguments on riscv Date: Wed, 4 Oct 2023 13:09:03 +0200 Message-Id: <20231004110905.49024-2-bjorn@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231004110905.49024-1-bjorn@kernel.org> References: <20231004110905.49024-1-bjorn@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 04 Oct 2023 04:09:30 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778822961177868157 X-GMAIL-MSGID: 1778822961177868157 From: Alexandre Ghiti Since commit 08d0ce30e0e4 ("riscv: Implement syscall wrappers"), riscv selects ARCH_HAS_SYSCALL_WRAPPER so let's use the generic implementation of PT_REGS_SYSCALL_REGS(). Fixes: 08d0ce30e0e4 ("riscv: Implement syscall wrappers") Signed-off-by: Alexandre Ghiti --- tools/lib/bpf/bpf_tracing.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/lib/bpf/bpf_tracing.h b/tools/lib/bpf/bpf_tracing.h index 3803479dbe10..1c13f8e88833 100644 --- a/tools/lib/bpf/bpf_tracing.h +++ b/tools/lib/bpf/bpf_tracing.h @@ -362,8 +362,6 @@ struct pt_regs___arm64 { #define __PT_PARM7_REG a6 #define __PT_PARM8_REG a7 -/* riscv does not select ARCH_HAS_SYSCALL_WRAPPER. */ -#define PT_REGS_SYSCALL_REGS(ctx) ctx #define __PT_PARM1_SYSCALL_REG __PT_PARM1_REG #define __PT_PARM2_SYSCALL_REG __PT_PARM2_REG #define __PT_PARM3_SYSCALL_REG __PT_PARM3_REG