From patchwork Fri Jan 19 01:38:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Bin X-Patchwork-Id: 189374 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp734238dyb; Thu, 18 Jan 2024 17:37:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IG+yuvtKeUfmDaAxigohjmiXSuBBJwfzfBaVUQCocFmaKTPDudIG9s4ab9L3AAEVsnpkMg6 X-Received: by 2002:a50:fb83:0:b0:55a:6a:8655 with SMTP id e3-20020a50fb83000000b0055a006a8655mr1073984edq.66.1705628234213; Thu, 18 Jan 2024 17:37:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705628234; cv=pass; d=google.com; s=arc-20160816; b=iuMqOAVs1dBiaqeuskIyVtA+Hf8IWARhJjYOFYhmAu1hO/73lRk24qHBqM+BXAYcMW sJzt4+VDMWpcv2xm96qoiqnYk1T4LFBpa0oV/xU4G3KzgVR7/ATICVyF64n/uCBqcBuS YzPQhvx7tnAbt9eEdChToqwzeCDET8mkLkawvxiQErrOKTr6Vrb+Qr58VHHpB3jVUW4z mJxrM7I27a1nThPrnz5P2ZJ2PzCyGevPPIql2ykVBy3gtNWIdbIwMr35L9H0d7+OCm2+ aJ056twcDfioNLNS+YJJcDGSjrlyyPvm2UHoXZ7KRdSuM83XAvt+sLXN20NhCrn5/ZGe XJ9g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=wfgHjHtmw0px4uSXCu15VJZAOYdqfEfqQw6KwQLKsFY=; fh=Us/DORbzHj5XmgnBeJW+VlCBdo2pSXKHAejHonylCvY=; b=sAZfskmQTh1+XYJifIo8xYzq/N6zpviIDMYSAMo7dtmDcpklcvJXbZcWvHa2740gHJ vmdb46uJlZLw3fpcNY42zFLnadN3pQnCNYAl7ccXjulby/puOaE3qJSnilKwCwCPgyIx BDd6qtWZNqF6xq9e/aONAQ+e2lxYf+PpjsT9KMiE0xc/aAI58vclB/pb9WmWDqCOYa0Z eyNS7R0s4Wfr5eS8aNrJIEeqpKxEYUyaokNQE8Z3wj2PYH1rBtCFovXsX48CVr98TAt8 Z5mIT6skPinmFcLHNfSkoYI5TLRKcodENXaG6ucZoU0bxU9G0SVwPzK9xVhf7rz15k31 5vYQ== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-30688-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-30688-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id cm16-20020a0564020c9000b00559ef78e8fdsi1623281edb.685.2024.01.18.17.37.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 17:37:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-30688-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-30688-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-30688-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id CD2FA1F2222F for ; Fri, 19 Jan 2024 01:37:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C6B4879C5; Fri, 19 Jan 2024 01:36:22 +0000 (UTC) Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) (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 48B24ED9; Fri, 19 Jan 2024 01:36:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.190 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705628181; cv=none; b=IcLK54/OOoCcLycL+qf+i3rF+eABVCAjG03V1lpg8W/83nQLGcrM7q9c+NbVSUOjGJ7+YDvKf2mp3P/OvrAwt5UcTx5T8LqX3raogkQdOox8q60+qLSezbH9SGzEr/XuaUqB3EXD38+g2EVgklPFW055Jzm2hroae1owk8wJZu4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705628181; c=relaxed/simple; bh=9v9m7nPcfnEvdIhqDenml4Or78lsJCXEaQSzOCTjMqs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qKhtvSkchW48cYhzLHdf6tbnioT54wMRkc+YbCP8TtRMl7KMmT0Uo1jw7E0lo6gTY0Tf170ABdxi7NX9uPBltX4xRTBb+HfuT8KYVmqXW3px82ObpkfJQFqvMXnk/ZF1pWGQ/PDZ/4CsS36pTFMZOLcmn4/YDrUe6OtGFe2OuBU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.190 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.234]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4TGMcx0wGTz1xmR9; Fri, 19 Jan 2024 09:35:29 +0800 (CST) Received: from canpemm500010.china.huawei.com (unknown [7.192.105.118]) by mail.maildlp.com (Postfix) with ESMTPS id C0304140113; Fri, 19 Jan 2024 09:36:15 +0800 (CST) Received: from huawei.com (10.175.127.227) by canpemm500010.china.huawei.com (7.192.105.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Fri, 19 Jan 2024 09:36:15 +0800 From: Ye Bin To: , , , CC: , Subject: [PATCH 2/3] tracing/probes: support '%pD' type for print struct file's name Date: Fri, 19 Jan 2024 09:38:47 +0800 Message-ID: <20240119013848.3111364-3-yebin10@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240119013848.3111364-1-yebin10@huawei.com> References: <20240119013848.3111364-1-yebin10@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To canpemm500010.china.huawei.com (7.192.105.118) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788480830854416093 X-GMAIL-MSGID: 1788480830854416093 Similar to '%pD' for printk, use 'pD' for print struct file's name. Signed-off-by: Ye Bin --- kernel/trace/trace_probe.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 460f98b85b1c..400a1dd52c39 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -12,6 +12,7 @@ #define pr_fmt(fmt) "trace_probe: " fmt #include +#include #include #include "trace_btf.h" @@ -89,6 +90,8 @@ static const struct fetch_type probe_fetch_types[] = { "__data_loc char[]"), __ASSIGN_FETCH_TYPE("pd", string, string, sizeof(u32), 1, 1, "__data_loc char[]"), + __ASSIGN_FETCH_TYPE("pD", string, string, sizeof(u32), 1, 1, + "__data_loc char[]"), /* Basic types */ ASSIGN_FETCH_TYPE(u8, u8, 0), ASSIGN_FETCH_TYPE(u16, u16, 0), @@ -1093,18 +1096,26 @@ static int __parse_bitfield_probe_arg(const char *bf, return (BYTES_TO_BITS(t->size) < (bw + bo)) ? -EINVAL : 0; } -static char* traceprobe_expand_dentry(const char *argv) +static char* traceprobe_expand_dentry_file(const char *argv, bool is_dentry) { #define DENTRY_EXPAND_LEN 7 /* +0xXX() */ + #define FILE_EXPAND_LEN 15 /* +0xXX(+0xXXX()) */ char *new_argv; - int len = strlen(argv) + 1 + DENTRY_EXPAND_LEN; + int len, ret; + len = strlen(argv) + 1 + (is_dentry ? DENTRY_EXPAND_LEN : FILE_EXPAND_LEN); new_argv = kmalloc(len, GFP_KERNEL); if (!new_argv) return NULL; - if (snprintf(new_argv, len, "+0x%lx(%s)", - offsetof(struct dentry, d_name.name), argv) >= len) { + if (is_dentry) + ret = snprintf(new_argv, len, "+0x%lx(%s)", + offsetof(struct dentry, d_name.name), argv); + else + ret = snprintf(new_argv, len, "+0x%lx(+0x%lx(%s))", + offsetof(struct dentry, d_name.name), + offsetof(struct file, f_path.dentry), argv); + if (ret >= len) { kfree(new_argv); return NULL; } @@ -1205,10 +1216,11 @@ static int traceprobe_parse_probe_arg_body(const char *argv, ssize_t *size, parg->count); } - if (!strcmp("pd", parg->type->name)) { + if (!strcasecmp("pd", parg->type->name)) { char *temp; - temp = traceprobe_expand_dentry(arg); + temp = traceprobe_expand_dentry_file(arg, + parg->type->name[1] == 'd'); if (!temp) goto out; org_arg = arg; @@ -1277,7 +1289,7 @@ static int traceprobe_parse_probe_arg_body(const char *argv, ssize_t *size, } } - if (!strcmp(parg->type->name, "pd")) + if (!strcasecmp(parg->type->name, "pd")) code++; /* If op == DEREF, replace it with STRING */