From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, PDS_BTC_ID,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29263C432C0 for ; Tue, 3 Dec 2019 22:55:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E3B892053B for ; Tue, 3 Dec 2019 22:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413706; bh=zYB41gfG09mqdRPWxWlUgH4vOV0svqU0ru6XZw2f+fE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OR9/v59uH9AxZy3UAzhabsqDRPuoA55FdJxp7G/GJQ8WXq9lrLoIA4Pq4GbZvbUUk d60+AyxJQxLuXcb8wEncpuCpZycuC8L09bK6Q1zaZSlctjzwWZRX3pzakueZ6VApnX vSnvEA5GXE+/1K4a3f42FqCMrvZnJbRBGxlK6lMM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730324AbfLCWzE (ORCPT ); Tue, 3 Dec 2019 17:55:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:49144 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730321AbfLCWy7 (ORCPT ); Tue, 3 Dec 2019 17:54:59 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 A7693214AF; Tue, 3 Dec 2019 22:54:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413699; bh=zYB41gfG09mqdRPWxWlUgH4vOV0svqU0ru6XZw2f+fE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nfOQ6YKmwFX1jXj3bUBCiHsUUwldpfFHtuoU0IWPdqdI3h2fX56mKU7Qo4hY2tzoX PPwNg1qPNQu3J1ZdhETk66fJmJG1PcMlitpjsN8ZaxPY8FItC5BMaDRLeV+vV8KhzE Al2HA0x32hN4fTNZsPXnr1sXAHZ3OPcnRrsm9lOs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Thumshirn , Jan Kara , Jens Axboe , Sasha Levin Subject: [PATCH 4.19 229/321] blktrace: Show requests without sector Date: Tue, 3 Dec 2019 23:34:55 +0100 Message-Id: <20191203223439.028520755@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@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: Jan Kara [ Upstream commit 0803de78049fe1b0baf44bcddc727b036fb9139b ] Currently, blktrace will not show requests that don't have any data as rq->__sector is initialized to -1 which is out of device range and thus discarded by act_log_check(). This is most notably the case for cache flush requests sent to the device. Fix the problem by making blk_rq_trace_sector() return 0 for requests without initialized sector. Reviewed-by: Johannes Thumshirn Signed-off-by: Jan Kara Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- include/linux/blktrace_api.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index 8804753805ac5..7bb2d8de9f308 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h @@ -116,7 +116,13 @@ extern void blk_fill_rwbs(char *rwbs, unsigned int op, int bytes); static inline sector_t blk_rq_trace_sector(struct request *rq) { - return blk_rq_is_passthrough(rq) ? 0 : blk_rq_pos(rq); + /* + * Tracing should ignore starting sector for passthrough requests and + * requests where starting sector didn't get set. + */ + if (blk_rq_is_passthrough(rq) || blk_rq_pos(rq) == (sector_t)-1) + return 0; + return blk_rq_pos(rq); } static inline unsigned int blk_rq_trace_nr_sectors(struct request *rq) -- 2.20.1