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 B737FC369D3 for ; Mon, 28 Apr 2025 09:24:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7F42A6B00AB; Mon, 28 Apr 2025 05:24:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 783196B00AA; Mon, 28 Apr 2025 05:24:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 581076B00AB; Mon, 28 Apr 2025 05:24:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 320766B00A9 for ; Mon, 28 Apr 2025 05:24:22 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 8C7001A0FF5 for ; Mon, 28 Apr 2025 09:24:23 +0000 (UTC) X-FDA: 83382916806.17.09E8EF9 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf07.hostedemail.com (Postfix) with ESMTP id DEFAA40003 for ; Mon, 28 Apr 2025 09:24:21 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=DyqXQ6VB; 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=1745832262; a=rsa-sha256; cv=none; b=zcPRW7cGq9EXNwuagzB3H/R0E4S9PVsn0uXUU0x02yldbuMejHjwcWTi/dofasJ1UQKnA3 gCGY45wTDRXENpczX+OTjgncPSWs1cVegh5zx2jaOuMcy75q5ACIoach7EwKcPyxCWR7hq aZ+GKrC26M74FTSkv34x46JEhDsi1C0= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=DyqXQ6VB; 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=1745832262; 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=52+yGXnF7WmaQpmnHD64Abc8GOERoL17UyX9Asn2VWA=; b=NaqYVlu2Tg5U7kNOren/srj9Kh691iWKou8aRwRBMgCyoW/kk1tc/x/f7ve5qa83VG583q bqYDV5YtORKsii3FhnU73LF2ahqflr7y8944HosxcRcqspMQpqzF+2Za99ZC3dX8uCZ2vY iw/lj/fBaxfn0ubT7LH0dU59sMl+s+g= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id E9A814A93F; Mon, 28 Apr 2025 09:24:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C09AC4CEE4; Mon, 28 Apr 2025 09:24:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745832260; bh=JltzEs94lpehyHx6nl6wHRaPQKIRgU/HyWicrIFjUro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DyqXQ6VBPGUV60WqF+uTbZzXAsUAIJ9C1BCb2KV9m8F42ozYCzXInlnKQFxIS2b36 s+SctZer4F7Q5NkzQQld7WJZo9qsmkj9svarVHnHcf2ojzaBTAeBo4/HXSAAYmAED9 0xAI51RXFcaNAViqGFTvgw71I5NRyjdQoBDcESxnGQBEZOfbe7wMnLan2Z1+J+qRj+ 8OEN5Dl/+rgO5hpebjkaj1SMCY1/3eRJ/TzmFUnFCx9NWXXoE71dQT6bHrYlzaqCDj cQfDk5LtjtwfeRrBMl5iLWmlcl+SqiMKCEXYnYeUEY8YsO01MnQzVcNjFdveNAbkls vBmDT0QLSZCQA== 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 v10 24/24] nvme-pci: store aborted state in flags variable Date: Mon, 28 Apr 2025 12:22:30 +0300 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DEFAA40003 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: w8awub1w3hsehmm36wcwhytbhtami8bi X-HE-Tag: 1745832261-804640 X-HE-Meta: U2FsdGVkX1+hiXgCdA95+tpUwlUiUwFzeyiXTfjOD6myfEy4Q5SeFHRwiySuNQs33XABlv/w3IF1SqA7dejFF9jmIIs9gATm6OSJfuhPtDQJ0T7SSLobl3YVuZXpT/9GnmaT1MSyR96r29usq3xbZAcawzxMqJGjLqRBsYQJEt91/gVVxR0fN7RTxgegymM4ewiusOSP44CP5Jph6QVV91T39IKoow6ONKRVaTMLmGpbiqlBVAKtH38Xaei8Z/MoANlYFQJCKVPOy32hg8lC/EqbCeo7GJG8Y+z1nV8lOlnHTEJv17wh//CvIg8lW/gYRTQbNiCr/9ljoqwdy7wAZAAahui9noFqff779hfOOKvoBE4jQ+D5ih+C5W6rEc8eRPs3RPx6jhcxuLGFaY12gRvCjgbQEQSqJbc6CdLDtm5fkf/zOlPauVovwW00KhvsQPkNWySpFm20N0msxEBlRu8woKQZLaBk6rUv8EQyuZpokGWE5hshO10FsgowEIpu2olHLcldOtQhZQ3cg+KmmalUFYGEWO3EMR/J21h7RHrBRxd3DVNqo9EwfMHuflSNhrB9IwvHToLwY+46bBnBnh+V48Wiq4totJWExMhongMpb2TI/0NVoQyoRgDcKo7Y5QL88KpWzPVrnC5WAT98t+IP8my59yPb1AIDBxK0MoWp9na4UDxl6+xXAInthJhCsTbBSIUz6FOXGI8yOdvDQGQfCelBt44sWmoWtbDPi2IKsgS1i3Hrxc8Kibo8+PHjOytx9068wJA147ptcyPSUPx7CezDYQM1ICzwbmC+EHTJ33v+QRzmQPTjqKsB/PuCFrwsKtBV8wKQIMzxju9Py+2IfaCxTGYBshOh8BAXXSGeD3PBM6YzF4NINfU+T/Qd+EhbG5ifsY0XrXlApm6+03sk5PKIN4iexKmHk/lVT2C8pUKgZwb7Dozw++NPoNR4Cj5PJwwi4CyXCnMgXc+ N1C7zMhy fRMPnmGTzdhNyotVbx/lHiTd0f5nWD8vxDa9mjYh5AvvhM7VA3KpzGD8dS5xiTjY6gcKCiIpiiVl8FL46/oSqpZ+QCb1k5VwAWzCmjfCX2voNO4sAI/EqJuGveHjFEIUlx2sPDyIyywC+fN+BTYYsZ2a2scwSLYTjm8cns7N86tzx/V8B9ta1Eau3bcse/fpF8ieFug+nKc/+8/TGFp1EEG3gGGegeYZdz+OScJ/5uRs3/Zw= 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 eb835425b496..9f3e2d8cbd04 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 << 0, /* uses the full page sized descriptor pool */ IOD_SINGLE_SEGMENT = 1 << 1, /* single segment dma mapping */ + IOD_ABORTED = 1 << 2, /* 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 */ u8 flags; unsigned int total_len; /* length of the entire transfer */ @@ -1027,7 +1027,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; @@ -1576,7 +1575,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, @@ -1589,7 +1588,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