From patchwork Mon Oct 24 11:27:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10400 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp706865wru; Mon, 24 Oct 2022 16:42:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6CYxxr813ieFGPSNj/e903otVDHuipH7X956inlZUyqNlYC7462H8Xx0bglsEmcqPLA9Xv X-Received: by 2002:a65:4bc3:0:b0:439:103b:fc35 with SMTP id p3-20020a654bc3000000b00439103bfc35mr30074565pgr.248.1666654972918; Mon, 24 Oct 2022 16:42:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666654972; cv=none; d=google.com; s=arc-20160816; b=RlzzhOREpXgqafMxy/wN8DP1iX4Pe8ooA5VEKPMJbViHLtCEXEYHW2WEKUEJ1tcjzU r2lIJCY5r26bvsXED2zSPPx38cJBqOanLlo0M0tUE6RLEu9jWRlcb8I2vigQv9GM3QvW nhjuyBuBsxrxDoRY+cFVaKYAFqvfjOrSyHLEaqrdDCKZnmtsun6RbS90F7p4rAsU64Az VIgZXMoSBSnuPUP4rxLDGCSrF4RlJnldhtmX7tT0vZNENH1G1y1ZmMfCa2DwqJGvPIdt gHyMrFQFZdzNDZgsFqdHXqCLRlSHJxnOE4ZbN+4oI+k90i0jNPWqG8rkzq0EK2b6qFN5 cvjA== 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=HDLFFkMd02W9FQZ6GY3agyP0SaE0YLg5APcQYWLyUyQ=; b=PWaeJTytHdY9TLj9BoIHL0y8KRqymihzIMBVIV2GsZcUb087E6/H8iuM9IOz6srEM0 WeAxiIoa2ubEk3vn8ieveek585/oYQYchy1PIgqzS1e5QO4ZFk3GYGH9UUpXi7+u+Ues hSDpLW2gji6kAu6HrJKAoh3/K/FC4hdqF4loTrSySXCdYM36co36ZfhKFOEMNWe0p3wB 3p01Bf1pp2uT/TrT95NarlYfSv3/ONNkk4CvV58vHcqIqOMy4ugPyiCSwf+o9kGW3XMO 1sRK+jx3BIZjq84UFr4t4FdrEp/M7g5mZCj1qoAPkliAdfVsLNtPBPq9rMUzUHjawZwH 4LNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=G9gVRETy; 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 k190-20020a636fc7000000b0043aebb63fc6si1055009pgc.81.2022.10.24.16.42.40; Mon, 24 Oct 2022 16:42:52 -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=G9gVRETy; 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 S229961AbiJXXan (ORCPT + 99 others); Mon, 24 Oct 2022 19:30:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230176AbiJXXaN (ORCPT ); Mon, 24 Oct 2022 19:30:13 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BF0EA6C23; Mon, 24 Oct 2022 14:51:37 -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 ams.source.kernel.org (Postfix) with ESMTPS id 2E87AB817B7; Mon, 24 Oct 2022 12:37:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85E5AC433D6; Mon, 24 Oct 2022 12:37:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615077; bh=nxEKmGxOtGsNuJyAGeiUf4z7RLnoonGnwdmN+Tlnkt4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G9gVRETykEh4XrW5gb/vvsubrKoXZQrzj6lk8aaPCVgQqUgdafpx0x3ZAQDokSbGT l3v+QLz9WFaO326a0kGIjhuQeotj7enogArHGsUXVnHFSetalknFD9q6CY+tiXbZRw ihe/MBCQiRIY8xXovkAmSebeXBbnuecUi4Ezb704= 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 114/530] tracing: Add ioctl() to force ring buffer waiters to wake up Date: Mon, 24 Oct 2022 13:27:38 +0200 Message-Id: <20221024113050.190501594@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?1747614404808856001?= X-GMAIL-MSGID: =?utf-8?q?1747614404808856001?= From: Steven Rostedt (Google) commit 01b2a52171735c6eea80ee2f355f32bea6c41418 upstream. If a process is waiting on the ring buffer for data, there currently isn't a clean way to force it to wake up. Add an ioctl call that will force any tasks that are waiting on the trace_pipe_raw file to wake up. Link: https://lkml.kernel.org/r/20220929095029.117f913f@gandalf.local.home 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 --- kernel/trace/trace.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -8310,12 +8310,34 @@ out: return ret; } +/* An ioctl call with cmd 0 to the ring buffer file will wake up all waiters */ +static long tracing_buffers_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +{ + struct ftrace_buffer_info *info = file->private_data; + struct trace_iterator *iter = &info->iter; + + if (cmd) + return -ENOIOCTLCMD; + + mutex_lock(&trace_types_lock); + + 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); + + mutex_unlock(&trace_types_lock); + return 0; +} + static const struct file_operations tracing_buffers_fops = { .open = tracing_buffers_open, .read = tracing_buffers_read, .poll = tracing_buffers_poll, .release = tracing_buffers_release, .splice_read = tracing_buffers_splice_read, + .unlocked_ioctl = tracing_buffers_ioctl, .llseek = no_llseek, };