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:     Jiri Olsa <jolsa@redhat.com>
CC:     "bpf@vger.kernel.org" <bpf@vger.kernel.org>,
        Networking <netdev@vger.kernel.org>,
        linux-kernel <linux-kernel@vger.kernel.org>,
        "ast@kernel.org" <ast@kernel.org>,
        "daniel@iogearbox.net" <daniel@iogearbox.net>,
        Kernel Team <Kernel-team@fb.com>,
        "peterz@infradead.org" <peterz@infradead.org>,
        "acme@redhat.com" <acme@redhat.com>,
        "jolsa@kernel.org" <jolsa@kernel.org>,
        "namhyung@kernel.org" <namhyung@kernel.org>
Subject: Re: [PATCH v7 perf,bpf 12/15] perf, bpf: enable annotation of bpf
 program
Thread-Topic: [PATCH v7 perf,bpf 12/15] perf, bpf: enable annotation of bpf
 program
Thread-Index: AQHU1Q94d1kU5xxUhU2jOkg31L0NcKYGvXCAgAACOQA=
Date:   Mon, 11 Mar 2019 18:04:39 +0000
Message-ID: <C0126410-1B35-4A28-8DEC-67B2D737E1ED@fb.com>
References: <20190307175810.249857-1-songliubraving@fb.com>
 <20190307175810.249857-13-songliubraving@fb.com>
 <20190311175641.GA19721@krava>
In-Reply-To: <20190311175641.GA19721@krava>
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: <A8DD19081D31E14EAB5A359F40D8839E@namprd15.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: c5e03e61-0b4b-4328-8543-08d6a64c07e5
X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Mar 2019 18:04:39.8540
 (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: MWHPR15MB1117
X-OriginatorOrg: fb.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-03-11_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 Mar 11, 2019, at 10:56 AM, Jiri Olsa <jolsa@redhat.com> wrote:
>=20
> On Thu, Mar 07, 2019 at 09:58:07AM -0800, Song Liu wrote:
>=20
> SNIP
>=20
>> +		if (linfo && btf) {
>> +			srcline =3D btf__name_by_offset(btf, linfo->line_off);
>> +			nr_skip++;
>> +		} else
>> +			srcline =3D NULL;
>> +
>> +		fprintf(s, "\n");
>> +		prev_buf_size =3D buf_size;
>> +		fflush(s);
>> +
>> +		if (!opts->hide_src_code && srcline) {
>> +			args->offset =3D -1;
>> +			args->line =3D strdup(srcline);
>> +			args->line_nr =3D 0;
>> +			args->ms.sym  =3D sym;
>> +			dl =3D disasm_line__new(args);
>> +			if (dl) {
>> +				annotation_line__add(&dl->al,
>> +						     &notes->src->source);
>> +			}
>> +		}
>=20
> I still miss answer for why is the line added twice for
> !opts->hide_src_code && srcline ? code up and down
>=20
> jirka

The line above (under "!hide_src_code && srcline") is the src code=20
line; while the one below is the disassemble output. We only show the=20
source code when "!hide_src_code && srcline" is true.=20

Thanks,
Song

>> +
>> +		args->offset =3D pc;
>> +		args->line =3D buf + prev_buf_size;
>> +		args->line_nr =3D 0;
>> +		args->ms.sym  =3D sym;
>> +		dl =3D disasm_line__new(args);
>> +		if (dl)
>> +			annotation_line__add(&dl->al, &notes->src->source);
>> +
>> +		pc +=3D count;
>> +	} while (count > 0 && pc < len);
>=20
> SNIP