From nobody Thu Jan 1 19:23:59 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A2D2CDB484 for ; Thu, 19 Oct 2023 07:39:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344913AbjJSHjN (ORCPT ); Thu, 19 Oct 2023 03:39:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344886AbjJSHix (ORCPT ); Thu, 19 Oct 2023 03:38:53 -0400 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D80418E for ; Thu, 19 Oct 2023 00:38:50 -0700 (PDT) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id EED9A10000B; Thu, 19 Oct 2023 10:38:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru EED9A10000B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1697701127; bh=BBTzZEqsm/wZZOPygxY/squ4vnYn9Ag4bIEvCJkN4iQ=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=rgYrhySUwSqy03N87r3OURo82Afg0GJYP+xbiL2q0ccNh7WTrQDW6LryU5sWx1PMW Myx4/yP1xQSDYXuC1NJqpGhfnsKjW/VRKQup1U7cJgyEH0+Jo1eHnxVMihvDLgVfGG b0ijbntjWsjMQjkYLyE+GUAl62nGHXHqP9xeHQMb3VQ2uJc/qU9QZBVqFwikefx9j3 r/ikVZmK/GrL0esm/7VAHq3PTxeeGA2Q75wy/xBtNQTwTuYcnEQdtCkPg1ud/4tHwn AH7npaf/m7TfZoNThjbNDGAkNgALFzjNz6ZGrINjdwV0dQr9fOR37hED5oTNIwsmZR 9UEjyVR2jv9wA== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Thu, 19 Oct 2023 10:38:47 +0300 (MSK) Received: from CAB-WSD-0004828.sigma.sbrf.ru (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Thu, 19 Oct 2023 10:38:47 +0300 From: Martin Kurbanov To: David Woodhouse , Richard Weinberger , Christian Brauner , Dave Chinner , Yu Zhe CC: , , , Martin Kurbanov Subject: [PATCH v1 1/2] jffs2: introduce jffs2_nandflash() Date: Thu, 19 Oct 2023 10:38:37 +0300 Message-ID: <20231019073838.17586-2-mmkurbanov@salutedevices.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20231019073838.17586-1-mmkurbanov@salutedevices.com> References: <20231019073838.17586-1-mmkurbanov@salutedevices.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 180720 [Oct 19 2023] X-KSMG-AntiSpam-Version: 6.0.0.2 X-KSMG-AntiSpam-Envelope-From: mmkurbanov@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 541 541 6f62a06a82e8ec968d29b8e7c7bba6aeceb34f57, {Tracking_from_domain_doesnt_match_to}, p-i-exch-sc-m01.sberdevices.ru:7.1.1,5.0.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;salutedevices.com:7.1.1;127.0.0.199:7.1.2;100.64.160.123:7.1.2, FromAlignment: s, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/10/19 05:18:00 #22229383 X-KSMG-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Introduce jffs2_nandflash() instead of jffs2_cleanmarker_oob(). The jffs2_nandflash() is used to determine the type of flash. And the jffs2_cleanmarker_oob() determines whether cleanmarkers are needed. The function name is chosen by analogy with jffs2_dataflash() and jffs2_ubivol(). This is a preparation patch making further changes a bit cleaner (no functional change). Signed-off-by: Martin Kurbanov --- fs/jffs2/erase.c | 2 +- fs/jffs2/fs.c | 4 ++-- fs/jffs2/os-linux.h | 3 +++ fs/jffs2/scan.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c index acd32f05b519..4475de5206c0 100644 --- a/fs/jffs2/erase.c +++ b/fs/jffs2/erase.c @@ -173,7 +173,7 @@ static void jffs2_erase_failed(struct jffs2_sb_info *c,= struct jffs2_eraseblock { /* For NAND, if the failure did not occur at the device level for a specific physical page, don't bother updating the bad block table. */ - if (jffs2_cleanmarker_oob(c) && (bad_offset !=3D (uint32_t)MTD_FAIL_ADDR_= UNKNOWN)) { + if (jffs2_nandflash(c) && (bad_offset !=3D (uint32_t)MTD_FAIL_ADDR_UNKNOW= N)) { /* We had a device-level failure to erase. Let's see if we've failed too many times. */ if (!jffs2_write_nand_badblock(c, jeb, bad_offset)) { diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index 038516bee1ab..6de91c00eb73 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c @@ -687,7 +687,7 @@ struct jffs2_inode_info *jffs2_gc_fetch_inode(struct jf= fs2_sb_info *c, static int jffs2_flash_setup(struct jffs2_sb_info *c) { int ret =3D 0; =20 - if (jffs2_cleanmarker_oob(c)) { + if (jffs2_nandflash(c)) { /* NAND flash... do setup accordingly */ ret =3D jffs2_nand_flash_setup(c); if (ret) @@ -720,7 +720,7 @@ static int jffs2_flash_setup(struct jffs2_sb_info *c) { =20 void jffs2_flash_cleanup(struct jffs2_sb_info *c) { =20 - if (jffs2_cleanmarker_oob(c)) { + if (jffs2_nandflash(c)) { jffs2_nand_flash_cleanup(c); } =20 diff --git a/fs/jffs2/os-linux.h b/fs/jffs2/os-linux.h index 8da19766c101..c604f639a00f 100644 --- a/fs/jffs2/os-linux.h +++ b/fs/jffs2/os-linux.h @@ -81,6 +81,7 @@ static inline void jffs2_init_inode_info(struct jffs2_ino= de_info *f) #define jffs2_flush_wbuf_pad(c) ({ do{} while(0); (void)(c), 0; }) #define jffs2_flush_wbuf_gc(c, i) ({ do{} while(0); (void)(c), (void) i, 0= ; }) #define jffs2_write_nand_badblock(c,jeb,bad_offset) (1) +#define jffs2_nandflash(c) (0) #define jffs2_nand_flash_setup(c) (0) #define jffs2_nand_flash_cleanup(c) do {} while(0) #define jffs2_wbuf_dirty(c) (0) @@ -124,6 +125,8 @@ void jffs2_wbuf_timeout(unsigned long data); void jffs2_wbuf_process(void *data); int jffs2_flush_wbuf_gc(struct jffs2_sb_info *c, uint32_t ino); int jffs2_flush_wbuf_pad(struct jffs2_sb_info *c); + +#define jffs2_nandflash(c) ((c)->mtd->type =3D=3D MTD_NANDFLASH) int jffs2_nand_flash_setup(struct jffs2_sb_info *c); void jffs2_nand_flash_cleanup(struct jffs2_sb_info *c); =20 diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c index 29671e33a171..005d0af950ea 100644 --- a/fs/jffs2/scan.c +++ b/fs/jffs2/scan.c @@ -113,7 +113,7 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) if (!flashbuf) { /* For NAND it's quicker to read a whole eraseblock at a time, apparently */ - if (jffs2_cleanmarker_oob(c)) + if (jffs2_nandflash(c)) try_size =3D c->sector_size; else try_size =3D PAGE_SIZE; --=20 2.40.0 From nobody Thu Jan 1 19:23:59 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DAA9DCDB465 for ; Thu, 19 Oct 2023 07:39:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235180AbjJSHjG (ORCPT ); Thu, 19 Oct 2023 03:39:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344876AbjJSHix (ORCPT ); Thu, 19 Oct 2023 03:38:53 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D23C124 for ; Thu, 19 Oct 2023 00:38:50 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 3BBC012000D; Thu, 19 Oct 2023 10:38:48 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 3BBC012000D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1697701128; bh=8EUTHmA8KnT2ITQYRQVP7dMugb9aOlZWZtyYH44SnBU=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=RJqzeRRENG7CfJEsIsI0BPnh5KtG1+wukdYnK7byqgLTlFaupDaqKma3G7URgTM9C wCmSQJvYf3YEb+FY7krEBmJIz53ud6CA0apGGhJABXEYd8FB9B2vq3LFfR9XDtv9mT WxJ/D+b6Qyp2rRRQAUPQLG1OIvF79Nkf+D47uGn9v4R+1astZEwtOansqJLyNXsTu0 7b3158RxtGXZ3eIfk+fUr/xKzFimL2q4evzH6uNbTsa0dkN09akJv1RZHrsMoacf0T dq1R9L1MYZaP1hLFDtgEQEAkjS4L/FqL8nzl7MVE9GaxldL0dMnKDj2bgSo7BzNOQd 7fXkG7gx4Md+Q== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Thu, 19 Oct 2023 10:38:48 +0300 (MSK) Received: from CAB-WSD-0004828.sigma.sbrf.ru (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Thu, 19 Oct 2023 10:38:47 +0300 From: Martin Kurbanov To: David Woodhouse , Richard Weinberger , Christian Brauner , Dave Chinner , Yu Zhe CC: , , , Martin Kurbanov Subject: [PATCH v1 2/2] jffs2: make cleanmarker support option Date: Thu, 19 Oct 2023 10:38:38 +0300 Message-ID: <20231019073838.17586-3-mmkurbanov@salutedevices.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20231019073838.17586-1-mmkurbanov@salutedevices.com> References: <20231019073838.17586-1-mmkurbanov@salutedevices.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 180720 [Oct 19 2023] X-KSMG-AntiSpam-Version: 6.0.0.2 X-KSMG-AntiSpam-Envelope-From: mmkurbanov@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 541 541 6f62a06a82e8ec968d29b8e7c7bba6aeceb34f57, {Tracking_from_domain_doesnt_match_to}, p-i-exch-sc-m01.sberdevices.ru:7.1.1,5.0.1;127.0.0.199:7.1.2;salutedevices.com:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;100.64.160.123:7.1.2, FromAlignment: s, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/10/19 05:18:00 #22229383 X-KSMG-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch support for disable cleanmarker option. This is useful on some NAND devices which entire OOB area is protected by ECC. Problem fires when JFFS2 driver writes cleanmarker to some page and later it tries to write to this page - write will be done successfully, but after that such page becomes unreadable due to invalid ECC codes. This occurs because the second write necessitates an update to ECC, but it is impossible to do it correctly without block erase. Signed-off-by: Martin Kurbanov --- fs/jffs2/Kconfig | 10 ++++++++++ fs/jffs2/os-linux.h | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/fs/jffs2/Kconfig b/fs/jffs2/Kconfig index 7c96bc107218..8a66941d1e93 100644 --- a/fs/jffs2/Kconfig +++ b/fs/jffs2/Kconfig @@ -29,6 +29,16 @@ config JFFS2_FS_DEBUG If reporting bugs, please try to have available a full dump of the messages at debug level 1 while the misbehaviour was occurring. =20 +config JFFS2_FS_NOCLEANMARKER + bool "Disable cleanmarkers JFFS2 feature" + depends on JFFS2_FS_WRITEBUFFER + depends on MTD_NAND || MTD_SPI_NAND + default n + help + Do not write 'CLEANMARKER' nodes to the beginning of each erase block. + This option can be useful on NAND flash where there is no free + space in the OOB area or the entire OOB area is protected by ECC. + config JFFS2_FS_WRITEBUFFER bool "JFFS2 write-buffering support" depends on JFFS2_FS diff --git a/fs/jffs2/os-linux.h b/fs/jffs2/os-linux.h index c604f639a00f..ea42964d8118 100644 --- a/fs/jffs2/os-linux.h +++ b/fs/jffs2/os-linux.h @@ -109,7 +109,9 @@ static inline void jffs2_init_inode_info(struct jffs2_i= node_info *f) #define jffs2_can_mark_obsolete(c) (c->mtd->flags & (MTD_BIT_WRITEABLE)) #endif =20 -#define jffs2_cleanmarker_oob(c) (c->mtd->type =3D=3D MTD_NANDFLASH) +#define jffs2_cleanmarker_oob(c) \ + (!IS_ENABLED(CONFIG_JFFS2_FS_NOCLEANMARKER) && \ + ((c)->mtd->type =3D=3D MTD_NANDFLASH)) =20 #define jffs2_wbuf_dirty(c) (!!(c)->wbuf_len) =20 --=20 2.40.0