From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87E44C433F5 for ; Mon, 8 Nov 2021 08:39:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3C88C61288 for ; Mon, 8 Nov 2021 08:39:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3C88C61288 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id D49826B0080; Mon, 8 Nov 2021 03:39:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CF7AB6B0081; Mon, 8 Nov 2021 03:39:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BBEE26B0082; Mon, 8 Nov 2021 03:39:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0222.hostedemail.com [216.40.44.222]) by kanga.kvack.org (Postfix) with ESMTP id ACE1D6B0080 for ; Mon, 8 Nov 2021 03:39:47 -0500 (EST) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 6A5E6182012B6 for ; Mon, 8 Nov 2021 08:39:47 +0000 (UTC) X-FDA: 78785114814.18.6410515 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by imf13.hostedemail.com (Postfix) with ESMTP id E7CC7104F341 for ; Mon, 8 Nov 2021 08:39:36 +0000 (UTC) Received: by mail-pf1-f177.google.com with SMTP id 127so15309903pfu.1 for ; Mon, 08 Nov 2021 00:39:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jQqHvCs2MTZ23pzaDipnjVEuJT5n+/mnDeqlR4J5X1s=; b=FBNJQvD8VIJ6uUEzs0CTS/FbDDoXwoxs2R7wK/wQUA0G2/b5AyxLoDfdGh03PKDWoh kirsgwnEtgFvH6YXH4cHpV8TPoKMeouBoBiC9HBeYFy6mXZeKNYDruFrgxtOtagUaCHp laFxG90tvGykBeri7hkDoLFRwQRQskQEs6ahxhAKpWhI94I8pbssT34fAVk2dErfHPdn Xf0SmxbL7jOttaxJa1IyBdg3ONVLHFeSxEz8eeUXOFQyOYVn+s2HEuNodd0VQ6V5JfsJ qYDap4v3ZeSpmUjay38ZhsC6COJgO0aa9XaUvqaVMeLsiWjO63ipYlCWpCk6Sng6QqLT XycA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jQqHvCs2MTZ23pzaDipnjVEuJT5n+/mnDeqlR4J5X1s=; b=nJaY2rAYVUne9LOdvoRl9xlInXyft+jf95z73KipcEj+g6A8RCsP72KywHMbNVmpRe J07LDtANWXg8/fajECIUiEk6UUkZJGpPNeJn+jB3xRxOcj0FK47kqZvqxMm12rCwshEB 4nMzs6LaV14goYXW38h+U4gNdMa3tO9W2tqNvV7wzMtbfcw7gaqJS/PpVe5QV8DA27CJ 8MnyACc7qGcN1hbWCN5W/aSCzP+TizpWu+dU+yvIsG5cOh8GkegWPSpO3Tco2JLul3g4 UH+M5Neb5++p1HaLf+95ZS2/hqpwi/iRI3KzKYcl580dUFoBQNkznh1LkXD4qO+FOmKl brWQ== X-Gm-Message-State: AOAM532d2V2Z4L/sb/Sv3lrQszHD7CJjJw6U2LCaE65FzD0F28LuKIPp SML3L3ckUENR4S/5M4T4jG4= X-Google-Smtp-Source: ABdhPJzC5TIvVeUxW/sa1XCq0pzyQv39+eD9OWLIs5cika5zyfhxlNpP9FYB8kkiEly2ft4BYkpcVA== X-Received: by 2002:aa7:96ba:0:b0:49f:c35f:83f8 with SMTP id g26-20020aa796ba000000b0049fc35f83f8mr10317791pfk.47.1636360786296; Mon, 08 Nov 2021 00:39:46 -0800 (PST) Received: from localhost.localdomain ([45.63.124.202]) by smtp.gmail.com with ESMTPSA id w3sm12253206pfd.195.2021.11.08.00.39.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 00:39:45 -0800 (PST) From: Yafang Shao To: akpm@linux-foundation.org Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, oliver.sang@intel.com, lkp@intel.com, Yafang Shao , Kees Cook , Mathieu Desnoyers , Arnaldo Carvalho de Melo , Alexei Starovoitov , Andrii Nakryiko , Michal Miroslaw , Peter Zijlstra , Steven Rostedt , Matthew Wilcox , David Hildenbrand , Al Viro , Petr Mladek Subject: [PATCH 5/7] samples/bpf/test_overhead_kprobe_kern: make it adopt to task comm size change Date: Mon, 8 Nov 2021 08:38:38 +0000 Message-Id: <20211108083840.4627-6-laoar.shao@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20211108083840.4627-1-laoar.shao@gmail.com> References: <20211108083840.4627-1-laoar.shao@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: E7CC7104F341 X-Stat-Signature: s36w3j69dbgwtxhfacqn3jhd3xyzkcqr Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=FBNJQvD8; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.210.177 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com X-HE-Tag: 1636360776-728770 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: bpf_probe_read_kernel_str() will add a nul terminator to the dst, then we don't care about if the dst size is big enough. This patch also replaces the hard-coded 16 with TASK_COMM_LEN to make it adopt to task comm size change. Signed-off-by: Yafang Shao Reviewed-by: Kees Cook Cc: Mathieu Desnoyers Cc: Arnaldo Carvalho de Melo Cc: Alexei Starovoitov Cc: Andrii Nakryiko Cc: Michal Miroslaw Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Matthew Wilcox Cc: David Hildenbrand Cc: Al Viro Cc: Kees Cook Cc: Petr Mladek --- samples/bpf/offwaketime_kern.c | 4 ++-- samples/bpf/test_overhead_kprobe_kern.c | 11 ++++++----- samples/bpf/test_overhead_tp_kern.c | 5 +++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/samples/bpf/offwaketime_kern.c b/samples/bpf/offwaketime_ker= n.c index 4866afd054da..eb4d94742e6b 100644 --- a/samples/bpf/offwaketime_kern.c +++ b/samples/bpf/offwaketime_kern.c @@ -113,11 +113,11 @@ static inline int update_counts(void *ctx, u32 pid,= u64 delta) /* taken from /sys/kernel/debug/tracing/events/sched/sched_switch/format= */ struct sched_switch_args { unsigned long long pad; - char prev_comm[16]; + char prev_comm[TASK_COMM_LEN]; int prev_pid; int prev_prio; long long prev_state; - char next_comm[16]; + char next_comm[TASK_COMM_LEN]; int next_pid; int next_prio; }; diff --git a/samples/bpf/test_overhead_kprobe_kern.c b/samples/bpf/test_o= verhead_kprobe_kern.c index f6d593e47037..8fdd2c9c56b2 100644 --- a/samples/bpf/test_overhead_kprobe_kern.c +++ b/samples/bpf/test_overhead_kprobe_kern.c @@ -6,6 +6,7 @@ */ #include #include +#include #include #include #include @@ -22,17 +23,17 @@ int prog(struct pt_regs *ctx) { struct signal_struct *signal; struct task_struct *tsk; - char oldcomm[16] =3D {}; - char newcomm[16] =3D {}; + char oldcomm[TASK_COMM_LEN] =3D {}; + char newcomm[TASK_COMM_LEN] =3D {}; u16 oom_score_adj; u32 pid; =20 tsk =3D (void *)PT_REGS_PARM1(ctx); =20 pid =3D _(tsk->pid); - bpf_probe_read_kernel(oldcomm, sizeof(oldcomm), &tsk->comm); - bpf_probe_read_kernel(newcomm, sizeof(newcomm), - (void *)PT_REGS_PARM2(ctx)); + bpf_probe_read_kernel_str(oldcomm, sizeof(oldcomm), &tsk->comm); + bpf_probe_read_kernel_str(newcomm, sizeof(newcomm), + (void *)PT_REGS_PARM2(ctx)); signal =3D _(tsk->signal); oom_score_adj =3D _(signal->oom_score_adj); return 0; diff --git a/samples/bpf/test_overhead_tp_kern.c b/samples/bpf/test_overh= ead_tp_kern.c index eaa32693f8fc..80edadacb692 100644 --- a/samples/bpf/test_overhead_tp_kern.c +++ b/samples/bpf/test_overhead_tp_kern.c @@ -4,6 +4,7 @@ * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. */ +#include #include #include =20 @@ -11,8 +12,8 @@ struct task_rename { __u64 pad; __u32 pid; - char oldcomm[16]; - char newcomm[16]; + char oldcomm[TASK_COMM_LEN]; + char newcomm[TASK_COMM_LEN]; __u16 oom_score_adj; }; SEC("tracepoint/task/task_rename") --=20 2.17.1