Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'block-6.14-20250207' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
- MD pull request via Song:
- fix an error handling path for md-linear
- NVMe pull request via Keith:
- Connection fixes for fibre channel transport (Daniel)
- Endian fixes (Keith, Christoph)
- Cleanup fix for host memory buffer (Francis)
- Platform specific power quirks (Georg)
- Target memory leak (Sagi)
- Use appropriate controller state accessor (Daniel)
- Fixup for a regression introduced last week, where sunvdc wasn't
updated for an API change, causing compilation failures on sparc64.
* tag 'block-6.14-20250207' of git://git.kernel.dk/linux:
drivers/block/sunvdc.c: update the correct AIP call
md: Fix linear_set_limits()
nvme-fc: use ctrl state getter
nvme: make nvme_tls_attrs_group static
nvmet: add a missing endianess conversion in nvmet_execute_admin_connect
nvmet: the result field in nvmet_alloc_ctrl_args is little endian
nvmet: fix a memory leak in controller identify
nvme-fc: do not ignore connectivity loss during connecting
nvme: handle connectivity loss in nvme_set_queue_count
nvme-fc: go straight to connecting state when initializing
nvme-pci: Add TUXEDO IBP Gen9 to Samsung sleep quirk
nvme-pci: Add TUXEDO InfinityFlex to Samsung sleep quirk
nvme-pci: remove redundant dma frees in hmb
nvmet: fix rw control endian access
+43
-29
+2
-2
drivers/block/sunvdc.c
+2
-2
drivers/block/sunvdc.c
···
1127
1127
1128
1128
spin_lock_irq(&port->vio.lock);
1129
1129
port->drain = 0;
1130
-
blk_mq_unquiesce_queue(q, memflags);
1131
-
blk_mq_unfreeze_queue(q);
1130
+
blk_mq_unquiesce_queue(q);
1131
+
blk_mq_unfreeze_queue(q, memflags);
1132
1132
}
1133
1133
1134
1134
static void vdc_ldc_reset_timer_work(struct work_struct *work)
+1
-3
drivers/md/md-linear.c
+1
-3
drivers/md/md-linear.c
···
76
76
lim.max_write_zeroes_sectors = mddev->chunk_sectors;
77
77
lim.io_min = mddev->chunk_sectors << 9;
78
78
err = mddev_stack_rdev_limits(mddev, &lim, MDDEV_STACK_INTEGRITY);
79
-
if (err) {
80
-
queue_limits_cancel_update(mddev->gendisk->queue);
79
+
if (err)
81
80
return err;
82
-
}
83
81
84
82
return queue_limits_set(mddev->gendisk->queue, &lim);
85
83
}
+7
-1
drivers/nvme/host/core.c
+7
-1
drivers/nvme/host/core.c
···
1700
1700
1701
1701
status = nvme_set_features(ctrl, NVME_FEAT_NUM_QUEUES, q_count, NULL, 0,
1702
1702
&result);
1703
-
if (status < 0)
1703
+
1704
+
/*
1705
+
* It's either a kernel error or the host observed a connection
1706
+
* lost. In either case it's not possible communicate with the
1707
+
* controller and thus enter the error code path.
1708
+
*/
1709
+
if (status < 0 || status == NVME_SC_HOST_PATH_ERROR)
1704
1710
return status;
1705
1711
1706
1712
/*
+25
-10
drivers/nvme/host/fc.c
+25
-10
drivers/nvme/host/fc.c
···
781
781
static void
782
782
nvme_fc_ctrl_connectivity_loss(struct nvme_fc_ctrl *ctrl)
783
783
{
784
+
enum nvme_ctrl_state state;
785
+
unsigned long flags;
786
+
784
787
dev_info(ctrl->ctrl.device,
785
788
"NVME-FC{%d}: controller connectivity lost. Awaiting "
786
789
"Reconnect", ctrl->cnum);
787
790
788
-
switch (nvme_ctrl_state(&ctrl->ctrl)) {
791
+
spin_lock_irqsave(&ctrl->lock, flags);
792
+
set_bit(ASSOC_FAILED, &ctrl->flags);
793
+
state = nvme_ctrl_state(&ctrl->ctrl);
794
+
spin_unlock_irqrestore(&ctrl->lock, flags);
795
+
796
+
switch (state) {
789
797
case NVME_CTRL_NEW:
790
798
case NVME_CTRL_LIVE:
791
799
/*
···
2087
2079
nvme_fc_complete_rq(rq);
2088
2080
2089
2081
check_error:
2090
-
if (terminate_assoc && ctrl->ctrl.state != NVME_CTRL_RESETTING)
2082
+
if (terminate_assoc &&
2083
+
nvme_ctrl_state(&ctrl->ctrl) != NVME_CTRL_RESETTING)
2091
2084
queue_work(nvme_reset_wq, &ctrl->ioerr_work);
2092
2085
}
2093
2086
···
2542
2533
static void
2543
2534
nvme_fc_error_recovery(struct nvme_fc_ctrl *ctrl, char *errmsg)
2544
2535
{
2536
+
enum nvme_ctrl_state state = nvme_ctrl_state(&ctrl->ctrl);
2537
+
2545
2538
/*
2546
2539
* if an error (io timeout, etc) while (re)connecting, the remote
2547
2540
* port requested terminating of the association (disconnect_ls)
···
2551
2540
* the controller. Abort any ios on the association and let the
2552
2541
* create_association error path resolve things.
2553
2542
*/
2554
-
if (ctrl->ctrl.state == NVME_CTRL_CONNECTING) {
2543
+
if (state == NVME_CTRL_CONNECTING) {
2555
2544
__nvme_fc_abort_outstanding_ios(ctrl, true);
2556
-
set_bit(ASSOC_FAILED, &ctrl->flags);
2557
2545
dev_warn(ctrl->ctrl.device,
2558
2546
"NVME-FC{%d}: transport error during (re)connect\n",
2559
2547
ctrl->cnum);
···
2560
2550
}
2561
2551
2562
2552
/* Otherwise, only proceed if in LIVE state - e.g. on first error */
2563
-
if (ctrl->ctrl.state != NVME_CTRL_LIVE)
2553
+
if (state != NVME_CTRL_LIVE)
2564
2554
return;
2565
2555
2566
2556
dev_warn(ctrl->ctrl.device,
···
3177
3167
else
3178
3168
ret = nvme_fc_recreate_io_queues(ctrl);
3179
3169
}
3180
-
if (!ret && test_bit(ASSOC_FAILED, &ctrl->flags))
3181
-
ret = -EIO;
3182
3170
if (ret)
3183
3171
goto out_term_aen_ops;
3184
3172
3185
-
changed = nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_LIVE);
3173
+
spin_lock_irqsave(&ctrl->lock, flags);
3174
+
if (!test_bit(ASSOC_FAILED, &ctrl->flags))
3175
+
changed = nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_LIVE);
3176
+
else
3177
+
ret = -EIO;
3178
+
spin_unlock_irqrestore(&ctrl->lock, flags);
3179
+
3180
+
if (ret)
3181
+
goto out_term_aen_ops;
3186
3182
3187
3183
ctrl->ctrl.nr_reconnects = 0;
3188
3184
···
3594
3578
list_add_tail(&ctrl->ctrl_list, &rport->ctrl_list);
3595
3579
spin_unlock_irqrestore(&rport->lock, flags);
3596
3580
3597
-
if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_RESETTING) ||
3598
-
!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING)) {
3581
+
if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING)) {
3599
3582
dev_err(ctrl->ctrl.device,
3600
3583
"NVME-FC{%d}: failed to init ctrl state\n", ctrl->cnum);
3601
3584
goto fail_ctrl;
+3
-9
drivers/nvme/host/pci.c
+3
-9
drivers/nvme/host/pci.c
···
2153
2153
return 0;
2154
2154
2155
2155
out_free_bufs:
2156
-
while (--i >= 0) {
2157
-
size_t size = le32_to_cpu(descs[i].size) * NVME_CTRL_PAGE_SIZE;
2158
-
2159
-
dma_free_attrs(dev->dev, size, bufs[i],
2160
-
le64_to_cpu(descs[i].addr),
2161
-
DMA_ATTR_NO_KERNEL_MAPPING | DMA_ATTR_NO_WARN);
2162
-
}
2163
-
2164
2156
kfree(bufs);
2165
2157
out_free_descs:
2166
2158
dma_free_coherent(dev->dev, descs_size, descs, descs_dma);
···
3139
3147
* because of high power consumption (> 2 Watt) in s2idle
3140
3148
* sleep. Only some boards with Intel CPU are affected.
3141
3149
*/
3142
-
if (dmi_match(DMI_BOARD_NAME, "GMxPXxx") ||
3150
+
if (dmi_match(DMI_BOARD_NAME, "DN50Z-140HC-YD") ||
3151
+
dmi_match(DMI_BOARD_NAME, "GMxPXxx") ||
3152
+
dmi_match(DMI_BOARD_NAME, "GXxMRXx") ||
3143
3153
dmi_match(DMI_BOARD_NAME, "PH4PG31") ||
3144
3154
dmi_match(DMI_BOARD_NAME, "PH4PRX1_PH6PRX1") ||
3145
3155
dmi_match(DMI_BOARD_NAME, "PH6PG01_PH6PG71"))
+1
-1
drivers/nvme/host/sysfs.c
+1
-1
drivers/nvme/host/sysfs.c
+1
drivers/nvme/target/admin-cmd.c
+1
drivers/nvme/target/admin-cmd.c
+1
-1
drivers/nvme/target/fabrics-cmd.c
+1
-1
drivers/nvme/target/fabrics-cmd.c
+1
-1
drivers/nvme/target/io-cmd-bdev.c
+1
-1
drivers/nvme/target/io-cmd-bdev.c