This is being resolved in upstream [1], closing. [1] https://lore.kernel.org/linux-block/20200428085203.1852494-1-hch@lst.de/