Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jC5Ir-0002eh-HM for mharc-grub-devel@gnu.org; Wed, 11 Mar 2020 13:37:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33403) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC5Io-0002ZK-Ln for grub-devel@gnu.org; Wed, 11 Mar 2020 13:37:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jC5Im-0000Dh-Sk for grub-devel@gnu.org; Wed, 11 Mar 2020 13:37:54 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:44108) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jC5Im-0000DB-Mc for grub-devel@gnu.org; Wed, 11 Mar 2020 13:37:52 -0400 Received: by mail-pg1-x542.google.com with SMTP id 37so1569068pgm.11 for ; Wed, 11 Mar 2020 10:37:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=delphix.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BeYZctyH8t/Dn3/6SOUPX0A0qciPet3QsnVESOKqRs4=; b=HnTLs1NlzXJE6Vdo03P/L6Gv79t90LK1l3+1wtbBXyP6tLLPLcDijaokL9z1dE15WU Msldxk9gsvp6O0iX9EmtI4yVAqS8Xo/eZw8bAc+klF2V+EDdNXL2f0vXQl7ToQ/bYoZN sIYa5uCjoDh3oWDOHTNBspBZTcPFU7X/lAmP4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BeYZctyH8t/Dn3/6SOUPX0A0qciPet3QsnVESOKqRs4=; b=cXzeMzSahk0SRMojGBh1cL3kEvxkQm6vF7G8WmkVYVQxmWuvYQoXrc4xDe9R5S8ogE r+uIKXAVywCkBFsju9j1J/jc7SKkdFlwhgKlQmF5DQ8nh6DiKvyDeQ9Sy4yDTPevB/73 u7OWnkHm00oc6mZbtrPRk66r4I9jD6yBtVMQ9bTj4oZqiczsmgvJco/YRXhZMn1Fm4UK wnRPy6litR36xchDt+7X4+qpCHnnFdGgzQoD8/IXzDuw29iZlXetgxzbipJO4Ays5l/h voitdC30aXNVpDCLcCJ7TrXDfgN64FmMOX++oubsA/AJiWAfYhdcm4kJhHnXT/XP7IeA U1Og== X-Gm-Message-State: ANhLgQ2EovsAAWtMYvNTXq5MVTTu0nUc6RWocgtAhAe9SKT2V8ha+BiA 2OvEAsOwLyZ9t1oWfa5yp4cR3y5gctE1w7x/zQcuCXLRGvWUCTjHlfuDLje6xytPiT1hjP1aYgz bXWpS7KpfzbCQAmVK9r1bL033msigaSkmKb3z66RrCw/ZkJN/9w6YFw== X-Google-Smtp-Source: ADFU+vsSItjNhhbC3N3c7XB8JYDtD8L9gY3D8uo6vuA9OOFdObxWiXh5UKJo+KemyL5mnwSGRxOsgw== X-Received: by 2002:a63:9c4:: with SMTP id 187mr3740699pgj.389.1583948271114; Wed, 11 Mar 2020 10:37:51 -0700 (PDT) Received: from localhost.localdomain (c-73-162-153-225.hsd1.ca.comcast.net. [73.162.153.225]) by smtp.gmail.com with ESMTPSA id b3sm6342060pjq.38.2020.03.11.10.37.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Mar 2020 10:37:50 -0700 (PDT) From: Paul Dagnelie To: grub-devel@gnu.org Cc: mahrens@delphix.com, behlendorf1@llnl.gov, george.wilson@delphix.com, sebastien.roy@delphix.com, Paul Dagnelie Subject: [PATCH 4/7] Use envblk file and fs functions to implement reading the grubenv file from special FS regions Date: Wed, 11 Mar 2020 10:37:12 -0700 Message-Id: <20200311173715.22274-5-pcd@delphix.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20200311173715.22274-1-pcd@delphix.com> References: <20200311173715.22274-1-pcd@delphix.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::542 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2020 17:37:56 -0000 This patch modifies the loadenv command to take advantage of the new envblock functions provided by a previous patch. These functions will be used instead of the normal file-based functions if the boot filesystem is detected to support them. There is also a config variable, grubenv_src, that can be used to force the file or envblock logic to be used. Signed-off-by: Paul Dagnelie --- grub-core/commands/loadenv.c | 122 ++++++++++++++++++++++++++++++----- include/grub/lib/envblk.h | 2 + 2 files changed, 109 insertions(+), 15 deletions(-) diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c index 3fd664aac..66f5345ec 100644 --- a/grub-core/commands/loadenv.c +++ b/grub-core/commands/loadenv.c @@ -79,6 +79,94 @@ open_envblk_file (char *filename, return file; } +static grub_file_t +open_envblk_block (grub_fs_t fs, grub_device_t dev, enum grub_file_type type) +{ + if (fs->fs_envblk_open) + return grub_file_envblk_open(fs, dev, type); + return NULL; +} + +static grub_file_t +open_envblk (grub_extcmd_context_t ctxt, enum grub_file_type type) +{ + struct grub_arg_list *state = ctxt->state; + grub_file_t file = NULL; + grub_device_t device = NULL; + const char *source; + grub_fs_t fs = NULL; + char *filename = state[0].set ? state[0].arg : NULL; + + source = grub_env_get ("grubenv_src"); + if (! source || ! grub_strcmp (source, GRUB_ENVBLK_SRC_BLK)) + { + char *device_name; + const char *prefix; + grub_dprintf ("loadenv", "checking for envblk\n"); + + prefix = grub_env_get ("prefix"); + if (! prefix) + { + grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("variable `%s' isn't set"), "prefix"); + return NULL; + } + + device_name = grub_file_get_device_name (prefix); + if (grub_errno) + return NULL; + + device = grub_device_open (device_name); + if (! device) + return NULL; + + fs = grub_fs_probe (device); + if (! fs) { + grub_device_close (device); + return NULL; + } + + /* We have to reopen the device here because it was closed in grub_fs_probe. */ + device = grub_device_open (device_name); + grub_free (device_name); + if (! device) + return NULL; + + } + if (! source) + { + if (fs->fs_envblk_open) + { + source = GRUB_ENVBLK_SRC_BLK; + grub_dprintf ("loadenv", "envblk support detected\n"); + } + else + { + source = GRUB_ENVBLK_SRC_FILE; + grub_dprintf ("loadenv", "envblk support not detected\n"); + } + } + + if (! grub_strcmp (source, GRUB_ENVBLK_SRC_FILE)) + { + if (device) + grub_device_close (device); + file = open_envblk_file (filename, type); + + if (! file) + return NULL; + } + else if (! grub_strcmp (source, GRUB_ENVBLK_SRC_BLK)) + { + file = open_envblk_block (fs, device, type); + if (! file) + { + grub_device_close (device); + return NULL; + } + } + return file; +} + static grub_envblk_t read_envblk_file (grub_file_t file) { @@ -165,11 +253,10 @@ grub_cmd_load_env (grub_extcmd_context_t ctxt, int argc, char **args) whitelist.len = argc; whitelist.list = args; - /* state[0] is the -f flag; state[1] is the --skip-sig flag */ - file = open_envblk_file ((state[0].set) ? state[0].arg : 0, - GRUB_FILE_TYPE_LOADENV - | (state[1].set - ? GRUB_FILE_TYPE_SKIP_SIGNATURE : GRUB_FILE_TYPE_NONE)); + file = open_envblk (ctxt, GRUB_FILE_TYPE_LOADENV + | (state[1].set + ? GRUB_FILE_TYPE_SKIP_SIGNATURE : + GRUB_FILE_TYPE_NONE)); if (! file) return grub_errno; @@ -204,10 +291,9 @@ grub_cmd_list_env (grub_extcmd_context_t ctxt, grub_file_t file; grub_envblk_t envblk; - file = open_envblk_file ((state[0].set) ? state[0].arg : 0, - GRUB_FILE_TYPE_LOADENV - | (state[1].set - ? GRUB_FILE_TYPE_SKIP_SIGNATURE : GRUB_FILE_TYPE_NONE)); + file = open_envblk (ctxt, GRUB_FILE_TYPE_LOADENV + | (state[1].set + ? GRUB_FILE_TYPE_SKIP_SIGNATURE : GRUB_FILE_TYPE_NONE)); if (! file) return grub_errno; @@ -379,7 +465,6 @@ save_env_read_hook (grub_disk_addr_t sector, unsigned offset, unsigned length, static grub_err_t grub_cmd_save_env (grub_extcmd_context_t ctxt, int argc, char **args) { - struct grub_arg_list *state = ctxt->state; grub_file_t file; grub_envblk_t envblk; struct grub_cmd_save_env_ctx ctx = { @@ -390,9 +475,8 @@ grub_cmd_save_env (grub_extcmd_context_t ctxt, int argc, char **args) if (! argc) return grub_error (GRUB_ERR_BAD_ARGUMENT, "no variable is specified"); - file = open_envblk_file ((state[0].set) ? state[0].arg : 0, - GRUB_FILE_TYPE_SAVEENV - | GRUB_FILE_TYPE_SKIP_SIGNATURE); + file = open_envblk (ctxt, GRUB_FILE_TYPE_SAVEENV + | GRUB_FILE_TYPE_SKIP_SIGNATURE); if (! file) return grub_errno; @@ -409,7 +493,7 @@ grub_cmd_save_env (grub_extcmd_context_t ctxt, int argc, char **args) if (! envblk) goto fail; - if (check_blocklists (envblk, ctx.head, file)) + if (! grub_file_envblk (file) && check_blocklists (envblk, ctx.head, file)) goto fail; while (argc) @@ -432,7 +516,15 @@ grub_cmd_save_env (grub_extcmd_context_t ctxt, int argc, char **args) args++; } - write_blocklists (envblk, ctx.head, file); + if (grub_file_envblk (file)) + { + grub_file_seek (file, 0); + file->fs->fs_envblk_write (file, grub_envblk_buffer (envblk), grub_envblk_size (envblk)); + } + else + { + write_blocklists (envblk, ctx.head, file); + } fail: if (envblk) diff --git a/include/grub/lib/envblk.h b/include/grub/lib/envblk.h index c3e655921..287c87105 100644 --- a/include/grub/lib/envblk.h +++ b/include/grub/lib/envblk.h @@ -21,6 +21,8 @@ #define GRUB_ENVBLK_SIGNATURE "# GRUB Environment Block\n" #define GRUB_ENVBLK_DEFCFG "grubenv" +#define GRUB_ENVBLK_SRC_BLK "block" +#define GRUB_ENVBLK_SRC_FILE "file" #ifndef ASM_FILE -- 2.19.0