From patchwork Fri Jun 23 01:31:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 111874 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp5478043vqr; Thu, 22 Jun 2023 19:27:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ52nWE5O78eDBhCkOlmMdahAS71IctN00GUq3QEDgkNp7AzJaH1H+kHF0b0oKdCXFaFb5gK X-Received: by 2002:a17:90a:6fe2:b0:25b:d292:d9a3 with SMTP id e89-20020a17090a6fe200b0025bd292d9a3mr20007978pjk.37.1687487253582; Thu, 22 Jun 2023 19:27:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687487253; cv=none; d=google.com; s=arc-20160816; b=b8hIW++AlUPdAl3tQwhRqDbqBScugs+hJIYeNFDAwAjGy9qBiEMAVzP2jsmDwJzWiV A/51iZIzcpTaC2YaSj1/F6Cw3dg5Qt32buwDrr9NpF6SF1tU9fFqZkNmVN9HBF8PgRat KhAQWvlVSXdCgXomjZiC1mkpsQUK01pL+tll6hPXuCeKiTI6OEpKIuvUEduhgraa56NB Z32/dK9zUwMDHsARwiaLG7H81rfAP7vNdKwO+02dab53NyHkr2NfygIbGSUjngHkWZvy ePKay4XwpWG7RBkN7BwEjhEvCvb3TVYAcWhhpPLf7lS9aTUDgpizQGdBZqxAzhyjVWqk /ktA== 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=6P0b2mLpx+FK/mLi4eSV2w7pkhxQ5qHI8kzcFBL8lEc=; fh=RGOsZV6tntbV1Q1Do2P7MeB9f8KzDAA9RCGgIKQMzW4=; b=khfp0urWGsfhy9lOOnjoD/gh2Rw0LzI3PgxNEtfBY4Jggs5PQg8lsU+Ffin7CIQ4Vb JuRPZFG4eBm/ZavW4SHQipTuojOUYG1l8lWT89sWsNvifkR21ZYJ+Pha4dFj5PmOMaDE fJ/iQN7Uq3Mcbf05y8PpUIPKNnCr8uxF89bXdt8EpqS1qH31nKZIHynNxbKsyt9+Jo5+ Tm3HIhFB7rcHjNf+RZDnUg+dKg4/9e3ZD0J15FE2YGUo+33LMKYEBkQSfshAnHh65KS0 lb9HszpnzvjAZgG+waZMXmv/M4oOWLUDnNYaAILIW75qKR0cZoa1k+ATMCdF2QqRfU3B HmNQ== 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 g1-20020a17090a828100b0025eab041423si776523pjn.189.2023.06.22.19.27.20; Thu, 22 Jun 2023 19:27:33 -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 S230242AbjFWBds (ORCPT + 99 others); Thu, 22 Jun 2023 21:33:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230008AbjFWBdj (ORCPT ); Thu, 22 Jun 2023 21:33:39 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CED01FE9 for ; Thu, 22 Jun 2023 18:33:38 -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 F044261949 for ; Fri, 23 Jun 2023 01:33:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51067C433C8; Fri, 23 Jun 2023 01:33:37 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qCVg8-002M7B-0W; Thu, 22 Jun 2023 21:33:36 -0400 Message-ID: <20230623013335.974523605@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 22 Jun 2023 21:31:53 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , sunliming , Beau Belgrave Subject: [for-linus][PATCH 1/3] tracing/user_events: Fix incorrect return value for writing operation when events are disabled References: <20230623013152.037225511@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?1769458634465560593?= X-GMAIL-MSGID: =?utf-8?q?1769458634465560593?= From: sunliming The writing operation return the count of writes regardless of whether events are enabled or disabled. Switch it to return 0 to indicates that the event is disabled. Link: https://lore.kernel.org/linux-trace-kernel/20230621060827.151564-2-sunliming@kylinos.cn Signed-off-by: sunliming Acked-by: Beau Belgrave 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..902cae005df4 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 0; return ret; }