From nobody Wed Dec 17 03:28:13 2025 Received: from mail-pg1-f228.google.com (mail-pg1-f228.google.com [209.85.215.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 492BB1E1C22 for ; Mon, 21 Apr 2025 16:17:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745252258; cv=none; b=MPC2W/1gVLNwvhGwdhhDs+uGtz8ThCuNSMZxlPK2/fTI2Tfli0Z9GnLrLf5l8lv8NlCh4xIm3PohWWdFjo3RswDh0rmOALvNzR/tIiESl8gwlGhU04bWbdtB3oTpFObEwIOPesncy1IaQDuzjlAjl5NEx9Hn/uRlllCkyJuBA2M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745252258; c=relaxed/simple; bh=Q2BBs4sgBC+rV3+H3rPoTA6kzcY/ni/Xy190be33v9c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SyQH1tLSBzaIE+1zCE4xZ8Kez0PvHAXSwlDwvU1H2vYtMQyziwgfCLdvbsTgm8MA96xq+W1uuuU28gF0OV1xfD1uqoryvi83ral67jIKMjGajVOze5E7RzqPQwqyiVb1PtVaI1hxY/EDGjHZPcOooIqAry0Q9Kww8rkBfis19jQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=aTGcSbve; arc=none smtp.client-ip=209.85.215.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="aTGcSbve" Received: by mail-pg1-f228.google.com with SMTP id 41be03b00d2f7-b0b229639e3so381795a12.0 for ; Mon, 21 Apr 2025 09:17:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1745252255; x=1745857055; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xMEgWb5Zpf4MCf6w3ykJFs0Ob9U5wFpE+oGVVEOi8uc=; b=aTGcSbve1ZyaeEYwBN/5AT4C6qNObh2dyCg9XKcEbN1rf8q2T3xc6R1UzPuANpvQ4g D6ZznlxOsrS1mSeQ7Rtw2Htryi4ZZFiQyDO6o2bzvbFKDs4hRtFRviSbwVuYKbl7bayR H94OxMfIQo/J3ho9kLy7cKf7dHLmSXSQeNnDDgqJiyA5niYbLWIO3qtxjyL9fDzanzWj zF00H+PB1uiVnazrX4KYCVfxJs7hfi4CQvnEpjLNBYajiQs2t50NqbTyNKVSEdRK2BSW /nY3Bp6OXXysuv7HjWF30IDwRjXdWvDgaosgpWTal+u4Z1aJjsVNMFVBpgzczJ/pyANE tNew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745252255; x=1745857055; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xMEgWb5Zpf4MCf6w3ykJFs0Ob9U5wFpE+oGVVEOi8uc=; b=w7Iuax00148S7ZEKCR2Kvn6Z/n6JrQblD/XufalHqKhJOb3nMeQbRXHSq0vk6+4DEI JHWdlqePsQ6EGboRjawrzHZWoX3s3eLt58BkWUoXoBPqYvE/fZEHk0Z98ryhFkDBFi+y c2mrIsrJaqYTwbBERMjK7YVKglkInn+SSLgaYjOKxtqgQqsv7avMpJUnJPjg00Slek7z WxciNApKdnsWIp0db65swxMX3zx+xDbhEkHtaDY5G8TmKQMLtHjgI1lt1h28Sp6/U75d Cx9Cc4Q9gR74uDkdSmsH+HKmejcuFCF/2hMTRpIrhosE6mLzcEVKfph+c6pYcNhJOK8k faAg== X-Forwarded-Encrypted: i=1; AJvYcCUEgrj+EqmQOgucMTm+z8eVRwGKgtaYQe5f5AgnpR2e+4PGrQtfLA1Xp9fLH18i3vMyPmEN1GdMg8GOtYI=@vger.kernel.org X-Gm-Message-State: AOJu0YwXyVR93HjBYkf1+0LVKwTRyt4Gu9g8VMOwg+aWfMNp7pT6ThUq XjGzPtaSkUmyVWlCKAZyUqH75bXoaOsvIQ4vCfmjXLfAo3LO3q5WrviEVq29k77AxkFFI2J7r6W QIjrp5KEuaJbPTEaiggB5FVxQuxCKpMjO X-Gm-Gg: ASbGnctCGy6Kt/XLTj8kZpFZRTPByh7h27vFRpn2rdOL9hKeUz33cig1vFcy5dw0u1z NzqMPBn5pQXM8xn8LU21Ry3RlWrIc++L1bWuyKPSDDNYvQCtwl7bxj7hju9Gi/1kBNHL2Q9OyaX ozLhBQBKdtUFeFVWwtGOZjw5ZzoX8rqa00ZCFvKe5DS2Y/b8iTmzwdTFpxUyp9QHm5JttGq/n5O BWzEKfVLrRwiButpAOUN087UUIwK2uNwnUgiu3iKeOupniEnySWFx8ajoDmW3N5S0zCRY1tOI7o /yJIqgIjExjzKMhKezS0U8QlhrKq7GH9LB0+7yWc9bfc X-Google-Smtp-Source: AGHT+IE6loebWB1SWVve/qgKlrBiVTBt8NCR34+v7ti1HB8vnb5fZGntVJutHi+ayxKstwkEGksjiK0bSxi0 X-Received: by 2002:a17:90b:3e85:b0:301:1c11:aa7a with SMTP id 98e67ed59e1d1-3087bba8573mr6764330a91.3.1745252255440; Mon, 21 Apr 2025 09:17:35 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id 98e67ed59e1d1-3087e05ee89sm472211a91.15.2025.04.21.09.17.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Apr 2025 09:17:35 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (unknown [IPv6:2620:125:9007:640:ffff::418a]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id E961C3402B2; Mon, 21 Apr 2025 10:17:34 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id E72EEE41856; Mon, 21 Apr 2025 10:17:34 -0600 (MDT) From: Caleb Sander Mateos To: Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg Cc: Kanchan Joshi , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH v2 1/2] nvme/pci: factor out nvme_init_hctx() helper Date: Mon, 21 Apr 2025 10:17:24 -0600 Message-ID: <20250421161725.1610286-2-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250421161725.1610286-1-csander@purestorage.com> References: <20250421161725.1610286-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" nvme_init_hctx() and nvme_admin_init_hctx() are very similar. In preparation for adding more logic, factor out a nvme_init_hctx() helper. Rename the old nvme_init_hctx() to nvme_io_init_hctx(). Signed-off-by: Caleb Sander Mateos --- drivers/nvme/host/pci.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index b178d52eac1b..642890ddada5 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -395,32 +395,33 @@ static int nvme_pci_npages_prp(void) unsigned max_bytes =3D (NVME_MAX_KB_SZ * 1024) + NVME_CTRL_PAGE_SIZE; unsigned nprps =3D DIV_ROUND_UP(max_bytes, NVME_CTRL_PAGE_SIZE); return DIV_ROUND_UP(8 * nprps, NVME_CTRL_PAGE_SIZE - 8); } =20 -static int nvme_admin_init_hctx(struct blk_mq_hw_ctx *hctx, void *data, - unsigned int hctx_idx) +static int nvme_init_hctx(struct blk_mq_hw_ctx *hctx, void *data, unsigned= qid) { struct nvme_dev *dev =3D to_nvme_dev(data); - struct nvme_queue *nvmeq =3D &dev->queues[0]; - - WARN_ON(hctx_idx !=3D 0); - WARN_ON(dev->admin_tagset.tags[0] !=3D hctx->tags); + struct nvme_queue *nvmeq =3D &dev->queues[qid]; + struct blk_mq_tags *tags; =20 + tags =3D qid ? dev->tagset.tags[qid - 1] : dev->admin_tagset.tags[0]; + WARN_ON(tags !=3D hctx->tags); hctx->driver_data =3D nvmeq; return 0; } =20 -static int nvme_init_hctx(struct blk_mq_hw_ctx *hctx, void *data, - unsigned int hctx_idx) +static int nvme_admin_init_hctx(struct blk_mq_hw_ctx *hctx, void *data, + unsigned int hctx_idx) { - struct nvme_dev *dev =3D to_nvme_dev(data); - struct nvme_queue *nvmeq =3D &dev->queues[hctx_idx + 1]; + WARN_ON(hctx_idx !=3D 0); + return nvme_init_hctx(hctx, data, 0); +} =20 - WARN_ON(dev->tagset.tags[hctx_idx] !=3D hctx->tags); - hctx->driver_data =3D nvmeq; - return 0; +static int nvme_io_init_hctx(struct blk_mq_hw_ctx *hctx, void *data, + unsigned int hctx_idx) +{ + return nvme_init_hctx(hctx, data, hctx_idx + 1); } =20 static int nvme_pci_init_request(struct blk_mq_tag_set *set, struct request *req, unsigned int hctx_idx, unsigned int numa_node) @@ -1813,11 +1814,11 @@ static const struct blk_mq_ops nvme_mq_admin_ops = =3D { static const struct blk_mq_ops nvme_mq_ops =3D { .queue_rq =3D nvme_queue_rq, .queue_rqs =3D nvme_queue_rqs, .complete =3D nvme_pci_complete_rq, .commit_rqs =3D nvme_commit_rqs, - .init_hctx =3D nvme_init_hctx, + .init_hctx =3D nvme_io_init_hctx, .init_request =3D nvme_pci_init_request, .map_queues =3D nvme_pci_map_queues, .timeout =3D nvme_timeout, .poll =3D nvme_poll, }; --=20 2.45.2 From nobody Wed Dec 17 03:28:13 2025 Received: from mail-pl1-f228.google.com (mail-pl1-f228.google.com [209.85.214.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2412C1E1E1F for ; Mon, 21 Apr 2025 16:17:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745252262; cv=none; b=RKBGFwgwi8jD5ZJqFcoumtmZoqjadU0hfFijbcSbL/9/8rwESxQeSwP74UWDNL8FJRUfINbaIQK2cZUjz2UjVH2m31sSjWcnMHcnpBUTuKQPRx3UoAYshAEqx3rL8Nf0INfxWVLTkHqeKivu0tSAXDXKhwffGQr9BZVPt1JBdRg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745252262; c=relaxed/simple; bh=OP8TgMqJhQBOwOyZverarKrg5MQdqdBLmCAKUM6F630=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iuBwhcZMHv1OiklCobFpBofg83H7r1hO0LIjtiHYZE6UYvJ4nxsJe+lanEr9JqWiUDeC74dja/3iKMjOlZKMc3x7tS3qMd2kBuRM+AtqzIZQUB3us6fKjPjo3Ls0eEk6EnXtNnbLkwKPGDyboOM05yEZ/FUqebAzO/aY3djH+kc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=X3/EM38B; arc=none smtp.client-ip=209.85.214.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="X3/EM38B" Received: by mail-pl1-f228.google.com with SMTP id d9443c01a7336-227e29b6c55so8068905ad.1 for ; Mon, 21 Apr 2025 09:17:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1745252256; x=1745857056; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5BMH3c7ujdLvJMwxRazhMEDY7Ti57bCSxTP/oTo4J4E=; b=X3/EM38BcodY5pE9Bq8djgcQfcjJ/niatdM//3OAIvEE0DGEiRkRUfOBPq32iWAZYx ew7MzaV3pB4TyIt1BwXQDDSSwxenKR03GSIrWacUd63zd3nVgcCZ75HRgl8D1C/aoM7H +pzkOflPfnuAkSnm5Vm/6cpjoesmoMjlnVL+pUv2zMMG/gGIQU4Tj+InsHDU1EffHTF1 AyGkoIF8zhQRGOeiNEjJ4CNXlZQLETsLVnTVtHP6CBH0bOwPcSYssRaLIvtcCrdQGQzc NFBo9x85W2wykYBolrwZ5t5d34JCKqlINtWC9CA7o53A5xLAJBQn2+3BCb7RcWxSZF/B 9Zeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745252256; x=1745857056; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5BMH3c7ujdLvJMwxRazhMEDY7Ti57bCSxTP/oTo4J4E=; b=w/UN/OaABD2jIELdbj9h5O4ul+BK8TmluONQxZHERzVy0arMUvq25wuBtj6xcbtOTn 3dsANfD0DkAMwiWR3hxd7etB0MhCLLonuc29rUjSZEUD1bexWch0egxe2jOyJe+NOH5l 5dyo+6kwJc76ouYVxkh7ErFTx7BGb9yM2FRJEXou/V2xJblk3ZU9R9Mls2B3/4ZKuDcW 0bdDJ6cybwbhOEeTEvwORaYzaws185VxK6M0YX/kNc+TC/2s1HVZUVs3SG34XKbyyPbS smBhvWAdGb92xKkthEF0J8j3HPvpC3AwrW3qS9Xwjd+Puz8TLGyKpLtXjEr6Mekp4BXe CAGg== X-Forwarded-Encrypted: i=1; AJvYcCU08Rt2iwueBHo1iwu77EOL7wFavNEI64pf/dmRcTMAPNTfXqAhYba6wf/R1DpJtYbQkVzsSvB1k3Wtb9M=@vger.kernel.org X-Gm-Message-State: AOJu0YwBfdnbQOSyvjeStfywrxU5roW4RQ051YG442u+qkkjvsZSexCW xMYagyOhTr8coPA8nOUKBJw62OEOUOBAYlO9MfnGDiY9KVsxOfUZVwBgnOmaop83Q0qrhgDPDNt i+jWWOpwCTd80SNM4Mi48JzHU6A9LSagC X-Gm-Gg: ASbGncuYl59xka0WOV6u6+/1kEVXb/IXjEVJx7knl43i2vL/jPztco8CUJrXluyt5O6 nsgOdm7P99TYM9NFBLU/lvK/OkYV0avC9Q6P3ddFk6Q41yE+tcshLW85MGiZwSe87VLcJxZCTtO lCF6Rr6e7S91DVl083gsmm7G+nY+evI+bFRG7uGZgSb7ywRD1DNU93As0k+fG+iq25zDZF12X1s Vv0gRLP3Kjyarki5zjynpYLiG8ueAJINf/lAxiSl3a+5KW4OD6ThZmPyd4t8DHtnSF9HyAQC/dw lYcBVdvDy2N4NUyce/myIXwlQ0CU8CmcUxNmzeWoIx1e X-Google-Smtp-Source: AGHT+IFvAPkDA2qYrSrWX0PVUPMg+vaO6DHKY4CGkI4jg5UYncQBUdXCNreogBVCEQXyHUT7MlNM4CtbLSFN X-Received: by 2002:a17:903:3c6b:b0:224:13a2:ab9a with SMTP id d9443c01a7336-22c535ad00amr68392735ad.7.1745252256270; Mon, 21 Apr 2025 09:17:36 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-22c50d82569sm3907625ad.97.2025.04.21.09.17.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Apr 2025 09:17:36 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (unknown [IPv6:2620:125:9007:640:ffff::418a]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 917BA3406E9; Mon, 21 Apr 2025 10:17:35 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 8CDF3E41856; Mon, 21 Apr 2025 10:17:35 -0600 (MDT) From: Caleb Sander Mateos To: Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg Cc: Kanchan Joshi , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH v2 2/2] nvme/pci: make PRP list DMA pools per-NUMA-node Date: Mon, 21 Apr 2025 10:17:25 -0600 Message-ID: <20250421161725.1610286-3-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250421161725.1610286-1-csander@purestorage.com> References: <20250421161725.1610286-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" NVMe commands with more than 4 KB of data allocate PRP list pages from the per-nvme_device dma_pool prp_page_pool or prp_small_pool. Each call to dma_pool_alloc() and dma_pool_free() takes the per-dma_pool spinlock. These device-global spinlocks are a significant source of contention when many CPUs are submitting to the same NVMe devices. On a workload issuing 32 KB reads from 16 CPUs (8 hypertwin pairs) across 2 NUMA nodes to 23 NVMe devices, we observed 2.4% of CPU time spent in _raw_spin_lock_irqsave called from dma_pool_alloc and dma_pool_free. Ideally, the dma_pools would be per-hctx to minimize contention. But that could impose considerable resource costs in a system with many NVMe devices and CPUs. As a compromise, allocate per-NUMA-node PRP list DMA pools. Map each nvme_queue to the set of DMA pools corresponding to its device and its hctx's NUMA node. This reduces the _raw_spin_lock_irqsave overhead by about half, to 1.2%. Preventing the sharing of PRP list pages across NUMA nodes also makes them cheaper to initialize. Link: https://lore.kernel.org/linux-nvme/CADUfDZqa=3DOOTtTTznXRDmBQo1WrFcDw= 1hBA7XwM7hzJ-hpckcA@mail.gmail.com/T/#u Signed-off-by: Caleb Sander Mateos --- drivers/nvme/host/pci.c | 145 +++++++++++++++++++++++----------------- 1 file changed, 85 insertions(+), 60 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 642890ddada5..399f3b348cea 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -16,10 +16,11 @@ #include #include #include #include #include +#include #include #include #include #include #include @@ -110,21 +111,24 @@ struct nvme_queue; =20 static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown); static void nvme_delete_io_queues(struct nvme_dev *dev); static void nvme_update_attrs(struct nvme_dev *dev); =20 +struct nvme_prp_dma_pools { + struct dma_pool *large; + struct dma_pool *small; +}; + /* * Represents an NVM Express device. Each nvme_dev is a PCI function. */ struct nvme_dev { struct nvme_queue *queues; struct blk_mq_tag_set tagset; struct blk_mq_tag_set admin_tagset; u32 __iomem *dbs; struct device *dev; - struct dma_pool *prp_page_pool; - struct dma_pool *prp_small_pool; unsigned online_queues; unsigned max_qid; unsigned io_queues[HCTX_MAX_TYPES]; unsigned int num_vecs; u32 q_depth; @@ -160,10 +164,11 @@ struct nvme_dev { struct nvme_host_mem_buf_desc *host_mem_descs; void **host_mem_desc_bufs; unsigned int nr_allocated_queues; unsigned int nr_write_queues; unsigned int nr_poll_queues; + struct nvme_prp_dma_pools prp_pools[]; }; =20 static int io_queue_depth_set(const char *val, const struct kernel_param *= kp) { return param_set_uint_minmax(val, kp, NVME_PCI_MIN_QUEUE_SIZE, @@ -189,10 +194,11 @@ static inline struct nvme_dev *to_nvme_dev(struct nvm= e_ctrl *ctrl) * An NVM Express queue. Each device has at least two (one for admin * commands and one for I/O commands). */ struct nvme_queue { struct nvme_dev *dev; + struct nvme_prp_dma_pools prp_pools; spinlock_t sq_lock; void *sq_cmds; /* only used for poll queues: */ spinlock_t cq_poll_lock ____cacheline_aligned_in_smp; struct nvme_completion *cqes; @@ -395,18 +401,68 @@ static int nvme_pci_npages_prp(void) unsigned max_bytes =3D (NVME_MAX_KB_SZ * 1024) + NVME_CTRL_PAGE_SIZE; unsigned nprps =3D DIV_ROUND_UP(max_bytes, NVME_CTRL_PAGE_SIZE); return DIV_ROUND_UP(8 * nprps, NVME_CTRL_PAGE_SIZE - 8); } =20 +static struct nvme_prp_dma_pools * +nvme_setup_prp_pools(struct nvme_dev *dev, unsigned numa_node) +{ + struct nvme_prp_dma_pools *prp_pools; + size_t small_align =3D 256; + + prp_pools =3D &dev->prp_pools[numa_node < nr_node_ids ? numa_node : 0]; + if (prp_pools->small) + return prp_pools; /* already initialized */ + + prp_pools->large =3D dma_pool_create("prp list page", dev->dev, + NVME_CTRL_PAGE_SIZE, + NVME_CTRL_PAGE_SIZE, 0); + if (!prp_pools->large) + return ERR_PTR(-ENOMEM); + + if (dev->ctrl.quirks & NVME_QUIRK_DMAPOOL_ALIGN_512) + small_align =3D 512; + + /* Optimisation for I/Os between 4k and 128k */ + prp_pools->small =3D dma_pool_create("prp list 256", dev->dev, + 256, small_align, 0); + if (!prp_pools->small) { + dma_pool_destroy(prp_pools->large); + return ERR_PTR(-ENOMEM); + } + + return prp_pools; +} + +static void nvme_release_prp_pools(struct nvme_dev *dev) +{ + struct nvme_prp_dma_pools *pools_end =3D dev->prp_pools + nr_node_ids; + struct nvme_prp_dma_pools *prp_pools; + + for (prp_pools =3D dev->prp_pools; prp_pools < pools_end; prp_pools++) { + if (!prp_pools->small) + continue; + + dma_pool_destroy(prp_pools->large); + dma_pool_destroy(prp_pools->small); + } +} + static int nvme_init_hctx(struct blk_mq_hw_ctx *hctx, void *data, unsigned= qid) { struct nvme_dev *dev =3D to_nvme_dev(data); struct nvme_queue *nvmeq =3D &dev->queues[qid]; + struct nvme_prp_dma_pools *prp_pools; struct blk_mq_tags *tags; =20 tags =3D qid ? dev->tagset.tags[qid - 1] : dev->admin_tagset.tags[0]; WARN_ON(tags !=3D hctx->tags); + prp_pools =3D nvme_setup_prp_pools(dev, hctx->numa_node); + if (IS_ERR(prp_pools)) + return PTR_ERR(prp_pools); + + nvmeq->prp_pools =3D *prp_pools; hctx->driver_data =3D nvmeq; return 0; } =20 static int nvme_admin_init_hctx(struct blk_mq_hw_ctx *hctx, void *data, @@ -536,27 +592,28 @@ static inline bool nvme_pci_use_sgls(struct nvme_dev = *dev, struct request *req, if (!sgl_threshold || avg_seg_size < sgl_threshold) return nvme_req(req)->flags & NVME_REQ_USERCMD; return true; } =20 -static void nvme_free_prps(struct nvme_dev *dev, struct request *req) +static void nvme_free_prps(struct nvme_queue *nvmeq, struct request *req) { const int last_prp =3D NVME_CTRL_PAGE_SIZE / sizeof(__le64) - 1; struct nvme_iod *iod =3D blk_mq_rq_to_pdu(req); dma_addr_t dma_addr =3D iod->first_dma; int i; =20 for (i =3D 0; i < iod->nr_allocations; i++) { __le64 *prp_list =3D iod->list[i].prp_list; dma_addr_t next_dma_addr =3D le64_to_cpu(prp_list[last_prp]); =20 - dma_pool_free(dev->prp_page_pool, prp_list, dma_addr); + dma_pool_free(nvmeq->prp_pools.large, prp_list, dma_addr); dma_addr =3D next_dma_addr; } } =20 -static void nvme_unmap_data(struct nvme_dev *dev, struct request *req) +static void nvme_unmap_data(struct nvme_dev *dev, struct nvme_queue *nvmeq, + struct request *req) { struct nvme_iod *iod =3D blk_mq_rq_to_pdu(req); =20 if (iod->dma_len) { dma_unmap_page(dev->dev, iod->first_dma, iod->dma_len, @@ -567,17 +624,17 @@ static void nvme_unmap_data(struct nvme_dev *dev, str= uct request *req) WARN_ON_ONCE(!iod->sgt.nents); =20 dma_unmap_sgtable(dev->dev, &iod->sgt, rq_dma_dir(req), 0); =20 if (iod->nr_allocations =3D=3D 0) - dma_pool_free(dev->prp_small_pool, iod->list[0].sg_list, + dma_pool_free(nvmeq->prp_pools.small, iod->list[0].sg_list, iod->first_dma); else if (iod->nr_allocations =3D=3D 1) - dma_pool_free(dev->prp_page_pool, iod->list[0].sg_list, + dma_pool_free(nvmeq->prp_pools.large, iod->list[0].sg_list, iod->first_dma); else - nvme_free_prps(dev, req); + nvme_free_prps(nvmeq, req); mempool_free(iod->sgt.sgl, dev->iod_mempool); } =20 static void nvme_print_sgl(struct scatterlist *sgl, int nents) { @@ -591,11 +648,11 @@ static void nvme_print_sgl(struct scatterlist *sgl, i= nt nents) i, &phys, sg->offset, sg->length, &sg_dma_address(sg), sg_dma_len(sg)); } } =20 -static blk_status_t nvme_pci_setup_prps(struct nvme_dev *dev, +static blk_status_t nvme_pci_setup_prps(struct nvme_queue *nvmeq, struct request *req, struct nvme_rw_command *cmnd) { struct nvme_iod *iod =3D blk_mq_rq_to_pdu(req); struct dma_pool *pool; int length =3D blk_rq_payload_bytes(req); @@ -627,14 +684,14 @@ static blk_status_t nvme_pci_setup_prps(struct nvme_d= ev *dev, goto done; } =20 nprps =3D DIV_ROUND_UP(length, NVME_CTRL_PAGE_SIZE); if (nprps <=3D (256 / 8)) { - pool =3D dev->prp_small_pool; + pool =3D nvmeq->prp_pools.small; iod->nr_allocations =3D 0; } else { - pool =3D dev->prp_page_pool; + pool =3D nvmeq->prp_pools.large; iod->nr_allocations =3D 1; } =20 prp_list =3D dma_pool_alloc(pool, GFP_ATOMIC, &prp_dma); if (!prp_list) { @@ -672,11 +729,11 @@ static blk_status_t nvme_pci_setup_prps(struct nvme_d= ev *dev, done: cmnd->dptr.prp1 =3D cpu_to_le64(sg_dma_address(iod->sgt.sgl)); cmnd->dptr.prp2 =3D cpu_to_le64(iod->first_dma); return BLK_STS_OK; free_prps: - nvme_free_prps(dev, req); + nvme_free_prps(nvmeq, req); return BLK_STS_RESOURCE; bad_sgl: WARN(DO_ONCE(nvme_print_sgl, iod->sgt.sgl, iod->sgt.nents), "Invalid SGL for payload:%d nents:%d\n", blk_rq_payload_bytes(req), iod->sgt.nents); @@ -697,11 +754,11 @@ static void nvme_pci_sgl_set_seg(struct nvme_sgl_desc= *sge, sge->addr =3D cpu_to_le64(dma_addr); sge->length =3D cpu_to_le32(entries * sizeof(*sge)); sge->type =3D NVME_SGL_FMT_LAST_SEG_DESC << 4; } =20 -static blk_status_t nvme_pci_setup_sgls(struct nvme_dev *dev, +static blk_status_t nvme_pci_setup_sgls(struct nvme_queue *nvmeq, struct request *req, struct nvme_rw_command *cmd) { struct nvme_iod *iod =3D blk_mq_rq_to_pdu(req); struct dma_pool *pool; struct nvme_sgl_desc *sg_list; @@ -717,14 +774,14 @@ static blk_status_t nvme_pci_setup_sgls(struct nvme_d= ev *dev, nvme_pci_sgl_set_data(&cmd->dptr.sgl, sg); return BLK_STS_OK; } =20 if (entries <=3D (256 / sizeof(struct nvme_sgl_desc))) { - pool =3D dev->prp_small_pool; + pool =3D nvmeq->prp_pools.small; iod->nr_allocations =3D 0; } else { - pool =3D dev->prp_page_pool; + pool =3D nvmeq->prp_pools.large; iod->nr_allocations =3D 1; } =20 sg_list =3D dma_pool_alloc(pool, GFP_ATOMIC, &sgl_dma); if (!sg_list) { @@ -784,16 +841,16 @@ static blk_status_t nvme_setup_sgl_simple(struct nvme= _dev *dev, } =20 static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *re= q, struct nvme_command *cmnd) { + struct nvme_queue *nvmeq =3D req->mq_hctx->driver_data; struct nvme_iod *iod =3D blk_mq_rq_to_pdu(req); blk_status_t ret =3D BLK_STS_RESOURCE; int rc; =20 if (blk_rq_nr_phys_segments(req) =3D=3D 1) { - struct nvme_queue *nvmeq =3D req->mq_hctx->driver_data; struct bio_vec bv =3D req_bvec(req); =20 if (!is_pci_p2pdma_page(bv.bv_page)) { if (!nvme_pci_metadata_use_sgls(dev, req) && (bv.bv_offset & (NVME_CTRL_PAGE_SIZE - 1)) + @@ -824,13 +881,13 @@ static blk_status_t nvme_map_data(struct nvme_dev *de= v, struct request *req, ret =3D BLK_STS_TARGET; goto out_free_sg; } =20 if (nvme_pci_use_sgls(dev, req, iod->sgt.nents)) - ret =3D nvme_pci_setup_sgls(dev, req, &cmnd->rw); + ret =3D nvme_pci_setup_sgls(nvmeq, req, &cmnd->rw); else - ret =3D nvme_pci_setup_prps(dev, req, &cmnd->rw); + ret =3D nvme_pci_setup_prps(nvmeq, req, &cmnd->rw); if (ret !=3D BLK_STS_OK) goto out_unmap_sg; return BLK_STS_OK; =20 out_unmap_sg: @@ -841,10 +898,11 @@ static blk_status_t nvme_map_data(struct nvme_dev *de= v, struct request *req, } =20 static blk_status_t nvme_pci_setup_meta_sgls(struct nvme_dev *dev, struct request *req) { + struct nvme_queue *nvmeq =3D req->mq_hctx->driver_data; struct nvme_iod *iod =3D blk_mq_rq_to_pdu(req); struct nvme_rw_command *cmnd =3D &iod->cmd.rw; struct nvme_sgl_desc *sg_list; struct scatterlist *sgl, *sg; unsigned int entries; @@ -864,11 +922,11 @@ static blk_status_t nvme_pci_setup_meta_sgls(struct n= vme_dev *dev, rc =3D dma_map_sgtable(dev->dev, &iod->meta_sgt, rq_dma_dir(req), DMA_ATTR_NO_WARN); if (rc) goto out_free_sg; =20 - sg_list =3D dma_pool_alloc(dev->prp_small_pool, GFP_ATOMIC, &sgl_dma); + sg_list =3D dma_pool_alloc(nvmeq->prp_pools.small, GFP_ATOMIC, &sgl_dma); if (!sg_list) goto out_unmap_sg; =20 entries =3D iod->meta_sgt.nents; iod->meta_list.sg_list =3D sg_list; @@ -946,11 +1004,11 @@ static blk_status_t nvme_prep_rq(struct nvme_dev *de= v, struct request *req) =20 nvme_start_request(req); return BLK_STS_OK; out_unmap_data: if (blk_rq_nr_phys_segments(req)) - nvme_unmap_data(dev, req); + nvme_unmap_data(dev, req->mq_hctx->driver_data, req); out_free_cmd: nvme_cleanup_cmd(req); return ret; } =20 @@ -1036,10 +1094,11 @@ static void nvme_queue_rqs(struct rq_list *rqlist) nvme_submit_cmds(nvmeq, &submit_list); *rqlist =3D requeue_list; } =20 static __always_inline void nvme_unmap_metadata(struct nvme_dev *dev, + struct nvme_queue *nvmeq, struct request *req) { struct nvme_iod *iod =3D blk_mq_rq_to_pdu(req); =20 if (!iod->meta_sgt.nents) { @@ -1047,11 +1106,11 @@ static __always_inline void nvme_unmap_metadata(str= uct nvme_dev *dev, rq_integrity_vec(req).bv_len, rq_dma_dir(req)); return; } =20 - dma_pool_free(dev->prp_small_pool, iod->meta_list.sg_list, + dma_pool_free(nvmeq->prp_pools.small, iod->meta_list.sg_list, iod->meta_dma); dma_unmap_sgtable(dev->dev, &iod->meta_sgt, rq_dma_dir(req), 0); mempool_free(iod->meta_sgt.sgl, dev->iod_meta_mempool); } =20 @@ -1059,14 +1118,14 @@ static __always_inline void nvme_pci_unmap_rq(struc= t request *req) { struct nvme_queue *nvmeq =3D req->mq_hctx->driver_data; struct nvme_dev *dev =3D nvmeq->dev; =20 if (blk_integrity_rq(req)) - nvme_unmap_metadata(dev, req); + nvme_unmap_metadata(dev, nvmeq, req); =20 if (blk_rq_nr_phys_segments(req)) - nvme_unmap_data(dev, req); + nvme_unmap_data(dev, nvmeq, req); } =20 static void nvme_pci_complete_rq(struct request *req) { nvme_pci_unmap_rq(req); @@ -2839,39 +2898,10 @@ static int nvme_disable_prepare_reset(struct nvme_d= ev *dev, bool shutdown) return -EBUSY; nvme_dev_disable(dev, shutdown); return 0; } =20 -static int nvme_setup_prp_pools(struct nvme_dev *dev) -{ - size_t small_align =3D 256; - - dev->prp_page_pool =3D dma_pool_create("prp list page", dev->dev, - NVME_CTRL_PAGE_SIZE, - NVME_CTRL_PAGE_SIZE, 0); - if (!dev->prp_page_pool) - return -ENOMEM; - - if (dev->ctrl.quirks & NVME_QUIRK_DMAPOOL_ALIGN_512) - small_align =3D 512; - - /* Optimisation for I/Os between 4k and 128k */ - dev->prp_small_pool =3D dma_pool_create("prp list 256", dev->dev, - 256, small_align, 0); - if (!dev->prp_small_pool) { - dma_pool_destroy(dev->prp_page_pool); - return -ENOMEM; - } - return 0; -} - -static void nvme_release_prp_pools(struct nvme_dev *dev) -{ - dma_pool_destroy(dev->prp_page_pool); - dma_pool_destroy(dev->prp_small_pool); -} - static int nvme_pci_alloc_iod_mempool(struct nvme_dev *dev) { size_t meta_size =3D sizeof(struct scatterlist) * (NVME_MAX_META_SEGS + 1= ); size_t alloc_size =3D sizeof(struct scatterlist) * NVME_MAX_SEGS; =20 @@ -3182,11 +3212,12 @@ static struct nvme_dev *nvme_pci_alloc_dev(struct p= ci_dev *pdev, unsigned long quirks =3D id->driver_data; int node =3D dev_to_node(&pdev->dev); struct nvme_dev *dev; int ret =3D -ENOMEM; =20 - dev =3D kzalloc_node(sizeof(*dev), GFP_KERNEL, node); + dev =3D kzalloc_node(sizeof(*dev) + nr_node_ids * sizeof(*dev->prp_pools), + GFP_KERNEL, node); if (!dev) return ERR_PTR(-ENOMEM); INIT_WORK(&dev->ctrl.reset_work, nvme_reset_work); mutex_init(&dev->shutdown_lock); =20 @@ -3257,17 +3288,13 @@ static int nvme_probe(struct pci_dev *pdev, const s= truct pci_device_id *id) =20 result =3D nvme_dev_map(dev); if (result) goto out_uninit_ctrl; =20 - result =3D nvme_setup_prp_pools(dev); - if (result) - goto out_dev_unmap; - result =3D nvme_pci_alloc_iod_mempool(dev); if (result) - goto out_release_prp_pools; + goto out_dev_unmap; =20 dev_info(dev->ctrl.device, "pci function %s\n", dev_name(&pdev->dev)); =20 result =3D nvme_pci_enable(dev); if (result) @@ -3339,12 +3366,10 @@ static int nvme_probe(struct pci_dev *pdev, const s= truct pci_device_id *id) nvme_dbbuf_dma_free(dev); nvme_free_queues(dev, 0); out_release_iod_mempool: mempool_destroy(dev->iod_mempool); mempool_destroy(dev->iod_meta_mempool); -out_release_prp_pools: - nvme_release_prp_pools(dev); out_dev_unmap: nvme_dev_unmap(dev); out_uninit_ctrl: nvme_uninit_ctrl(&dev->ctrl); out_put_ctrl: --=20 2.45.2