Commit 21633981 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Kees Cook
Browse files

rslib: Split rs control struct 



The decoder library uses variable length arrays on stack. To get rid of
them it would be simple to allocate fixed length arrays on stack, but those
might become rather large. The other solution is to allocate the buffers in
the rs control structure, but this cannot be done as long as the structure
can be shared by several users. Sharing is desired because the RS polynom
tables are large and initialization is time consuming.

To solve this split the codec information out of the control structure and
have a pointer to a shared codec in it. Instantiate the control structure
for each user, create a new codec if no shareable is avaiable yet.  Adjust
all affected usage sites to the new scheme.

This allows to add per instance decoder buffers to the control structure
later on.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Segher Boessenkool <segher@kernel.crashing.org>
Cc: Kernel Hardening <kernel-hardening@lists.openwall.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Mike Snitzer <snitzer@redhat.com>
Cc: Anton Vorontsov <anton@enomsg.org>
Cc: Colin Cross <ccross@android.com>
Cc: Andrew Morton <akpm@linuxfoundation.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Alasdair Kergon <agk@redhat.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent a85e126a

drivers/mtd/nand/raw/cafe_nand.c

+4 −3
Original line number Diff line number Diff line
@@ -394,8 +394,9 @@ static int cafe_nand_read_page(struct mtd_info *mtd, struct nand_chip *chip, 


		for (i=0; i<8; i+=2) {

			uint32_t tmp = cafe_readl(cafe, NAND_ECC_SYN01 + (i*2));

			syn[i] = cafe->rs->index_of[tmp & 0xfff];

			syn[i+1] = cafe->rs->index_of[(tmp >> 16) & 0xfff];



			syn[i] = cafe->rs->codec->index_of[tmp & 0xfff];

			syn[i+1] = cafe->rs->codec->index_of[(tmp >> 16) & 0xfff];

		}



		n = decode_rs16(cafe->rs, NULL, NULL, 1367, syn, 0, pos, 0,

drivers/mtd/nand/raw/diskonchip.c

+4 −3
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ static int doc_ecc_decode(struct rs_control *rs, uint8_t *data, uint8_t *ecc) 
	int i, j, nerr, errpos[8];

	uint8_t parity;

	uint16_t ds[4], s[5], tmp, errval[8], syn[4];

	struct rs_codec *cd = rs->codec;



	memset(syn, 0, sizeof(syn));

	/* Convert the ecc bytes into words */
@@ -160,15 +161,15 @@ static int doc_ecc_decode(struct rs_control *rs, uint8_t *data, uint8_t *ecc) 
	for (j = 1; j < NROOTS; j++) {

		if (ds[j] == 0)

			continue;

		tmp = rs->index_of[ds[j]];

		tmp = cd->index_of[ds[j]];

		for (i = 0; i < NROOTS; i++)

			s[i] ^= rs->alpha_to[rs_modnn(rs, tmp + (FCR + i) * j)];

			s[i] ^= cd->alpha_to[rs_modnn(cd, tmp + (FCR + i) * j)];

	}



	/* Calc syn[i] = s[i] / alpha^(v + i) */

	for (i = 0; i < NROOTS; i++) {

		if (s[i])

			syn[i] = rs_modnn(rs, rs->index_of[s[i]] + (NN - FCR - i));

			syn[i] = rs_modnn(cd, cd->index_of[s[i]] + (NN - FCR - i));

	}

	/* Call the decoder library */

	nerr = decode_rs16(rs, NULL, NULL, 1019, syn, 0, errpos, 0, errval);

include/linux/rslib.h

+13 −6
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/gfp.h>		/* for GFP_KERNEL */



/**

 * struct rs_control - rs control structure

 * struct rs_codec - rs codec data

 *

 * @mm:		Bits per symbol

 * @nn:		Symbols per block (= (1<<mm)-1)
@@ -29,9 +29,9 @@ 
 * @gfpoly:	The primitive generator polynominal

 * @gffunc:	Function to generate the field, if non-canonical representation

 * @users:	Users of this structure

 * @list:	List entry for the rs control list

 * @list:	List entry for the rs codec list

*/

struct rs_control {

struct rs_codec {

	int		mm;

	int		nn;

	uint16_t	*alpha_to;
@@ -47,6 +47,14 @@ struct rs_control { 
	struct list_head list;

};



/**

 * struct rs_control - rs control structure per instance

 * @codec:	The codec used for this instance

 */

struct rs_control {

	struct rs_codec	*codec;

};



/* General purpose RS codec, 8-bit data width, symbol width 1-15 bit  */

#ifdef CONFIG_REED_SOLOMON_ENC8

int encode_rs8(struct rs_control *rs, uint8_t *data, int len, uint16_t *par,
@@ -69,7 +77,6 @@ int decode_rs16(struct rs_control *rs, uint16_t *data, uint16_t *par, int len, 
		uint16_t *corr);

#endif



/* Create or get a matching rs control structure */

struct rs_control *init_rs_gfp(int symsize, int gfpoly, int fcr, int prim,

			       int nroots, gfp_t gfp);
@@ -100,7 +107,7 @@ void free_rs(struct rs_control *rs); 


/** modulo replacement for galois field arithmetics

 *

 *  @rs:	the rs control structure

 *  @rs:	Pointer to the RS codec

 *  @x:		the value to reduce

 *

 *  where
@@ -110,7 +117,7 @@ void free_rs(struct rs_control *rs); 
 *  Simple arithmetic modulo would return a wrong result for values

 *  >= 3 * rs->nn

*/

static inline int rs_modnn(struct rs_control *rs, int x)

static inline int rs_modnn(struct rs_codec *rs, int x)

{

	while (x >= rs->nn) {

		x -= rs->nn;

lib/reed_solomon/decode_rs.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * Generic data width independent code which is included by the wrappers.

 */

{

	struct rs_codec *rs = rsc->codec;

	int deg_lambda, el, deg_omega;

	int i, j, r, k, pad;

	int nn = rs->nn;

lib/reed_solomon/encode_rs.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * Generic data width independent code which is included by the wrappers.

 */

{

	struct rs_codec *rs = rsc->codec;

	int i, j, pad;

	int nn = rs->nn;

	int nroots = rs->nroots;

CRA Git | Maintained and supported by SUSTech CRA and CCSE