From patchwork Mon Oct 23 09:57:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Maguire X-Patchwork-Id: 13432700 X-Patchwork-Delegate: bpf@iogearbox.net Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 405DE1429B for ; Mon, 23 Oct 2023 09:58:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="M02WGdcB" Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8F2C1994 for ; Mon, 23 Oct 2023 02:58:26 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39N6kMXs018254; Mon, 23 Oct 2023 09:57:38 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2023-03-30; bh=QIuDmul7oyTlvtmdeR4Erkrj5nyqjgT3l/40UW/4P44=; b=M02WGdcBvSGDRMjouSzcHkMsBEu5ThOMexBUn7cOZbmjWIN+apZPMlTNmru9rEkEA7bf 3NjkRRiIxfbU0sJ/vrGLGgj3T+5BxQdYoExMnBotcICyISMbLs9WhLLO8wcc/KU6cY0i R/B7XnLy0bh5+gMve02exaIGd5oH8s7gdbdCop0Jlbhie53T+ttIQXaauvUmkCAipy7P qmTWbl/89x3IlnvZYTgyWndEAvJkdt5nfQHgA50eE5DCS8g2OAvY2KMjd/2EIeo2aVc4 Jd4IrEFIXT71L3dScOQLRsfCHuaFMYYn0ccoidN7ag5OzfNCKno2Q/pwUIH0/wIFdkSJ cw== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3tv52dtqxq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 23 Oct 2023 09:57:38 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 39N9uQnq001762; Mon, 23 Oct 2023 09:57:37 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3tv53a810m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 23 Oct 2023 09:57:37 +0000 Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 39N9t2cN039213; Mon, 23 Oct 2023 09:57:37 GMT Received: from bpf.uk.oracle.com (dhcp-10-175-206-92.vpn.oracle.com [10.175.206.92]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3tv53a80w0-2; Mon, 23 Oct 2023 09:57:36 +0000 From: Alan Maguire To: acme@kernel.org, andrii.nakryiko@gmail.com Cc: jolsa@kernel.org, ast@kernel.org, daniel@iogearbox.net, eddyz87@gmail.com, martin.lau@linux.dev, song@kernel.org, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, mykolal@fb.com, bpf@vger.kernel.org, Alan Maguire , Andrii Nakryiko Subject: [PATCH v4 dwarves 1/5] btf_encoder, pahole: move btf encoding options into conf_load Date: Mon, 23 Oct 2023 10:57:22 +0100 Message-Id: <20231023095726.1179529-2-alan.maguire@oracle.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231023095726.1179529-1-alan.maguire@oracle.com> References: <20231023095726.1179529-1-alan.maguire@oracle.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-23_07,2023-10-19_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999 adultscore=0 bulkscore=0 suspectscore=0 mlxscore=0 phishscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310170001 definitions=main-2310230085 X-Proofpoint-ORIG-GUID: 4ig3BmBQqG5NkmGnDLuGlIVhNZGP58MA X-Proofpoint-GUID: 4ig3BmBQqG5NkmGnDLuGlIVhNZGP58MA ...rather than passing them to btf_encoder__new(); this tidies up the encoder API and also allows us to use generalized methods to translate from a BTF feature (forthcoming) to a conf_load value. Signed-off-by: Alan Maguire Acked-by: Jiri Olsa Acked-by: Andrii Nakryiko Acked-by: Eduard Zingerman --- btf_encoder.c | 8 ++++---- btf_encoder.h | 2 +- dwarves.h | 3 +++ pahole.c | 21 ++++++++------------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/btf_encoder.c b/btf_encoder.c index 65f6e71..fd04008 100644 --- a/btf_encoder.c +++ b/btf_encoder.c @@ -1625,7 +1625,7 @@ out: return err; } -struct btf_encoder *btf_encoder__new(struct cu *cu, const char *detached_filename, struct btf *base_btf, bool skip_encoding_vars, bool force, bool gen_floats, bool verbose) +struct btf_encoder *btf_encoder__new(struct cu *cu, const char *detached_filename, struct btf *base_btf, bool verbose, struct conf_load *conf_load) { struct btf_encoder *encoder = zalloc(sizeof(*encoder)); @@ -1639,9 +1639,9 @@ struct btf_encoder *btf_encoder__new(struct cu *cu, const char *detached_filenam if (encoder->btf == NULL) goto out_delete; - encoder->force = force; - encoder->gen_floats = gen_floats; - encoder->skip_encoding_vars = skip_encoding_vars; + encoder->force = conf_load->btf_encode_force; + encoder->gen_floats = conf_load->btf_gen_floats; + encoder->skip_encoding_vars = conf_load->skip_encoding_btf_vars; encoder->verbose = verbose; encoder->has_index_type = false; encoder->need_index_type = false; diff --git a/btf_encoder.h b/btf_encoder.h index 34516bb..f54c95a 100644 --- a/btf_encoder.h +++ b/btf_encoder.h @@ -16,7 +16,7 @@ struct btf; struct cu; struct list_head; -struct btf_encoder *btf_encoder__new(struct cu *cu, const char *detached_filename, struct btf *base_btf, bool skip_encoding_vars, bool force, bool gen_floats, bool verbose); +struct btf_encoder *btf_encoder__new(struct cu *cu, const char *detached_filename, struct btf *base_btf, bool verbose, struct conf_load *conf_load); void btf_encoder__delete(struct btf_encoder *encoder); int btf_encoder__encode(struct btf_encoder *encoder); diff --git a/dwarves.h b/dwarves.h index eb1a6df..db68161 100644 --- a/dwarves.h +++ b/dwarves.h @@ -68,6 +68,9 @@ struct conf_load { bool skip_encoding_btf_enum64; bool btf_gen_optimized; bool skip_encoding_btf_inconsistent_proto; + bool skip_encoding_btf_vars; + bool btf_gen_floats; + bool btf_encode_force; uint8_t hashtable_bits; uint8_t max_hashtable_bits; uint16_t kabi_prefix_len; diff --git a/pahole.c b/pahole.c index e843999..7a41dc3 100644 --- a/pahole.c +++ b/pahole.c @@ -32,13 +32,10 @@ static struct btf_encoder *btf_encoder; static char *detached_btf_filename; static bool btf_encode; -static bool btf_gen_floats; static bool ctf_encode; static bool sort_output; static bool need_resort; static bool first_obj_only; -static bool skip_encoding_btf_vars; -static bool btf_encode_force; static const char *base_btf_file; static const char *prettify_input_filename; @@ -1786,9 +1783,9 @@ static error_t pahole__options_parser(int key, char *arg, case ARGP_header_type: conf.header_type = arg; break; case ARGP_skip_encoding_btf_vars: - skip_encoding_btf_vars = true; break; + conf_load.skip_encoding_btf_vars = true; break; case ARGP_btf_encode_force: - btf_encode_force = true; break; + conf_load.btf_encode_force = true; break; case ARGP_btf_base: base_btf_file = arg; break; case ARGP_kabi_prefix: @@ -1797,9 +1794,9 @@ static error_t pahole__options_parser(int key, char *arg, case ARGP_numeric_version: print_numeric_version = true; break; case ARGP_btf_gen_floats: - btf_gen_floats = true; break; + conf_load.btf_gen_floats = true; break; case ARGP_btf_gen_all: - btf_gen_floats = true; break; + conf_load.btf_gen_floats = true; break; case ARGP_with_flexible_array: show_with_flexible_array = true; break; case ARGP_prettify_input_filename: @@ -3063,8 +3060,8 @@ static enum load_steal_kind pahole_stealer(struct cu *cu, * And, it is used by the thread * create it. */ - btf_encoder = btf_encoder__new(cu, detached_btf_filename, conf_load->base_btf, skip_encoding_btf_vars, - btf_encode_force, btf_gen_floats, global_verbose); + btf_encoder = btf_encoder__new(cu, detached_btf_filename, conf_load->base_btf, + global_verbose, conf_load); if (btf_encoder && thr_data) { struct thread_data *thread = thr_data; @@ -3093,10 +3090,8 @@ static enum load_steal_kind pahole_stealer(struct cu *cu, thread->encoder = btf_encoder__new(cu, detached_btf_filename, NULL, - skip_encoding_btf_vars, - btf_encode_force, - btf_gen_floats, - global_verbose); + global_verbose, + conf_load); thread->btf = btf_encoder__btf(thread->encoder); } encoder = thread->encoder;