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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 B3C0DC432C3 for ; Fri, 22 Nov 2019 05:59:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D4C42068E for ; Fri, 22 Nov 2019 05:59:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574402378; bh=zYB41gfG09mqdRPWxWlUgH4vOV0svqU0ru6XZw2f+fE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xg9dp/e9VpdT7vIk/+bpc9S6GWeYnSRHUpHkG5C3nr6/UOO32zTx+eFemxNnoT3fn oqQDreFsI+lhVd+5JrspI0KqGzuGLpFCIoLgd60FlVeSx2D1cxd+jBWGEvd1S4HLoq q+oySeUKEf+7D8NDtFfSbsB9Fe6x5Fuh67ljBj90= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728778AbfKVF7h (ORCPT ); Fri, 22 Nov 2019 00:59:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:36350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729531AbfKVF5t (ORCPT ); Fri, 22 Nov 2019 00:57:49 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9461D20854; Fri, 22 Nov 2019 05:57:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574402269; bh=zYB41gfG09mqdRPWxWlUgH4vOV0svqU0ru6XZw2f+fE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eHRYycikVW4uDB0vwSgUG6RsJuW5LsH3Q8rfDxGrU3VooK6UJi7qU/0BjyQ9jmXjx ENwN8OSqUb48qGIL4G0UPlAvO8u83INrDy+dEq+fhJso0K9ug3Hwb660wJsRa/xNVK 1rn43XGUKULrYtfUZEMg+3UGRWVZpqq5m4uwmKvo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jan Kara , Johannes Thumshirn , Jens Axboe , Sasha Levin Subject: [PATCH AUTOSEL 4.14 109/127] blktrace: Show requests without sector Date: Fri, 22 Nov 2019 00:55:27 -0500 Message-Id: <20191122055544.3299-108-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122055544.3299-1-sashal@kernel.org> References: <20191122055544.3299-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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