From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 16 Jan 2023 15:29:05 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pHQTx-00DdWQ-RZ for lore@lore.pengutronix.de; Mon, 16 Jan 2023 15:29:05 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pHQTv-0000Bf-E9 for lore@pengutronix.de; Mon, 16 Jan 2023 15:29:04 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:From:In-Reply-To: Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Qhxw8xvYPuUp1N4js2tWBJbTHD/AvFEvd47dLjimLas=; b=LJgEvFwFItDs+uq4eozif4wJ8i if1xV1lubqEhuqiObbd1q/nx334XqN9lJIcpj5JqDpurdNk42iQbSJG99vJp4xYc4LHGuIhULb2pt TvWyR9YbvenOgi00e0os10/IKA78xAP+s2Ve/k0PDlfOrc1U5Qd9itMFwiJIbPGc06wjx5b44bBr1 Bw72Jqj7vx/QYDWh52FR64sjxvTb0cV96Ou0rLB+y3IRwb61pDjkWTD9kD65SsF1PmZtEbvoD3QD2 MSNF8C7BWOU07hyVOLvyl1KALQA1/yEeEyC93GpiAYp5iWB/9fLz2pXRzr2IUuKdmwJJkCTglnZOx rSdNkIcA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHQSJ-00AtNM-JO; Mon, 16 Jan 2023 14:27:24 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHQOP-00Aral-IJ for barebox@lists.infradead.org; Mon, 16 Jan 2023 14:23:24 +0000 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pHQON-0007Xv-Tk; Mon, 16 Jan 2023 15:23:19 +0100 Received: from sha by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1pHQON-0005ef-Mh; Mon, 16 Jan 2023 15:23:19 +0100 Date: Mon, 16 Jan 2023 15:23:19 +0100 To: Ahmad Fatoum Cc: barebox@lists.infradead.org, uol@pengutronix.de Message-ID: <20230116142319.GE24755@pengutronix.de> References: <20230116125443.713033-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230116125443.713033-1-a.fatoum@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) From: Sascha Hauer X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230116_062321_682040_E6F7D560 X-CRM114-Status: GOOD ( 28.67 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.7 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH] state: backend: direct: open backend in read-only mode if possible X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) On Mon, Jan 16, 2023 at 01:54:43PM +0100, Ahmad Fatoum wrote: > We unconditionally open the device backing a direct bucket in read-write > mode. We already populate struct state_backend_storage::readonly though, > which we could consult at device open time. Do so. This could possibly > be done for MTD as well, but until that's tested, for now, we do it only > for the direct backend meant for use with block devices. > > This has no functional change for barebox, which calls state_new_from_node > in the DT driver and in the EFI initcall always with readonly=false, but > we can benefit from this in barebox_state to open a device in read-only > mode when possible (e.g. when called to --dump). > > Signed-off-by: Ahmad Fatoum > --- > common/state/backend_bucket_direct.c | 4 ++-- > common/state/backend_storage.c | 2 +- > common/state/state.c | 6 +++--- > common/state/state.h | 2 +- > 4 files changed, 7 insertions(+), 7 deletions(-) Applied, thanks Sascha > > diff --git a/common/state/backend_bucket_direct.c b/common/state/backend_bucket_direct.c > index 3818c6f0b0ec..f06e14277862 100644 > --- a/common/state/backend_bucket_direct.c > +++ b/common/state/backend_bucket_direct.c > @@ -164,12 +164,12 @@ static void state_backend_bucket_direct_free(struct > > int state_backend_bucket_direct_create(struct device *dev, const char *path, > struct state_backend_storage_bucket **bucket, > - off_t offset, ssize_t max_size) > + off_t offset, ssize_t max_size, bool readonly) > { > int fd; > struct state_backend_storage_bucket_direct *direct; > > - fd = open(path, O_RDWR); > + fd = open(path, readonly ? O_RDONLY : O_RDWR); > if (fd < 0) { > dev_err(dev, "Failed to open file '%s', %d\n", path, -errno); > return -errno; > diff --git a/common/state/backend_storage.c b/common/state/backend_storage.c > index c55d22e37f70..df81902bf7be 100644 > --- a/common/state/backend_storage.c > +++ b/common/state/backend_storage.c > @@ -332,7 +332,7 @@ static int state_storage_file_buckets_init(struct state_backend_storage *storage > offset = storage->offset + n * stridesize; > ret = state_backend_bucket_direct_create(storage->dev, storage->path, > &bucket, offset, > - stridesize); > + stridesize, storage->readonly); > if (ret) { > dev_warn(storage->dev, "Failed to create direct bucket at '%s' offset %lld\n", > storage->path, (long long) offset); > diff --git a/common/state/state.c b/common/state/state.c > index a614c849c74e..cabe285fbdf3 100644 > --- a/common/state/state.c > +++ b/common/state/state.c > @@ -653,14 +653,14 @@ struct state *state_new_from_node(struct device_node *node, bool readonly) > if (ret) > goto out_release_state; > > + if (readonly) > + state_backend_set_readonly(state); > + > ret = state_storage_init(state, state->backend_path, offset, > size, stridesize, storage_type); > if (ret) > goto out_release_state; > > - if (readonly) > - state_backend_set_readonly(state); > - > ret = state_from_node(state, node, 1); > if (ret) { > goto out_release_state; > diff --git a/common/state/state.h b/common/state/state.h > index 7eb51bbdb57d..f0c5b1de4123 100644 > --- a/common/state/state.h > +++ b/common/state/state.h > @@ -226,7 +226,7 @@ void state_backend_set_readonly(struct state *state); > void state_storage_free(struct state_backend_storage *storage); > int state_backend_bucket_direct_create(struct device *dev, const char *path, > struct state_backend_storage_bucket **bucket, > - off_t offset, ssize_t max_size); > + off_t offset, ssize_t max_size, bool readonly); > int state_storage_write(struct state_backend_storage *storage, > const void * buf, ssize_t len); > int state_storage_read(struct state_backend_storage *storage, > -- > 2.30.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |