Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nvme fixes for Linux 6.18 

- iostats accounting fixed on multipath retries (Amit)
  - secure concatenation response fixup (Martin)
  - tls partial record fixup (Wilfred)
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE3Fbyvv+648XNRdHTPe3zGtjzRgkFAmjxPZ8ACgkQPe3zGtjz
 RgkyGRAAkDHeOO7UtyorHDjOHCOP1HD/g3iSBSKUihVzNTuD3x5wF6HF9JQPxUvz
 OTDUryw5FupxZJMCLd5+cF1UZLNhLmUS4pmOsDJnkHpu+atB7rAsvCq1P+UY8AKc
 3tWDwkqxUG1iiV2BtL0PKETqaKpkQ5YvdzjJbTZ/4Y01G79acP9c3IRkVEDAN4uS
 QoDKQfmEaFWYMikBEF1UR1TF+PbfgITtNHYi+lrQw10Q5jFETH9GGxuy1Eyn20IN
 ACB4/y/soqnovlTRnkS2bmWyOSDHPM7F/59Isrg3klepgLwD8EC3Jk9ssaK0YBi9
 1SkMlQwtyd3ntFdyxPRplzEA8Wl4fpqMsW28Y7IeL6PFYnXljS1yhAVSWzB8IZR5
 hgOY5NF7wLUrA3VX7kcUyV68jyGI24uACceDjCEIltqcBURIgcudEd1Lr3Yg2Kyc
 HkWkRBLOClo7wolqM7eCNrEYtZyKLusE8+QNf1A/kR9uDn4oFUmyKiVmeDcVBzNz
 CIG54J5eb2beU7D6Jc8HoQDZf1Obxxfbhdofk5RfTXdmbYmmWvXGwuhz2wlMpyfJ
 fT0Q7/vTFFYegwuAf6Br+HMBiO1Pka3BjwekbRvNUpdQrvEGH52dUn+sjP0jirZH
 DUmBgsELL61QHzw0cYLmT3/RHsc6FMPI2XNv+WrqmnywL7uNecg=
 =excu
 -----END PGP SIGNATURE-----

Merge tag 'nvme-6.18-2025-10-16' of git://git.infradead.org/nvme into block-6.18

Pull NVMe fixes from Keith:

"- iostats accounting fixed on multipath retries (Amit)
 - secure concatenation response fixup (Martin)
 - tls partial record fixup (Wilfred)"

* tag 'nvme-6.18-2025-10-16' of git://git.infradead.org/nvme:
  nvme/tcp: handle tls partially sent records in write_space()
  nvme-auth: update sc_c in host response
  nvme-multipath: Skip nr_active increments in RETRY disposition
This commit is contained in:
Jens Axboe 2025-10-16 13:25:40 -06:00
parent 08823e89e3 5a869d0177
commit f0624c6646
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/nvme/host/auth.c
View File

@ -36,6 +36,7 @@ struct nvme_dhchap_queue_context {
u8 status;
u8 dhgroup_id;
u8 hash_id;
u8 sc_c;
size_t hash_len;
u8 c1[64];
u8 c2[64];
@ -154,6 +155,8 @@ static int nvme_auth_set_dhchap_negotiate_data(struct nvme_ctrl *ctrl,
data->auth_protocol[0].dhchap.idlist[34] = NVME_AUTH_DHGROUP_6144;
data->auth_protocol[0].dhchap.idlist[35] = NVME_AUTH_DHGROUP_8192;
chap->sc_c = data->sc_c;
return size;
}
@ -489,7 +492,7 @@ static int nvme_auth_dhchap_setup_host_response(struct nvme_ctrl *ctrl,
ret = crypto_shash_update(shash, buf, 2);
if (ret)
goto out;
memset(buf, 0, sizeof(buf));
*buf = chap->sc_c;
ret = crypto_shash_update(shash, buf, 1);
if (ret)
goto out;
@ -500,6 +503,7 @@ static int nvme_auth_dhchap_setup_host_response(struct nvme_ctrl *ctrl,
strlen(ctrl->opts->host->nqn));
if (ret)
goto out;
memset(buf, 0, sizeof(buf));
ret = crypto_shash_update(shash, buf, 1);
if (ret)
goto out;

6
drivers/nvme/host/multipath.c
View File

@ -182,12 +182,14 @@ void nvme_mpath_start_request(struct request *rq)
struct nvme_ns *ns = rq->q->queuedata;
struct gendisk *disk = ns->head->disk;
if (READ_ONCE(ns->head->subsys->iopolicy) == NVME_IOPOLICY_QD) {
if ((READ_ONCE(ns->head->subsys->iopolicy) == NVME_IOPOLICY_QD) &&
!(nvme_req(rq)->flags & NVME_MPATH_CNT_ACTIVE)) {
atomic_inc(&ns->ctrl->nr_active);
nvme_req(rq)->flags |= NVME_MPATH_CNT_ACTIVE;
}
if (!blk_queue_io_stat(disk->queue) || blk_rq_is_passthrough(rq))
if (!blk_queue_io_stat(disk->queue) || blk_rq_is_passthrough(rq) ||
(nvme_req(rq)->flags & NVME_MPATH_IO_STATS))
return;
nvme_req(rq)->flags |= NVME_MPATH_IO_STATS;

3
drivers/nvme/host/tcp.c
View File

@ -1081,6 +1081,9 @@ static void nvme_tcp_write_space(struct sock *sk)
queue = sk->sk_user_data;
if (likely(queue && sk_stream_is_writeable(sk))) {
clear_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
/* Ensure pending TLS partial records are retried */
if (nvme_tcp_queue_tls(queue))
queue->write_space(sk);
queue_work_on(queue->io_cpu, nvme_tcp_wq, &queue->io_work);
}
read_unlock_bh(&sk->sk_callback_lock);