Reed-Solomon Code: Update no_eras to the actual number of errors
Subsystems (2)
RFC 1/1 Reed-Solomon Code: Update no_eras to the actual number of errors
Corr and eras_pos are updated to actual correction pattern and erasure positions, but no_eras is not.
When this library is used to recover lost bytes, we normally memset the lost trunk of bytes to zero as a placeholder. Unfortunately, if the lost byte is zero, b[i] is zero too. Without correct no_eras, users won't be able to determine the valid length of corr and eras_pos.
--- drivers/md/dm-verity-fec.c | 2 +- fs/pstore/ram_core.c | 2 +- include/linux/rslib.h | 4 ++-- lib/reed_solomon/decode_rs.c | 20 ++++++++++++++------ lib/reed_solomon/reed_solomon.c | 4 ++-- lib/reed_solomon/test_rslib.c | 18 ++++++++++++------ 6 files changed, 32 insertions(+), 18 deletions(-)
drivers/md/dm-verity-fec.c +1 -1
@@ -50,7 +50,7 @@ static int fec_decode_rs8(struct dm_verity *v, struct dm_verity_fec_io *fio,for (i =0 ; i < v->fec->roots; i++) par[i] = fec[i]; -return decode_rs8 (fio->rs, data, par, v->fec->rsn,NULL , neras, +return decode_rs8 (fio->rs, data, par, v->fec->rsn,NULL , &neras, fio->erasures,0 ,NULL ); }
fs/pstore/ram_core.c +1 -1
@@ -115,7 +115,7 @@ static int persistent_ram_decode_rs8(struct persistent_ram_zone *prz,for (i =0 ; i < prz->ecc_info.ecc_size; i++) prz->ecc_info.par[i] = ecc[i]; -return decode_rs8 (prz->rs_decoder, data, prz->ecc_info.par, len, +return decode_rs8 (prz->rs_decoder, data, prz->ecc_info.par, &len,NULL ,0 ,NULL ,0 ,NULL ); }
include/linux/rslib.h +2 -2
@@ -64,7 +64,7 @@ int encode_rs8(struct rs_control *rs, uint8_t *data, int len, uint16_t *par,#endif #ifdef CONFIG_REED_SOLOMON_DEC8 int decode_rs8 (struct rs_control *rs,uint8_t *data,uint16_t *par,int len, -uint16_t *s,int no_eras,int *eras_pos,uint16_t invmsk, +uint16_t *s,int *no_eras,int *eras_pos,uint16_t invmsk,uint16_t *corr);#endif
@@ -75,7 +75,7 @@ int encode_rs16(struct rs_control *rs, uint16_t *data, int len, uint16_t *par,#endif #ifdef CONFIG_REED_SOLOMON_DEC16 int decode_rs16 (struct rs_control *rs,uint16_t *data,uint16_t *par,int len, -uint16_t *s,int no_eras,int *eras_pos,uint16_t invmsk, +uint16_t *s,int *no_eras,int *eras_pos,uint16_t invmsk,uint16_t *corr);#endif
lib/reed_solomon/decode_rs.c +14 -6
@@ -24,6 +24,7 @@int count =0 ;int num_corrected;uint16_t msk = (uint16_t ) rs->nn; +int no_eras_orig = no_eras ? *no_eras :0 ;/* * The decoder buffers are in the rs control struct. They are
@@ -106,11 +107,11 @@memset (&lambda[1 ],0 , nroots *sizeof (lambda[0 ])); lambda[0 ] =1 ; -if (no_eras >0 ) { +if (no_eras_orig >0 ) {/* Init lambda to be the erasure locator polynomial */ lambda[1 ] = alpha_to[rs_modnn (rs, prim * (nn -1 - (eras_pos[0 ] + pad)))]; -for (i =1 ; i < no_eras; i++) { +for (i =1 ; i < no_eras_orig; i++) { u =rs_modnn (rs, prim * (nn -1 - (eras_pos[i] + pad)));for (j = i +1 ; j >0 ; j--) { tmp = index_of[lambda[j -1 ]];
@@ -129,8 +130,8 @@* Begin Berlekamp-Massey algorithm to determine error+erasure * locator polynomial */ - r = no_eras; - el = no_eras; + r = no_eras_orig; + el = no_eras_orig;while (++r <= nroots) {/* r is the step number */ /* Compute discrepancy at the r-th step in poly-form */ discr_r =0 ;
@@ -158,8 +159,8 @@ }else t[i +1 ] = lambda[i +1 ]; } -if (2 * el <= r + no_eras -1 ) { - el = r + no_eras - el; +if (2 * el <= r + no_eras_orig -1 ) { + el = r + no_eras_orig - el;/* * 2 lines below: B(x) <-- inv(discr_r) * * lambda(x)
@@ -312,14 +313,21 @@ eras_pos[j++] = loc[i] - pad; } } +if (no_eras >0 ) + *no_eras = j; }else if (data && par) {/* Apply error to data and parity */ + j =0 ;for (i =0 ; i < count; i++) {if (loc[i] < (nn - nroots)) data[loc[i] - pad] ^= b[i];else par[loc[i] - pad - len] ^= b[i]; +if (b[i]) + j++; } +if (no_eras >0 ) + *no_eras = j; }return num_corrected;
lib/reed_solomon/reed_solomon.c +2 -2
@@ -359,7 +359,7 @@ EXPORT_SYMBOL_GPL(encode_rs8);* errors. The count includes errors in the parity. */ int decode_rs8 (struct rs_control *rsc,uint8_t *data,uint16_t *par,int len, -uint16_t *s,int no_eras,int *eras_pos,uint16_t invmsk, +uint16_t *s,int *no_eras,int *eras_pos,uint16_t invmsk,uint16_t *corr) {#include "decode_rs.c"
@@ -410,7 +410,7 @@ EXPORT_SYMBOL_GPL(encode_rs16);* errors. The count includes errors in the parity. */ int decode_rs16 (struct rs_control *rsc,uint16_t *data,uint16_t *par,int len, -uint16_t *s,int no_eras,int *eras_pos,uint16_t invmsk, +uint16_t *s,int *no_eras,int *eras_pos,uint16_t invmsk,uint16_t *corr) {#include "decode_rs.c"
lib/reed_solomon/test_rslib.c +12 -6
@@ -258,7 +258,7 @@ static void compute_syndrome(struct rs_control *rsc, uint16_t *data,/* Test up to error correction capacity */ static void test_uc (struct rs_control *rs,int len,int errs, -int eras,int trials,struct estat *stat, +int *eras,int trials,struct estat *stat,struct wspace *ws,int method) {int dlen = len - rs->codec->nroots;
@@ -327,8 +327,11 @@ static int ex_rs_helper(struct rs_control *rs, struct wspace *ws,pr_info (" %s\n" , desc[method]);for (errs =0 ; errs <= nroots /2 ; errs++) -for (eras =0 ; eras <= nroots -2 * errs; eras++) -test_uc (rs, len, errs, eras, trials, &stat, ws, method); +for (eras =0 ; eras <= nroots -2 * errs; eras++) { +int no_eras = ers; + +test_uc (rs, len, errs, &no_eras, trials, &stat, ws, method); + }if (v >=V_CSUMMARY ) { pr_info(" Decodes wrong: %d / %d\n",
@@ -364,7 +367,7 @@ static int exercise_rs(struct rs_control *rs, struct wspace *ws,/* Tests for correct behaviour beyond error correction capacity */ static void test_bc (struct rs_control *rs,int len,int errs, -int eras,int trials,struct bcstat *stat, +int *eras,int trials,struct bcstat *stat,struct wspace *ws) {int nroots = rs->codec->nroots;
@@ -420,8 +423,11 @@ static int exercise_rs_bc(struct rs_control *rs, struct wspace *ws, eras =0 ; cutoff = nroots <= len - errs ? nroots : len - errs; -for (; eras <= cutoff; eras++) -test_bc (rs, len, errs, eras, trials, &stat, ws); +for (; eras <= cutoff; eras++) { +int no_eras = eras; + +test_bc (rs, len, errs, &no_eras, trials, &stat, ws); + } }if (v >=V_CSUMMARY ) {
Signature · 1 line
2.25.1
Quoted 36 lines · Aiden Leong
Corr and
eras_posare updated to actual correction pattern and erasure positions, butno_erasis not.When this library is used to recover lost bytes, we normally memset the lost trunk of bytes to zero as a placeholder. Unfortunately, if the lost byte is zero, b[i] is zero too. Without correct
no_eras, users won't be able to determine the valid length of corr anderas_pos.Signed-off-by Aiden Leong <[email protected]>--- drivers/md/dm-verity-fec.c | 2 +- fs/pstore/ram_core.c | 2 +- include/linux/rslib.h | 4 ++-- lib/reed_solomon/decode_rs.c | 20 ++++++++++++++------ lib/reed_solomon/reed_solomon.c | 4 ++-- lib/reed_solomon/test_rslib.c | 18 ++++++++++++------ 6 files changed, 32 insertions(+), 18 deletions(-)drivers/md/dm-verity-fec.c +1
-1@@ -50,7 +50,7 @@ static int fec_decode_rs8(struct dm_verity *v, struct dm_verity_fec_io *fio,for (i =0 ; i < v->fec->roots; i++) par[i] = fec[i]; -return decode_rs8 (fio->rs, data, par, v->fec->rsn,NULL , neras, +return decode_rs8 (fio->rs, data, par, v->fec->rsn,NULL , &neras, fio->erasures,0 ,NULL ); }fs/pstore/ram_core.c +0
-0
fs/pstore/ram_core.c static int persistent_ram_decode_rs8(struct persistent_ram_zone *prz, · line 119
Quoted 6 lines
fs/pstore/ram_core.c +1
-1@@ -115,7 +115,7 @@ static int persistent_ram_decode_rs8(struct persistent_ram_zone *prz,for (i =0 ; i < prz->ecc_info.ecc_size; i++) prz->ecc_info.par[i] = ecc[i]; -return decode_rs8 (prz->rs_decoder, data, prz->ecc_info.par, len, +return decode_rs8 (prz->rs_decoder, data, prz->ecc_info.par, &len,NULL ,0 ,NULL ,0 ,NULL );
This looks like the wrong arg changed -- did you compile test this?
Quoted 29 lines
fs/pstore/ram_core.c +0
-0}include/linux/rslib.h +2
-2@@ -64,7 +64,7 @@ int encode_rs8(struct rs_control *rs, uint8_t *data, int len, uint16_t *par,#endif #ifdef CONFIG_REED_SOLOMON_DEC8 int decode_rs8 (struct rs_control *rs,uint8_t *data,uint16_t *par,int len, -uint16_t *s,int no_eras,int *eras_pos,uint16_t invmsk, +uint16_t *s,int *no_eras,int *eras_pos,uint16_t invmsk,uint16_t *corr);#endif @@ -75,7 +75,7 @@ int encode_rs16(struct rs_control *rs, uint16_t *data, int len, uint16_t *par,#endif #ifdef CONFIG_REED_SOLOMON_DEC16 int decode_rs16 (struct rs_control *rs,uint16_t *data,uint16_t *par,int len, -uint16_t *s,int no_eras,int *eras_pos,uint16_t invmsk, +uint16_t *s,int *no_eras,int *eras_pos,uint16_t invmsk,uint16_t *corr);#endif lib/reed_solomon/decode_rs.c +0
-0
lib/reed_solomon/decode_rs.c line 27
Quoted 4 lines
lib/reed_solomon/decode_rs.c +1
-0@@ -24,6 +24,7 @@int count =0 ;int num_corrected;uint16_t msk = (uint16_t ) rs->nn; +int no_eras_orig = no_eras ? *no_eras :0 ;
To avoid code churn, I would name this int no_eras, and change the arg to something like no_eras_ptr:
int no_eras = no_eras_ptr ? *no_eras_ptr : 0;
Quoted 40 lines
lib/reed_solomon/decode_rs.c +6
-6/* * The decoder buffers are in the rs control struct. They are @@ -106,11 +107,11 @@memset (&lambda[1 ],0 , nroots *sizeof (lambda[0 ])); lambda[0 ] =1 ; -if (no_eras >0 ) { +if (no_eras_orig >0 ) {/* Init lambda to be the erasure locator polynomial */ lambda[1 ] = alpha_to[rs_modnn (rs, prim * (nn -1 - (eras_pos[0 ] + pad)))]; -for (i =1 ; i < no_eras; i++) { +for (i =1 ; i < no_eras_orig; i++) { u =rs_modnn (rs, prim * (nn -1 - (eras_pos[i] + pad)));for (j = i +1 ; j >0 ; j--) { tmp = index_of[lambda[j -1 ]];@@ -129,8 +130,8 @@* Begin Berlekamp-Massey algorithm to determine error+erasure * locator polynomial */ - r = no_eras; - el = no_eras; + r = no_eras_orig; + el = no_eras_orig;while (++r <= nroots) {/* r is the step number */ /* Compute discrepancy at the r-th step in poly-form */ discr_r =0 ;@@ -158,8 +159,8 @@ }else t[i +1 ] = lambda[i +1 ]; } -if (2 * el <= r + no_eras -1 ) { - el = r + no_eras - el; +if (2 * el <= r + no_eras_orig -1 ) { + el = r + no_eras_orig - el;/* * 2 lines below: B(x) <-- inv(discr_r) * * lambda(x)
lib/reed_solomon/decode_rs.c line 317
Quoted 5 lines
lib/reed_solomon/decode_rs.c +2
-0@@ -312,14 +313,21 @@ eras_pos[j++] = loc[i] - pad; } } +if (no_eras >0 ) + *no_eras = j;
Is this meant to be "if (j > 0)" or "if (no_eras != NULL)" ? It's uncommon to use > 0 for a pointer value.
lib/reed_solomon/decode_rs.c line 330
Quoted 13 lines
lib/reed_solomon/decode_rs.c +5
-0}else if (data && par) {/* Apply error to data and parity */ + j =0 ;for (i =0 ; i < count; i++) {if (loc[i] < (nn - nroots)) data[loc[i] - pad] ^= b[i];else par[loc[i] - pad - len] ^= b[i]; +if (b[i]) + j++; } +if (no_eras >0 ) + *no_eras = j;
I assume it's a pointer test, so both would be:
if (no_eras_ptr != NULL) *no_eras_ptr = j;
Quoted 78 lines
lib/reed_solomon/decode_rs.c +0
-0}return num_corrected;lib/reed_solomon/reed_solomon.c +2
-2@@ -359,7 +359,7 @@ EXPORT_SYMBOL_GPL(encode_rs8);* errors. The count includes errors in the parity. */ int decode_rs8 (struct rs_control *rsc,uint8_t *data,uint16_t *par,int len, -uint16_t *s,int no_eras,int *eras_pos,uint16_t invmsk, +uint16_t *s,int *no_eras,int *eras_pos,uint16_t invmsk,uint16_t *corr) {#include "decode_rs.c" @@ -410,7 +410,7 @@ EXPORT_SYMBOL_GPL(encode_rs16);* errors. The count includes errors in the parity. */ int decode_rs16 (struct rs_control *rsc,uint16_t *data,uint16_t *par,int len, -uint16_t *s,int no_eras,int *eras_pos,uint16_t invmsk, +uint16_t *s,int *no_eras,int *eras_pos,uint16_t invmsk,uint16_t *corr) {#include "decode_rs.c" lib/reed_solomon/test_rslib.c +12
-6@@ -258,7 +258,7 @@ static void compute_syndrome(struct rs_control *rsc, uint16_t *data,/* Test up to error correction capacity */ static void test_uc (struct rs_control *rs,int len,int errs, -int eras,int trials,struct estat *stat, +int *eras,int trials,struct estat *stat,struct wspace *ws,int method) {int dlen = len - rs->codec->nroots;@@ -327,8 +327,11 @@ static int ex_rs_helper(struct rs_control *rs, struct wspace *ws,pr_info (" %s\n" , desc[method]);for (errs =0 ; errs <= nroots /2 ; errs++) -for (eras =0 ; eras <= nroots -2 * errs; eras++) -test_uc (rs, len, errs, eras, trials, &stat, ws, method); +for (eras =0 ; eras <= nroots -2 * errs; eras++) { +int no_eras = ers; + +test_uc (rs, len, errs, &no_eras, trials, &stat, ws, method); + }if (v >=V_CSUMMARY ) { pr_info(" Decodes wrong: %d / %d\n",@@ -364,7 +367,7 @@ static int exercise_rs(struct rs_control *rs, struct wspace *ws,/* Tests for correct behaviour beyond error correction capacity */ static void test_bc (struct rs_control *rs,int len,int errs, -int eras,int trials,struct bcstat *stat, +int *eras,int trials,struct bcstat *stat,struct wspace *ws) {int nroots = rs->codec->nroots;@@ -420,8 +423,11 @@ static int exercise_rs_bc(struct rs_control *rs, struct wspace *ws, eras =0 ; cutoff = nroots <= len - errs ? nroots : len - errs; -for (; eras <= cutoff; eras++) -test_bc (rs, len, errs, eras, trials, &stat, ws); +for (; eras <= cutoff; eras++) { +int no_eras = eras; + +test_bc (rs, len, errs, &no_eras, trials, &stat, ws); + } }if (v >=V_CSUMMARY ) {Signature · 1 line
2.25.1
Otherwise, yeah, cool. Looks good.
Signature · 1 line
Kees Cook
Quoted 3 lines · Kees Cook
Quoted 2 lines · Aiden Leong
Corr and
eras_posare updated to actual correction pattern and erasure positions, butno_erasis not.
[]
Quoted 26 lines
lib/reed_solomon/decode_rs.c line 317
Quoted 6 lines
lib/reed_solomon/decode_rs.c +2
-0@@ -312,14 +313,21 @@ eras_pos[j++] = loc[i] - pad; } } +if (no_eras >0 ) + *no_eras = j;Is this meant to be "if (j > 0)" or "if (
no_eras!= NULL)" ? It's uncommon to use > 0 for a pointer value.lib/reed_solomon/decode_rs.c line 330
Quoted 13 lines
lib/reed_solomon/decode_rs.c +5
-0}else if (data && par) {/* Apply error to data and parity */ + j =0 ;for (i =0 ; i < count; i++) {if (loc[i] < (nn - nroots)) data[loc[i] - pad] ^= b[i];else par[loc[i] - pad - len] ^= b[i]; +if (b[i]) + j++; } +if (no_eras >0 ) + *no_eras = j;I assume it's a pointer test, so both would be:
Quoted 2 lines
if (no_eras_ptr != NULL) *no_eras_ptr = j;
More common still would be
if (no_eras_ptr) *no_eras_ptr = j;
though I think using _ptr is too Hungarian.
Thanks a lot.
I will send you another version soon.
BTW: I do believe these functions should be split into a function family. It's really hard to call them correctly and hard to debug as well.
Aiden Leong
------------------------------------------------------------------
From:Kees Cook <[email protected]>
Send Time:2020年6月25日(星期四) 13:35
To:Aiden Leong <[email protected]>
Cc:Gustavo A. R. Silva <[email protected]>; Thomas Gleixner <[email protected]>; Ferdinand Blomqvist <[email protected]>; YueHaibing <[email protected]>; dm-devel <[email protected]>; linux-kernel <[email protected]>; Alasdair Kergon <[email protected]>; Mike Snitzer <[email protected]>; Anton Vorontsov <[email protected]>; Colin Cross <[email protected]>; Tony Luck <[email protected]> Subject:Re: [RFC] Reed-Solomon Code: Update no_eras to the actual number of errors
Quoted 36 lines · Aiden Leong
Corr and
eras_posare updated to actual correction pattern and erasure positions, butno_erasis not.When this library is used to recover lost bytes, we normally memset the lost trunk of bytes to zero as a placeholder. Unfortunately, if the lost byte is zero, b[i] is zero too. Without correct
no_eras, users won't be able to determine the valid length of corr anderas_pos.Signed-off-by Aiden Leong <[email protected]>--- drivers/md/dm-verity-fec.c | 2 +- fs/pstore/ram_core.c | 2 +- include/linux/rslib.h | 4 ++-- lib/reed_solomon/decode_rs.c | 20 ++++++++++++++------ lib/reed_solomon/reed_solomon.c | 4 ++-- lib/reed_solomon/test_rslib.c | 18 ++++++++++++------ 6 files changed, 32 insertions(+), 18 deletions(-)drivers/md/dm-verity-fec.c +1
-1@@ -50,7 +50,7 @@ static int fec_decode_rs8(struct dm_verity *v, struct dm_verity_fec_io *fio,for (i =0 ; i < v->fec->roots; i++) par[i] = fec[i]; -return decode_rs8 (fio->rs, data, par, v->fec->rsn,NULL , neras, +return decode_rs8 (fio->rs, data, par, v->fec->rsn,NULL , &neras, fio->erasures,0 ,NULL ); }fs/pstore/ram_core.c +0
-0
fs/pstore/ram_core.c static int persistent_ram_decode_rs8(struct persistent_ram_zone *prz, · line 119
Quoted 6 lines
fs/pstore/ram_core.c +1
-1@@ -115,7 +115,7 @@ static int persistent_ram_decode_rs8(struct persistent_ram_zone *prz,for (i =0 ; i < prz->ecc_info.ecc_size; i++) prz->ecc_info.par[i] = ecc[i]; -return decode_rs8 (prz->rs_decoder, data, prz->ecc_info.par, len, +return decode_rs8 (prz->rs_decoder, data, prz->ecc_info.par, &len,NULL ,0 ,NULL ,0 ,NULL );
This looks like the wrong arg changed -- did you compile test this?
Quoted 29 lines
fs/pstore/ram_core.c +0
-0}include/linux/rslib.h +2
-2@@ -64,7 +64,7 @@ int encode_rs8(struct rs_control *rs, uint8_t *data, int len, uint16_t *par,#endif #ifdef CONFIG_REED_SOLOMON_DEC8 int decode_rs8 (struct rs_control *rs,uint8_t *data,uint16_t *par,int len, -uint16_t *s,int no_eras,int *eras_pos,uint16_t invmsk, +uint16_t *s,int *no_eras,int *eras_pos,uint16_t invmsk,uint16_t *corr);#endif @@ -75,7 +75,7 @@ int encode_rs16(struct rs_control *rs, uint16_t *data, int len, uint16_t *par,#endif #ifdef CONFIG_REED_SOLOMON_DEC16 int decode_rs16 (struct rs_control *rs,uint16_t *data,uint16_t *par,int len, -uint16_t *s,int no_eras,int *eras_pos,uint16_t invmsk, +uint16_t *s,int *no_eras,int *eras_pos,uint16_t invmsk,uint16_t *corr);#endif lib/reed_solomon/decode_rs.c +0
-0
lib/reed_solomon/decode_rs.c line 27
Quoted 4 lines
lib/reed_solomon/decode_rs.c +1
-0@@ -24,6 +24,7 @@int count =0 ;int num_corrected;uint16_t msk = (uint16_t ) rs->nn; +int no_eras_orig = no_eras ? *no_eras :0 ;
To avoid code churn, I would name this int no_eras, and change the arg to something like no_eras_ptr:
int no_eras = no_eras_ptr ? *no_eras_ptr : 0;
Quoted 40 lines
lib/reed_solomon/decode_rs.c +6
-6/* * The decoder buffers are in the rs control struct. They are @@ -106,11 +107,11 @@memset (&lambda[1 ],0 , nroots *sizeof (lambda[0 ])); lambda[0 ] =1 ; -if (no_eras >0 ) { +if (no_eras_orig >0 ) {/* Init lambda to be the erasure locator polynomial */ lambda[1 ] = alpha_to[rs_modnn (rs, prim * (nn -1 - (eras_pos[0 ] + pad)))]; -for (i =1 ; i < no_eras; i++) { +for (i =1 ; i < no_eras_orig; i++) { u =rs_modnn (rs, prim * (nn -1 - (eras_pos[i] + pad)));for (j = i +1 ; j >0 ; j--) { tmp = index_of[lambda[j -1 ]];@@ -129,8 +130,8 @@* Begin Berlekamp-Massey algorithm to determine error+erasure * locator polynomial */ - r = no_eras; - el = no_eras; + r = no_eras_orig; + el = no_eras_orig;while (++r <= nroots) {/* r is the step number */ /* Compute discrepancy at the r-th step in poly-form */ discr_r =0 ;@@ -158,8 +159,8 @@ }else t[i +1 ] = lambda[i +1 ]; } -if (2 * el <= r + no_eras -1 ) { - el = r + no_eras - el; +if (2 * el <= r + no_eras_orig -1 ) { + el = r + no_eras_orig - el;/* * 2 lines below: B(x) <-- inv(discr_r) * * lambda(x)
lib/reed_solomon/decode_rs.c line 317
Quoted 5 lines
lib/reed_solomon/decode_rs.c +2
-0@@ -312,14 +313,21 @@ eras_pos[j++] = loc[i] - pad; } } +if (no_eras >0 ) + *no_eras = j;
Is this meant to be "if (j > 0)" or "if (no_eras != NULL)" ? It's uncommon to use > 0 for a pointer value.
lib/reed_solomon/decode_rs.c line 330
Quoted 13 lines
lib/reed_solomon/decode_rs.c +5
-0}else if (data && par) {/* Apply error to data and parity */ + j =0 ;for (i =0 ; i < count; i++) {if (loc[i] < (nn - nroots)) data[loc[i] - pad] ^= b[i];else par[loc[i] - pad - len] ^= b[i]; +if (b[i]) + j++; } +if (no_eras >0 ) + *no_eras = j;
I assume it's a pointer test, so both would be:
if (no_eras_ptr != NULL) *no_eras_ptr = j;
Quoted 78 lines
lib/reed_solomon/decode_rs.c +0
-0}return num_corrected;lib/reed_solomon/reed_solomon.c +2
-2@@ -359,7 +359,7 @@ EXPORT_SYMBOL_GPL(encode_rs8);* errors. The count includes errors in the parity. */ int decode_rs8 (struct rs_control *rsc,uint8_t *data,uint16_t *par,int len, -uint16_t *s,int no_eras,int *eras_pos,uint16_t invmsk, +uint16_t *s,int *no_eras,int *eras_pos,uint16_t invmsk,uint16_t *corr) {#include "decode_rs.c" @@ -410,7 +410,7 @@ EXPORT_SYMBOL_GPL(encode_rs16);* errors. The count includes errors in the parity. */ int decode_rs16 (struct rs_control *rsc,uint16_t *data,uint16_t *par,int len, -uint16_t *s,int no_eras,int *eras_pos,uint16_t invmsk, +uint16_t *s,int *no_eras,int *eras_pos,uint16_t invmsk,uint16_t *corr) {#include "decode_rs.c" lib/reed_solomon/test_rslib.c +12
-6@@ -258,7 +258,7 @@ static void compute_syndrome(struct rs_control *rsc, uint16_t *data,/* Test up to error correction capacity */ static void test_uc (struct rs_control *rs,int len,int errs, -int eras,int trials,struct estat *stat, +int *eras,int trials,struct estat *stat,struct wspace *ws,int method) {int dlen = len - rs->codec->nroots;@@ -327,8 +327,11 @@ static int ex_rs_helper(struct rs_control *rs, struct wspace *ws,pr_info (" %s\n" , desc[method]);for (errs =0 ; errs <= nroots /2 ; errs++) -for (eras =0 ; eras <= nroots -2 * errs; eras++) -test_uc (rs, len, errs, eras, trials, &stat, ws, method); +for (eras =0 ; eras <= nroots -2 * errs; eras++) { +int no_eras = ers; + +test_uc (rs, len, errs, &no_eras, trials, &stat, ws, method); + }if (v >=V_CSUMMARY ) { pr_info(" Decodes wrong: %d / %d\n",@@ -364,7 +367,7 @@ static int exercise_rs(struct rs_control *rs, struct wspace *ws,/* Tests for correct behaviour beyond error correction capacity */ static void test_bc (struct rs_control *rs,int len,int errs, -int eras,int trials,struct bcstat *stat, +int *eras,int trials,struct bcstat *stat,struct wspace *ws) {int nroots = rs->codec->nroots;@@ -420,8 +423,11 @@ static int exercise_rs_bc(struct rs_control *rs, struct wspace *ws, eras =0 ; cutoff = nroots <= len - errs ? nroots : len - errs; -for (; eras <= cutoff; eras++) -test_bc (rs, len, errs, eras, trials, &stat, ws); +for (; eras <= cutoff; eras++) { +int no_eras = eras; + +test_bc (rs, len, errs, &no_eras, trials, &stat, ws); + } }if (v >=V_CSUMMARY ) {Signature · 1 line
2.25.1
Otherwise, yeah, cool. Looks good.
Signature · 1 line
Kees Cook
Hi,
Quoted 2 lines · Aiden Leong
BTW: I do believe these functions should be split into a function family. It's really hard to call them correctly and hard to debug as well.
I don't think the functions should be split up. Most probably it is the documentation that should be improved :) But, I do agree that it is not that easy to call the functions correctly.
Best,
Ferdinand
Signature · 3 lines
Ferdinand Blomqvist ferdinand.blomqvist[at]gmail.com GPG key: 9EFB 7A2C 0432 4EC5 32BA FA61 CFE9 4164 93E8 B9E4