From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1185D19D060; Wed, 5 Jun 2024 12:02:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717588953; cv=none; b=e9lQxS8lwVj/86/Le5uxU1k7QsMOnLCDc6ZACtmlv+RKjiq+dRbAXenGDqb4DUhBhWLWQS9bOjv+FaDJHBiGuqckvaWA7WuDWVrjEiPLrlUDjZEd8xpGNvm8SYEw4fRSYawtb0fy1XbdEgKid5N+jmMVwnTJpijO5pXfMFlK1Mg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717588953; c=relaxed/simple; bh=EpcOa/PoeA1uayk+/SDygq1AbB+riunm58LMI5D8cdI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O+gX4w/MGEh84QMZ5rsSk9/VYs/m4SOElCwXjLSGDeYQiAQ5TonKTviPDmqe9LlzCojTYvN9e3WeIi+qb6a5hWuGDTrULQYbQIWwYmuZ8Dox+6mkoR0objx9zoPpdi+L4ksmi9qf3+3DOUbhg4Uo6aNN4Z6cylC3e7eb0H9FE14= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Xjphsm3u; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Xjphsm3u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA7B1C3277B; Wed, 5 Jun 2024 12:02:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717588952; bh=EpcOa/PoeA1uayk+/SDygq1AbB+riunm58LMI5D8cdI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xjphsm3uG44XfvsRvRIhwDFEbL3pWL8vUD+YuuwaOy2QCxoYYcGeE9oyImw/5+0C/ 5B1x1mrzd3dT1PjpBEa2+aYWS3Z3YLvt/OU3IwVA3eQDRE12Tv4Oxnicgt5sFmQMrc sS7kBxCucoCwERMYv4QnrNqB6Y6XbK8vr3a3OZTu4Wfh+olnO+6lMIGcGpi5XpdQJ0 M4EW2QC3qNtxH5vAPLLVw8OSCWwOJoCp/1NVPgsb8HkqB6cHV+13gukus3RiQHhU5F BUESO8dsKIjxGmC5Cbs883Nun33msBuvDDO1DWQhwbcNDmhMSHfSeF0uxKQ6cGszzO LgMiyXWT83b7g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kundan Kumar , Christoph Hellwig , Sagi Grimberg , Keith Busch , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 6.9 06/23] nvme: adjust multiples of NVME_CTRL_PAGE_SIZE in offset Date: Wed, 5 Jun 2024 08:01:49 -0400 Message-ID: <20240605120220.2966127-6-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240605120220.2966127-1-sashal@kernel.org> References: <20240605120220.2966127-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.9.3 Content-Transfer-Encoding: 8bit From: Kundan Kumar [ Upstream commit 1bd293fcf3af84674e82ed022c049491f3768840 ] bio_vec start offset may be relatively large particularly when large folio gets added to the bio. A bigger offset will result in avoiding the single-segment mapping optimization and end up using expensive mempool_alloc further. Rather than using absolute value, adjust bv_offset by NVME_CTRL_PAGE_SIZE while checking if segment can be fitted into one/two PRP entries. Suggested-by: Christoph Hellwig Signed-off-by: Kundan Kumar Reviewed-by: Sagi Grimberg Reviewed-by: Christoph Hellwig Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 710043086dffa..102a9fb0c65ff 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -778,7 +778,8 @@ static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req, struct bio_vec bv = req_bvec(req); if (!is_pci_p2pdma_page(bv.bv_page)) { - if (bv.bv_offset + bv.bv_len <= NVME_CTRL_PAGE_SIZE * 2) + if ((bv.bv_offset & (NVME_CTRL_PAGE_SIZE - 1)) + + bv.bv_len <= NVME_CTRL_PAGE_SIZE * 2) return nvme_setup_prp_simple(dev, req, &cmnd->rw, &bv); -- 2.43.0