From patchwork Sun Dec 10 03:54:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 176269 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6353886vqy; Sat, 9 Dec 2023 20:04:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IEy06erx5KpSW6MPiW5LTpyaS5NhqS+MxZ+eUYLluMYnTwPIjpnEnCvsJcey4eFT2Du7lZi X-Received: by 2002:a05:6870:59f:b0:1fa:1719:dce2 with SMTP id m31-20020a056870059f00b001fa1719dce2mr3115783oap.28.1702181096167; Sat, 09 Dec 2023 20:04:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702181096; cv=none; d=google.com; s=arc-20160816; b=cXOl7R1KM9RAksnVq12F872rZKYkRyWL1ndZrzTxIFJw+zQuzo3/gpMncYX6X0HoTn IeWO9I5l1JOUaV97AMZTFukC4CnqB10RxxU1azYNt/vnJ5ENTWT1yPGROMVsT4M126Ns tOMRPHUNjUY2qNBjh1Mf4SHZv1+zoUXu0L4kzodpTlDgaZI6O0cX7SQagM2JNzX2imfO TZKTYJuw08Lc3frMxY5qoqwmALbiZy0gHuA7vVF5jD88THGmfra/MtNSonGYLrTG76B+ GEMSmNCouhyvJemKaO5TniWNzQSMlnvw/VMUMpeBiABf6x0uD5I7jtxznA459Ub4oUkf IxNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=1/KTL/MdExsqEVcDaWlHh9guTnY1c/7X/YMUaTA0ra8=; fh=pL1t9p0RxD5qCgSUniSa3P4+XmpksJYPzX6TE+dndao=; b=ypV9LLsx2wlKI56WwODmxZvi0LIQevw7jdEu9y7hayjCWlOifdfCHu6DxA+xBaVgcF FbMmE7bkTdGyDTORsPsFNPCJ4kU14E4l958HL/Z6OBS76QXWwGirqOGJ5Ln+PMioALjn sjorau6IQ4I1U3U81g1GYv24UJGRoqRl4IXDIBpMTPbbILXeNw5LJY77dASWmeGGrq0n dH+Je6lBLLGZJjN/iGj+yEJUcCNODpeb4nADfFbaPIFWPtkDesDxedTDcdI3jsECID5M zYcAtf4mhmfSNdXtYEa0UvHGzwaMD30sscPW+i0a/y9wuPJgTigdVdqzFrQXRtnImsYc M3aA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id a3-20020a654183000000b005b9a1494637si3881390pgq.317.2023.12.09.20.04.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Dec 2023 20:04:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 592BC8067B5B; Sat, 9 Dec 2023 20:04:38 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231588AbjLJEE1 (ORCPT + 99 others); Sat, 9 Dec 2023 23:04:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231490AbjLJEEH (ORCPT ); Sat, 9 Dec 2023 23:04:07 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D716110E for ; Sat, 9 Dec 2023 20:04:13 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7CCDBC433C9; Sun, 10 Dec 2023 04:04:13 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rCB3i-000000021Om-23pp; Sat, 09 Dec 2023 23:04:50 -0500 Message-ID: <20231210040450.277096110@goodmis.org> User-Agent: quilt/0.67 Date: Sat, 09 Dec 2023 22:54:11 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Tzvetomir Stoyanov , Vincent Donnefort , Kent Overstreet Subject: [PATCH 07/14] ring-buffer: Do no swap cpu buffers if order is different References: <20231210035404.053677508@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email 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 (howler.vger.email [0.0.0.0]); Sat, 09 Dec 2023 20:04:38 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784866245212924472 X-GMAIL-MSGID: 1784866245212924472 From: "Steven Rostedt (Google)" As all the subbuffer order (subbuffer sizes) must be the same throughout the ring buffer, check the order of the buffers that are doing a CPU buffer swap in ring_buffer_swap_cpu() to make sure they are the same. If the are not the same, then fail to do the swap, otherwise the ring buffer will think the CPU buffer has a specific subbuffer size when it does not. Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ring_buffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 4e7eb41695f5..9725aab1b5eb 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -5550,6 +5550,9 @@ int ring_buffer_swap_cpu(struct trace_buffer *buffer_a, if (cpu_buffer_a->nr_pages != cpu_buffer_b->nr_pages) goto out; + if (buffer_a->subbuf_order != buffer_b->subbuf_order) + goto out; + ret = -EAGAIN; if (atomic_read(&buffer_a->record_disabled))