From patchwork Wed Dec 23 15:33:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 351453 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp6293138jai; Wed, 23 Dec 2020 07:34:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJyijpR5EhC+6cziiHqSsf4FYid/eKFz7Oee2yT1Zh8qVL9fd7J0jhYYfAPh0inVAO7zqfjK X-Received: by 2002:aa7:db56:: with SMTP id n22mr25635298edt.4.1608737650346; Wed, 23 Dec 2020 07:34:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608737650; cv=none; d=google.com; s=arc-20160816; b=PDlfSkVAnron82YjjDtdl05fNXrjNrr68zVeF5rbw2cNBPDiP88j9aKt0ShUGW0IiX 8rXZ+oFhQJ0QqeHNK+IJIeF/fuDRqirfy5gEkv+VIluz0Ozcklis1oxIscsH2+vWa4Ng 2s/rVLRkygDfV3ZqXiBZY83qnlI+21qBljVsC6pjeojfQQ/cq1SKRopFpXG4wXW53SL8 ujW5AqyF3CnIbBF1uyFYkGeB5/4rKoVLUIQc+Kqs3QXGnTaDGD492gfMK+Gec7pOnR0p LNh/bjllXLRCU1VPlPhujL2DoAjFxqbBJ3Z2X2g72AXF5cAowj4IZJDqLiVNwgw6qEE0 //Rg== 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=ypJKmnRHJMoPzszCEstUFvU+y+nnRqDenT5OCcekfUY=; b=V5/9zTygcr3qIPBTD76zm5BXboZTmWgtCKkXVFNesaHSuemZ+AnQj168G0jDnWrYwm DeE+/WQrlzFcF1tKHxm4vyYJ8xBSFCA7PjAaj5Duov3m1YqYqB7BJYca27gr6des5JUk rRx79VZ4AXaO2tNZl6PDrMDRxkx8WnFKUXdLkFJOBiE3eS4eFH/2R7ZfEwEtFsRN/YFw Vb1holFzPRUEiK0tzwMLW1/zQ4SJd9yFOpJDWqJtvSBPr8wPkAjfartc3Zakz+S2QR6k VAohWgKKo1fCRAwQnwDmdkkn4hAN2AqPA/sAn09WztEvL/HRdKkW5SZoxNC+UECY5TrR cs9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nm1mJICy; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g25si12192647ejp.67.2020.12.23.07.34.10; Wed, 23 Dec 2020 07:34:10 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nm1mJICy; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S1728393AbgLWPeH (ORCPT + 14 others); Wed, 23 Dec 2020 10:34:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:44870 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728350AbgLWPeE (ORCPT ); Wed, 23 Dec 2020 10:34:04 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id B920423370; Wed, 23 Dec 2020 15:33:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1608737582; bh=RiEJGmvqO4OuLaNqfBxsJGXrbPh5AhWfNVWAHGOaYQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nm1mJICyoB9EwA3LWABFODpouj9JaNLUZtLkjV/yLWke/gd5X++F+wIitRyhzRvnI pCN4qMmegFeqccrBTDX8DYQXHEOrhHrmhthZNVDOiSPMR/Bk/fRlyaCSyOglohEYw4 2BbDke8OjjU7/prcRrK4VCIQntg9OWoA5K2r/QIM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mathieu Poirier , Al Grant , Mike Leach , Suzuki K Poulose Subject: [PATCH 5.10 17/40] coresight: tmc-etr: Fix barrier packet insertion for perf buffer Date: Wed, 23 Dec 2020 16:33:18 +0100 Message-Id: <20201223150516.385258340@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201223150515.553836647@linuxfoundation.org> References: <20201223150515.553836647@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Suzuki K Poulose commit 83be0b84fe846edf0c722fefe225482d5f0d7395 upstream. When the ETR is used in perf mode with a larger buffer (configured via sysfs or the default size of 1M) than the perf aux buffer size, we end up inserting the barrier packet at the wrong offset, while moving the offset forward. i.e, instead of the "new moved offset", we insert it at the current hardware buffer offset. These packets will not be visible as they are never copied and could lead to corruption in the trace decoding side, as the decoder is not aware that it needs to reset the decoding. Fixes: ec13c78d7b45 ("coresight: tmc-etr: Add barrier packets when moving offset forward") Cc: Mathieu Poirier Cc: stable@vger.kernel.org Reported-by: Al Grant Tested-by: Mike Leach Signed-off-by: Suzuki K Poulose Signed-off-by: Mathieu Poirier Link: https://lore.kernel.org/r/20201208182651.1597945-2-mathieu.poirier@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/hwtracing/coresight/coresight-tmc-etr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/hwtracing/coresight/coresight-tmc-etr.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c @@ -1552,7 +1552,7 @@ tmc_update_etr_buffer(struct coresight_d /* Insert barrier packets at the beginning, if there was an overflow */ if (lost) - tmc_etr_buf_insert_barrier_packet(etr_buf, etr_buf->offset); + tmc_etr_buf_insert_barrier_packet(etr_buf, offset); tmc_etr_sync_perf_buffer(etr_perf, offset, size); /*