tests/qtest/ide-test: cover raw (2352-byte) ATAPI CD reads
READ CD with the field-selector set to 0xf8 returns full 2352-byte raw sectors (sync + header + 2048 data + EDC/ECC), driving the ATAPI raw read path that READ10 never touches. Add a send_scsi_cdb_read_cd() helper and a CDROM_RAW flag to cdrom_read_impl(), then exercise both PIO and DMA. The PIO case uses a byte-count limit spanning several raw sectors so the device must rebuffer mid-burst, and each sector's 2048-byte payload is verified at its in-sector offset. Signed-off-by: Denis V. Lunev <den@openvz.org>
Denis V. Lunev committed
Jun 19, 2026 at 02:29 UTC
502dbdfd9687e967dfe5eefce7123ecf9baa798c
1 file changed
+70
-6
tests/qtest/ide-test.c
+70
-6
@@ -48,6 +48,10 @@
48
49
#define ATAPI_BLOCK_SIZE 2048
50
51
+/* Raw READ CD sector: 12 sync + 4 header + 2048 data + 288 EDC/ECC. */
52
+#define ATAPI_RAW_SIZE 2352
53
+#define ATAPI_RAW_DATA 16
54
+
55
/* How many bytes to receive via ATAPI PIO at one time.
56
* Must be less than 0xFFFF. */
57
#define BYTE_COUNT_LIMIT 5120
@@ -982,6 +986,41 @@ static void send_scsi_cdb_read10(QPCIDevice *dev, QPCIBar ide_bar,
986
}
987
}
988
989
+typedef struct ReadCDCDB {
990
+ uint8_t opcode;
991
+ uint8_t sector_type;
992
+ uint32_t lba;
993
+ uint8_t length[3];
994
+ uint8_t main_channel;
995
+ uint8_t sub_channel;
996
+ uint8_t control;
997
+} __attribute__((__packed__)) ReadCDCDB;
998
+
999
+static void send_scsi_cdb_read_cd(QPCIDevice *dev, QPCIBar ide_bar,
1000
+ uint64_t lba, int nblocks)
1001
+{
1002
+ ReadCDCDB pkt = { };
1003
+ int i;
1004
+
1005
+ g_assert_cmpint(lba, <=, UINT32_MAX);
1006
+ g_assert_cmpint(nblocks, >=, 0);
1007
+ g_assert_cmpint(nblocks, <=, 0xffffff);
1008
+
1009
+ /* Construct SCSI CDB packet */
1010
+ pkt.opcode = 0xbe;
1011
+ pkt.lba = cpu_to_be32(lba);
1012
+ pkt.length[0] = (nblocks >> 16) & 0xff;
1013
+ pkt.length[1] = (nblocks >> 8) & 0xff;
1014
+ pkt.length[2] = nblocks & 0xff;
1015
+ pkt.main_channel = 0xf8; /* sync + headers + user data + EDC/ECC: 2352 */
1016
+
1017
+ /* Send Packet */
1018
+ for (i = 0; i < sizeof(ReadCDCDB) / 2; i++) {
1019
+ qpci_io_writew(dev, ide_bar, reg_data,
1020
+ le16_to_cpu(((uint16_t *)&pkt)[i]));
1021
+ }
1022
+}
1023
+
1024
static void nsleep(QTestState *qts, int64_t nsecs)
1025
{
1026
const struct timespec val = { .tv_nsec = nsecs };
@@ -1036,10 +1075,12 @@ static void ide_wait_intr(QTestState *qts, int irq)
1075
1076
#define CDROM_PIO 0
1077
#define CDROM_DMA (1 << 0)
1078
+#define CDROM_RAW (1 << 1)
1079
1080
static void cdrom_read_impl(int nblocks, unsigned flags)
1081
{
1082
bool dma = flags & CDROM_DMA;
1083
+ bool raw = flags & CDROM_RAW;
1084
QTestState *qts;
1085
QPCIDevice *dev;
1086
QPCIBar bmdma_bar, ide_bar;
@@ -1047,8 +1088,11 @@ static void cdrom_read_impl(int nblocks, unsigned flags)
1088
int patt_blocks = MAX(16, nblocks);
1089
size_t patt_len = ATAPI_BLOCK_SIZE * patt_blocks;
1090
char *pattern = g_malloc(patt_len);
1050
- size_t rxsize = ATAPI_BLOCK_SIZE * nblocks;
1091
+ unsigned xfer = raw ? ATAPI_RAW_SIZE : ATAPI_BLOCK_SIZE;
1092
+ size_t rxsize = xfer * nblocks;
1093
uint16_t *rx = g_malloc0(rxsize);
1094
+ void (*send_cdb)(QPCIDevice *, QPCIBar, uint64_t, int) =
1095
+ raw ? send_scsi_cdb_read_cd : send_scsi_cdb_read10;
1096
int i, j;
1097
uint8_t data;
1098
uint16_t limit;
@@ -1075,8 +1119,7 @@ static void cdrom_read_impl(int nblocks, unsigned flags)
1119
prdt[0].size = cpu_to_le32(rxsize | PRDT_EOT);
1120
1121
send_dma_request_dev(qts, dev, bmdma_bar, ide_bar, CMD_PACKET, 0,
1078
- nblocks, prdt, ARRAY_SIZE(prdt),
1079
- send_scsi_cdb_read10);
1122
+ nblocks, prdt, ARRAY_SIZE(prdt), send_cdb);
1123
1124
qtest_memread(qts, guest_buf, rx, rxsize);
1125
} else {
@@ -1093,8 +1136,7 @@ static void cdrom_read_impl(int nblocks, unsigned flags)
1136
assert_bit_set(data, DRQ | DRDY);
1137
assert_bit_clear(data, ERR | DF | BSY);
1138
1096
- /* SCSI CDB (READ10) -- read n*2048 bytes from block 0 */
1097
- send_scsi_cdb_read10(dev, ide_bar, 0, nblocks);
1139
+ send_cdb(dev, ide_bar, 0, nblocks);
1140
1141
/*
1142
* Read data back: occurs in bursts of 'BYTE_COUNT_LIMIT' bytes.
@@ -1134,7 +1176,17 @@ static void cdrom_read_impl(int nblocks, unsigned flags)
1176
assert_bit_clear(data, DRQ | ERR | DF | BSY);
1177
}
1178
1137
- g_assert_cmpint(memcmp(pattern, rx, rxsize), ==, 0);
1179
+ if (raw) {
1180
+ /* The 2048-byte payload of each raw sector sits past its header. */
1181
+ for (i = 0; i < nblocks; i++) {
1182
+ uint8_t *sec = (uint8_t *)rx + i * ATAPI_RAW_SIZE + ATAPI_RAW_DATA;
1183
+
1184
+ g_assert_cmpint(memcmp(sec, pattern + i * ATAPI_BLOCK_SIZE,
1185
+ ATAPI_BLOCK_SIZE), ==, 0);
1186
+ }
1187
+ } else {
1188
+ g_assert_cmpint(memcmp(pattern, rx, rxsize), ==, 0);
1189
+ }
1190
1191
g_free(pattern);
1192
g_free(rx);
@@ -1163,6 +1215,16 @@ static void test_cdrom_dma_large(void)
1215
cdrom_read_impl(BYTE_COUNT_LIMIT * 4 / ATAPI_BLOCK_SIZE, CDROM_DMA);
1216
}
1217
1218
+static void test_cdrom_pio_raw(void)
1219
+{
1220
+ cdrom_read_impl(4, CDROM_RAW);
1221
+}
1222
+
1223
+static void test_cdrom_dma_raw(void)
1224
+{
1225
+ cdrom_read_impl(4, CDROM_DMA | CDROM_RAW);
1226
+}
1227
+
1228
int main(int argc, char **argv)
1229
{
1230
const char *base;
@@ -1223,6 +1285,8 @@ int main(int argc, char **argv)
1285
qtest_add_func("/ide/cdrom/pio_large", test_cdrom_pio_large);
1286
qtest_add_func("/ide/cdrom/dma", test_cdrom_dma);
1287
qtest_add_func("/ide/cdrom/dma_large", test_cdrom_dma_large);
1288
+ qtest_add_func("/ide/cdrom/pio_raw", test_cdrom_pio_raw);
1289
+ qtest_add_func("/ide/cdrom/dma_raw", test_cdrom_dma_raw);
1290
1291
ret = g_test_run();
1292