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 026631C776A; Wed, 5 Jun 2024 12:05:00 +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=1717589100; cv=none; b=q/Zw6rYtPAu5PAO0UJP9sdfKjQCO2pR2ecccGGRisE4HioxQu8ROcaGz80NILk+x+yvfRGON0swbx0Hqvb49JjeSxbTFc/hiWVWhvy1u61qj5WyWo9KNRAqNrFFDsMs/a7jL2la4lZYii17EwIApyyPi8Vw/BBy4bphjkAiNTQI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717589100; c=relaxed/simple; bh=B0k5s6buZQwPBJm0xzZLzHx/9pO9n+AEcUzQ/fkRK88=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WV2TVeLFq6bDLas52mOgJ/R218M/dndOezw/1Rm1fXupQmHPks1QELebrjzX4p2Bx2tICXD+70sSPqypzVOztUpjXbvpvUUt/u2JnwfMWTYa778EmLU9/uh4WBIdvTNFsHIZwhEL+KSddXGMvM21weBnfvtb1fX+VSdKR18MgPE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VNNQ8w73; 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="VNNQ8w73" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00A01C32786; Wed, 5 Jun 2024 12:04:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717589099; bh=B0k5s6buZQwPBJm0xzZLzHx/9pO9n+AEcUzQ/fkRK88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VNNQ8w73Ql4nrJ0cgbCU/RgrgjqLtlhHM6LkwoOv0Mpk2Hw1GxgT+P0Exb1w+dxuG 2SgtTJx805IpzBA45MRc7xwMILnHAOddtlPmG+xQRoEYbr8bjQXp3NbOZ1oxEE/Rb5 oNh1a3ZZfvGi6+9fjcRwy5dd/OpAmLNxo2MTSi+XQUyZWifWkSKDbe9OQLuYHr+InF T4mP8WdCWgPNGdy4oTQLNykWVv/zywgW6dOjUO1KjG0onpc3m0IY/HlQVBWPAEUU0y FcP03EmPpXsjlyIKxfeKwHF+az/hFLFSNbevLroQg1EaZzawBN064yiJGdEkL5VQE6 HNVOOKdhziQpg== 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.1 03/14] nvme: adjust multiples of NVME_CTRL_PAGE_SIZE in offset Date: Wed, 5 Jun 2024 08:04:36 -0400 Message-ID: <20240605120455.2967445-3-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240605120455.2967445-1-sashal@kernel.org> References: <20240605120455.2967445-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@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.1.92 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 5ff09f2cacab7..32e89ea853a47 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -824,7 +824,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