From 44c4aab5424b6a48bb89d27b7cce406147fc2cf7 Mon Sep 17 00:00:00 2001 From: chenjingwei Date: Tue, 9 Dec 2025 20:20:14 +0800 Subject: [PATCH] urma:add ubcore_log_level module parama and change global log level of ubmad openEuler inclusion category: feature bugzilla: https://gitee.com/openeuler/release-management/issues/ID3WJX CVE: NA ------------------------------------------------------------ Add ubcore_log_level module parameter to control log level. Change global log level of ubmad for better debugging experience. Signed-off-by: chenjingwei --- drivers/ub/urma/ubcore/ubcm/ubcm_log.c | 2 +- drivers/ub/urma/ubcore/ubcm/ubmad_datapath.c | 24 ++++++++++---------- drivers/ub/urma/ubcore/ubcore_main.c | 8 +++++++ 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/drivers/ub/urma/ubcore/ubcm/ubcm_log.c b/drivers/ub/urma/ubcore/ubcm/ubcm_log.c index dd0154308276..1d462e4e632b 100644 --- a/drivers/ub/urma/ubcore/ubcm/ubcm_log.c +++ b/drivers/ub/urma/ubcore/ubcm/ubcm_log.c @@ -12,4 +12,4 @@ #include #include "ubcm_log.h" -uint32_t g_ubcm_log_level = UBCM_LOG_LEVEL_INFO; +uint32_t g_ubcm_log_level = UBCM_LOG_LEVEL_WARNING; diff --git a/drivers/ub/urma/ubcore/ubcm/ubmad_datapath.c b/drivers/ub/urma/ubcore/ubcm/ubmad_datapath.c index e6897e29c62c..e0e45948a8de 100644 --- a/drivers/ub/urma/ubcore/ubcm/ubmad_datapath.c +++ b/drivers/ub/urma/ubcore/ubcm/ubmad_datapath.c @@ -121,7 +121,7 @@ static void ubmad_rt_work_handler(struct work_struct *work) ubcm_log_err("repost send failed. msg type %d msn %llu\n", msg->msg_type, msg->msn); } - ubcm_log_info("Do not repost, found: %u, rt_work->rt_cnt: %u.\n", + ubcm_log_info_rl("Do not repost, found: %u, rt_work->rt_cnt: %u.\n", (uint32_t)found, rt_work->rt_cnt); /* not found OR repost failed @@ -369,7 +369,7 @@ static int ubmad_do_post_send_conn_data(struct ubcore_jetty *jetty, goto destroy_msn_node; } - ubcm_log_info("send conn data successfully. msn %llu eid " EID_FMT "\n", + ubcm_log_info_rl("send conn data successfully. msn %llu eid " EID_FMT "\n", msn, EID_ARGS(*dst_eid)); return 0; @@ -587,7 +587,7 @@ int ubmad_repost_send_conn_data(struct ubcore_jetty *jetty, return -1; } - ubcm_log_info("send conn data successfully. msn %llu eid " EID_FMT "\n", + ubcm_log_info_rl("send conn data successfully. msn %llu eid " EID_FMT "\n", msn, EID_ARGS(*dst_eid)); return 0; } @@ -603,7 +603,7 @@ int ubmad_repost_send(struct ubmad_msg *msg, struct ubmad_tjetty *tjetty, struct ubcore_jfs_wr jfs_wr = { 0 }; int ret; - ubcm_log_info("timeout and repost. msn %llu eid " EID_FMT "\n", + ubcm_log_info_rl("timeout and repost. msn %llu eid " EID_FMT "\n", msg->msn, EID_ARGS(*dst_eid)); // prepare wr @@ -802,7 +802,7 @@ static int ubmad_process_conn_data(struct ubcore_cr *cr, } } - ubcm_log_info( + ubcm_log_info_rl( "Finish to recv request. msn %llu right_end %llu, seid " EID_FMT "\n", msg->msn, seid_node->rx_bitmap->right_end, EID_ARGS(*seid)); @@ -854,12 +854,12 @@ static void ubmad_process_conn_ack(struct ubcore_cr *cr, } spin_unlock_irqrestore(&msn_mgr->msn_hlist_lock, flag); // msn_node not in msn_hlist, indicates already removed by previous ack with same msn - ubcm_log_info("redundant ack. msn %llu seid " EID_FMT "\n", msg->msn, + ubcm_log_info_rl("redundant ack. msn %llu seid " EID_FMT "\n", msg->msn, EID_ARGS(*seid)); put_tjetty: ubmad_put_tjetty(tjetty); - ubcm_log_info("recv conn ack. msn %llu seid " EID_FMT "\n", msg->msn, + ubcm_log_info_rl("recv conn ack. msn %llu seid " EID_FMT "\n", msg->msn, EID_ARGS(*seid)); } @@ -887,7 +887,7 @@ static inline void ubmad_process_close_req(struct ubcore_cr *cr, ubmad_remove_tjetty(&cr->remote_id.eid, rsrc); ubmad_delete_seid_node(&cr->remote_id.eid, rsrc); - ubcm_log_info("Finish to process close request, remote eid: " EID_FMT + ubcm_log_info_rl("Finish to process close request, remote eid: " EID_FMT ", remote id: %u.\n", EID_ARGS(cr->remote_id.eid), cr->remote_id.id); } @@ -965,7 +965,7 @@ int ubmad_ubc_send(struct ubcore_device *device, send_buf->src_eid = dev_priv->eid_info.eid; ubmad_put_device_priv(dev_priv); - ubcm_log_info("ubc dev: %s, s_eid: " EID_FMT ", d_eid: " EID_FMT " ", + ubcm_log_info_rl("ubc dev: %s, s_eid: " EID_FMT ", d_eid: " EID_FMT " ", device->dev_name, EID_ARGS(send_buf->src_eid), EID_ARGS(send_buf->dst_eid)); @@ -1043,7 +1043,7 @@ static void ubmad_send_work_handler(struct ubmad_device_priv *dev_priv, } while (cr_cnt > 0); ret = ubcore_rearm_jfc(jfc, false); - ubcm_log_info("Rearm send jfc, jfc_id: %u, ret: %d.\n", jfc->id, ret); + ubcm_log_info_rl("Rearm send jfc, jfc_id: %u, ret: %d.\n", jfc->id, ret); } // polling here indicates if recv msg @@ -1106,7 +1106,7 @@ static void ubmad_recv_work_handler(struct ubmad_device_priv *dev_priv, } while (cr_cnt > 0); ret = ubcore_rearm_jfc(jfc, false); - ubcm_log_info("Rearm recv jfc, jfc_id: %u, ret: %d.\n", jfc->id, ret); + ubcm_log_info_rl("Rearm recv jfc, jfc_id: %u, ret: %d.\n", jfc->id, ret); } // continue from ubmad_jfce_handler() @@ -1164,7 +1164,7 @@ static void ubmad_jfce_handler(struct ubcore_jfc *jfc, jfc->ub_dev->dev_name); return; } - ubcm_log_info("Start to handle jfce, type: %d, jfc_id: %u.\n", type, jfc->id); + ubcm_log_info_rl("Start to handle jfce, type: %d, jfc_id: %u.\n", type, jfc->id); // free in ubmad_jfce_work_handler() jfce_work = kzalloc(sizeof(struct ubmad_jfce_work), GFP_ATOMIC); diff --git a/drivers/ub/urma/ubcore/ubcore_main.c b/drivers/ub/urma/ubcore/ubcore_main.c index b0cb2ca68823..6b5548f2027f 100644 --- a/drivers/ub/urma/ubcore/ubcore_main.c +++ b/drivers/ub/urma/ubcore/ubcore_main.c @@ -21,6 +21,14 @@ #include "ubcore_genl.h" #include "ubcm/ub_cm.h" +#define UBCORE_LOG_FILE_PERMISSION (0644) + +module_param(g_ubcore_log_level, uint, UBCORE_LOG_FILE_PERMISSION); +MODULE_PARM_DESC(g_ubcore_log_level, " 3: ERR, 4: WARNING, 6: INFO, 7: DEBUG"); + +module_param(g_ubcore_connect_type, uint, UBCORE_LOG_FILE_PERMISSION); +MODULE_PARM_DESC(g_ubcore_connect_type, " 0: WK-JETTY, 1: SOCK"); + static int __init ubcore_init(void) { int ret; -- Gitee