From patchwork Mon Oct 24 11:29:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8685 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp422442wru; Mon, 24 Oct 2022 05:22:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6JBFsmNgV+1jGhok51g99hVa5y1GVrdgS8MI7QKrlaUN9FuFfm0UukwtlrJ8XiO8MV/Fhb X-Received: by 2002:a05:6402:28ca:b0:43b:5235:f325 with SMTP id ef10-20020a05640228ca00b0043b5235f325mr30043583edb.320.1666614162838; Mon, 24 Oct 2022 05:22:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666614162; cv=none; d=google.com; s=arc-20160816; b=UZe4zHaD2QKbrG4K/yfgF9q8YIqrqUYMTcLi7bCFRyqgQKEHArGpBbYf99gCsoEwXo TF1ASEKSqTeIwJyADv78KXUFwE98V4YKf3yNr3HExgGY2oUAuNYGDIHGgt/QcwOiHR6+ 9BLlqPYwWzBee6nzGtQPXFPX5krOxTxepw78hpFWst9b7L0oPe4Z9ffRQv2gL8POGNkE iHGkI7mF4eFGPkFfijh1iCQsyJvdcCv6t/ajjWFkDhFoptlklvZSROTCOmz5bCmylcrq VB5buBT2eSXjoNRSV5gwzH9ieOKUdzdfzuUXuYVw3XQQ29c+CtZ/9+3JzXrQHDaPLQOr KpmQ== 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=yiVLxMZbvyDb0RbUA0MvZfZMhpytpEsnrI9Zf7BAwus=; b=HoQYDApekwLOmy5rh0MZmvq6d6+QhwWmAntvUgVC7tE1MlM98DUT/OyudgB6Arc3+6 k3aO5fLQB+7zK0VgO88fVz0/iqQRptX7vyDmPzuLsHtCVykbGjwXPNhlblomEKlGG52n HgvEJeuz+7yUCcPXkBrb8Bv3AhJUG6k7BqCBhgl6ea1Eyiwf8z+SL/bxyf2ThZzfHo1Y R4NPuggJtSvj4ySVdAAxW+GJOoUVXQP2cFEIEd9Mes1ZaTnvftfdKTUQuYWnC0kYhtM0 5tMIvFy2NpG4kXcnB8VvOnnIYezWPoEDf7C3WQjAVRwwDAnB7qRrlz4kzPKok3H8LEUb ACPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="DHk/5euK"; 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 e11-20020a50a68b000000b0045cd10a4c20si27540680edc.321.2022.10.24.05.22.18; Mon, 24 Oct 2022 05:22:42 -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="DHk/5euK"; 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 S233219AbiJXMVA (ORCPT + 99 others); Mon, 24 Oct 2022 08:21:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233392AbiJXMTV (ORCPT ); Mon, 24 Oct 2022 08:19:21 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16F6682D36; Mon, 24 Oct 2022 04:58:07 -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 E025FB811BB; Mon, 24 Oct 2022 11:49:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42D59C433C1; Mon, 24 Oct 2022 11:49:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612194; bh=YpURN54bP3lO0GSk/IShWNXb2+lp0qTSkE0YhNm2eEo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DHk/5euKyDhMNbphkCF25eVXj0M0B93EdbhGD6Yk9ZL4ThA3FXH8oww5xDKbFWmTm Q2J6V5fNBxHPSgmK8XvWwrY0+ImIAdy/7xqMGRhQnsgwHGPiHBFl3lNfPJqweDdvuT ODoHZZhceB8gtIomNa1HNS+MhnsgfoBF1HUidRWc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Steven Rostedt (Google)" Subject: [PATCH 4.14 074/210] ring-buffer: Allow splice to read previous partially read pages Date: Mon, 24 Oct 2022 13:29:51 +0200 Message-Id: <20221024112959.465611437@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@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?1747571612150099870?= X-GMAIL-MSGID: =?utf-8?q?1747571612150099870?= 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 @@ -4639,7 +4639,15 @@ int ring_buffer_read_page(struct ring_bu 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))