Received: by 2002:ab2:1149:0:b0:1f3:1f8c:d0c6 with SMTP id z9csp1946569lqz; Tue, 2 Apr 2024 02:34:06 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWAzryYNy0Ck9xmWLK4/RHGMECNvpCZzFKNE2XxtfAa6BPYSamujFTBPAimj2ryPKViO8OKDsIR+nBwDzPO27f+L3C3SqZKo4sSAdkGYw== X-Google-Smtp-Source: AGHT+IH6LQZeaycMDZPkxcMs2oYca9JSFpEuo3NACHQ6d4Jw6V2WFxk+t2ZPJWR43gcyQAHB37lP X-Received: by 2002:a17:90a:fd96:b0:2a2:6244:32b5 with SMTP id cx22-20020a17090afd9600b002a2624432b5mr1136399pjb.11.1712050446365; Tue, 02 Apr 2024 02:34:06 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712050446; cv=pass; d=google.com; s=arc-20160816; b=1HtKg6Q12KzA9f/w4Jnn75xRBV+x5SvN2Oo/8K/5P/bf2Vu77jvyRbFA4VhoPEMPes J4wz+0vwJBK+gCUlm6cpmaOwA2+DXSnqFgXMQZi6CWmQcDUoTHEaVZ++747VWqQxgpUu /Tx9C1ZJlDKAheXnSqGstYGwHRQFHuOdjLuqP1Fv1Hqw0jdkaczzAC9BPgtQvwHiobpG G6jC8sSrAux19Qi4XrAu6qHy0GG6M8UcUwb6vSU5Q2qpR+Anh4J0zNZF0YGaDmNDE6ja 9p6IEWcjlgI+k7KnTvXfUJTFN82Khe71I5iENU6IOpGTTsxOdU0Oi2MO9dIUXBpRe8Db ptPg== 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:dkim-signature; bh=ggSvnxud3VoC5x3+PuJWx/+x8akRs3yI11t/dzhUYcI=; fh=WgAS3umXxbyQId9aPc2QKOeov9Gf2yKTsTTaOZ3LbMc=; b=gegmolDeUTHMCB+ofvGv/m3bM/zjlg0FHoreeh0NbpWhSl+8knFyORcm4JNU+sc3vM b5DQgPyd5dwHkjXIeHl8zSGjPWZRnX018z6mNwxSv/1XiBihIsen8bQAltxBxlKynh13 TUBz8SPyoCxgkwR/e40Y65ncwgE8cRPyw2qQyGBVMb9DmkHa/REzyzStRvwNlvb0b/cD hsV10QW55ARC8j28PvBggO0npqmtAIriLm2qFbj669u+banI36mf2zPouHfEzLuhnJG2 4YYoUpH0Y1xecsW0NBTrPgl6l5nojl4yF6Rz6SsDeKS2uFgorYjOmsZhKaI4oxbIjRV4 oUHQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oFTNaz+e; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-127639-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-127639-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id a18-20020a17090aa51200b002a03864ce2bsi13178970pjq.171.2024.04.02.02.34.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 02:34:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-127639-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oFTNaz+e; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-127639-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-127639-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id CD6F9282FA0 for ; Tue, 2 Apr 2024 09:34:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 740B358AC3; Tue, 2 Apr 2024 09:33:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oFTNaz+e" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 69C9A5822A; Tue, 2 Apr 2024 09:33:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712050419; cv=none; b=MrYusPwzvEcZHVVwoUdnvbLTuoySYjiZfZ7RD4uilgj17pBAIFHosW/H7OZxmJlhqMHJ2fBEm/AeOYUK8+qHy9A2U3DPXAGlEfuAeVmgUEcDbIjR+GXi49Xl8bu0sW3rV3oIHAKh0kGL5+eznz5rwPXyFTJkd/lAmx3uQMU4/OI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712050419; c=relaxed/simple; bh=CN/0bvZF7u+3c1dNdVa1XcG94ZWxF1kZ5q3Qu3S+EmY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZHEfMML+w9s4RCjaLQjVrIKrAjbj1S/JOYIPj9PoQSEnOl3fSm7/9AXn7wG8bpROw7SnCd7xcH/A6BghLQX7wEeg/XTRkNJoTBzw49xIbbN3QI8S2GU2DtoKoaM7kvJJQT1VMR4dlmCryDettqv9DFhJAgvdn1O5zSggfaW2J64= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oFTNaz+e; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8FDFC433F1; Tue, 2 Apr 2024 09:33:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712050419; bh=CN/0bvZF7u+3c1dNdVa1XcG94ZWxF1kZ5q3Qu3S+EmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oFTNaz+eE+/N3fwEP+Aln0RB6iAYtWOl/CSrCGziDfrVn/4KONHGXtatH/UetIK2o dDg+0EKqtrRnP4GEW5I5A3L0tzbjpStI2K8daeUKyWf4gF4J4RGKKdCSEBPSIi7WaV GhB/5xJCALGHja331wef6/Gp8Iuz02VgoURPw5vBVbeQ3bsdBJWrRB1lS4Z6VQUJQM AxhQB9Sj6fjvvSSmU7wC0+DW7yKKNM5VXjAaBN8AU37cKORLJNQcVXnGp2orLbDvBp MB0Uoe8+/hNoRIEpz8+wJDYu0aCpG7ZJVoZCuYHvk/AcyCfA5zoRC+Khf8YxbRe1ay KnHNDi10z+YzA== From: Jiri Olsa To: Steven Rostedt , Masami Hiramatsu , Oleg Nesterov , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, bpf@vger.kernel.org, Song Liu , Yonghong Song , John Fastabend , Peter Zijlstra , Thomas Gleixner , "Borislav Petkov (AMD)" , x86@kernel.org Subject: [PATCHv2 bpf-next 3/3] selftests/bpf: Add uretprobe test for regs changes Date: Tue, 2 Apr 2024 11:33:02 +0200 Message-ID: <20240402093302.2416467-4-jolsa@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240402093302.2416467-1-jolsa@kernel.org> References: <20240402093302.2416467-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Adding test that creates uprobe consumer on uretprobe which changes some of the registers. Making sure the changed registers are propagated to the user space from the ureprobe trampoline on x86_64. To be able to do this, adding support to bpf_testmod to create uprobe via new attribute file: /sys/kernel/bpf_testmod_uprobe This file is expecting file offset and creates related uprobe on current process exe file and removes existing uprobe if offset is 0. The can be only single uprobe at any time. The uprobe has specific consumer that changes registers used in ureprobe trampoline and which are later checked in the test. Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- .../selftests/bpf/bpf_testmod/bpf_testmod.c | 122 +++++++++++++++++- .../selftests/bpf/prog_tests/uprobe_syscall.c | 67 ++++++++++ 2 files changed, 188 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c b/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c index 39ad96a18123..704ebd7fb53d 100644 --- a/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c +++ b/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "bpf_testmod.h" #include "bpf_testmod_kfunc.h" @@ -343,6 +344,118 @@ static struct bin_attribute bin_attr_bpf_testmod_file __ro_after_init = { .write = bpf_testmod_test_write, }; +/* bpf_testmod_uprobe sysfs attribute is so far enabled for x86_64 only, + * please see test_uretprobe_regs_change test */ +#ifdef __x86_64__ + +static int +uprobe_ret_handler(struct uprobe_consumer *self, unsigned long func, + struct pt_regs *regs) + +{ + regs->ax = 0x12345678deadbeef; + regs->cx = 0x87654321feebdaed; + regs->r11 = (u64) -1; + return true; +} + +struct testmod_uprobe { + struct path path; + loff_t offset; + struct uprobe_consumer consumer; +}; + +static DEFINE_MUTEX(testmod_uprobe_mutex); + +static struct testmod_uprobe uprobe = { + .consumer.ret_handler = uprobe_ret_handler, +}; + +static int testmod_register_uprobe(loff_t offset) +{ + int err = -EBUSY; + + if (uprobe.offset) + return -EBUSY; + + mutex_lock(&testmod_uprobe_mutex); + + if (uprobe.offset) + goto out; + + err = kern_path("/proc/self/exe", LOOKUP_FOLLOW, &uprobe.path); + if (err) + goto out; + + err = uprobe_register_refctr(d_real_inode(uprobe.path.dentry), + offset, 0, &uprobe.consumer); + if (err) + path_put(&uprobe.path); + else + uprobe.offset = offset; + +out: + mutex_unlock(&testmod_uprobe_mutex); + return err; +} + +static void testmod_unregister_uprobe(void) +{ + mutex_lock(&testmod_uprobe_mutex); + + if (uprobe.offset) { + uprobe_unregister(d_real_inode(uprobe.path.dentry), + uprobe.offset, &uprobe.consumer); + uprobe.offset = 0; + } + + mutex_unlock(&testmod_uprobe_mutex); +} + +static ssize_t +bpf_testmod_uprobe_write(struct file *file, struct kobject *kobj, + struct bin_attribute *bin_attr, + char *buf, loff_t off, size_t len) +{ + unsigned long offset; + int err; + + if (kstrtoul(buf, 0, &offset)) + return -EINVAL; + + if (offset) + err = testmod_register_uprobe(offset); + else + testmod_unregister_uprobe(); + + return err ?: strlen(buf); +} + +static struct bin_attribute bin_attr_bpf_testmod_uprobe_file __ro_after_init = { + .attr = { .name = "bpf_testmod_uprobe", .mode = 0666, }, + .write = bpf_testmod_uprobe_write, +}; + +static int register_bpf_testmod_uprobe(void) +{ + return sysfs_create_bin_file(kernel_kobj, &bin_attr_bpf_testmod_uprobe_file); +} + +static void unregister_bpf_testmod_uprobe(void) +{ + testmod_unregister_uprobe(); + sysfs_remove_bin_file(kernel_kobj, &bin_attr_bpf_testmod_uprobe_file); +} + +#else +static int register_bpf_testmod_uprobe(void) +{ + return 0; +} + +static void unregister_bpf_testmod_uprobe(void) { } +#endif + BTF_KFUNCS_START(bpf_testmod_common_kfunc_ids) BTF_ID_FLAGS(func, bpf_iter_testmod_seq_new, KF_ITER_NEW) BTF_ID_FLAGS(func, bpf_iter_testmod_seq_next, KF_ITER_NEXT | KF_RET_NULL) @@ -650,7 +763,13 @@ static int bpf_testmod_init(void) return ret; if (bpf_fentry_test1(0) < 0) return -EINVAL; - return sysfs_create_bin_file(kernel_kobj, &bin_attr_bpf_testmod_file); + ret = sysfs_create_bin_file(kernel_kobj, &bin_attr_bpf_testmod_file); + if (ret < 0) + return ret; + ret = register_bpf_testmod_uprobe(); + if (ret < 0) + return ret; + return 0; } static void bpf_testmod_exit(void) @@ -664,6 +783,7 @@ static void bpf_testmod_exit(void) msleep(20); sysfs_remove_bin_file(kernel_kobj, &bin_attr_bpf_testmod_file); + unregister_bpf_testmod_uprobe(); } module_init(bpf_testmod_init); diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c b/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c index 311ac19d8992..1a50cd35205d 100644 --- a/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c +++ b/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c @@ -149,15 +149,82 @@ static void test_uretprobe_regs_equal(void) cleanup: uprobe_syscall__destroy(skel); } + +#define BPF_TESTMOD_UPROBE_TEST_FILE "/sys/kernel/bpf_testmod_uprobe" + +static int write_bpf_testmod_uprobe(unsigned long offset) +{ + size_t n, ret; + char buf[30]; + int fd; + + n = sprintf(buf, "%lu", offset); + + fd = open(BPF_TESTMOD_UPROBE_TEST_FILE, O_WRONLY); + if (fd < 0) + return -errno; + + ret = write(fd, buf, n); + close(fd); + return ret != n ? (int) ret : 0; +} + +static void test_uretprobe_regs_change(void) +{ + struct pt_regs before = {}, after = {}; + unsigned long *pb = (unsigned long *) &before; + unsigned long *pa = (unsigned long *) &after; + unsigned long cnt = sizeof(before)/sizeof(*pb); + unsigned int i, err, offset; + + offset = get_uprobe_offset(uretprobe_regs_trigger); + + err = write_bpf_testmod_uprobe(offset); + if (!ASSERT_OK(err, "register_uprobe")) + return; + + uretprobe_regs(&before, &after); + + err = write_bpf_testmod_uprobe(0); + if (!ASSERT_OK(err, "unregister_uprobe")) + return; + + for (i = 0; i < cnt; i++) { + unsigned int offset = i * sizeof(unsigned long); + + switch (offset) { + case offsetof(struct pt_regs, rax): + ASSERT_EQ(pa[i], 0x12345678deadbeef, "rax"); + break; + case offsetof(struct pt_regs, rcx): + ASSERT_EQ(pa[i], 0x87654321feebdaed, "rcx"); + break; + case offsetof(struct pt_regs, r11): + ASSERT_EQ(pa[i], (__u64) -1, "r11"); + break; + default: + if (!ASSERT_EQ(pa[i], pb[i], "register before-after value check")) + fprintf(stdout, "failed register offset %u\n", offset); + } + } +} + #else static void test_uretprobe_regs_equal(void) { test__skip(); } + +static void test_uretprobe_regs_change(void) +{ + test__skip(); +} #endif void test_uprobe_syscall(void) { if (test__start_subtest("uretprobe_regs_equal")) test_uretprobe_regs_equal(); + if (test__start_subtest("uretprobe_regs_change")) + test_uretprobe_regs_change(); } -- 2.44.0