From patchwork Mon Oct 24 11:27:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10270 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp644825wru; Mon, 24 Oct 2022 13:46:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4InjFdkqJ7Qm3yCTBKFUEZeEkrouRieSNLddEfFQITRQS93VOPSczXf/4PrT5EHbzQBQ5N X-Received: by 2002:a17:903:4ca:b0:179:d21f:f04b with SMTP id jm10-20020a17090304ca00b00179d21ff04bmr35550169plb.7.1666644375418; Mon, 24 Oct 2022 13:46:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666644375; cv=none; d=google.com; s=arc-20160816; b=IjTBokq3oA+m5NnclGu7IJtgyPp7wtu0TSDLEPloPX+7bEbVDeL2jbcgZ2v8ASTlhW CZS+yWFLtAOUzfD7VkfJZH3DvQL0NZRNDPiCoWUGrNCY/lOyf6u6nK725s7IKCqyMrMy wU1yRnx6heJ6kkTGOLHqGCGeWGXtEd1p+E3si1qAy5z12Srjhd2gSZ1ZY8hE9kvZWN+l hWN4w1CabfDQHVlPCYll31sP6+kUP0cQBp+V6U5r+m0/a6I/QZYahkuu9pT0U8vtkAGM JorpWnK3sEeODm7cmnxxvjCmcSNDCpS9AO/d4xyOAjbiRDa81xtZ/V4m6bMsMCWhRMTt bwhA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=D6C2oXD5XKPuRTkp4dGeJy4t1shJ1Mfb1hDBlBWSZzU=; b=aW415HAeBxOywZmdART65Zs/43dF8pfi183pN3/34TsqJO4ShSlsr0xf0jNMdlMfqG evQb9/3BW4l7bjo01C4j/jZ5Qng2h/U6PhIgh+Jshb47HiyTeg60dg6mrTX/nmOh8aoN zTBcNbIRuD09v5MnjlQbJC6DJD2zt4UpWqYmjiJSGIsV94EVZUkQbBYYWYN49o8oBcGf CYmb5CzBC4mTSL2GFos4vSzt0vaC/wBjWzVV8SxRZVB5+o4hNjNvVMfftznGaUJQYtvj ysfK5KodObc6x6lO1tCj6b7TevdDzjT5nj8yig/XP08HXCqvO0sDeyfj9f5TM80/kO7C ZcRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CUkfmyDu; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s24-20020a639258000000b0045a5d846af1si581066pgn.134.2022.10.24.13.46.01; Mon, 24 Oct 2022 13:46:15 -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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CUkfmyDu; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234775AbiJXUpd (ORCPT + 99 others); Mon, 24 Oct 2022 16:45:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234773AbiJXUnn (ORCPT ); Mon, 24 Oct 2022 16:43:43 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D1B22AD9E0; Mon, 24 Oct 2022 11:51:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 8FEF3CE1582; Mon, 24 Oct 2022 12:37:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75D40C433C1; Mon, 24 Oct 2022 12:37:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615072; bh=xLnmq/e1GktPM53bVVsTWUVSNLFocaglt+qGnImyh60=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CUkfmyDuj++NiKpM3ylhbVAUPaA/iAVk1/wxBn5Dufac4ZFVm5t3BosCgUaFiTtb2 OA1dC9NuMK3YvPHgJ0bj2gCsu5x4lxWo4ynFkJH1uk5PMR79LyjcYJJvWP7IWFXV6o P2mA7u1N7GwNVdXT2ovGSgZ3TYJC8hLz8Db21m7c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ingo Molnar , Andrew Morton , "Steven Rostedt (Google)" Subject: [PATCH 5.15 112/530] tracing: Wake up ring buffer waiters on closing of the file Date: Mon, 24 Oct 2022 13:27:36 +0200 Message-Id: <20221024113050.105982512@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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?1747603292650296935?= X-GMAIL-MSGID: =?utf-8?q?1747603292650296935?= From: Steven Rostedt (Google) commit f3ddb74ad0790030c9592229fb14d8c451f4e9a8 upstream. When the file that represents the ring buffer is closed, there may be waiters waiting on more input from the ring buffer. Call ring_buffer_wake_waiters() to wake up any waiters when the file is closed. Link: https://lkml.kernel.org/r/20220927231825.182416969@goodmis.org Cc: stable@vger.kernel.org Cc: Ingo Molnar Cc: Andrew Morton Fixes: e30f53aad2202 ("tracing: Do not busy wait in buffer splice") Signed-off-by: Steven Rostedt (Google) Signed-off-by: Greg Kroah-Hartman --- include/linux/trace_events.h | 1 + kernel/trace/trace.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -91,6 +91,7 @@ struct trace_iterator { unsigned int temp_size; char *fmt; /* modified format holder */ unsigned int fmt_size; + long wait_index; /* trace_seq for __print_flags() and __print_symbolic() etc. */ struct trace_seq tmp_seq; --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -8117,6 +8117,12 @@ static int tracing_buffers_release(struc __trace_array_put(iter->tr); + iter->wait_index++; + /* Make sure the waiters see the new wait_index */ + smp_wmb(); + + ring_buffer_wake_waiters(iter->array_buffer->buffer, iter->cpu_file); + if (info->spare) ring_buffer_free_read_page(iter->array_buffer->buffer, info->spare_cpu, info->spare); @@ -8270,6 +8276,8 @@ tracing_buffers_splice_read(struct file /* did we read anything? */ if (!spd.nr_pages) { + long wait_index; + if (ret) goto out; @@ -8277,10 +8285,17 @@ tracing_buffers_splice_read(struct file if ((file->f_flags & O_NONBLOCK) || (flags & SPLICE_F_NONBLOCK)) goto out; + wait_index = READ_ONCE(iter->wait_index); + ret = wait_on_pipe(iter, iter->tr->buffer_percent); if (ret) goto out; + /* Make sure we see the new wait_index */ + smp_rmb(); + if (wait_index != iter->wait_index) + goto out; + goto again; }