mirrors
/
anolis-cloud-kernel
mirror of https://gitee.com/anolis/cloud-kernel.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

anolis: virtio-blk: rename no_align to pt_enable 

ANBZ: #19447

As we hide generic chardev, the actual meaning of no_alignment bit is
passthrough feature enable. So we rename it.

Signed-off-by: Ferry Meng <mengferry@linux.alibaba.com>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Link: https://gitee.com/anolis/cloud-kernel/pulls/5446
This commit is contained in:
Ferry Meng 2025-06-17 20:30:33 +08:00
parent 2114cb6d98
commit 72ad9fd00b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/block/virtio_blk.c
View File

@ -145,7 +145,7 @@ struct virtio_blk {
#ifdef CONFIG_VIRTIO_BLK_RING_PAIR
bool ring_pair;
bool no_align;
bool pt_enable;
bool hide_bdev;
/* saved indirect desc pointer, dma_addr and dma_len for SQ */
struct virtblk_indir_desc **indir_desc;
@ -1308,9 +1308,9 @@ int check_ext_feature(struct virtio_blk *vblk, void __iomem *ioaddr,
vblk->ring_pair = !!(*host_ext_features & VIRTIO_BLK_EXT_F_RING_PAIR);
if (vblk->ring_pair)
*guest_ext_features |= (VIRTIO_BLK_EXT_F_RING_PAIR);
vblk->no_align = !!(*host_ext_features & VIRTIO_BLK_EXT_F_RING_NO_ALIGN);
if (vblk->no_align)
*guest_ext_features |= (VIRTIO_BLK_EXT_F_RING_NO_ALIGN);
vblk->pt_enable = !!(*host_ext_features & VIRTIO_BLK_EXT_F_PT_ENABLE);
if (vblk->pt_enable)
*guest_ext_features |= (VIRTIO_BLK_EXT_F_PT_ENABLE);
vblk->hide_bdev = !!(*host_ext_features & VIRTIO_BLK_EXT_F_HIDE_BLOCK);
if (vblk->hide_bdev)
*guest_ext_features |= (VIRTIO_BLK_EXT_F_HIDE_BLOCK);
@ -1502,7 +1502,7 @@ static int init_vq(struct virtio_blk *vblk)
#ifdef CONFIG_VIRTIO_BLK_RING_PAIR
vblk->ring_pair = false;
vblk->no_align = false;
vblk->pt_enable = false;
vblk->hide_bdev = false;
/* ext feature only support for virtio_blk over pci device currently */
@ -2467,7 +2467,7 @@ static int virtblk_probe(struct virtio_device *vdev)
blk_queue_max_segment_size(q, max_size);
#ifdef CONFIG_VIRTIO_BLK_RING_PAIR
if (vblk->no_align)
if (vblk->pt_enable)
blk_queue_dma_alignment(q, 0);
#endif
@ -2559,7 +2559,7 @@ static int virtblk_probe(struct virtio_device *vdev)
virtio_blk_dev_dbg_init(vblk);
#ifdef CONFIG_VIRTIO_BLK_RING_PAIR
if (vblk->no_align)
if (vblk->pt_enable)
WARN_ON(virtblk_cdev_add(vblk));
#endif
@ -2595,7 +2595,7 @@ static void virtblk_remove(struct virtio_device *vdev)
flush_work(&vblk->config_work);
#ifdef CONFIG_VIRTIO_BLK_RING_PAIR
if (vblk->no_align)
if (vblk->pt_enable)
virtblk_cdev_del(&vblk->cdev, &vblk->cdev_device);
#endif

2
drivers/block/virtio_blk_ext.h
View File

@ -5,7 +5,7 @@
/* ext feature bit definition */
#define VIRTIO_BLK_EXT_F_RING_PAIR (1U << 0)
#define VIRTIO_BLK_EXT_F_RING_NO_ALIGN (1U << 1)
#define VIRTIO_BLK_EXT_F_PT_ENABLE (1U << 1)
#define VIRTIO_BLK_EXT_F_HIDE_BLOCK (1U << 2)
#define VIRTIO_BLK_EXT_F_INVAL (-1)