From patchwork Wed Oct 19 08:23:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5372 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp300689wrs; Wed, 19 Oct 2022 05:34:52 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5teuOEa6B17lQ1yWqdStw9NMZEKmtdTrER3OcMp81dgHdbxZ0dUXOAS0WUNdFrWmaXbmIQ X-Received: by 2002:a05:6a00:301c:b0:567:6e2c:4c10 with SMTP id ay28-20020a056a00301c00b005676e2c4c10mr4585977pfb.83.1666182891848; Wed, 19 Oct 2022 05:34:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666182891; cv=none; d=google.com; s=arc-20160816; b=n3UoTgkS1NYSyAHhLYkYU30D23OFv3zV/CHHwGqCTlpIGMpQJN7U796yhx9pHLJj4U Y4Vrnj6ire6/HKPkGP62jd39//vojN++bIwohY2xmfeOAVSqB1a3DfXaJN1H7jHmoh0H RV630wpUEzsW66bz0CHh++TlhEhxhoaKzYZmehyYDzrUJQwnHR2loYK1/jra9ss99nCu CDr858Lu3EPjVSE2l5tHg2oLJe5UWgyVGX27upvsYqKNkghbQK1czXkEtFOOWxCy46O7 ivwWFat4yMauxmbg/Es+GJYEDE/66LCqHE6JR2KuWIXC+cDavXEHbfMeTPsMrEA7dIRw 6Uxw== 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=iAcpwmqtvMsWnBA1wKY6nqifE/qZlcrQLqQuTj1uuPc=; b=Qz4JHj2W3xExPQxV6fGXTJ9EvPMGm0y3tJgKQiOB/qXmy1/RAA3Frw+jEIlrMO9oni culWNaiH3khyg7RQNslTcP6s4GHb8umm0HZK4Y9obAx1xWpK/UPDGtslyKOMlOQT++/1 YlhEqqg1r+Bzd3UhhHdFMG5KD1ULBdKSCV1Zr+L1jgUxY3HyZC2vP5rwx6HbE2OTQXok M+pNYGS7m8bWrCY6CXW1OEk4KTatvzkLZwSnanuuGHfzlCkLFEwLJDGKSsT1ZyZ4r5Yk QmLtjO2Q6tdE0lPYAczzCwP9JM4cZzIAPcpY2FuPv9iqpKoCuP05K0lNhxzvPOgMGWU+ eTNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=dCgx+XQ4; 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 l4-20020a62be04000000b0053e8981932esi16122785pff.330.2022.10.19.05.34.36; Wed, 19 Oct 2022 05:34:51 -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=dCgx+XQ4; 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 S229515AbiJSMVZ (ORCPT + 99 others); Wed, 19 Oct 2022 08:21:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232746AbiJSMUM (ORCPT ); Wed, 19 Oct 2022 08:20:12 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A883114DDE; Wed, 19 Oct 2022 04:55:24 -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 64A86B82311; Wed, 19 Oct 2022 08:45:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5979C433D6; Wed, 19 Oct 2022 08:45:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169134; bh=FBSqfGdqenbLRx3kzmze2zovm+J2vRZ3J4A4qSTPPVo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dCgx+XQ4f+puNdbCmP8pMYJyq4PcYWJXIazRd9rKV86FGu/HA6VhwQ/XFD1JTq87R g33VChmYH5SM8BQkRV4v1ixp46IeUhkj/vMTnFsveZhHSR771UawaqUdd/Wwnn0Nzh mtsQ7Qe/aifSrhBUmgQmmlqaekIduEW9bf5AyN8c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Steven Rostedt (Google)" Subject: [PATCH 6.0 152/862] ring-buffer: Allow splice to read previous partially read pages Date: Wed, 19 Oct 2022 10:23:59 +0200 Message-Id: <20221019083256.705618045@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 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?1747119391736200067?= X-GMAIL-MSGID: =?utf-8?q?1747119391736200067?= From: Steven Rostedt (Google) commit fa8f4a89736b654125fb254b0db753ac68a5fced upstream. If a page is partially read, and then the splice system call is run against the ring buffer, it will always fail to read, no matter how much is in the ring buffer. That's because the code path for a partial read of the page does will fail if the "full" flag is set. The splice system call wants full pages, so if the read of the ring buffer is not yet full, it should return zero, and the splice will block. But if a previous read was done, where the beginning has been consumed, it should still be given to the splice caller if the rest of the page has been written to. This caused the splice command to never consume data in this scenario, and let the ring buffer just fill up and lose events. Link: https://lkml.kernel.org/r/20220927144317.46be6b80@gandalf.local.home Cc: stable@vger.kernel.org Fixes: 8789a9e7df6bf ("ring-buffer: read page interface") Signed-off-by: Steven Rostedt (Google) Signed-off-by: Greg Kroah-Hartman --- kernel/trace/ring_buffer.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -5616,7 +5616,15 @@ int ring_buffer_read_page(struct trace_b unsigned int pos = 0; unsigned int size; - if (full) + /* + * If a full page is expected, this can still be returned + * if there's been a previous partial read and the + * rest of the page can be read and the commit page is off + * the reader page. + */ + if (full && + (!read || (len < (commit - read)) || + cpu_buffer->reader_page == cpu_buffer->commit_page)) goto out_unlock; if (len > (commit - read))