Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2834530ybg; Mon, 28 Oct 2019 03:12:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqxquMT4A0iZKxcxh1lirJstVmtMo/+yRnwiL3Qk3Kacm9xrwENIasIkjz1U1EtKv1nSa9Dk X-Received: by 2002:a50:90a6:: with SMTP id c35mr18671167eda.22.1572257561312; Mon, 28 Oct 2019 03:12:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572257561; cv=none; d=google.com; s=arc-20160816; b=UY6C+xcaMyoQZIayIhuUGibc2JjwhVTPXZ4NYRxLxN+Vra/T9gP3hv1BXNU7WSRBj1 8g/RVQNCmMk7mvbaA7ydvzwtLR+QAyzqHwH8c2foVudIJbqaLT52eCfKzkB58mrTFmYu pqBg1LhEXqNwxHlQuZjmARplWX2mb/SBzddqfiidZh97GKmjUj6nWIPD30+bTxcHOZNs HbWPRnZyNX/KxaieMD641hMYuJzp820NEvUAhxuQEw99UYHY0GXH5t6yVmz+4z+MrBU6 p8MZ96i4i65lSTR2NXuhJBLI/CfczLEIAyKFB6M0rwUUMJDLnRXGgoA/+lSAgHg1ZGyt leiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=5yiNCv7p1vhKUKpvkwXqcGA+fCGid35XKFYZ660a6CY=; b=iSD6yGjC0u6rskJ5R3MFVY6KRGdiVjjRaUNdP85o4712Zw4iJmN2nvHEy1HJlCCuzU PP5jGyKLOmbcHIO/PBa+EvIBhk/HZrEw9OLhkf1MdgKmHc8PC1ph0PuCmUo3NHviy1vX 7vEKsyxVHajDTdnl8w100AiQ/KexjeJmyp6VGxAIAElgJ54JS7BtGCvSSM1tYe2ZqUp2 Dgcps/kQ2UeHxNZxYGaBu9eMeSOftJ2qGO1o8SXznLtCtHAT0Vg4HI7Hu+j6ntfO5w20 e1DP5f61Pqu5hUlbS4hMDWRA3TAbgNW8O/BO+MQ7hypBNDPj6xUFu+cAPY7qQGBDbHtG h/kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="w/ORJfyf"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p92si7549745edd.407.2019.10.28.03.12.18; Mon, 28 Oct 2019 03:12:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="w/ORJfyf"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732946AbfJ0V03 (ORCPT + 99 others); Sun, 27 Oct 2019 17:26:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:48376 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732928AbfJ0V00 (ORCPT ); Sun, 27 Oct 2019 17:26:26 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4FDAD21E6F; Sun, 27 Oct 2019 21:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211585; bh=2dkV0I/ttTsDq2uK0syJ7uNnKrFVDYIZq51ZA9hvSWg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w/ORJfyfLyq+8SLsKV8YB8wl6lbiE9uC5Q8awLZN/RgRqr9XP/Xao9ZrpRAlZS4k8 AifGPNo166YOzSWAV8UxAXKXIDlelCQQS4YU+tcOh7eVRRTVb9c6ZK/AX43tfMuQpN 6voQTXHuAFP6uvJRBYyciJsalRcW35NsDpz57oEw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nikolay Borisov , Qu Wenruo , David Sterba Subject: [PATCH 5.3 187/197] btrfs: tracepoints: Fix bad entry members of qgroup events Date: Sun, 27 Oct 2019 22:01:45 +0100 Message-Id: <20191027203406.582477867@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qu Wenruo commit 1b2442b4ae0f234daeadd90e153b466332c466d8 upstream. [BUG] For btrfs:qgroup_meta_reserve event, the trace event can output garbage: qgroup_meta_reserve: 9c7f6acc-b342-4037-bc47-7f6e4d2232d7: refroot=5(FS_TREE) type=DATA diff=2 qgroup_meta_reserve: 9c7f6acc-b342-4037-bc47-7f6e4d2232d7: refroot=5(FS_TREE) type=0x258792 diff=2 The @type can be completely garbage, as DATA type is not possible for trace_qgroup_meta_reserve() trace event. [CAUSE] Ther are several problems related to qgroup trace events: - Unassigned entry member Member entry::type of trace_qgroup_update_reserve() and trace_qgourp_meta_reserve() is not assigned - Redundant entry member Member entry::type is completely useless in trace_qgroup_meta_convert() Fixes: 4ee0d8832c2e ("btrfs: qgroup: Update trace events for metadata reservation") CC: stable@vger.kernel.org # 4.10+ Reviewed-by: Nikolay Borisov Signed-off-by: Qu Wenruo Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- include/trace/events/btrfs.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/include/trace/events/btrfs.h +++ b/include/trace/events/btrfs.h @@ -1687,6 +1687,7 @@ TRACE_EVENT(qgroup_update_reserve, __entry->qgid = qgroup->qgroupid; __entry->cur_reserved = qgroup->rsv.values[type]; __entry->diff = diff; + __entry->type = type; ), TP_printk_btrfs("qgid=%llu type=%s cur_reserved=%llu diff=%lld", @@ -1709,6 +1710,7 @@ TRACE_EVENT(qgroup_meta_reserve, TP_fast_assign_btrfs(root->fs_info, __entry->refroot = root->root_key.objectid; __entry->diff = diff; + __entry->type = type; ), TP_printk_btrfs("refroot=%llu(%s) type=%s diff=%lld", @@ -1725,7 +1727,6 @@ TRACE_EVENT(qgroup_meta_convert, TP_STRUCT__entry_btrfs( __field( u64, refroot ) __field( s64, diff ) - __field( int, type ) ), TP_fast_assign_btrfs(root->fs_info,