From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) (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 E59EAA23 for ; Tue, 29 Oct 2024 15:30:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.153.30 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730215818; cv=none; b=o9hEA10VJE+82TQxQnzNqxPfrFY7kgqB8Re6qOFvcD95Vr7AFv2sgbZ6cUpNhpci1HlTiFcRaclikUXvXRnVd5zTEaxCzPFcDDwtpHMHrxzkt9Bmit8XUgCTld6fO3lbFyGA22RTFngyYx4EpCrnCxZKuC+2QdRy967ISy4XIKM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730215818; c=relaxed/simple; bh=PA5iXsH/Xd/UbthqDjpyw2oMptkm2zO7zrpcUHtSxfc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=W+Blg7kZ+CCjr83GmOxHXd1FjqlpsiqlRH0l/NZNdD2SD6fPYdfqj3ghiXP+2fbl49l5LTj6kADZu2uWjI/HFEzIwvh0Ndr1vZKin8D0jLwH5qaOH4O57otfGSQpRmVxpHS8QZnd/OYTir/8yj9AfYYRCyD/GHs/eBsP98Y3WJY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=meta.com; spf=pass smtp.mailfrom=meta.com; dkim=pass (2048-bit key) header.d=meta.com header.i=@meta.com header.b=TMoItQ1r; arc=none smtp.client-ip=67.231.153.30 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=meta.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=meta.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=meta.com header.i=@meta.com header.b="TMoItQ1r" Received: from pps.filterd (m0148460.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49TFOpW2031771 for ; Tue, 29 Oct 2024 08:30:14 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=s2048-2021-q4; bh=x/4Rs+/KHiyorPSfQjblUK3s8N8FTBr6z3phKq6+RS0=; b=TMoItQ1rRVRa kzKPbPL5uYRC96UfI+FmivyrgXyvAd8JF2vGQxXsmnL5QUmbC5lmyajHUssXkWE2 Ku12paSiEidofOZoiZ8lIFVwkyK/BBGD7DQYVrmM/Yimz0s9oba++ofPsHbNxEVs KNwmaDkWOWAuCDz8CRGBjPF6ucLMPhcTimPsPSb/E4mBDzPCPJQeS5QhU1Y38Di2 9ag+0oc9wjauzJeMvnKeTH93tIsSU+7HZTjl0/gfzkOa5IWXScyOKsKQUXocQc6U xBQwP8VImLn9S0w/HtP2JwzCAEDcwCBWVM6V9jb5EDSy5dC3SgrnqL6pakoY21pE 7A/aBIwq0g== Received: from maileast.thefacebook.com ([163.114.135.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 42k2asr1gw-9 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 29 Oct 2024 08:30:14 -0700 (PDT) Received: from twshared13460.05.ash9.facebook.com (2620:10d:c0a8:1c::1b) by mail.thefacebook.com (2620:10d:c0a9:6f::237c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1544.11; Tue, 29 Oct 2024 15:30:09 +0000 Received: by devbig638.nha1.facebook.com (Postfix, from userid 544533) id 3D16914920EAD; Tue, 29 Oct 2024 08:19:44 -0700 (PDT) From: Keith Busch To: , , , CC: , , , , , Hui Qi , Nitesh Shetty , Hannes Reinecke , Keith Busch Subject: [PATCHv10 8/9] nvme: enable FDP support Date: Tue, 29 Oct 2024 08:19:21 -0700 Message-ID: <20241029151922.459139-9-kbusch@meta.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20241029151922.459139-1-kbusch@meta.com> References: <20241029151922.459139-1-kbusch@meta.com> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: VVsgFr2gtHpXIAbw02zFzV5CoLbP6UMr X-Proofpoint-GUID: VVsgFr2gtHpXIAbw02zFzV5CoLbP6UMr X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-05_03,2024-10-04_01,2024-09-30_01 From: Kanchan Joshi Flexible Data Placement (FDP), as ratified in TP 4146a, allows the host to control the placement of logical blocks so as to reduce the SSD WAF. Userspace can send the write hint information using io_uring or fcntl. Fetch the placement-identifiers if the device supports FDP. The incoming write-hint is mapped to a placement-identifier, which in turn is set in the DSPEC field of the write command. Signed-off-by: Kanchan Joshi Signed-off-by: Hui Qi Signed-off-by: Nitesh Shetty Reviewed-by: Hannes Reinecke Signed-off-by: Keith Busch --- drivers/nvme/host/core.c | 84 ++++++++++++++++++++++++++++++++++++++++ drivers/nvme/host/nvme.h | 5 +++ include/linux/nvme.h | 19 +++++++++ 3 files changed, 108 insertions(+) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 3de7555a7de74..bd7b89912ddb9 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -44,6 +44,20 @@ struct nvme_ns_info { bool is_removed; }; =20 +struct nvme_fdp_ruh_status_desc { + u16 pid; + u16 ruhid; + u32 earutr; + u64 ruamw; + u8 rsvd16[16]; +}; + +struct nvme_fdp_ruh_status { + u8 rsvd0[14]; + __le16 nruhsd; + struct nvme_fdp_ruh_status_desc ruhsd[]; +}; + unsigned int admin_timeout =3D 60; module_param(admin_timeout, uint, 0644); MODULE_PARM_DESC(admin_timeout, "timeout in seconds for admin commands")= ; @@ -657,6 +671,7 @@ static void nvme_free_ns_head(struct kref *ref) ida_free(&head->subsys->ns_ida, head->instance); cleanup_srcu_struct(&head->srcu); nvme_put_subsystem(head->subsys); + kfree(head->plids); kfree(head); } =20 @@ -974,6 +989,13 @@ static inline blk_status_t nvme_setup_rw(struct nvme= _ns *ns, if (req->cmd_flags & REQ_RAHEAD) dsmgmt |=3D NVME_RW_DSM_FREQ_PREFETCH; =20 + if (req->write_hint && ns->head->nr_plids) { + u16 hint =3D max(req->write_hint, ns->head->nr_plids); + + dsmgmt |=3D ns->head->plids[hint - 1] << 16; + control |=3D NVME_RW_DTYPE_DPLCMT; + } + if (req->cmd_flags & REQ_ATOMIC && !nvme_valid_atomic_write(req)) return BLK_STS_INVAL; =20 @@ -2105,6 +2127,52 @@ static int nvme_update_ns_info_generic(struct nvme= _ns *ns, return ret; } =20 +static int nvme_fetch_fdp_plids(struct nvme_ns *ns, u32 nsid) +{ + struct nvme_fdp_ruh_status_desc *ruhsd; + struct nvme_ns_head *head =3D ns->head; + struct nvme_fdp_ruh_status *ruhs; + struct nvme_command c =3D {}; + int size, ret, i; + + if (head->plids) + return 0; + + size =3D struct_size(ruhs, ruhsd, NVME_MAX_PLIDS); + ruhs =3D kzalloc(size, GFP_KERNEL); + if (!ruhs) + return -ENOMEM; + + c.imr.opcode =3D nvme_cmd_io_mgmt_recv; + c.imr.nsid =3D cpu_to_le32(nsid); + c.imr.mo =3D 0x1; + c.imr.numd =3D cpu_to_le32((size >> 2) - 1); + + ret =3D nvme_submit_sync_cmd(ns->queue, &c, ruhs, size); + if (ret) + goto out; + + i =3D le16_to_cpu(ruhs->nruhsd); + if (!i) + goto out; + + ns->head->nr_plids =3D min_t(u16, i, NVME_MAX_PLIDS); + head->plids =3D kcalloc(ns->head->nr_plids, sizeof(head->plids), + GFP_KERNEL); + if (!head->plids) { + ret =3D -ENOMEM; + goto out; + } + + for (i =3D 0; i < ns->head->nr_plids; i++) { + ruhsd =3D &ruhs->ruhsd[i]; + head->plids[i] =3D le16_to_cpu(ruhsd->pid); + } +out: + kfree(ruhs); + return ret; +} + static int nvme_update_ns_info_block(struct nvme_ns *ns, struct nvme_ns_info *info) { @@ -2141,6 +2209,19 @@ static int nvme_update_ns_info_block(struct nvme_n= s *ns, goto out; } =20 + if (ns->ctrl->ctratt & NVME_CTRL_ATTR_FDPS) { + ret =3D nvme_fetch_fdp_plids(ns, info->nsid); + if (ret) + dev_warn(ns->ctrl->device, + "FDP failure status:0x%x\n", ret); + if (ret < 0) + goto out; + } else { + ns->head->nr_plids =3D 0; + kfree(ns->head->plids); + ns->head->plids =3D NULL; + } + blk_mq_freeze_queue(ns->disk->queue); ns->head->lba_shift =3D id->lbaf[lbaf].ds; ns->head->nuse =3D le64_to_cpu(id->nuse); @@ -2171,6 +2252,9 @@ static int nvme_update_ns_info_block(struct nvme_ns= *ns, if (!nvme_init_integrity(ns->head, &lim, info)) capacity =3D 0; =20 + lim.max_write_hints =3D ns->head->nr_plids; + if (lim.max_write_hints) + lim.features |=3D BLK_FEAT_PLACEMENT_HINTS; ret =3D queue_limits_commit_update(ns->disk->queue, &lim); if (ret) { blk_mq_unfreeze_queue(ns->disk->queue); diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 093cb423f536b..cec8e5d96377b 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -454,6 +454,8 @@ struct nvme_ns_ids { u8 csi; }; =20 +#define NVME_MAX_PLIDS (NVME_CTRL_PAGE_SIZE / sizeof(16)) + /* * Anchor structure for namespaces. There is one for each namespace in = a * NVMe subsystem that any of our controllers can see, and the namespace @@ -490,6 +492,9 @@ struct nvme_ns_head { struct device cdev_device; =20 struct gendisk *disk; + + u16 nr_plids; + u16 *plids; #ifdef CONFIG_NVME_MULTIPATH struct bio_list requeue_list; spinlock_t requeue_lock; diff --git a/include/linux/nvme.h b/include/linux/nvme.h index b58d9405d65e0..a954eaee5b0f3 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -275,6 +275,7 @@ enum nvme_ctrl_attr { NVME_CTRL_ATTR_HID_128_BIT =3D (1 << 0), NVME_CTRL_ATTR_TBKAS =3D (1 << 6), NVME_CTRL_ATTR_ELBAS =3D (1 << 15), + NVME_CTRL_ATTR_FDPS =3D (1 << 19), }; =20 struct nvme_id_ctrl { @@ -843,6 +844,7 @@ enum nvme_opcode { nvme_cmd_resv_register =3D 0x0d, nvme_cmd_resv_report =3D 0x0e, nvme_cmd_resv_acquire =3D 0x11, + nvme_cmd_io_mgmt_recv =3D 0x12, nvme_cmd_resv_release =3D 0x15, nvme_cmd_zone_mgmt_send =3D 0x79, nvme_cmd_zone_mgmt_recv =3D 0x7a, @@ -864,6 +866,7 @@ enum nvme_opcode { nvme_opcode_name(nvme_cmd_resv_register), \ nvme_opcode_name(nvme_cmd_resv_report), \ nvme_opcode_name(nvme_cmd_resv_acquire), \ + nvme_opcode_name(nvme_cmd_io_mgmt_recv), \ nvme_opcode_name(nvme_cmd_resv_release), \ nvme_opcode_name(nvme_cmd_zone_mgmt_send), \ nvme_opcode_name(nvme_cmd_zone_mgmt_recv), \ @@ -1015,6 +1018,7 @@ enum { NVME_RW_PRINFO_PRCHK_GUARD =3D 1 << 12, NVME_RW_PRINFO_PRACT =3D 1 << 13, NVME_RW_DTYPE_STREAMS =3D 1 << 4, + NVME_RW_DTYPE_DPLCMT =3D 2 << 4, NVME_WZ_DEAC =3D 1 << 9, }; =20 @@ -1102,6 +1106,20 @@ struct nvme_zone_mgmt_recv_cmd { __le32 cdw14[2]; }; =20 +struct nvme_io_mgmt_recv_cmd { + __u8 opcode; + __u8 flags; + __u16 command_id; + __le32 nsid; + __le64 rsvd2[2]; + union nvme_data_ptr dptr; + __u8 mo; + __u8 rsvd11; + __u16 mos; + __le32 numd; + __le32 cdw12[4]; +}; + enum { NVME_ZRA_ZONE_REPORT =3D 0, NVME_ZRASF_ZONE_REPORT_ALL =3D 0, @@ -1822,6 +1840,7 @@ struct nvme_command { struct nvmf_auth_receive_command auth_receive; struct nvme_dbbuf dbbuf; struct nvme_directive_cmd directive; + struct nvme_io_mgmt_recv_cmd imr; }; }; =20 --=20 2.43.5