From patchwork Wed Jun 28 12:54:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 113927 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8963664vqr; Wed, 28 Jun 2023 07:20:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5tI3pBriTDmcHuIyMw2I3iqjNgwxxe9AmIZSlceJ45XXZI04Am50v3eKKUx9DhJvUapew2 X-Received: by 2002:a17:906:7a52:b0:988:9dea:ab9c with SMTP id i18-20020a1709067a5200b009889deaab9cmr21675340ejo.1.1687962039712; Wed, 28 Jun 2023 07:20:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687962039; cv=none; d=google.com; s=arc-20160816; b=rA4DcnOMV6sJTWxyU7oJlLjloEva5IY4Nw/gYNw/ISZtSHSx4r5Td6ynDCi2twVkea a791IdyACCwVh7SGXUPw7Ibi73wrcyGphGIi5FSwElGldfUi5UeECubl7StuXFoUsPCH 9o7f9Y8deBd8a2PgMwwzBa1vQPu/BindPaA/HvNTaROyiK3BeU7BtnbtBHGJJ++Q3bZc Ws45ntIoKGPny6uiyWdXwBsHDqCtt+IUKDmk3bmcnZjMf7+VjdW8ptxjG/0NJBS2WEN1 LaNow15VbXmM95xDwRmJ5FqUKc8nVhrLFVhfx5ifjLhYlKuDwcVxD2g1rj99/irB+Vob tcSg== 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=8HYs9F+2Nrmb1IMKfISausfDcAaD4qToL1WkjRihD+U=; fh=XyXCQ+Xm6Xbh43g0a2No8WvLIzKo19KiX0TngsJCwhU=; b=Pczdeo0oc5ivzZf2Z7J1mkUKKMF7CFAGh3+9Q74+CXreNkoYa2wwsLGA6sbOIXFcmW 5dRkrJ9RdxAIIw2rFsUBopZYHIbeNEmQHR5xpENKv2iTKIwWMQdQhMRtJR0YfU+/U3sf jkPYq+D/3uT3XKNYUZBwX6aosvBy1jTRWJhl6xPqaftwkRKOhlBv6X1ekdwV+jXyaE8R fbPfno2cB5eCBJQ9aqnV0twsi30cStxEn8gp2Ckd+NPZvhAbCPUP8k/dnXzPWdKXEY2C b2fQMhh3jCpZg+u8/ZB3vE+ZxOJq6APWcv2aQUx5MDG+3xxKrYKF1Dny8wI/3tKynJRQ VuAg== 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 gf18-20020a170906e21200b009828e8bec17si5725306ejb.531.2023.06.28.07.20.15; Wed, 28 Jun 2023 07:20:39 -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 S231368AbjF1OFM (ORCPT + 99 others); Wed, 28 Jun 2023 10:05:12 -0400 Received: from dfw.source.kernel.org ([139.178.84.217]:39632 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232414AbjF1ODl (ORCPT ); Wed, 28 Jun 2023 10:03:41 -0400 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 7E48661342 for ; Wed, 28 Jun 2023 14:03:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA91BC433C0; Wed, 28 Jun 2023 14:03:39 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qEVli-002phL-2s; Wed, 28 Jun 2023 10:03:38 -0400 Message-ID: <20230628140338.707970985@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 28 Jun 2023 08:54:49 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Beau Belgrave , sunliming Subject: [for-linus][PATCH 1/3] tracing/user_events: Fix incorrect return value for writing operation when events are disabled References: <20230628125448.007243475@goodmis.org> MIME-Version: 1.0 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?1769956483731628919?= X-GMAIL-MSGID: =?utf-8?q?1769956483731628919?= From: sunliming The writing operation return the count of writes regardless of whether events are enabled or disabled. Switch it to return -EBADF to indicates that the event is disabled. Link: https://lkml.kernel.org/r/20230626111344.19136-2-sunliming@kylinos.cn Acked-by: Beau Belgrave Signed-off-by: sunliming Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_user.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index 8df0550415e7..09f7d9167b8e 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -2096,7 +2096,8 @@ static ssize_t user_events_write_core(struct file *file, struct iov_iter *i) if (unlikely(faulted)) return -EFAULT; - } + } else + return -EBADF; return ret; } From patchwork Wed Jun 28 12:54:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 113922 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8961641vqr; Wed, 28 Jun 2023 07:18:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5jIKHRPdtQL0USYGqotYhubvpPNq/CsYjDpnTel32b2vJQD4QrJYnT7GDk2yf5ggsSqbWY X-Received: by 2002:a17:906:648e:b0:988:8e7a:d953 with SMTP id e14-20020a170906648e00b009888e7ad953mr4133740ejm.1.1687961883705; Wed, 28 Jun 2023 07:18:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687961883; cv=none; d=google.com; s=arc-20160816; b=j4ts1seTXy71H+9iUlwRWrhANbN83i7SkLfyX8wpp3lLqONw+RgG5U8fd0fdwaLgnM CldwIRWZaTEMFcFtYoTAo4/gS3StcpfSXBD+ctrR+QqnY5XbwNvXtMGydLFlJwh25XAK gar8A+DhDtl0ZZFv9haJ9FiTOs8nrlN78O6H5FkQ89uXEADk0HjFjWglY1SIzM3RZ/Nf ybHq8Wl+xid0GLNWs7/0m0smtT7U4z3Yx0PbMQaNkm8hUGXbutSl1a77VfRbW6z0o/fa 35gxlDqlhR92R1TT7V4UHAQpUxkVeoLdjQp9SOFzQ8DpzUbbyhyIoEABPmL3SgTpB7Yd Dslw== 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=Ae2XvNkwvOKdPbAa5EzbpyOqcs5tcP0lDskTnT9HXls=; fh=XyXCQ+Xm6Xbh43g0a2No8WvLIzKo19KiX0TngsJCwhU=; b=H8Q1wyoo4ExC96X17OSkehZFWhU2T+6huwYacICD9sxUJYb+BfblP4Oz71agHJ27Zt eAJ5ZtGxHzHYj+vmHzePjEgQXQ4qYWWpSvewv6oyXexTewMNbn9zxAK2lcS4/pxEXy8T t5mlhOUDMz0kYQuPyHYXwar6SWO61E5eVbHBKFoFh2GnVisq1eBSQQuv2uo/Ormcdiy4 PILLTOIDprqaonGNb+0dxUE6gkUL2I/0pdMaP8/DUvNGTSPNbasjFSniUxKtbvVOHoPy G15+e6jZ8s+g6bPzYz7fgGpu02HzX1twunnYNV3jmYQ8wUDij6u9H9FLkdaw01d7IYAB 6Wgg== 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 m19-20020a1709066d1300b00988a13c6a90si5482831ejr.601.2023.06.28.07.17.39; Wed, 28 Jun 2023 07:18:03 -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 S232294AbjF1OFS (ORCPT + 99 others); Wed, 28 Jun 2023 10:05:18 -0400 Received: from dfw.source.kernel.org ([139.178.84.217]:39682 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232418AbjF1ODm (ORCPT ); Wed, 28 Jun 2023 10:03:42 -0400 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 9860E61341 for ; Wed, 28 Jun 2023 14:03:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13143C433CA; Wed, 28 Jun 2023 14:03:41 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qEVlj-002piD-0J; Wed, 28 Jun 2023 10:03:39 -0400 Message-ID: <20230628140338.913735267@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 28 Jun 2023 08:54:50 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Beau Belgrave , sunliming Subject: [for-linus][PATCH 2/3] selftests/user_events: Enable the event before write_fault test in ftrace self-test References: <20230628125448.007243475@goodmis.org> MIME-Version: 1.0 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?1769956320634237066?= X-GMAIL-MSGID: =?utf-8?q?1769956320634237066?= From: sunliming The user_event has not be enabled in write_fault test in ftrace self-test, Just enable it. Link: https://lkml.kernel.org/r/20230626111344.19136-3-sunliming@kylinos.cn Acked-by: Beau Belgrave Signed-off-by: sunliming Signed-off-by: Steven Rostedt (Google) --- tools/testing/selftests/user_events/ftrace_test.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/user_events/ftrace_test.c b/tools/testing/selftests/user_events/ftrace_test.c index eb6904d89f14..88898749e5b7 100644 --- a/tools/testing/selftests/user_events/ftrace_test.c +++ b/tools/testing/selftests/user_events/ftrace_test.c @@ -400,6 +400,10 @@ TEST_F(user, write_fault) { ASSERT_EQ(0, ioctl(self->data_fd, DIAG_IOCSREG, ®)); ASSERT_EQ(0, reg.write_index); + /* Enable event */ + self->enable_fd = open(enable_file, O_RDWR); + ASSERT_NE(-1, write(self->enable_fd, "1", sizeof("1"))) + /* Write should work normally */ ASSERT_NE(-1, writev(self->data_fd, (const struct iovec *)io, 2)); From patchwork Wed Jun 28 12:54:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 113933 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8965441vqr; Wed, 28 Jun 2023 07:23:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4zpzrKbWEqh54Tn8YkXZfGULLTwobX+jxoHKDDsc0FWkC++USax/e1j0+G+qu6WJCo8Ga9 X-Received: by 2002:a05:6a21:9985:b0:127:2dc1:c885 with SMTP id ve5-20020a056a21998500b001272dc1c885mr11913348pzb.4.1687962188735; Wed, 28 Jun 2023 07:23:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687962188; cv=none; d=google.com; s=arc-20160816; b=0Vh2p/COAUTaVP6V6OztA0WwI9wXhjTANEpyavvpE7x8QD9GCLa5Ah8diBK73WgfpL PTp+qDT0my0HDX0Db7nFTdezZ8kVKpNrFmDcc8Y5ca6EpNxoLd1aEY0U955cT/UpO6h2 syPIMVJ5x7RhpcumoiDvBWRhJrXFGo3LHHex2EN//tgVcILBOmt2vU3X7HdsLiO+/zN+ xqFswMOXpl5HC13O3DsBDjLW37Is3QzMGdG+q83TA06jTJypzvainsY2MYaduJw/+yCq yI0SV4nnbtsxsoEuhcrOttLCHjt5tGSb3QXN0NyC+w5mSFBQkNYNMF+4QW2BAD4z9n7n Co6A== 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=Yd6tqeXEG6qUalF+fReiiOEA+oooYPZifLKEn/NjHSY=; fh=XyXCQ+Xm6Xbh43g0a2No8WvLIzKo19KiX0TngsJCwhU=; b=GNkxzONBSvv+oH8CbE61w3arZlzB80VlqtaGtXADCjN+xDIOBQptwFp3Rgm44rszy6 +nw/JYJeZONbofdHG5UG5iXgpygqQwapIJ1HO4Tl3lHaAXuQJ5kLcis4biboim28xbhV OXxD5OQLXwIdqi5lKzZmpSmfP0ZIABIX4CGFauudY8xJtsgZpketdF3QJFWAV1RwVxXG H1ekhk/L1+HvaiIvzO3b/TjzrDrZcYrbEE86rEgrd2FvxMi+i4WNn870AUgDXhBOiFuD YTK9l6FdcvlOtd7qs2HBlyAvTFVCn8586fG+kC/KdYAJzN51Ja9egtntW0HGrP4LA5AY un4A== 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 f7-20020a056a00228700b0064d42dddf9fsi5528759pfe.32.2023.06.28.07.22.55; Wed, 28 Jun 2023 07:23:08 -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 S232696AbjF1OFu (ORCPT + 99 others); Wed, 28 Jun 2023 10:05:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232584AbjF1OET (ORCPT ); Wed, 28 Jun 2023 10:04:19 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CEE530EA for ; Wed, 28 Jun 2023 07:03:42 -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 981056134E for ; Wed, 28 Jun 2023 14:03:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1308EC433C8; Wed, 28 Jun 2023 14:03:41 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qEVlj-002pil-0x; Wed, 28 Jun 2023 10:03:39 -0400 Message-ID: <20230628140339.117011485@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 28 Jun 2023 08:54:51 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Beau Belgrave , sunliming Subject: [for-linus][PATCH 3/3] selftests/user_events: Add test cases when event is disabled References: <20230628125448.007243475@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,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?1769956639683899026?= X-GMAIL-MSGID: =?utf-8?q?1769956639683899026?= From: sunliming When user_events are disabled, it's write operation should return -EBADF. Add this test cases. Link: https://lkml.kernel.org/r/20230626111344.19136-4-sunliming@kylinos.cn Acked-by: Beau Belgrave Signed-off-by: sunliming Signed-off-by: Steven Rostedt (Google) --- tools/testing/selftests/user_events/ftrace_test.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/user_events/ftrace_test.c b/tools/testing/selftests/user_events/ftrace_test.c index 88898749e5b7..5beb0aef1d81 100644 --- a/tools/testing/selftests/user_events/ftrace_test.c +++ b/tools/testing/selftests/user_events/ftrace_test.c @@ -324,6 +324,10 @@ TEST_F(user, write_events) { io[0].iov_base = ®.write_index; io[0].iov_len = sizeof(reg.write_index); + /* Write should return -EBADF when event is not enabled */ + ASSERT_EQ(-1, writev(self->data_fd, (const struct iovec *)io, 3)); + ASSERT_EQ(EBADF, errno); + /* Enable event */ self->enable_fd = open(enable_file, O_RDWR); ASSERT_NE(-1, write(self->enable_fd, "1", sizeof("1")))