mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Luis Henriques <luis.henriques@canonical.com>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
	kernel-team@lists.ubuntu.com
Cc: Seth Forshee <seth.forshee@canonical.com>,
	Josh Boyer <jwboyer@redhat.com>,
	Matthew Garrett <mjg59@srcf.ucam.org>,
	Seiji Aguchi <seiji.aguchi@hds.com>,
	Tony Luck <tony.luck@intel.com>,
	Matt Fleming <matt.fleming@intel.com>,
	Luis Henriques <luis.henriques@canonical.com>
Subject: [PATCH 70/72] efivars: Allow disabling use as a pstore backend
Date: Thu, 18 Apr 2013 10:16:55 +0100	[thread overview]
Message-ID: <1366276617-3553-71-git-send-email-luis.henriques@canonical.com> (raw)
In-Reply-To: <1366276617-3553-1-git-send-email-luis.henriques@canonical.com>

3.5.7.11 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Seth Forshee <seth.forshee@canonical.com>

commit ed9dc8ce7a1c8115dba9483a9b51df8b63a2e0ef upstream.

Add a new option, CONFIG_EFI_VARS_PSTORE, which can be set to N to
avoid using efivars as a backend to pstore, as some users may want to
compile out the code completely.

Set the default to Y to maintain backwards compatability, since this
feature has always been enabled until now.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Cc: Josh Boyer <jwboyer@redhat.com>
Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Seiji Aguchi <seiji.aguchi@hds.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
[ luis: adjust context ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 drivers/firmware/Kconfig   |  9 +++++++
 drivers/firmware/efivars.c | 63 +++++++++++++++-------------------------------
 2 files changed, 29 insertions(+), 43 deletions(-)

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 9b00072..898023d 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -53,6 +53,15 @@ config EFI_VARS
 	  Subsequent efibootmgr releases may be found at:
 	  <http://linux.dell.com/efibootmgr>
 
+config EFI_VARS_PSTORE
+	bool "Register efivars backend for pstore"
+	depends on EFI_VARS && PSTORE
+	default y
+	help
+	  Say Y here to enable use efivars as a backend to pstore. This
+	  will allow writing console messages, crash dumps, or anything
+	  else supported by pstore to EFI variables.
+
 config EFI_PCDP
 	bool "Console device selection via EFI PCDP or HCDP table"
 	depends on ACPI && EFI && IA64
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index bfd8f43..40d4e03 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -629,15 +629,13 @@ static struct kobj_type efivar_ktype = {
 	.default_attrs = def_attrs,
 };
 
-static struct pstore_info efi_pstore_info;
-
 static inline void
 efivar_unregister(struct efivar_entry *var)
 {
 	kobject_put(&var->kobj);
 }
 
-#ifdef CONFIG_PSTORE
+#ifdef CONFIG_EFI_VARS_PSTORE
 
 static int efi_pstore_open(struct pstore_info *psi)
 {
@@ -771,37 +769,6 @@ static int efi_pstore_erase(enum pstore_type_id type, u64 id,
 
 	return 0;
 }
-#else
-static int efi_pstore_open(struct pstore_info *psi)
-{
-	return 0;
-}
-
-static int efi_pstore_close(struct pstore_info *psi)
-{
-	return 0;
-}
-
-static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type,
-			       struct timespec *timespec,
-			       char **buf, struct pstore_info *psi)
-{
-	return -1;
-}
-
-static int efi_pstore_write(enum pstore_type_id type,
-		enum kmsg_dump_reason reason, u64 *id,
-		unsigned int part, size_t size, struct pstore_info *psi)
-{
-	return 0;
-}
-
-static int efi_pstore_erase(enum pstore_type_id type, u64 id,
-			    struct pstore_info *psi)
-{
-	return 0;
-}
-#endif
 
 static struct pstore_info efi_pstore_info = {
 	.owner		= THIS_MODULE,
@@ -813,6 +780,24 @@ static struct pstore_info efi_pstore_info = {
 	.erase		= efi_pstore_erase,
 };
 
+static void efivar_pstore_register(struct efivars *efivars)
+{
+	efivars->efi_pstore_info = efi_pstore_info;
+	efivars->efi_pstore_info.buf = kmalloc(4096, GFP_KERNEL);
+	if (efivars->efi_pstore_info.buf) {
+		efivars->efi_pstore_info.bufsize = 1024;
+		efivars->efi_pstore_info.data = efivars;
+		spin_lock_init(&efivars->efi_pstore_info.buf_lock);
+		pstore_register(&efivars->efi_pstore_info);
+	}
+}
+#else
+static void efivar_pstore_register(struct efivars *efivars)
+{
+	return;
+}
+#endif
+
 static ssize_t efivar_create(struct file *filp, struct kobject *kobj,
 			     struct bin_attribute *bin_attr,
 			     char *buf, loff_t pos, size_t count)
@@ -1188,15 +1173,7 @@ int register_efivars(struct efivars *efivars,
 	if (error)
 		unregister_efivars(efivars);
 
-	efivars->efi_pstore_info = efi_pstore_info;
-
-	efivars->efi_pstore_info.buf = kmalloc(4096, GFP_KERNEL);
-	if (efivars->efi_pstore_info.buf) {
-		efivars->efi_pstore_info.bufsize = 1024;
-		efivars->efi_pstore_info.data = efivars;
-		spin_lock_init(&efivars->efi_pstore_info.buf_lock);
-		pstore_register(&efivars->efi_pstore_info);
-	}
+	efivar_pstore_register(efivars);
 
 out:
 	kfree(variable_name);
-- 
1.8.1.2


  parent reply	other threads:[~2013-04-18  9:19 UTC|newest]

Thread overview: 77+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-18  9:15 [ 3.5.y.z extended stable ] Linux 3.5.7.11 stable review Luis Henriques
2013-04-18  9:15 ` [PATCH 01/72] ASoC: imx-ssi: Fix occasional AC97 reset failure Luis Henriques
2013-04-18  9:15 ` [PATCH 02/72] ASoC: dma-sh7760: Fix compile error Luis Henriques
2013-04-18  9:15 ` [PATCH 03/72] spi/s3c64xx: modified error interrupt handling and init Luis Henriques
2013-04-18  9:15 ` [PATCH 04/72] spi/mpc512x-psc: optionally keep PSC SS asserted across xfer segmensts Luis Henriques
2013-04-18  9:15 ` [PATCH 05/72] EISA/PCI: Fix bus res reference Luis Henriques
2013-04-18  9:15 ` [PATCH 06/72] EISA/PCI: Init EISA early, before PNP Luis Henriques
2013-04-18  9:15 ` [PATCH 07/72] mwifiex: limit channel number not to overflow memory Luis Henriques
2013-04-18  9:15 ` [PATCH 08/72] ALSA: hda - bug fix on return value when getting HDMI ELD info Luis Henriques
2013-04-18  9:15 ` [PATCH 09/72] x86: remove the x32 syscall bitmask from syscall_get_nr() Luis Henriques
2013-04-18  9:15 ` [PATCH 10/72] ixgbe: fix registration order of driver and DCA nofitication Luis Henriques
2013-04-18  9:15 ` [PATCH 11/72] Revert "drivers/rtc/rtc-at91rm9200.c: use a variable for storing IMR" Luis Henriques
2013-04-18  9:15 ` [PATCH 12/72] alpha: Add irongate_io to PCI bus resources Luis Henriques
2013-04-18  9:15 ` [PATCH 13/72] crypto: gcm - fix assumption that assoc has one segment Luis Henriques
2013-04-18  9:15 ` [PATCH 14/72] libata: Use integer return value for atapi_command_packet_set Luis Henriques
2013-04-18  9:16 ` [PATCH 15/72] libata: Set max sector to 65535 for Slimtype DVD A DS8A8SH drive Luis Henriques
2013-04-18  9:16 ` [PATCH 16/72] ata_piix: Fix DVD not dectected at some Haswell platforms Luis Henriques
2013-04-18  9:16 ` [PATCH 17/72] remoteproc: fix error path of handle_vdev Luis Henriques
2013-04-18  9:16 ` [PATCH 18/72] hwspinlock: fix __hwspin_lock_request error path Luis Henriques
2013-04-18  9:16 ` [PATCH 19/72] remoteproc: fix FW_CONFIG typo Luis Henriques
2013-04-18  9:16 ` [PATCH 20/72] powerpc: pSeries_lpar_hpte_remove fails from Adjunct partition being performed before the ANDCOND test Luis Henriques
2013-04-18  9:16 ` [PATCH 21/72] ftrace: Consistently restore trace function on sysctl enabling Luis Henriques
2013-04-18  9:16 ` [PATCH 22/72] spinlocks and preemption points need to be at least compiler barriers Luis Henriques
2013-04-18  9:16 ` [PATCH 23/72] drm/mgag200: Index 24 in extended CRTC registers is 24 in hex, not decimal Luis Henriques
2013-04-18  9:16 ` [PATCH 24/72] panic: fix a possible deadlock in panic() Luis Henriques
2013-04-18  9:16 ` [PATCH 25/72] Bluetooth: Add support for IMC Networks [13d3:3393] Luis Henriques
2013-04-18  9:16 ` [PATCH 26/72] Bluetooth: Add support for GC-WB300D PCIe [04ca:3006] to ath3k Luis Henriques
2013-04-18  9:16 ` [PATCH 27/72] Bluetooth: Add support for Foxconn / Hon Hai [0489:e04e] Luis Henriques
2013-04-18  9:16 ` [PATCH 28/72] Bluetooth: Add support for Foxconn / Hon Hai [0489:e056] Luis Henriques
2013-04-18  9:16 ` [PATCH 29/72] Bluetooth device 04ca:3008 should use ath3k Luis Henriques
2013-04-18  9:16 ` [PATCH 30/72] Bluetooth: Add support for atheros 04ca:3004 device to ath3k Luis Henriques
2013-04-18  9:16 ` [PATCH 31/72] Bluetooth: Device 0cf3:3008 should map AR 3012 Luis Henriques
2013-04-18  9:16 ` [PATCH 32/72] ALSA: hda - Enabling Realtek ALC 671 codec Luis Henriques
2013-04-18  9:16 ` [PATCH 33/72] ALSA: hda - fix typo in proc output Luis Henriques
2013-04-18  9:16 ` [PATCH 34/72] KVM: x86: fix for buffer overflow in handling of MSR_KVM_SYSTEM_TIME (CVE-2013-1796) Luis Henriques
2013-04-18  9:16 ` [PATCH 35/72] KVM: x86: Convert MSR_KVM_SYSTEM_TIME to use gfn_to_hva_cache functions (CVE-2013-1797) Luis Henriques
2013-04-22  3:54   ` Ben Hutchings
2013-04-22  8:55     ` Luis Henriques
2013-04-18  9:16 ` [PATCH 36/72] KVM: Fix bounds checking in ioapic indirect register reads (CVE-2013-1798) Luis Henriques
2013-04-18  9:16 ` [PATCH 37/72] rt2x00: rt2x00pci_regbusy_read() - only print register access failure once Luis Henriques
2013-04-18  9:16 ` [PATCH 38/72] can: gw: use kmem_cache_free() instead of kfree() Luis Henriques
2013-04-18  9:16 ` [PATCH 39/72] tracing: Fix double free when function profile init failed Luis Henriques
2013-04-18  9:16 ` [PATCH 40/72] r8169: fix auto speed down issue Luis Henriques
2013-04-18  9:16 ` [PATCH 41/72] x86: Fix rebuild with EFI_STUB enabled Luis Henriques
2013-04-18  9:16 ` [PATCH 42/72] msi-wmi: Fix memory leak Luis Henriques
2013-04-18  9:16 ` [PATCH 43/72] DRM/i915: Add QUIRK_INVERT_BRIGHTNESS for NCR machines Luis Henriques
2013-04-18  9:16 ` [PATCH 44/72] drm/i915: add quirk to invert brightness on eMachines G725 Luis Henriques
2013-04-18  9:16 ` [PATCH 45/72] drm/i915: add quirk to invert brightness on eMachines e725 Luis Henriques
2013-04-18  9:16 ` [PATCH 46/72] drm/i915: add quirk to invert brightness on Packard Bell NCL20 Luis Henriques
2013-04-18  9:16 ` [PATCH 47/72] block: avoid using uninitialized value in from queue_var_store Luis Henriques
2013-04-18  9:16 ` [PATCH 48/72] ALSA: usb-audio: fix endianness bug in snd_nativeinstruments_* Luis Henriques
2013-04-18  9:16 ` [PATCH 49/72] PM / reboot: call syscore_shutdown() after disable_nonboot_cpus() Luis Henriques
2013-04-18  9:16 ` [PATCH 50/72] ASoC: wm8903: Fix the bypass to HP/LINEOUT when no DAC or ADC is running Luis Henriques
2013-04-18  9:16 ` [PATCH 51/72] drm/i915: Use the correct size of the GTT for placing the per-process entries Luis Henriques
2013-04-18  9:16 ` [PATCH 52/72] GFS2: Fix unlock of fcntl locks during withdrawn state Luis Henriques
2013-04-18  9:16 ` [PATCH 53/72] libsas: fix handling vacant phy in sas_set_ex_phy() Luis Henriques
2013-04-18  9:16 ` [PATCH 54/72] sched_clock: Prevent 64bit inatomicity on 32bit systems Luis Henriques
2013-04-18  9:16 ` [PATCH 55/72] x86, mm, paravirt: Fix vmalloc_fault oops during lazy MMU updates Luis Henriques
2013-04-18  9:16 ` [PATCH 56/72] x86, mm: Patch out arch_flush_lazy_mmu_mode() when running on bare metal Luis Henriques
2013-04-18  9:16 ` [PATCH 57/72] cifs: Allow passwords which begin with a delimitor Luis Henriques
2013-04-18  9:16 ` [PATCH 58/72] target: Fix incorrect fallthrough of ALUA Standby/Offline/Transition CDBs Luis Henriques
2013-04-18  9:16 ` [PATCH 59/72] udl: handle EDID failure properly Luis Henriques
2013-04-18  9:16 ` [PATCH 60/72] tracing: Fix possible NULL pointer dereferences Luis Henriques
2013-04-18  9:16 ` [PATCH 61/72] ftrace: Move ftrace_filter_lseek out of CONFIG_DYNAMIC_FTRACE section Luis Henriques
2013-04-18  9:16 ` [PATCH 62/72] Btrfs: make sure nbytes are right after log replay Luis Henriques
2013-04-18  9:16 ` [PATCH 63/72] kobject: fix kset_find_obj() race with concurrent last kobject_put() Luis Henriques
2013-04-18  9:16 ` [PATCH 64/72] vfs: Revert spurious fix to spinning prevention in prune_icache_sb Luis Henriques
2013-04-18  9:16 ` [PATCH 65/72] kref: Implement kref_get_unless_zero v3 Luis Henriques
2013-04-18  9:16 ` [PATCH 66/72] mtdchar: fix offset overflow detection Luis Henriques
2013-04-22  3:56   ` Ben Hutchings
2013-04-22  8:51     ` Luis Henriques
2013-04-18  9:16 ` [PATCH 67/72] fbcon: fix locking harder Luis Henriques
2013-04-18  9:16 ` [PATCH 68/72] hrtimer: Don't reinitialize a cpu_base lock on CPU_UP Luis Henriques
2013-04-18  9:16 ` [PATCH 69/72] ARM: Do 15e0d9e37c (ARM: pm: let platforms select cpu_suspend support) properly Luis Henriques
2013-04-18  9:16 ` Luis Henriques [this message]
2013-04-18  9:16 ` [PATCH 71/72] efivars: Add module parameter to disable use as a pstore backend Luis Henriques
2013-04-18  9:16 ` [PATCH 72/72] efivars: Fix check for CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE Luis Henriques

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1366276617-3553-71-git-send-email-luis.henriques@canonical.com \
    --to=luis.henriques@canonical.com \
    --cc=jwboyer@redhat.com \
    --cc=kernel-team@lists.ubuntu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=matt.fleming@intel.com \
    --cc=mjg59@srcf.ucam.org \
    --cc=seiji.aguchi@hds.com \
    --cc=seth.forshee@canonical.com \
    --cc=stable@vger.kernel.org \
    --cc=tony.luck@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®