[U-Boot] [PATCH] jffs2: some fixes to summary support

[U-Boot] [PATCH] jffs2: some fixes to summary support

[Ilya Yanok]

This patch fixes some issues with JFFS2 summary support in U-Boot.
1/ Summary support made compilation configurable (as summary support
considered expiremental even in Linux).
2/ Summary code can do unaligned 16-bit and 32-bit memory accesses.
We need to get data byte by byte to exclude data aborts.
3/ Make summary scan in two passes so we can safely fall back to full
scan if we found unsupported entry in the summary.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
---
 fs/jffs2/jffs2_1pass.c |  122 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 81 insertions(+), 41 deletions(-)

diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index 11b66ab..ba8ac51 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -120,6 +120,7 @@
 #include <jffs2/jffs2.h>
 #include <jffs2/jffs2_1pass.h>
 #include <linux/mtd/compat.h>
+#include <asm/errno.h>
 
 #include "jffs2_private.h"
 
@@ -1220,8 +1221,30 @@ jffs2_1pass_rescan_needed(struct part_info *part)
 	return 0;
 }
 
+#ifdef CONFIG_JFFS2_SUMMARY
+static u32 sum_get_unaligned32(u32 *ptr)
+{
+	u32 val;
+	u8 *p = (u8 *)ptr;
+
+	val = *p | (*(p + 1) << 8) | (*(p + 2) << 16) | (*(p + 3) << 24);
+
+	return __le32_to_cpu(val);
+}
+
+static u16 sum_get_unaligned16(u16 *ptr)
+{
+	u16 val;
+	u8 *p = (u8 *)ptr;
+
+	val = *p | (*(p + 1) << 8);
+
+	return __le16_to_cpu(val);
+}
+
 #define dbg_summary(...) do {} while (0);
-/* Process the stored summary information - helper function for
+/*
+ * Process the stored summary information - helper function for
  * jffs2_sum_scan_sumnode()
  */
 
@@ -1230,54 +1253,64 @@ static int jffs2_sum_process_sum_data(struct part_info *part, uint32_t offset,
 				struct b_lists *pL)
 {
 	void *sp;
-	int i;
+	int i, pass;
+	void *ret;
 
-	sp = summary->sum;
+	for (pass = 0; pass < 2; pass++) {
+		sp = summary->sum;
 
-	for (i = 0; i < summary->sum_num; i++) {
-		dbg_summary("processing summary index %d\n", i);
+		for (i = 0; i < summary->sum_num; i++) {
+			struct jffs2_sum_unknown_flash *spu = sp;
+			dbg_summary("processing summary index %d\n", i);
 
-		switch (((struct jffs2_sum_unknown_flash *)sp)->nodetype) {
-			case JFFS2_NODETYPE_INODE: {
+			switch (sum_get_unaligned16(&spu->nodetype)) {
+				case JFFS2_NODETYPE_INODE: {
 				struct jffs2_sum_inode_flash *spi;
-				spi = sp;
-
-				dbg_summary("Inode at 0x%08x-0x%08x\n",
-					    offset + spi->offset,
-					    offset + spi->offset + spi->totlen);
+					if (pass) {
+						spi = sp;
 
-				if (insert_node(&pL->frag, (u32) part->offset +
-						offset + spi->offset) == NULL)
-					return -1;
+						ret = insert_node(&pL->frag,
+							(u32)part->offset +
+							offset +
+							sum_get_unaligned32(
+								&spi->offset));
+						if (ret == NULL)
+							return -1;
+					}
 
-				sp += JFFS2_SUMMARY_INODE_SIZE;
+					sp += JFFS2_SUMMARY_INODE_SIZE;
 
-				break;
-			}
-
-			case JFFS2_NODETYPE_DIRENT: {
-				struct jffs2_sum_dirent_flash *spd;
-				spd = sp;
-
-				dbg_summary("Dirent at 0x%08x-0x%08x\n",
-					    offset + spd->offset,
-					    offset + spd->offset + spd->totlen);
-
-				if (insert_node(&pL->dir, (u32) part->offset +
-						offset + spd->offset) == NULL)
-					return -1;
-
-				sp += JFFS2_SUMMARY_DIRENT_SIZE(spd->nsize);
+					break;
+				}
+				case JFFS2_NODETYPE_DIRENT: {
+					struct jffs2_sum_dirent_flash *spd;
+					spd = sp;
+					if (pass) {
+						ret = insert_node(&pL->dir,
+							(u32) part->offset +
+							offset +
+							sum_get_unaligned32(
+								&spd->offset));
+						if (ret == NULL)
+							return -1;
+					}
+
+					sp += JFFS2_SUMMARY_DIRENT_SIZE(
+							spd->nsize);
 
-				break;
-			}
-			default : {
-				uint16_t nodetype =
-					((struct jffs2_sum_unknown_flash *)
-					 sp)->nodetype;
-				printf("Unsupported node type %x found in "
-						"summary!\n", nodetype);
-				break;
+					break;
+				}
+				default : {
+					uint16_t nodetype = sum_get_unaligned16(
+								&spu->nodetype);
+					printf("Unsupported node type %x found"
+							" in summary!\n",
+							nodetype);
+					if ((nodetype & JFFS2_COMPAT_MASK) ==
+							JFFS2_FEATURE_INCOMPAT)
+						return -EIO;
+					return -EBADMSG;
+				}
 			}
 		}
 	}
@@ -1335,6 +1368,8 @@ int jffs2_sum_scan_sumnode(struct part_info *part, uint32_t offset,
 		dbg_summary("Summary : CLEANMARKER node \n");
 
 	ret = jffs2_sum_process_sum_data(part, offset, summary, pL);
+	if (ret == -EBADMSG)
+		return 0;
 	if (ret)
 		return ret;		/* real error */
 
@@ -1345,6 +1380,7 @@ crc_err:
 
 	return 0;
 }
+#endif /* CONFIG_JFFS2_SUMMARY */
 
 #ifdef DEBUG_FRAGMENTS
 static void
@@ -1450,13 +1486,16 @@ jffs2_1pass_build_lists(struct part_info * part)
 		uint32_t buf_ofs = sector_ofs;
 		uint32_t buf_len;
 		uint32_t ofs, prevofs;
+#ifdef CONFIG_JFFS2_SUMMARY
 		struct jffs2_sum_marker *sm;
 		void *sumptr = NULL;
 		uint32_t sumlen;
 		int ret;
+#endif
 
 		WATCHDOG_RESET();
 
+#ifdef CONFIG_JFFS2_SUMMARY
 		buf_len = sizeof(*sm);
 
 		/* Read as much as we want into the _end_ of the preallocated
@@ -1504,6 +1543,7 @@ jffs2_1pass_build_lists(struct part_info * part)
 				continue;
 
 		}
+#endif /* CONFIG_JFFS2_SUMMARY */
 
 		buf_len = EMPTY_SCAN_SIZE(part->sector_size);
 
-- 
1.6.0.6

[U-Boot] [PATCH] jffs2: some fixes to summary support

[Mike Frysinger]

On Friday 17 July 2009 07:02:42 Ilya Yanok wrote:
> +#ifdef CONFIG_JFFS2_SUMMARY
> +static u32 sum_get_unaligned32(u32 *ptr)
> +{
> +	u32 val;
> +	u8 *p = (u8 *)ptr;
> +
> +	val = *p | (*(p + 1) << 8) | (*(p + 2) << 16) | (*(p + 3) << 24);
> +
> +	return __le32_to_cpu(val);
> +}
> +
> +static u16 sum_get_unaligned16(u16 *ptr)
> +{
> +	u16 val;
> +	u8 *p = (u8 *)ptr;
> +
> +	val = *p | (*(p + 1) << 8);
> +
> +	return __le16_to_cpu(val);
> +}

do get_unaligned_le16 and such not work ?
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20090718/99166bb2/attachment.pgp 

[U-Boot] [PATCH] jffs2: some fixes to summary support

[Ilya Yanok]

Hi Mike,

Mike Frysinger wrote:
>> +#ifdef CONFIG_JFFS2_SUMMARY
>> +static u32 sum_get_unaligned32(u32 *ptr)
>> +{
>> +	u32 val;
>> +	u8 *p = (u8 *)ptr;
>> +
>> +	val = *p | (*(p + 1) << 8) | (*(p + 2) << 16) | (*(p + 3) << 24);
>> +
>> +	return __le32_to_cpu(val);
>> +}
>> +
>> +static u16 sum_get_unaligned16(u16 *ptr)
>> +{
>> +	u16 val;
>> +	u8 *p = (u8 *)ptr;
>> +
>> +	val = *p | (*(p + 1) << 8);
>> +
>> +	return __le16_to_cpu(val);
>> +}
>>     
>
> do get_unaligned_le16 and such not work ?
>   

Nope. They do only some typecasting and resulting code still uses word
(halfword) access instructions.

Regards, Ilya.

[U-Boot] [PATCH] jffs2: some fixes to summary support

[Detlev Zundel]

Hi Scott,

[...]

> Nope. They do only some typecasting and resulting code still uses word
> (halfword) access instructions.

Can you take care of this patch?  It seems to have fallen through the
cracks somehow.

Thanks!
  Detlev

-- 
The success of PCs is in large part due to the fact that, by making all
hardware equivalent, good software enabled bad hardware. (Ugly)
                                    -- Rob Pike
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de

[U-Boot] [PATCH] jffs2: some fixes to summary support

[Scott Wood]

On Fri, Aug 21, 2009 at 03:07:03PM +0200, Detlev Zundel wrote:
> Hi Scott,
> 
> [...]
> 
> > Nope. They do only some typecasting and resulting code still uses word
> > (halfword) access instructions.
> 
> Can you take care of this patch?  It seems to have fallen through the
> cracks somehow.

I am not the JFFS2 custodian, nor am I sufficiently familiar with it to
become such.

This should go through Wolfgang in the absence of anyone that wants to
take responsibility for JFFS2.

-Scott

[U-Boot] [PATCH] jffs2: some fixes to summary support

[Wolfgang Denk]

Dear Ilya Yanok,

In message <1247828562-9854-1-git-send-email-yanok@emcraft.com> you wrote:
> This patch fixes some issues with JFFS2 summary support in U-Boot.
> 1/ Summary support made compilation configurable (as summary support
> considered expiremental even in Linux).
> 2/ Summary code can do unaligned 16-bit and 32-bit memory accesses.
> We need to get data byte by byte to exclude data aborts.
> 3/ Make summary scan in two passes so we can safely fall back to full
> scan if we found unsupported entry in the summary.
> 
> Signed-off-by: Ilya Yanok <yanok@emcraft.com>
> ---
>  fs/jffs2/jffs2_1pass.c |  122 ++++++++++++++++++++++++++++++++----------------
>  1 files changed, 81 insertions(+), 41 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I think animal testing is a terrible idea; they get all  nervous  and
give the wrong answers.

[U-Boot] [PATCH] jffs2: some fixes to summary support

[Detlev Zundel]

Hi Scott,

> On Fri, Aug 21, 2009 at 03:07:03PM +0200, Detlev Zundel wrote:
>> Hi Scott,
>> 
>> [...]
>> 
>> > Nope. They do only some typecasting and resulting code still uses word
>> > (halfword) access instructions.
>> 
>> Can you take care of this patch?  It seems to have fallen through the
>> cracks somehow.
>
> I am not the JFFS2 custodian, nor am I sufficiently familiar with it to
> become such.

As I don't know of a JFFS2 custodian, I took my best shot, but ok, point
taken.

> This should go through Wolfgang in the absence of anyone that wants to
> take responsibility for JFFS2.

Ok, if no more negative feedback comes in, I'm sure he'll apply this.

Thanks
  Detlev

-- 
We support democracy, but that doesn't mean we have to support
governments that get elected as a result of democracy.
                                     -- George W. Bush - March 30, 2006
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de

[U-Boot] [PATCH] jffs2: some fixes to summary support

[Wolfgang Denk]

Dear Detlev Zundel,

In message <m2r5v17eko.fsf@ohwell.denx.de> you wrote:
> 
> Ok, if no more negative feedback comes in, I'm sure he'll apply this.

I will not. Not again, that is :-)

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Brontosaurus Principle: Organizations  can  grow  faster  than  their
brains  can manage them in relation to their environment and to their
own physiology: when this occurs, they are an endangered species.
                                                - Thomas K. Connellan