From patchwork Thu Jun 1 09:41:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sunliming X-Patchwork-Id: 101839 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp178410vqr; Thu, 1 Jun 2023 02:56:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5UbwUXbb9Npz5sdwTBc2RPACZ6X4hc0IBcULh6/jQZT3ZwjPL8NmBEDrRHeFOS5CzemkQY X-Received: by 2002:a05:6808:6142:b0:397:ee2b:c173 with SMTP id dl2-20020a056808614200b00397ee2bc173mr6508372oib.17.1685613400438; Thu, 01 Jun 2023 02:56:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685613400; cv=none; d=google.com; s=arc-20160816; b=giERyGXkGE8GFAYA5wsVzvafVlSt21SoHedpLl+xQHdj0zKRy9XYgmXh++xY7abb+I Sg5G1UVw92J+stqFZ9fdGcsQAdKMUj+T2ndK1tp/vhf+COG5JD5Q4I/X7PenmfeM3FSW 5Wmvr90rZx2k0i4oatX54Px00ON946yHBMz/c8MFFXGt6Wh0XNZTxsf+gOy32z6kG7+U v7QtG8hGckeiGtCmWVw0F7VF7gm5Y0BWrR7GqiSXnOgXgZekP6mLEAxq0x0bFaUH4udM d7WubQqSb8zURTgStXv8Km8F8BtWgev+Awu4hmpmKeHUCZfIlJfZsZmDBS0NuZYFN0hd WZaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=xD7Vt+s/zfrb3I67O6RtMQEijSSfyZ3z20C7E6e0J4Y=; b=l6Kef+61f8Gkf3nyhx9Ea6ajmOQyIC4zTk/jNm/5ei/3AY2BwFht4QQGLSo7zB3YtU X/rqEFHwKsdCEEz/kRFV8Gh9zVT96x8rSiv/hSABvRVXPL62ib9Zh6zPfBA0Sj0ECc+L K3PtLtPYBvyD+wOZzzpFiHPiWu87T2C/OJpA0Bj73njPQmakg6NTfvS6FDfnmm7aJgQK IBiLXvtkTw/6th5SgpkDDRMe084UtFRLaS7zm1h+2QrKGSCEYmLyntz8ou1wUxCiO98/ cQOCry0S5cRePCcwlVZzWTCvQeKeLEsU5uRpFP/9KEv81DwP8jmCc+EkhFMvLR56PUUo c+vQ== 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 az24-20020a17090b029800b00256610c2765si828068pjb.125.2023.06.01.02.56.28; Thu, 01 Jun 2023 02:56:40 -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 S232147AbjFAJmf (ORCPT + 99 others); Thu, 1 Jun 2023 05:42:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231529AbjFAJmX (ORCPT ); Thu, 1 Jun 2023 05:42:23 -0400 Received: from mail-ot1-f65.google.com (mail-ot1-f65.google.com [209.85.210.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10F981B5; Thu, 1 Jun 2023 02:42:12 -0700 (PDT) Received: by mail-ot1-f65.google.com with SMTP id 46e09a7af769-6af70ff2761so617918a34.0; Thu, 01 Jun 2023 02:42:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685612532; x=1688204532; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xD7Vt+s/zfrb3I67O6RtMQEijSSfyZ3z20C7E6e0J4Y=; b=WiQ1YXIRgNeofWs4vsRwhyvzuFjPbcTMsFRrO2sUHwGlU1X4nd+B/3i8oDwsFUJKV1 YeWgJug9DFtggSSHqs8H0dArJtDbF/s3kJTIxpX61zLpXldfvaARlYyVvKdxVkZvw+t+ qhz71LJ50H2G8lKTa/NqtWzWnMT7VIwrU2h4b2Dn+Ro/D9pUWFzps3xYKI/1zusFiYsN e0obc0qMqZocOVrx7uKuDkRScnT/SG41+xaL4dtqAnDbRtVYrqpZw7NT2Ew2PoE35V9Q RXTNXDpPGJ6fwS8klBs180NubXmjDttxMscJjryoHAwbxRmZpGmje9X6tAi7Z6a+Ert6 07Tw== X-Gm-Message-State: AC+VfDx0PfGyAwIlfTbZpKSnAoUu5xmF+FLQJuRyaoNQegIDFAxeeEv/ GU6wWcL+/FQquexCW1OyNA== X-Received: by 2002:a05:6358:e49c:b0:123:5b98:1944 with SMTP id by28-20020a056358e49c00b001235b981944mr2815301rwb.22.1685612531922; Thu, 01 Jun 2023 02:42:11 -0700 (PDT) Received: from localhost.localdomain ([116.128.244.169]) by smtp.gmail.com with ESMTPSA id ca14-20020a17090af30e00b0025023726fc4sm995437pjb.26.2023.06.01.02.42.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 02:42:11 -0700 (PDT) From: sunliming To: rostedt@goodmis.org, mhiramat@kernel.org, beaub@linux.microsoft.com Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, sunliming Subject: [PATCH] tracing/user_events: Fix the incorrect trace record for null arguments events Date: Thu, 1 Jun 2023 17:41:58 +0800 Message-Id: <20230601094158.575019-1-sunliming@kylinos.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no 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?1767493756645316680?= X-GMAIL-MSGID: =?utf-8?q?1767493756645316680?= The user_events support events that has null arguments. But the trace event is discard and not really committed when the arguments is null, fix this problem. Signed-off-by: sunliming --- kernel/trace/trace_events_user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index 0d91dac206ff..296bdfa674cb 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -1399,7 +1399,7 @@ static void user_event_ftrace(struct user_event *user, struct iov_iter *i, if (unlikely(!entry)) return; - if (unlikely(!copy_nofault(entry + 1, i->count, i))) + if (unlikely(i->count && !copy_nofault(entry + 1, i->count, i))) goto discard; if (!list_empty(&user->validators) && @@ -1440,7 +1440,7 @@ static void user_event_perf(struct user_event *user, struct iov_iter *i, perf_fetch_caller_regs(regs); - if (unlikely(!copy_nofault(perf_entry + 1, i->count, i))) + if (unlikely(i->count && !copy_nofault(perf_entry + 1, i->count, i))) goto discard; if (!list_empty(&user->validators) &&