From patchwork Thu Jul 30 11:44:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerry Crunchtime X-Patchwork-Id: 1338765 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=web.de header.i=@web.de header.a=rsa-sha256 header.s=dbaedf251592 header.b=Up6UeNDR; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BHT8t5VPlz9sRN for ; Thu, 30 Jul 2020 21:44:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727776AbgG3Lo3 (ORCPT ); Thu, 30 Jul 2020 07:44:29 -0400 Received: from mout.web.de ([212.227.15.14]:42083 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726267AbgG3Lo3 (ORCPT ); Thu, 30 Jul 2020 07:44:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1596109467; bh=bU/MFbqJw2aO6JDOdk8DfgdVihRLlc7fwbAEZIOQP5I=; h=X-UI-Sender-Class:From:To:Subject:Date; b=Up6UeNDRYXHh03BzuDCbyI7hLBRXBp7H/40R+olR/FzTdG07rd1BCLVKg5DFjekUp SmjybqNur0cCDKQZOyhgHKDMA7O0fQR87kSdBRYZzqfSrg1ZRk87Ni8zqS+LIjLFi5 VQIjQlPIe5IY53oXKknN2C1RTKwrZaEpNlcco03c= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.178.23] ([77.2.34.38]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MElZP-1jyaoa2Xmd-00GIQJ for ; Thu, 30 Jul 2020 13:44:27 +0200 From: Jerry Cruntime To: bpf@vger.kernel.org Subject: [PATCH bpf] libbpf: Fix register in PT_REGS MIPS macros Message-ID: <05fb9d72-d1a7-5346-b55b-4495cdf54124@web.de> Date: Thu, 30 Jul 2020 13:44:27 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 Content-Language: en-US X-Provags-ID: V03:K1:+jK3b068ShNLhN+CJ3Zj1XyFDGs6beUJTvc3ww5pKs7qvoM3iVW O/LU8uXRyZWZl6jqQHeCwBGKG5wF4+CxlhLYylBuBFUKUt3MCY5FQAR7XK9XWoFnIgwIvdm wLSzto558aOImLHe1MYmXNHeiogZbGnp0XBstAtviklUWiJ/zVqW4o9/44BXKKPd17PtTmE pDThA+F/IekMBMP1xvI6w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:ktLmlzUaoFc=:0Jhua8lkFdDkO7ukjXzMrd Ik2jmvZwUBnif6B7fRHqY1S786cTGwTnzVAJ9AhbaMPUD2NS+oV6R4/5aoZTdsS7DJvDi48DB 5Qid+Bjjkm20Gseg8I7RdwvxTX8WmlljRleTIkvADo3f8MoFnvwhLuXPBsPxRiqcESuXVlYNU 9rRsH3JxWbjHOTAgg1yb/cTX9YcAIu8Bz7LP4yb146vJOyncRCYP3l1+7q0Orb6vi6ITG9ugE HzpoZvunOIVVdQl6gRLdhiUICWLMjsGH4R2xlrveLnSmxsdsJgLeC+r8xsBsQThQZxEnZzbWi rZZTuwkUbCTK7MojzCa9N4zXmQVcdE2VUaKpZ4jDDzXLyNFynXcqr26wDgPa8iDJcqyaXLtcj sxnEOYIu6MSAe3Lm6bX664xGJpNGrMJ9uGkElqYm+CU6XOMoRBIHwwp/G3vWKrLPk1NSZaTM6 7z9KRvyaQOi+CDH+plBWIcTmcA0Ja+qvfJdKhqUOb2wr3sX88m65KglPKHByTre8IIdSbGTwy eDQEBEvcAKcuHVzs0fBC6LQLM2JUD9WBPPs2eIXAedGTzNloJMwOrwBlhROORBTf/F7LlBNT/ TixMCXl/yJOuxnVseQyz1uGSM1knmYffh8p6dU94JSUssTaxSd4X4atN13fRB7zfdJlyZ7YHP 4mMrambQerf1oIgvEZwP4F4OYVfBvH0qAXRfUszIZADvjUV4oeqiFOGw0ca6KalaF5viEqPOo cCjsw2A89nq/Zv5R9cMwxIFhfkgkFYRAd4H3YuiJi/NAqPWZFSxhPI88P3jPhOndJoWxCWrAR Cksn6wBnYSYFKdeQoRSCMhsH2n89LYqWiRKooatuGEVMWjsbqnzPLZlMGMMxW3tB26dPG5YhX kLXnZow5kojD1QgoEoRBZF2STKkF8wujIP1WNM+C3qwhmPjSFAxg1MnVSMP12WmF4XCBi6ilg 1I5wmEHeT6VAolua1svYngNebVC2KM2Q8XVRreCv1HKe3xgUOFDunb9b8dlR4XAT5C/MnjSaa +nDe1aCVKrWUXCK//OQJmgIWH9tII9tAE7Bg5/l7Zqu1KY5sAqnJ1qhjkSQsONhIgx+HM5gfm 87DAV00PR/OiGkDv6vIjy22Fmb5cl50jkR6NYtNOKXAxAFwDjGvKG8jTI6fCb+QVSE3rm7W+U zedvvHtyc1Nk8LNmBl4EaexNWkcCILjA0S0RYhs3Lfke6EDDfofoZrLTyB/lNgL0HURBtEK7W RKRMufumARc3B6D3d Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org The o32, n32 and n64 calling conventions require the return value to be stored in $v0 which maps to $2 register, i.e., the second register. Fixes: c1932cd ("bpf: Add MIPS support to samples/bpf.") Acked-by: Andrii Nakryiko Signed-off-by: Jerry Crunchtime --- tools/lib/bpf/bpf_tracing.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/tools/lib/bpf/bpf_tracing.h b/tools/lib/bpf/bpf_tracing.h index 58eceb884..ae205dcf8 100644 --- a/tools/lib/bpf/bpf_tracing.h +++ b/tools/lib/bpf/bpf_tracing.h @@ -215,7 +215,7 @@ struct pt_regs; #define PT_REGS_PARM5(x) ((x)->regs[8]) #define PT_REGS_RET(x) ((x)->regs[31]) #define PT_REGS_FP(x) ((x)->regs[30]) /* Works only with CONFIG_FRAME_POINTER */ -#define PT_REGS_RC(x) ((x)->regs[1]) +#define PT_REGS_RC(x) ((x)->regs[2]) #define PT_REGS_SP(x) ((x)->regs[29]) #define PT_REGS_IP(x) ((x)->cp0_epc)