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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5B09C369CB for ; Wed, 23 Apr 2025 08:15:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 67C596B009E; Wed, 23 Apr 2025 04:15:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 62EB06B009F; Wed, 23 Apr 2025 04:15:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4CB776B00A0; Wed, 23 Apr 2025 04:15:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 2CFA96B009E for ; Wed, 23 Apr 2025 04:15:33 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id AB9EB161511 for ; Wed, 23 Apr 2025 08:15:33 +0000 (UTC) X-FDA: 83364599346.25.D1A1A79 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf07.hostedemail.com (Postfix) with ESMTP id 0129340003 for ; Wed, 23 Apr 2025 08:15:31 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=J12nDPRU; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf07.hostedemail.com: domain of leon@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745396132; a=rsa-sha256; cv=none; b=HpSMm3EHLyNev71VfUtncGEai7LLUowODUi0WHrVHyVvzn81UtwbXmSW2k9Jc9Oa5y3qIp +xb6+4whtPbPeq4tWkOPJk0emiZ074+6TKuA9UvMQzZCciqs6cHYrDQx3Z7S5JqIlUzM76 VqNrE/7DQpTDJOUL1jhaFx3jYvDFfIA= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=J12nDPRU; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf07.hostedemail.com: domain of leon@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745396132; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=QbVlYEvvbEd6r1kmzRub22g5bJ8bELoGo7XxL5O6L6Q=; b=nsm4KMQV/tIy9cNoY6GxVcbhIbE4Gv7frdG+yuiJk8ONDHtreeDHTfHunQ6FA29+faPzc2 M3XGy2PGHBXA/YJPKOXs3w52d1EyWFYHen1BQ5QvbCOfkSOUNSrt+LL7ZY/Y00+Bl99/AX e36k0ne0EpX6AdVCliC5ppJ5IwEXmC8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 854EF4A4F8; Wed, 23 Apr 2025 08:15:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA44FC4CEE2; Wed, 23 Apr 2025 08:15:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745396130; bh=hJ7Ip9+BoZAGI5de25k6VVDZHayvfvf2mLK8emkWpDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J12nDPRU3cH7wA88Iu9BFVrY+PzsKtMJ7xncym3a/Q+sMbBCS7mLM3ryCPgfwbt4+ VfesgKcyGq1stn/1qMWS0rL0/jhFKx98nQP5G9WUIPyi6U66Kj1H2z5Cp+DRsrjzsp 2/XrS33uwHNvshj+OP+6nyD8KmO74H0MbhjK/6yY7scz7tsm8Jsap/FHPMQdW4g0Xu T5CFKk5USJ5XElRY01pmoB94PGC10Pllk2VaLO/uxA0SClhTgNbPWpAKkOAyDN7459 8vRn1WHXTwkLPiavmersXQcNwP6Sz1WdbV+biC8HCQeqVCWW6Zf1OZLtauCglURDip 0i7XWKreZyV0w== From: Leon Romanovsky To: Marek Szyprowski , Jens Axboe , Christoph Hellwig , Keith Busch Cc: Leon Romanovsky , Jake Edge , Jonathan Corbet , Jason Gunthorpe , Zhu Yanjun , Robin Murphy , Joerg Roedel , Will Deacon , Sagi Grimberg , Bjorn Helgaas , Logan Gunthorpe , Yishai Hadas , Shameer Kolothum , Kevin Tian , Alex Williamson , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Andrew Morton , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-rdma@vger.kernel.org, iommu@lists.linux.dev, linux-nvme@lists.infradead.org, linux-pci@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org, Niklas Schnelle , Chuck Lever , Luis Chamberlain , Matthew Wilcox , Dan Williams , Kanchan Joshi , Chaitanya Kulkarni Subject: [PATCH v9 24/24] nvme-pci: store aborted state in flags variable Date: Wed, 23 Apr 2025 11:13:15 +0300 Message-ID: <9432af8b4b3b947ed6b280e722389c188d5c957e.1745394536.git.leon@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0129340003 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: eaks8jkoz3mwkcc4u1woiqkca3rcnmns X-HE-Tag: 1745396131-194804 X-HE-Meta: U2FsdGVkX18iAEqODUtDCobl07+j7QEA9nlaMrhBtam5ao4KmUsZP69RWSquCb3/gXTUN3A8XUJwTnuyxus2lGqArC4MB1KmJNKRmWZuBkgabKnR2mrNhYhz0GjYevRuJ6w++P1jRWhmglGhknVHP8ZA1nqEDlcF+9wTc9mbDg0GK62rjhNs4pmE52Ia7ii0WV98dEB7aL5KGeUCyKrlO072F+qlGaoS7oq8Rdi0/aeZx0zd7Hu2nnOOceZ2cBK8Ycr3RtWGJqF+N/MpVqXoaaXgOrq/yevrVgFuy1yOK5UwqeNp0S3MzeOAIytue3jQrCGcj7JGO2s+XjVIHpvphB2wVPnYadbf71e/3K8H0HSR3B52+kGVlP5+wnXFwHq8EJZqS6CHsBelYS9Cdkw+Ew3i6/zQhxZkb4ykiZk2lVET/2WJjltOavUv7CQ9WmzFQhUK02PeDxPFffoWAQW2/ZjkKZgWndkHaYA4epdXmydIv3+pyYaUZW6MyvpbfAZretDBivZLOEacCm68A8mk2o2K8RQAtkqGbxyrEAvHAvXsegKMJ71lhPMCkX/7dLqSFea2U767qYmfvjTE1VRE/BGRAVjYMtvaUqE9YsMPDEa++Fik/gfjBdSTWFdPmdbY5B6ztWjbx0TeAPHWZYD/o6LO8jIo9noPPsdlQ2MvtFsSNai6b9/R4kcrQWzoTATS4m9izQitWGgJgjpxR3fILN1e4x21USlqYPQWB6PFUkO4AaVWECOaxRrBiZL2/rjMZ8uWysBZ0Ddi/mwcDI3y6p29u2npjRkzm97fetXCduPlxcrno9vGC6lAdWFV+k8xbezXSRAHNIui1lTTlp1TtSvzToc4D5ae2UYMSaHvMR9i2WDA1K56S1yKAhalvNNTeDWE+GgCI5GLi9HPWq8JqzUdE9iP7pu/dsvobibIF3cD/SffxNwQt2W66gJScAQcf6SlFeTy6sI19ZwmKn1 Uny4F0G+ DCleFJIEGPFh1ZCGWhTsz+hS+oX8KyG+ZrwMq+xpWyLkRV4TjMCOqovvBdCuAg3IaaImCFBeh8blbT88GwWAgEl4X7MFHl1O2b+vj0Qij64YgXBft9hAA09G1sbYPXuc2Y6VO2wrqkScan7/r4DUVPm0Bbo//fPeHHYVJXwFCC0fw8ujIF8SE5AL6rIZM7KOHwygFABJUWzOJovxLntfxXnamdAdiJgQULbnqpv8h7N7Nn4w= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Leon Romanovsky Instead of keeping dedicated "bool aborted" variable, let's reuse newly introduced flags variable and save space. Signed-off-by: Leon Romanovsky --- drivers/nvme/host/pci.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index eb60a486331c..f69f1eb4308e 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -219,6 +219,7 @@ struct nvme_queue { enum { IOD_LARGE_DESCRIPTORS = 1, /* uses the full page sized descriptor pool */ IOD_SINGLE_SEGMENT = 2, /* single segment dma mapping */ + IOD_ABORTED = 3, /* abort timed out commands */ }; /* @@ -227,7 +228,6 @@ enum { struct nvme_iod { struct nvme_request req; struct nvme_command cmd; - bool aborted; u8 nr_descriptors; /* # of PRP/SGL descriptors */ unsigned int flags; unsigned int total_len; /* length of the entire transfer */ @@ -1029,7 +1029,6 @@ static blk_status_t nvme_prep_rq(struct nvme_dev *dev, struct request *req) struct nvme_iod *iod = blk_mq_rq_to_pdu(req); blk_status_t ret; - iod->aborted = false; iod->nr_descriptors = 0; iod->flags = 0; iod->total_len = 0; @@ -1578,7 +1577,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req) * returned to the driver, or if this is the admin queue. */ opcode = nvme_req(req)->cmd->common.opcode; - if (!nvmeq->qid || iod->aborted) { + if (!nvmeq->qid || (iod->flags & IOD_ABORTED)) { dev_warn(dev->ctrl.device, "I/O tag %d (%04x) opcode %#x (%s) QID %d timeout, reset controller\n", req->tag, nvme_cid(req), opcode, @@ -1591,7 +1590,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req) atomic_inc(&dev->ctrl.abort_limit); return BLK_EH_RESET_TIMER; } - iod->aborted = true; + iod->flags |= IOD_ABORTED; cmd.abort.opcode = nvme_admin_abort_cmd; cmd.abort.cid = nvme_cid(req); -- 2.49.0