From patchwork Tue Sep 12 18:22:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 13871 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp601680vqx; Tue, 12 Sep 2023 11:30:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGa0VYXfgAovoZQWoLU6WNR7Z1wtl5TOjcHY13Cm1vAkRuAdKq7b9IBmLXBaAemZY3JzdHR X-Received: by 2002:a17:90b:357:b0:269:2682:11fb with SMTP id fh23-20020a17090b035700b00269268211fbmr105517pjb.8.1694543435894; Tue, 12 Sep 2023 11:30:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694543435; cv=none; d=google.com; s=arc-20160816; b=W5VUtjImSgOnhpUmq1pJCGWDUgYwpEJqO3nrXnWxikwzutiFdrWuW/YX7ij1m+WY+G i7tyCgl0TKTKh12j1qqAlnH4MTNt2eRAe7wp7ug+XMT2Ii+iwdKPkmTBfq+Z8i7umkXk mNHlxlgGX7IRH/wv6eygJ6+o3UeNXiNydheK4ifP/oMQpItRrYn72KGpKq/iGLTT2g6t V2lSI1Un/hbZyQrO77UzAjuFLXFlkQC4CGjnlIvCpTI1LlaUQd0CitfRQZnshtwQDqLu PJaXiGaTPwuD+C2nxUwp+NbVxDYbFL5GYvoN8qd5Tg4FpueaxlHLqWSgiXDG7i2s0WJY WLdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:date:user-agent:message-id; bh=eBuPLePi05UfQ4vL2rk0Ki6ePdcxVEwPGG9ttU/R+40=; fh=cY9HGbp9RiQ9xCYqjybSe1/cIiXVFs0Cn9z6ge1iyyY=; b=pIbcx0+pRUeSWzGh2k26ITIutIeb5Khd2QWCHd0ICoJmRhOPLpAtF2Wop0EXQ2OxGF rOAl81niwefF/lc7+hDQuA59T4J2kh0Ksvlb39TKJgzAfiARSHNIGzvVGSZIFOM4pwze JpoCl4a6v24zr+qrEE/AbTcKz4r/dv+PYI4YQf1ZdR0+NmIkkR0ph0UUsE6XASwSo349 kKlX17tqEf3DS+dG6sYKHEMmSEc8iUztqqL9S+8oa1MKXSk3fOdPClSyu1h+nQ4R7aY8 uEYI2eisE2VbykxK0X+Iuq+8c19jG/idAQSlDfmHgr0VTTHFO1jv8iFnQ8dvhAspJajq 08fw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id ip8-20020a17090b314800b00268cdfdf084si10736664pjb.80.2023.09.12.11.30.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 11:30:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 6DB728211220; Tue, 12 Sep 2023 11:22:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237241AbjILSW0 (ORCPT + 36 others); Tue, 12 Sep 2023 14:22:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231197AbjILSWZ (ORCPT ); Tue, 12 Sep 2023 14:22:25 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15505115 for ; Tue, 12 Sep 2023 11:22:22 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ACF34C433C8; Tue, 12 Sep 2023 18:22:21 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qg824-000JQt-0P; Tue, 12 Sep 2023 14:22:40 -0400 Message-ID: <20230912182213.795801173@goodmis.org> User-Agent: quilt/0.66 Date: Tue, 12 Sep 2023 14:22:13 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton Subject: [for-linus][PATCH 0/3] tracing: Some more fixes before pushing to 6.6 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 12 Sep 2023 11:22:34 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776857578033170489 X-GMAIL-MSGID: 1776857578033170489 Tracing updates for 6.6: - Fix NULL pointer dereference with eventfs_remove_rec() If an allocation fails in one of the eventfs_add_*() functions, the caller of it in event_subsystem_dir() or event_create_dir() assigns the result to the structure. But it's assigning the ERR_PTR and not NULL. This was passed to eventfs_remove_rec() which expects either a good pointer or a NULL, not ERR_PTR. The fix is to not assign the ERR_PTR to the structure, but to keep it NULL on error. - Fix list_for_each_rcu() to use list_for_each_srcu() in dcache_dir_open_wrapper(). One iteration of the code used RCU but because it had to call sleepable code, it had to be changed to use SRCU, but one of the iterations was missed. - Fix synthetic event print function to use "as_u64" instead of passing in a pointer to the union. To fix big/little endian issues, the u64 that represented several types was turned into a union to define the types properly. git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace/urgent Head SHA1: c8414dab164a74bd3bb859a2d836cb537d6b9298 Jinjie Ruan (1): eventfs: Fix the NULL pointer dereference bug in eventfs_remove_rec() Steven Rostedt (Google) (1): tracefs/eventfs: Use list_for_each_srcu() in dcache_dir_open_wrapper() Tero Kristo (1): tracing/synthetic: Print out u64 values properly ---- fs/tracefs/event_inode.c | 3 ++- kernel/trace/trace_events.c | 13 +++++++++---- kernel/trace/trace_events_synth.c | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-)