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;
From:   Song Liu <songliubraving@fb.com>
To:     Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
CC:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "acme@kernel.org" <acme@kernel.org>
Subject: Re: [PATCH] perf annotate: Fix build on 32 bit for BPF annotation
Thread-Topic: [PATCH] perf annotate: Fix build on 32 bit for BPF annotation
Thread-Index: AQHU6lXFqqa7wYSVLECtJxWqgZqKp6Yq9TyA
Date:   Wed, 3 Apr 2019 21:34:02 +0000
Message-ID: <ABAEFCEA-E8C6-4246-B109-6D6A12AAB75B@fb.com>
References: <20190403194452.10845-1-cascardo@canonical.com>
In-Reply-To: <20190403194452.10845-1-cascardo@canonical.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: fb.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="us-ascii"
Content-ID: <7418A620AFE5894F87ED1220F5D59344@namprd15.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 5a9d0fd3-02e0-45b6-4935-08d6b87c175a
X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Apr 2019 21:34:02.4800
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR15MB1295
X-OriginatorOrg: fb.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-04-03_13:,,
 signatures=0
X-Proofpoint-Spam-Reason: safe
X-FB-Internal: Safe
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> On Apr 3, 2019, at 12:44 PM, Thadeu Lima de Souza Cascardo <cascardo@cano=
nical.com> wrote:
>=20
> Commit 6987561c9e86 ("perf annotate: Enable annotation of BPF programs") =
adds
> support for BPF programs annotations but the new code does not build on 3=
2-bit.
>=20
> Fixes: 6987561c9e86 ("perf annotate: Enable annotation of BPF programs")
> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

Acked-by: Song Liu <songliubraving@fb.com>

Thanks for the fix!
Song

> ---
> tools/perf/util/annotate.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>=20
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index c8b01176c9e1..09762985c713 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -1714,8 +1714,8 @@ static int symbol__disassemble_bpf(struct symbol *s=
ym,
> 	if (dso->binary_type !=3D DSO_BINARY_TYPE__BPF_PROG_INFO)
> 		return -1;
>=20
> -	pr_debug("%s: handling sym %s addr %lx len %lx\n", __func__,
> -		 sym->name, sym->start, sym->end - sym->start);
> +	pr_debug("%s: handling sym %s addr %" PRIx64 " len %" PRIx64 "\n", __fu=
nc__,
> +		  sym->name, sym->start, sym->end - sym->start);
>=20
> 	memset(tpath, 0, sizeof(tpath));
> 	perf_exe(tpath, sizeof(tpath));
> @@ -1740,7 +1740,7 @@ static int symbol__disassemble_bpf(struct symbol *s=
ym,
> 	info_linear =3D info_node->info_linear;
> 	sub_id =3D dso->bpf_prog.sub_id;
>=20
> -	info.buffer =3D (void *)(info_linear->info.jited_prog_insns);
> +	info.buffer =3D (void *)(uintptr_t)(info_linear->info.jited_prog_insns)=
;
> 	info.buffer_length =3D info_linear->info.jited_prog_len;
>=20
> 	if (info_linear->info.nr_line_info)
> @@ -1776,7 +1776,7 @@ static int symbol__disassemble_bpf(struct symbol *s=
ym,
> 		const char *srcline;
> 		u64 addr;
>=20
> -		addr =3D pc + ((u64 *)(info_linear->info.jited_ksyms))[sub_id];
> +		addr =3D pc + ((u64 *)(uintptr_t)(info_linear->info.jited_ksyms))[sub_=
id];
> 		count =3D disassemble(pc, &info);
>=20
> 		if (prog_linfo)
> --=20
> 2.20.1
>=20