From patchwork Tue Nov 7 05:40:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahisa Kojima X-Patchwork-Id: 742098 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 398E920F8 for ; Tue, 7 Nov 2023 05:43:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="M9reAfX2" Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90171A3 for ; Mon, 6 Nov 2023 21:43:21 -0800 (PST) Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1cc53d0030fso42203635ad.0 for ; Mon, 06 Nov 2023 21:43:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699335801; x=1699940601; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wC9+6o/T27FauGqpCY6UW1sf3Qj4VAGRtqpDENax00E=; b=M9reAfX2vaqnuoYE+nOifienaCmhUUzgeC8hVVyxQqaV8IeLd+3/bYxGxKTnixkXLZ yuw6/UtNIR3tAIg5T2c0Yvi0aIG/K0EzaB3VWn93oasM9wTI2C2jyE+HS1FbriQwBRvq jW88tq+ahKwCzpTBG4QhBG6jraNZrwT7b8IQ/9MfHuTAnH1CjmjWdTEXBjwbsfT5fd2d p0+k/MZPqZ7lvsfrCJnFJ47njT8F7hUgekAUi4PF6emLW6BZLC3Y4ZLp7j/pAeM4I2QW n5SC2EkBWKrgGtRfAtLeSBRyS0UPWBqldRGdagFv+eyb1uv/OEsW5p5k4EztxVBkHXJO bMXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699335801; x=1699940601; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wC9+6o/T27FauGqpCY6UW1sf3Qj4VAGRtqpDENax00E=; b=WnYr2CG0KTriOJRkUy1mnDZaAz0CTG3M6xa0F8270syGkfW84OTiCcHvA6x24hCZas yHuYfx0RrfwpgrXDW0CrZ4XtgSukgPedoRRsXHq9Trri5yH5MMEEeUj7pkZO9I30uz3m 7sXwKhFK+ScEdG5zv1SxpdcYJzockMUBJgiAubPwGoquYWhCHpPZ8ynPECY5DeYymUyy uT625FSvVKoCn3Nqeevn9EFcc7bpo+WdCR/axjCZxMkm7hqOjx99CyqsQT8eRG5zsLkP WGAUi5SVLG2QxjrqNKIKvtNeeCDxZNPLy+js66fTRoCIaS/jIH+/Q+NIiZNhh8QPJL/h FzRw== X-Gm-Message-State: AOJu0YwS+xwNX8Iqa6qHav2xohULM7u0ElHv2chI4as70MwhLmzG4/lb swxY0+yW7JYlFTkAe6WlRoECir4ljn9Jo6avuqg= X-Google-Smtp-Source: AGHT+IGRYaCGocxUcM5RRfcCdHCzJSmAunVBaZlXeMoVP3uVCGHtYEKc+wGDxguUX1U58rJ1oLdyAA== X-Received: by 2002:a17:902:e851:b0:1cc:42d0:dbc5 with SMTP id t17-20020a170902e85100b001cc42d0dbc5mr2635662plg.13.1699335801028; Mon, 06 Nov 2023 21:43:21 -0800 (PST) Received: from localhost.localdomain (fp9875a45d.knge128.ap.nuro.jp. [152.117.164.93]) by smtp.gmail.com with ESMTPSA id b17-20020a170902ed1100b001cc530c495asm6752053pld.113.2023.11.06.21.43.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 21:43:20 -0800 (PST) From: Masahisa Kojima To: Ard Biesheuvel , Jens Wiklander , Jan Kiszka , Sumit Garg , linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org Cc: Ilias Apalodimas , Johan Hovold , Masahisa Kojima , Randy Dunlap , Heinrich Schuchardt , Jonathan Cameron , Jeremy Kerr , linux-efi@vger.kernel.org Subject: [PATCH v10 4/5] efivarfs: automatically update super block flag Date: Tue, 7 Nov 2023 14:40:55 +0900 Message-Id: <20231107054057.1893-5-masahisa.kojima@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107054057.1893-1-masahisa.kojima@linaro.org> References: <20231107054057.1893-1-masahisa.kojima@linaro.org> Precedence: bulk X-Mailing-List: linux-efi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 efivar operation is updated when the tee_stmm_efi module is probed. tee_stmm_efi module supports SetVariable runtime service, but user needs to manually remount the efivarfs as RW to enable the write access if the previous efivar operation does not support SerVariable and efivarfs is mounted as read-only. This commit notifies the update of efivar operation to efivarfs subsystem, then drops SB_RDONLY flag if the efivar operation supports SetVariable. Signed-off-by: Masahisa Kojima --- drivers/firmware/efi/efi.c | 6 ++++++ drivers/firmware/efi/vars.c | 8 ++++++++ fs/efivarfs/super.c | 33 +++++++++++++++++++++++++++++++++ include/linux/efi.h | 8 ++++++++ 4 files changed, 55 insertions(+) diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 53ae25bbb6ac..d2eec5ed8e5e 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -32,6 +32,7 @@ #include #include #include +#include #include @@ -187,6 +188,9 @@ static const struct attribute_group efi_subsys_attr_group = { .is_visible = efi_attr_is_visible, }; +struct blocking_notifier_head efivar_ops_nh; +EXPORT_SYMBOL_GPL(efivar_ops_nh); + static struct efivars generic_efivars; static struct efivar_operations generic_ops; @@ -427,6 +431,8 @@ static int __init efisubsys_init(void) platform_device_register_simple("efivars", 0, NULL, 0); } + BLOCKING_INIT_NOTIFIER_HEAD(&efivar_ops_nh); + error = sysfs_create_group(efi_kobj, &efi_subsys_attr_group); if (error) { pr_err("efi: Sysfs attribute export failed with error %d.\n", diff --git a/drivers/firmware/efi/vars.c b/drivers/firmware/efi/vars.c index e9dc7116daf1..f654e6f6af87 100644 --- a/drivers/firmware/efi/vars.c +++ b/drivers/firmware/efi/vars.c @@ -63,6 +63,7 @@ int efivars_register(struct efivars *efivars, const struct efivar_operations *ops) { int rv; + int event; if (down_interruptible(&efivars_lock)) return -EINTR; @@ -77,6 +78,13 @@ int efivars_register(struct efivars *efivars, __efivars = efivars; + if (efivar_supports_writes()) + event = EFIVAR_OPS_RDWR; + else + event = EFIVAR_OPS_RDONLY; + + blocking_notifier_call_chain(&efivar_ops_nh, event, NULL); + pr_info("Registered efivars operations\n"); rv = 0; out: diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c index 46c6446ec280..5751413d124c 100644 --- a/fs/efivarfs/super.c +++ b/fs/efivarfs/super.c @@ -15,11 +15,36 @@ #include #include #include +#include #include "internal.h" LIST_HEAD(efivarfs_list); +struct efivarfs_info { + struct super_block *sb; + struct notifier_block nb; +}; + +static struct efivarfs_info info; + +static int efivarfs_ops_notifier(struct notifier_block *nb, unsigned long event, + void *data) +{ + switch (event) { + case EFIVAR_OPS_RDONLY: + info.sb->s_flags |= SB_RDONLY; + break; + case EFIVAR_OPS_RDWR: + info.sb->s_flags &= ~SB_RDONLY; + break; + default: + return NOTIFY_DONE; + } + + return NOTIFY_OK; +} + static void efivarfs_evict_inode(struct inode *inode) { clear_inode(inode); @@ -311,6 +336,12 @@ static int efivarfs_fill_super(struct super_block *sb, struct fs_context *fc) if (!root) return -ENOMEM; + info.sb = sb; + info.nb.notifier_call = efivarfs_ops_notifier; + err = blocking_notifier_chain_register(&efivar_ops_nh, &info.nb); + if (err) + return err; + INIT_LIST_HEAD(&efivarfs_list); err = efivar_init(efivarfs_callback, (void *)sb, true, &efivarfs_list); @@ -348,6 +379,8 @@ static int efivarfs_init_fs_context(struct fs_context *fc) static void efivarfs_kill_sb(struct super_block *sb) { + blocking_notifier_chain_unregister(&efivar_ops_nh, &info.nb); + info.sb = NULL; kill_litter_super(sb); if (!efivar_is_available()) diff --git a/include/linux/efi.h b/include/linux/efi.h index 3db43957bf19..eacae0cf208c 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1356,6 +1356,14 @@ bool efi_config_table_is_usable(const efi_guid_t *guid, unsigned long table) umode_t efi_attr_is_visible(struct kobject *kobj, struct attribute *attr, int n); +/* + * efivar ops event type + */ +#define EFIVAR_OPS_RDONLY 0 +#define EFIVAR_OPS_RDWR 1 + +extern struct blocking_notifier_head efivar_ops_nh; + void efivars_generic_ops_register(void); void efivars_generic_ops_unregister(void);