Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCE59C433FE for ; Mon, 24 Jan 2022 19:22:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345434AbiAXTWn (ORCPT ); Mon, 24 Jan 2022 14:22:43 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:44782 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348736AbiAXTTi (ORCPT ); Mon, 24 Jan 2022 14:19:38 -0500 Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20OHVjeJ011778 for ; Mon, 24 Jan 2022 11:19:37 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=MDFP7gomuLSIrbcF7H+vs2XBTis8clGq0rAj/+JXTEc=; b=Y7tpqdr3Mxe8Os98YVdgWBWRYoxZyp9nf0dU6SXYBbjdOslcyPE+WYjfO4WhVemCGzsm kKMPaCxKkbDe+uFqd4Z3jZD5IjaFLpFSKqYcL98FPDa28+tGfuEVAveskhZsILF8AEcq D2A2JNmBdUqpLTGTGZmbFL/6EB0Zx/Wkclk= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3dswcptamw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 24 Jan 2022 11:19:37 -0800 Received: from twshared11487.23.frc3.facebook.com (2620:10d:c085:108::4) by mail.thefacebook.com (2620:10d:c085:11d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Mon, 24 Jan 2022 11:19:36 -0800 Received: by devvm1744.ftw0.facebook.com (Postfix, from userid 460691) id C91392AE3450; Mon, 24 Jan 2022 11:19:25 -0800 (PST) From: Kui-Feng Lee To: , CC: , , , Kui-Feng Lee Subject: [PATCH dwarves v2 3/3] pahole: Use per-thread btf instances to avoid mutex locking. Date: Mon, 24 Jan 2022 11:18:58 -0800 Message-ID: <20220124191858.1601255-4-kuifeng@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124191858.1601255-1-kuifeng@fb.com> References: <20220124191858.1601255-1-kuifeng@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: ODpqSC1FpvADn-aJQC6QkDJxGWmmA-pF X-Proofpoint-ORIG-GUID: ODpqSC1FpvADn-aJQC6QkDJxGWmmA-pF X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-24_09,2022-01-24_02,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 phishscore=0 malwarescore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 suspectscore=0 mlxscore=0 adultscore=0 mlxlogscore=999 bulkscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2201240127 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: dwarves@vger.kernel.org Create an instance of btf for each worker thread, and add type info to the local btf instance in the steal-function of pahole without mutex acquiring. Once finished with all worker threads, merge all per-thread btf instances to the primary btf instance. Signed-off-by: Kui-Feng Lee --- btf_encoder.c | 5 +++ btf_encoder.h | 2 + pahole.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 116 insertions(+), 5 deletions(-) diff --git a/btf_encoder.c b/btf_encoder.c index 9d015f304e92..56a76f5d7275 100644 --- a/btf_encoder.c +++ b/btf_encoder.c @@ -1529,3 +1529,8 @@ int btf_encoder__encode_cu(struct btf_encoder *enco= der, struct cu *cu) out: return err; } + +struct btf *btf_encoder__btf(struct btf_encoder *encoder) +{ + return encoder->btf; +} diff --git a/btf_encoder.h b/btf_encoder.h index f133b0d7674d..0f0eee84df74 100644 --- a/btf_encoder.h +++ b/btf_encoder.h @@ -29,4 +29,6 @@ struct btf_encoder *btf_encoders__first(struct list_hea= d *encoders); =20 struct btf_encoder *btf_encoders__next(struct btf_encoder *encoder); =20 +struct btf *btf_encoder__btf(struct btf_encoder *encoder); + #endif /* _BTF_ENCODER_H_ */ diff --git a/pahole.c b/pahole.c index f3eeaaca4cdf..93b844f97c38 100644 --- a/pahole.c +++ b/pahole.c @@ -2798,6 +2798,73 @@ out: =20 static struct type_instance *header; =20 +struct thread_data { + struct btf *btf; + struct btf_encoder *encoder; +}; + +static int pahole_threads_prepare(struct conf_load *conf, int nr_threads= , void **thr_data) +{ + int i; + struct thread_data *threads =3D calloc(sizeof(struct thread_data), nr_t= hreads); + + for (i =3D 0; i < nr_threads; i++) + thr_data[i] =3D threads + i; + + return 0; +} + +static int pahole_thread_exit(struct conf_load *conf, void *thr_data) +{ + struct thread_data *thread =3D thr_data; + + if (thread =3D=3D NULL) + return 0; + + /* + * Here we will call btf__dedup() here once we extend + * btf__dedup(). + */ + + return 0; +} + +static int pahole_threads_collect(struct conf_load *conf, int nr_threads= , void **thr_data, + int error) +{ + struct thread_data **threads =3D (struct thread_data **)thr_data; + int i; + int err =3D 0; + + if (error) + goto out; + + for (i =3D 0; i < nr_threads; i++) { + /* + * Merge content of the btf instances of worker + * threads to the btf instance of the primary + * btf_encoder. + */ + if (!threads[i]->btf || threads[i]->encoder =3D=3D btf_encoder) + continue; /* The primary btf_encoder */ + err =3D btf__add_btf(btf_encoder__btf(btf_encoder), threads[i]->btf); + if (err < 0) + goto out; + btf_encoder__delete(threads[i]->encoder); + threads[i]->encoder =3D NULL; + } + err =3D 0; + +out: + for (i =3D 0; i < nr_threads; i++) { + if (threads[i]->encoder && threads[i]->encoder !=3D btf_encoder) + btf_encoder__delete(threads[i]->encoder); + } + free(threads[0]); + + return err; +} + static enum load_steal_kind pahole_stealer(struct cu *cu, struct conf_load *conf_load, void *thr_data) @@ -2819,8 +2886,8 @@ static enum load_steal_kind pahole_stealer(struct c= u *cu, =20 if (btf_encode) { static pthread_mutex_t btf_lock =3D PTHREAD_MUTEX_INITIALIZER; + struct btf_encoder *encoder; =20 - pthread_mutex_lock(&btf_lock); /* * FIXME: * @@ -2828,21 +2895,55 @@ static enum load_steal_kind pahole_stealer(struct= cu *cu, * point we'll have cu->elf setup... */ if (!btf_encoder) { - btf_encoder =3D btf_encoder__new(cu, detached_btf_filename, conf_load= ->base_btf, skip_encoding_btf_vars, - btf_encode_force, btf_gen_floats, global_verbose); + pthread_mutex_lock(&btf_lock); + if (!btf_encoder) { + /* + * btf_encoder is the primary encoder. + * And, it is used by the thread + * create it. + */ + btf_encoder =3D btf_encoder__new(cu, detached_btf_filename, + conf_load->base_btf, + skip_encoding_btf_vars, + btf_encode_force, + btf_gen_floats, global_verbose); + if (btf_encoder && thr_data) { + struct thread_data *thread =3D (struct thread_data *)thr_data; + + thread->encoder =3D btf_encoder; + thread->btf =3D btf_encoder__btf(btf_encoder); + } + } + pthread_mutex_unlock(&btf_lock); if (btf_encoder =3D=3D NULL) { ret =3D LSK__STOP_LOADING; goto out_btf; } } =20 - if (btf_encoder__encode_cu(btf_encoder, cu)) { + if (thr_data) { + struct thread_data *thread =3D (struct thread_data *)thr_data; + + if (thread->encoder =3D=3D NULL) { + thread->encoder =3D + btf_encoder__new(cu, detached_btf_filename, + NULL, + skip_encoding_btf_vars, + btf_encode_force, + btf_gen_floats, + global_verbose); + thread->btf =3D btf_encoder__btf(thread->encoder); + } + encoder =3D thread->encoder; + } else + encoder =3D btf_encoder; + + if (btf_encoder__encode_cu(encoder, cu)) { fprintf(stderr, "Encountered error while encoding BTF.\n"); exit(1); } ret =3D LSK__DELETE; out_btf: - pthread_mutex_unlock(&btf_lock); return ret; } #if 0 @@ -3207,6 +3308,9 @@ int main(int argc, char *argv[]) memset(tab, ' ', sizeof(tab) - 1); =20 conf_load.steal =3D pahole_stealer; + conf_load.thread_exit =3D pahole_thread_exit; + conf_load.threads_prepare =3D pahole_threads_prepare; + conf_load.threads_collect =3D pahole_threads_collect; =20 // Make 'pahole --header type < file' a shorter form of 'pahole -C type= --count 1 < file' if (conf.header_type && !class_name && prettify_input) { --=20 2.30.2