btrfs: Add type check when reading a chunk
Hello Gu Jinxiang,
The patch 72e75ed03c8d: "btrfs: Add type check when reading a chunk" from Jul 4, 2018, leads to the following static checker warning:
fs/btrfs/volumes.c:6388 btrfs_check_chunk_valid() warn: AND to zero '0x4 & 0x1'
fs/btrfs/volumes.c
6356 if (!is_power_of_2(stripe_len) || stripe_len != BTRFS_STRIPE_LEN) {
6357 btrfs_err(fs_info, "invalid chunk stripe length: %llu",
6358 stripe_len);
6359 return -EIO;
6360 }
6361 if (~(BTRFS_BLOCK_GROUP_TYPE_MASK | BTRFS_BLOCK_GROUP_PROFILE_MASK) &
6362 type) {
6363 btrfs_err(fs_info, "unrecognized chunk type: %llu",
6364 ~(BTRFS_BLOCK_GROUP_TYPE_MASK |
6365 BTRFS_BLOCK_GROUP_PROFILE_MASK) &
6366 btrfs_chunk_type(leaf, chunk));
6367 return -EIO;
6368 }
6369
6370 if ((type & BTRFS_BLOCK_GROUP_TYPE_MASK) == 0) {
6371 btrfs_err(fs_info, "missing chunk type flag: %llu", type);
6372 return -EIO;
6373 }
6374
6375 if ((type & BTRFS_BLOCK_GROUP_SYSTEM) &&
6376 (type & (BTRFS_BLOCK_GROUP_METADATA | BTRFS_BLOCK_GROUP_DATA))) {
6377 btrfs_err(fs_info,
6378 "system chunk with data or metadata type: %llu", type);
6379 return -EIO;
6380 }
6381
6382 features = btrfs_super_incompat_flags(fs_info->super_copy);
6383 if (features & BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS)
6384 mixed = 1;
6385
6386 if (!mixed) {
6387 if (type &
6388 (BTRFS_BLOCK_GROUP_METADATA & BTRFS_BLOCK_GROUP_DATA)) {
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^Was this supposed to be | or perhaps check that both are set?
6389 btrfs_err(fs_info, 6390 "mixed chunk type in non-mixed mode: %llu", type); 6391 return -EIO;
6392 }
6393 }
regards,
dan carpenter
Quoted 50 lines
-----Original Message-----
From: Dan Carpenter [mailto:[email protected]]
Sent: Thursday, July 19, 2018 4:11 PM
To: Gu, Jinxiang/顾 金香 <[email protected]>
Cc: [email protected]
Subject: [bug report] btrfs: Add type check when reading a chunkHello Gu Jinxiang,
The patch
72e75ed03c8d: "btrfs: Add type check when reading a chunk" from Jul 4, 2018, leads to the following static checker warning:fs/btrfs/volumes.c:6388 btrfs_check_chunk_valid() warn: AND to zero '0x4 & 0x1'
fs/btrfs/volumes.c
6356 if (!is_power_of_2(stripe_len) ||stripe_len!=BTRFS_STRIPE_LEN) {
6357 btrfs_err(fs_info, "invalid chunk stripe length: %llu",
6358stripe_len);
6359 return-EIO;
6360 }
6361 if (~(BTRFS_BLOCK_GROUP_TYPE_MASK |BTRFS_BLOCK_GROUP_PROFILE_MASK) &
6362 type) {
6363 btrfs_err(fs_info, "unrecognized chunk type: %llu",
6364 ~(BTRFS_BLOCK_GROUP_TYPE_MASK |
6365BTRFS_BLOCK_GROUP_PROFILE_MASK) &
6366btrfs_chunk_type(leaf, chunk));
6367 return-EIO;
6368 }
6369
6370 if ((type &BTRFS_BLOCK_GROUP_TYPE_MASK) == 0) {
6371btrfs_err(fs_info, "missing chunk type flag: %llu", type);
6372 return-EIO;
6373 }
6374
6375 if ((type &BTRFS_BLOCK_GROUP_SYSTEM) &&
6376 (type & (BTRFS_BLOCK_GROUP_METADATA|BTRFS_BLOCK_GROUP_DATA))) {
6377 btrfs_err(fs_info,
6378 "system chunk with data or metadata type: %llu", type);
6379 return-EIO;
6380 }
6381
6382 features =btrfs_super_incompat_flags(fs_info->super_copy);
6383 if (features &BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS)
6384 mixed = 1;
6385
6386 if (!mixed) {
6387 if (type &
Quoted 3 lines
6388 (BTRFS_BLOCK_GROUP_METADATA & BTRFS_BLOCK_GROUP_DATA)) { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^Was this supposed to be | or perhaps check that both are set?
Yes. It should be |.
Thank you, I'll send a patch to fix it.
Quoted 10 lines
6389 btrfs_err(fs_info, 6390 "mixed chunk type in non-mixed mode: %llu", type); 6391 return -EIO;6392 }
6393 }regards,
dan carpenter
�翳簕.n�+壏煯壄�+%娝�遍荻w�簕.n�+壏{饼籯~镶炟^n噐■�侂h櫒璀�&{鄗夸z罐楘+€�+zf"穐殘啳嗃i��飦�戧鐉_璁鎗:+v墾�)撸鴐
Quoted 53 lines · Jinxiang
Quoted 50 lines
-----Original Message-----
From: Dan Carpenter [mailto:[email protected]]
Sent: Thursday, July 19, 2018 4:11 PM
To: Gu, Jinxiang/顾 金香 <[email protected]>
Cc: [email protected]
Subject: [bug report] btrfs: Add type check when reading a chunkHello Gu Jinxiang,
The patch
72e75ed03c8d: "btrfs: Add type check when reading a chunk" from Jul 4, 2018, leads to the following static checker warning:fs/btrfs/volumes.c:6388 btrfs_check_chunk_valid() warn: AND to zero '0x4 & 0x1'
fs/btrfs/volumes.c
6356 if (!is_power_of_2(stripe_len) ||stripe_len!=BTRFS_STRIPE_LEN) {
6357 btrfs_err(fs_info, "invalid chunk stripe length: %llu",
6358stripe_len);
6359 return-EIO;
6360 }
6361 if (~(BTRFS_BLOCK_GROUP_TYPE_MASK |BTRFS_BLOCK_GROUP_PROFILE_MASK) &
6362 type) {
6363 btrfs_err(fs_info, "unrecognized chunk type: %llu",
6364 ~(BTRFS_BLOCK_GROUP_TYPE_MASK |
6365BTRFS_BLOCK_GROUP_PROFILE_MASK) &
6366btrfs_chunk_type(leaf, chunk));
6367 return-EIO;
6368 }
6369
6370 if ((type &BTRFS_BLOCK_GROUP_TYPE_MASK) == 0) {
6371btrfs_err(fs_info, "missing chunk type flag: %llu", type);
6372 return-EIO;
6373 }
6374
6375 if ((type &BTRFS_BLOCK_GROUP_SYSTEM) &&
6376 (type & (BTRFS_BLOCK_GROUP_METADATA|BTRFS_BLOCK_GROUP_DATA))) {
6377 btrfs_err(fs_info,
6378 "system chunk with data or metadata type: %llu", type);
6379 return-EIO;
6380 }
6381
6382 features =btrfs_super_incompat_flags(fs_info->super_copy);
6383 if (features &BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS)
6384 mixed = 1;
6385
6386 if (!mixed) {
6387 if (type &Quoted 3 lines
6388 (BTRFS_BLOCK_GROUP_METADATA & BTRFS_BLOCK_GROUP_DATA)) { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^Was this supposed to be | or perhaps check that both are set?
Quoted 2 lines
Yes. It should be |.
Thank you, I'll send a patch to fix it.
Not needed, I'll fix the patch directly.
Quoted 54 lines · David Sterba
Quoted 53 lines · Jinxiang
Quoted 53 lines
-----Original Message-----
From: Dan Carpenter [mailto:[email protected]]
Sent: Thursday, July 19, 2018 4:11 PM
To: Gu, Jinxiang/顾 金香 <[email protected]>
Cc: [email protected]
Subject: [bug report] btrfs: Add type check when reading a chunkHello Gu Jinxiang,
The patch
72e75ed03c8d: "btrfs: Add type check when reading a chunk" from Jul 4, 2018, leads to the following static checker warning:fs/btrfs/volumes.c:6388 btrfs_check_chunk_valid() warn: AND to zero '0x4 & 0x1'
fs/btrfs/volumes.c
6356 if (!is_power_of_2(stripe_len) ||stripe_len!=BTRFS_STRIPE_LEN) {
6357 btrfs_err(fs_info, "invalid chunk stripe length: %llu",
6358stripe_len);
6359 return-EIO;
6360 }
6361 if (~(BTRFS_BLOCK_GROUP_TYPE_MASK |BTRFS_BLOCK_GROUP_PROFILE_MASK) &
6362 type) {
6363 btrfs_err(fs_info, "unrecognized chunk type: %llu",
6364 ~(BTRFS_BLOCK_GROUP_TYPE_MASK |
6365BTRFS_BLOCK_GROUP_PROFILE_MASK) &
6366btrfs_chunk_type(leaf, chunk));
6367 return-EIO;
6368 }
6369
6370 if ((type &BTRFS_BLOCK_GROUP_TYPE_MASK) == 0) {
6371btrfs_err(fs_info, "missing chunk type flag: %llu", type);
6372 return-EIO;
6373 }
6374
6375 if ((type &BTRFS_BLOCK_GROUP_SYSTEM) &&
6376 (type & (BTRFS_BLOCK_GROUP_METADATA|BTRFS_BLOCK_GROUP_DATA))) {
6377 btrfs_err(fs_info,
6378 "system chunk with data or metadata type: %llu", type);
6379 return-EIO;
6380 }
6381
6382 features =btrfs_super_incompat_flags(fs_info->super_copy);
6383 if (features &BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS)
6384 mixed = 1;
6385
6386 if (!mixed) {
6387 if (type &6388 (BTRFS_BLOCK_GROUP_METADATA & BTRFS_BLOCK_GROUP_DATA)) { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^Was this supposed to be | or perhaps check that both are set?
Quoted 4 lines
Quoted 2 lines
Yes. It should be |.
Thank you, I'll send a patch to fix it.Not needed, I'll fix the patch directly.
And that leads to failed mount:
[ 10.867868] BTRFS error (device vda): mixed chunk type in non-mixed mode: 1 [ 10.871084] BTRFS error (device vda): failed to read chunk tree: -5 [ 10.908541] BTRFS error (device vda): open_ctree failed
Please send fixed version.
Quoted 69 lines
-----Original Message-----
From: David Sterba [mailto:[email protected]]
Sent: Thursday, July 19, 2018 6:14 PM
To: [email protected]; Gu, Jinxiang/顾 金香 <[email protected]>; Dan Carpenter <[email protected]>; [email protected]
Subject: Re: [bug report] btrfs: Add type check when reading a chunkQuoted 54 lines · David Sterba
Quoted 53 lines · Jinxiang
Quoted 53 lines
-----Original Message-----
From: Dan Carpenter [mailto:[email protected]]
Sent: Thursday, July 19, 2018 4:11 PM
To: Gu, Jinxiang/顾 金香 <[email protected]>
Cc: [email protected]
Subject: [bug report] btrfs: Add type check when reading a chunkHello Gu Jinxiang,
The patch
72e75ed03c8d: "btrfs: Add type check when reading a chunk" from Jul 4, 2018, leads to the following static checker warning:fs/btrfs/volumes.c:6388 btrfs_check_chunk_valid() warn: AND to zero '0x4 & 0x1'
fs/btrfs/volumes.c
6356 if (!is_power_of_2(stripe_len) ||stripe_len!=BTRFS_STRIPE_LEN) {
6357 btrfs_err(fs_info, "invalid chunk stripe length: %llu",
6358stripe_len);
6359 return-EIO;
6360 }
6361 if (~(BTRFS_BLOCK_GROUP_TYPE_MASK |BTRFS_BLOCK_GROUP_PROFILE_MASK) &
6362 type) {
6363 btrfs_err(fs_info, "unrecognized chunk type: %llu",
6364 ~(BTRFS_BLOCK_GROUP_TYPE_MASK |
6365BTRFS_BLOCK_GROUP_PROFILE_MASK) &
6366btrfs_chunk_type(leaf, chunk));
6367 return-EIO;
6368 }
6369
6370 if ((type &BTRFS_BLOCK_GROUP_TYPE_MASK) == 0) {
6371btrfs_err(fs_info, "missing chunk type flag: %llu", type);
6372 return-EIO;
6373 }
6374
6375 if ((type &BTRFS_BLOCK_GROUP_SYSTEM) &&
6376 (type & (BTRFS_BLOCK_GROUP_METADATA|BTRFS_BLOCK_GROUP_DATA))) {
6377 btrfs_err(fs_info,
6378 "system chunk with data or metadata type: %llu", type);
6379 return-EIO;
6380 }
6381
6382 features =btrfs_super_incompat_flags(fs_info->super_copy);
6383 if (features &BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS)
6384 mixed = 1;
6385
6386 if (!mixed) {
6387 if (type &6388 (BTRFS_BLOCK_GROUP_METADATA & BTRFS_BLOCK_GROUP_DATA)) { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^Was this supposed to be | or perhaps check that both are set?
Quoted 4 lines
Quoted 2 lines
Yes. It should be |.
Thank you, I'll send a patch to fix it.Not needed, I'll fix the patch directly.
Quoted 7 lines
And that leads to failed mount:
[ 10.867868] BTRFS error (device vda): mixed chunk type in non-mixed mode: 1 [ 10.871084] BTRFS error (device vda): failed to read chunk tree: -5 [ 10.908541] BTRFS error (device vda): open_ctree failedPlease send fixed version.
I send a patch to fix this.
Patch: btrfs: fix bug of chunk type check
And, if possible, please just fold it into 72e75ed03c8d: "btrfs: Add type check when reading a chunk".
Thanks, Gu Jinxiang
Quoted 1 line
���{.n�+�������+%�����ݶ��w��{.n�+����{���k~���^n�r���z���h����&���z��z�ޗ�+��+zf���h���~����i��������z_��j:+v���)ߣ�m