From patchwork Thu Jun 15 13:05:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 108536 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp652342vqr; Thu, 15 Jun 2023 06:55:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ40xC3VMpq4jEO/NTMsH6lBBifNrqjr8HJr1PTK/xKppYK6f4KvMb2QWDgI0yluLWH01Xi/ X-Received: by 2002:a17:902:aa8f:b0:1b0:339d:db6a with SMTP id d15-20020a170902aa8f00b001b0339ddb6amr11253288plr.21.1686837355875; Thu, 15 Jun 2023 06:55:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686837355; cv=none; d=google.com; s=arc-20160816; b=f16U6BV6PiJUZvCMQYxiguF8X7WMxmjbuIFrUKYHhIDL75bbA5Xx91S3BEg1qKryIp kRBh9CsRmGuI420bYFWuusYnnffAAhdhaOBkWGGmfngvyzG24sZPvdg0hEhqYoy4fuSi l0CkGfpFGPu8M9qS+2Kus9OBZheat8AqTCwrB6nPmN8mv32F6UAcOGAVwBgufNUAgjzF z38hr5sljjFNXM5iHqp7n14kST8ijIOyvfA19FKjFoCPObe9op0ZWU+v1fSM6yJu4+jO SqJ68xACzmJrVNMx7oaInToW90Q6qdG10wTgMJlP1vBP8gdtYslWC5jIktJJDwtB8NaE PsCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=1H99irYoc6cLb0K06NrlLERSJzm53pvbaeeqoxLQYZw=; b=LI3qcz6MyQJoPIHz4LLndncnk23RTw5HpewiKXwxU4KwneKVU/svAH2s3W9+XEBEFf AXWTTxLG2WqEszt2uBKK68GacfkiZ7H0p0ueKs8GDotJy71BxJ90zT0aSj6kZI85llkK VBo3vFt1u8t5zzhUzn0kgAO3k80kK3z5ivYli9V+jzi3N8YsTHYowhpVSKy7A/aKDOXM TBXPEUIIce92i/vmuo1GKMECt7YljBHlmCgGE+60u7tylYdeIXpzQBlk+811rEG7BZc+ ChLfslQPgaN39LkszUsMJptXph8LkUtk/sD6pV9fvicXHjHfYN4+dIofeje5aAe6w/BJ kdaA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m11-20020a170902f64b00b001a95b85b070si9730186plg.604.2023.06.15.06.55.43; Thu, 15 Jun 2023 06:55:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344404AbjFONg6 (ORCPT + 99 others); Thu, 15 Jun 2023 09:36:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344361AbjFONgV (ORCPT ); Thu, 15 Jun 2023 09:36:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96DE7358B for ; Thu, 15 Jun 2023 06:35:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 86325638B3 for ; Thu, 15 Jun 2023 13:34:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F19F1C433CC; Thu, 15 Jun 2023 13:34:16 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1q9n7A-000To3-0E; Thu, 15 Jun 2023 09:34:16 -0400 Message-ID: <20230615133415.888378523@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 15 Jun 2023 09:05:37 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Beau Belgrave , sunliming Subject: [for-linus][PATCH 06/15] selftests/user_events: Add ftrace self-test for empty arguments events References: <20230615130531.200384328@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768777166916270389?= X-GMAIL-MSGID: =?utf-8?q?1768777166916270389?= From: sunliming Tests to ensure events that has empty arguments can input trace record correctly when using ftrace. Link: https://lkml.kernel.org/r/20230606062027.1008398-3-sunliming@kylinos.cn Acked-by: Beau Belgrave Acked-by: Masami Hiramatsu (Google) Signed-off-by: sunliming Signed-off-by: Steven Rostedt (Google) --- .../selftests/user_events/ftrace_test.c | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tools/testing/selftests/user_events/ftrace_test.c b/tools/testing/selftests/user_events/ftrace_test.c index 6e8c4b47281c..abfb49558a26 100644 --- a/tools/testing/selftests/user_events/ftrace_test.c +++ b/tools/testing/selftests/user_events/ftrace_test.c @@ -316,6 +316,39 @@ TEST_F(user, write_events) { ASSERT_EQ(EINVAL, errno); } +TEST_F(user, write_empty_events) { + struct user_reg reg = {0}; + struct iovec io[1]; + int before = 0, after = 0; + + reg.size = sizeof(reg); + reg.name_args = (__u64)"__test_event"; + reg.enable_bit = 31; + reg.enable_addr = (__u64)&self->check; + reg.enable_size = sizeof(self->check); + + io[0].iov_base = ®.write_index; + io[0].iov_len = sizeof(reg.write_index); + + /* Register should work */ + ASSERT_EQ(0, ioctl(self->data_fd, DIAG_IOCSREG, ®)); + ASSERT_EQ(0, reg.write_index); + ASSERT_EQ(0, self->check); + + /* Enable event */ + self->enable_fd = open(enable_file, O_RDWR); + ASSERT_NE(-1, write(self->enable_fd, "1", sizeof("1"))) + + /* Event should now be enabled */ + ASSERT_EQ(1 << reg.enable_bit, self->check); + + /* Write should make it out to ftrace buffers */ + before = trace_bytes(); + ASSERT_NE(-1, writev(self->data_fd, (const struct iovec *)io, 1)); + after = trace_bytes(); + ASSERT_GT(after, before); +} + TEST_F(user, write_fault) { struct user_reg reg = {0}; struct iovec io[2];