Received: by 2002:a25:e7d8:0:0:0:0:0 with SMTP id e207csp1378736ybh; Sun, 15 Mar 2020 01:33:46 -0700 (PDT) X-Google-Smtp-Source: ADFU+vu3geL9Kp2WLo08/rqLT8aL8N13VIwj25hEgE+I6PnoijNfvcgcc9yPvXoJEo6ZWUbQzR76 X-Received: by 2002:aca:adc7:: with SMTP id w190mr13459371oie.42.1584261226497; Sun, 15 Mar 2020 01:33:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584261226; cv=none; d=google.com; s=arc-20160816; b=uwhkdennqb/e0lqr1ivvKlXRQKRt3lpGem6Ohm2Fa2Kjl2E0BgFO9O2Yg5TSYcvO69 zgNdGOgNmitloXyRZkt4Y9xk4cdpXE28HDwS3uxCmYs6c5dqWYwuDxV3GU1ZNqUywfdt 8wQIG57SRW8bd39Y0ni+d4E5Ok5MbkJxXs92B7D+TSjUbRlqw4QlDkzV0WG0AUzmlqmO TinzCsv415d6CinWBi1+ibjcQpfrt2g+GW96L1xEyhGE0iQpxr1VGzKalAASM6mESHTP 9rOFbG6+DyfwZeK+1swOazoKddTAPVArBrBxIGW82U1/MPbe6ucnUBQoSrThfzC5jJwQ y77A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=Mc91MOfwvy0Krn8xqZ+9eQ5qoxXVwyTfd8xLMYOaUhA=; b=q87vCa7JDpqhIFnPXl0X+4/7aVhwyHLVl9sDndP8xIlGNCPzqFpDVLUbltq/0XZKPE fDIg3rq9pSnerT5Ul7Zo07Rl2bYtY5i2mj0LPKmMvwjy3rIRxj47LHTCrUaYN5bWZQ/+ RBkVzhv3nzNOkC/YcNbs39nrJGA7lFXvQja58TZdoqbbwg7Zea9VAyqW6reQcPfahCta R2pMaNg+6q6Iso+/ShJ4GLnirZV7I0p6lITKcaUG/O2gtEUvLIBuNoULOxemJZo2IpuR Nh1je1Hd3P1hTKH33jWOMRyftiTfJcGiViE5/52/QcSzrxz7D1GBpdrAQ36mXEZ9TsVe +hlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=gUjQj0Qa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m3si7687731otn.302.2020.03.15.01.33.32; Sun, 15 Mar 2020 01:33:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=gUjQj0Qa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727840AbgCOIdF (ORCPT + 99 others); Sun, 15 Mar 2020 04:33:05 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:36312 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727646AbgCOIdF (ORCPT ); Sun, 15 Mar 2020 04:33:05 -0400 Received: by mail-pg1-f193.google.com with SMTP id z4so1984867pgu.3; Sun, 15 Mar 2020 01:33:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Mc91MOfwvy0Krn8xqZ+9eQ5qoxXVwyTfd8xLMYOaUhA=; b=gUjQj0QaIXIolLufw1MTw01hCZkugAmnahw2dGNurUXkraFV5bat8RP+TeYi1QIzZL mSvJJ8/LRjA8PSZ8duqmQL/aDIDF34HdZgrquYdObEr1R4WgPZu4WSadOSTqAKJcxsE8 ErgjJuvy96CEOlsNqNqZqW2thet038HemrXGGZfHDykopdtjJRBVd9IC+fBhO+bHTpRG kx5BkKJCt4YB7DSfAohiADTPfBKk2Kkx8CogvwULf6fK+zSq0N3rK1UuvtBHzwq8Kird 7vpiovZpK2myt8Bj0G1VjIa6gXu/ZwjSL8ietEMafWBZTdrPBQH6kR8lvyY7fuD9TDYD TFPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Mc91MOfwvy0Krn8xqZ+9eQ5qoxXVwyTfd8xLMYOaUhA=; b=fTcfTyzczXCeeRAmUdDIx0HseT3zgxlhhA5qP0NVYSxdRJ7QXLAYgiMPwbfVx1JBC+ 7CqK5PUnXwmBIQbL3/jmZyz5bYhd8q10hDeAXAAAxctEeGq5NaHrLFONqR7DEo31lJMd 1veU+wYwZkcMpXNrZlJxdwXGHDlPzQl9+ck4ndZuLcLzO5vHlAjPvwtoPRjP+5lXp8wg uG2FhkYMk8IkQtz56moXGL+9ww6URgKro77UKngmK4Jx9oEnfOB+jEV1DiZIN6u4CuIX wuw4ZuMpJC5pFHkFvLWSF9XwUvo/fWIGqHHJKGzyEyJhfue+5baqUedPlJw446hmSNGG SbAQ== X-Gm-Message-State: ANhLgQ1QxZhbIMLwI20LTLCfjX1KiuPlQEYLe66bWwOsMkX4EjhmEkN1 lTZ5HPPbqZde5TUn9YdpSAAGwmBbCnTcyQ== X-Received: by 2002:a63:6c8a:: with SMTP id h132mr19335055pgc.301.1584261181934; Sun, 15 Mar 2020 01:33:01 -0700 (PDT) Received: from ubuntu-18.04-x8664 ([128.1.49.85]) by smtp.gmail.com with ESMTPSA id c207sm23181609pfb.47.2020.03.15.01.32.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 01:33:01 -0700 (PDT) From: Wenbo Zhang To: ast@kernel.org, daniel@iogearbox.net Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, ethercflow@gmail.com Subject: [PATCH] bpf: Fix ___bpf_kretprobe_args1(x) macro definition. Date: Sun, 15 Mar 2020 04:32:52 -0400 Message-Id: <20200315083252.22274-1-ethercflow@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use PT_REGS_RC instead of PT_REGS_RET to get ret currectly. Signed-off-by: Wenbo Zhang --- tools/lib/bpf/bpf_tracing.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lib/bpf/bpf_tracing.h b/tools/lib/bpf/bpf_tracing.h index b0c9ae5c73b5..f3f3c3fb98cb 100644 --- a/tools/lib/bpf/bpf_tracing.h +++ b/tools/lib/bpf/bpf_tracing.h @@ -390,7 +390,7 @@ ____##name(struct pt_regs *ctx, ##args) #define ___bpf_kretprobe_args0() ctx #define ___bpf_kretprobe_args1(x) \ - ___bpf_kretprobe_args0(), (void *)PT_REGS_RET(ctx) + ___bpf_kretprobe_args0(), (void *)PT_REGS_RC(ctx) #define ___bpf_kretprobe_args(args...) \ ___bpf_apply(___bpf_kretprobe_args, ___bpf_narg(args))(args) -- 2.17.1