From patchwork Mon Sep 28 16:34:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 11804069 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 05A036CB for ; Mon, 28 Sep 2020 16:37:07 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B2D9D2080C for ; Mon, 28 Sep 2020 16:37:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ECtjl898"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="wX2X5i59" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B2D9D2080C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=UQQ3wovTMYDFrDx7jaB+CHCQE8CC3+5ug1TgCBKW1vo=; b=ECtjl898S/iCOooo0ZgP6gCFe z6VJyFXqVPbgTN3kbVyEDPiPJbCv8hYQLn0tLRy5J8zC+Goalg3dhWAT71Fl2OyWxetZJHsl+mKR1 dQIDPshKmVqe9ZXv4QU4zzCle0DCGrNDCPbLXslCXWiqbLhgvDyIoPj8AcicGYMFVQurmn+1my5n4 aP/zPwDdRXMwxJE1FwauE899cY2+4yJ6D9SvuEBEgfHyJ74YVqtf9oEJ1Gkuljonwg/LXEqxCdbzq wYTl2drprJ7dNBLZIT9PU9sIGINqAGDUmIJP0W5SEkYncWAcVWUaAOlB1AexawLAXu4q9RrwfnIi9 MUlpSZirg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kMw8v-00013K-LT; Mon, 28 Sep 2020 16:36:49 +0000 Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kMw7Z-0000Y8-Mx for linux-arm-kernel@lists.infradead.org; Mon, 28 Sep 2020 16:35:29 +0000 Received: by mail-pj1-x1042.google.com with SMTP id a9so979915pjg.1 for ; Mon, 28 Sep 2020 09:35:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XKxXl3MciKAKZSXIF+TmSJQtPsXbnsXWSEMuZ9mJPpY=; b=wX2X5i59Q63zjV8FYOMQuBp2F1hmgrLrZqqrLaKd4BDNrFbhimrmks4UAk17E/DdEs 0b3VI/DqBsXAS9EKSrgz4xpOwh/vYMpG5MQnmTbfelr5mKyG6t/Pj+QJTxGGC3oyAd7d Fa9fVMlDS3nHJ0ZuHq1Xm+0QP3tTrmrdvlsM2epdkuUd5WlhVCHLzWQ7EoTMxlX7JZFq 8ExavDjFgiiwaQ5L6cXoQYvbqkl/IFVHVoD6aGO0HSyFqo++UiNjX7og4SNffWb6oZ4z vEPhZJ98iwTd5zQHZlCNvraJkehqL6SMQqG75AOw+eeEjW3mSA6ZS/E4ERKLWBsnoe0w OcVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XKxXl3MciKAKZSXIF+TmSJQtPsXbnsXWSEMuZ9mJPpY=; b=neAXKR3+Xb/Jc+WCQEKWF7p4wIDuvvBHkCG8m1Zyjcn/9QloZNSDzzhSzxFGnNj2v5 ODSUrmbuGdJspsFIPym9mdlyMskO0R463s4S2y3zex5hrfU527Ewhn6YoBE2MyGjmFsZ lXsSLiZmp8f8XRvBfqzoAspy7T5f0+1iappfUsp6DX+n2umG81HNNBFL2vxClvK0xV23 3aptV4OWL3hxZO6VNjq4l3+Q86wMIpMddScPGIvkjm3TFfou/nXq0Oy7xiM3phjSuD+9 nEyaO2M/fyM5qZaLINX8jIblymtUqaDjGfdwWgGCH0gyQ5NJWJNI+GJxXYvOPwLqPYrr Ia1Q== X-Gm-Message-State: AOAM531gmADfqQYpd5y8PsC+6tH0r3q1UwptlFY+UD1H/B/nFMIq1gaY jGSOpWq9FSPQOSjhT5STbJc+2wOVm5iRWA== X-Google-Smtp-Source: ABdhPJwrpxepEEUzeifXDPbPFvqwiotsmJUpk/W7hkbqpR5y3xYF10rN2TWZlLJ0q9069FY8ZMGULg== X-Received: by 2002:a17:90b:1988:: with SMTP id mv8mr133408pjb.23.1601310923548; Mon, 28 Sep 2020 09:35:23 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id f19sm2345640pfd.45.2020.09.28.09.35.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 09:35:22 -0700 (PDT) From: Mathieu Poirier To: gregkh@linuxfoundation.org Subject: [PATCH 08/25] coresight: etm: perf: Fix warning caused by etm_setup_aux failure Date: Mon, 28 Sep 2020 10:34:56 -0600 Message-Id: <20200928163513.70169-9-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200928163513.70169-1-mathieu.poirier@linaro.org> References: <20200928163513.70169-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200928_123525_833946_8EEB0105 X-CRM114-Status: GOOD ( 14.43 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1042 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Tingwei Zhang When coresight_build_path() fails on all the cpus, etm_setup_aux calls etm_free_aux() to free allocated event_data. WARN_ON(cpumask_empty(mask) will be triggered since cpu mask is empty. Check event_data->snk_config is not NULL first to avoid this warning. Fixes: f5200aa9831f38 ("coresight: perf: Refactor function free_event_data()") Signed-off-by: Tingwei Zhang Reviewed-by: Mike Leach Reviewed-by: Suzuki K Poulose Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-etm-perf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index 644805e0a9ec..47894a0dcf5e 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -126,10 +126,10 @@ static void free_sink_buffer(struct etm_event_data *event_data) cpumask_t *mask = &event_data->mask; struct coresight_device *sink; - if (WARN_ON(cpumask_empty(mask))) + if (!event_data->snk_config) return; - if (!event_data->snk_config) + if (WARN_ON(cpumask_empty(mask))) return; cpu = cpumask_first(mask);