Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757069Ab0FNWVi (ORCPT ); Mon, 14 Jun 2010 18:21:38 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:55901 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757037Ab0FNWVf (ORCPT ); Mon, 14 Jun 2010 18:21:35 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=jQ/2lKX2rufKeZaU5P1cdMj3eNykLCS+XoGJlrTzC2AdrbujZB2g96/3EQdJ9LMjHn 57ZkAVW/ckXln04zxlpSmiCQnqmuJS5vAHUMfsKkB4/ALfLtnER9C9dZT2s8oj2iSbHx +4Du+U/URvIDJnrH3L9vxJ5g1XR+Azr3ecMEw= From: John Kacur To: Thomas Gleixner Cc: lkml , rt-users , Clark Williams , Arnaldo Carvalho de Melo , Peter Zijlstra , Ingo Molnar Subject: [PATCH 3/6] perf: Fix errors path in perf_output_begin() Date: Tue, 15 Jun 2010 00:21:24 +0200 Message-Id: <1276554087-3632-4-git-send-email-jkacur@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1276554087-3632-1-git-send-email-jkacur@redhat.com> References: <1276554087-3632-1-git-send-email-jkacur@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1585 Lines: 47 From: Stephane Eranian In case the sampling buffer has no "payload" pages, nr_pages is 0. The problem is that the error path in perf_output_begin() skips to a label which assumes perf_output_lock() has been issued which is not the case. That triggers a WARN_ON() in perf_output_unlock(). This patch fixes the problem by skipping perf_output_unlock() in case data->nr_pages is 0. Signed-off-by: Stephane Eranian Signed-off-by: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: <4bf13674.014fd80a.6c82.ffffb20c@mx.google.com> Signed-off-by: Ingo Molnar Upstream-commit: 00d1d0b095ba4e5c0958cb228b2a9c445d4a339d Signed-off-by: John Kacur --- kernel/perf_event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 43c1dfb..e353be2 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -2933,7 +2933,7 @@ int perf_output_begin(struct perf_output_handle *handle, handle->sample = sample; if (!data->nr_pages) - goto fail; + goto out; have_lost = atomic_read(&data->lost); if (have_lost) -- 1.6.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/