From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6AFAC54E4A for ; Wed, 6 May 2020 21:15:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 970442087E for ; Wed, 6 May 2020 21:15:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ZGHBnmoR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729809AbgEFVPd (ORCPT ); Wed, 6 May 2020 17:15:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1729688AbgEFVPc (ORCPT ); Wed, 6 May 2020 17:15:32 -0400 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB555C0610D5 for ; Wed, 6 May 2020 14:15:31 -0700 (PDT) Received: by mail-pg1-x543.google.com with SMTP id b8so1421249pgi.11 for ; Wed, 06 May 2020 14:15:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sOeNB9LcGhN4fIyKgIhyr9C2Fp97SWGNqass42XeagE=; b=ZGHBnmoRWA47sVMPMpfEE3xpKwqW46dwJF7TirSqCbZ2wnFBxSIxep+nNk0hjnWMv3 VYChVlgZYoyL6mWNVjI4oJXMHIHebQlskD7vG4WX0agEbxql04y4UlKcy7QmpFJzpTaP jrUIOU0VgL6sO/nSPEImXMnOARuCc9oLo/Yqo= 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=sOeNB9LcGhN4fIyKgIhyr9C2Fp97SWGNqass42XeagE=; b=nmLNPGn6jYeI6gSTQjqTS4KLHePCLf4uKZAr1out28/IqSoAzpTPwx4WrgZSQ3MTCY OyjYPdtbxNo4+lJKp+0K0wCI21d4U/yxrHbCU3DT7hdE3iBtUyDDqnxkTGtURa8GIP+5 UM825PEo2yVzsZ8Ick6VPrXLfZn/zpM7Bk0zzDmCQxbiWzaT8mIldXupi/NaGXCyVs1F nHDrg2RaBqo0qWgosGxo5Qvrvz6uTMrVkj4iLdhBzRdcM8A7slotamrTpidF8eZjCLLR myh7oqo6wcQWZJJjpRQhHus+KnBqRHw1siJjFp4W03V/oaoPeY7wcPF5nsyQ2J4uY2Qq 5Urw== X-Gm-Message-State: AGi0PuafFZmJ2x2HytFLq4hqFrMc68MCrvE6egNFdOy7mKBvXDbYQvSn EHGio27g9pfcAHko/6QThVkFFQ== X-Google-Smtp-Source: APiQypKmgRUjCOneWzG5vZX/d75RWcfnxHE34jEEkMp7R/IQkS1VfrFSyEBXsJX6qbQH+6arA4VbXQ== X-Received: by 2002:a63:fd03:: with SMTP id d3mr8441436pgh.6.1588799731266; Wed, 06 May 2020 14:15:31 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id y2sm2767640pfq.16.2020.05.06.14.15.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 14:15:29 -0700 (PDT) From: Kees Cook To: Pavel Tatashin Cc: Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , Jonathan Corbet , Rob Herring , Benson Leung , Enric Balletbo i Serra , Petr Mladek , Sergey Senozhatsky , Steven Rostedt , jmorris@namei.org, sashal@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v3 2/6] pstore/platform: Pass max_reason to kmesg dump Date: Wed, 6 May 2020 14:15:19 -0700 Message-Id: <20200506211523.15077-3-keescook@chromium.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200506211523.15077-1-keescook@chromium.org> References: <20200506211523.15077-1-keescook@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Pavel Tatashin Add a new member to struct pstore_info for passing information about kmesg dump maximum reason. This allows a finer control of what kmesg dumps are sent to pstore storage backends. Those backends that do not explicitly set this field (keeping it equal to 0), get the default behavior: store only Oopses and Panics, or everything if the printk.always_kmsg_dump boot param is set. Signed-off-by: Pavel Tatashin Link: https://lore.kernel.org/r/20200505154510.93506-3-pasha.tatashin@soleen.com Co-developed-by: Kees Cook Signed-off-by: Kees Cook --- fs/pstore/platform.c | 4 +++- include/linux/pstore.h | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 6fb526187953..3a3906173534 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -606,8 +606,10 @@ int pstore_register(struct pstore_info *psi) pstore_get_records(0); - if (psi->flags & PSTORE_FLAGS_DMESG) + if (psi->flags & PSTORE_FLAGS_DMESG) { + pstore_dumper.max_reason = psinfo->max_reason; pstore_register_kmsg(); + } if (psi->flags & PSTORE_FLAGS_CONSOLE) pstore_register_console(); if (psi->flags & PSTORE_FLAGS_FTRACE) diff --git a/include/linux/pstore.h b/include/linux/pstore.h index e779441e6d26..e78d5c29aa8b 100644 --- a/include/linux/pstore.h +++ b/include/linux/pstore.h @@ -96,6 +96,12 @@ struct pstore_record { * * @read_mutex: serializes @open, @read, @close, and @erase callbacks * @flags: bitfield of frontends the backend can accept writes for + * @max_reason: Used when PSTORE_FLAGS_DMESG is set. Contains the + * kmsg_dump_reason enum value. KMSG_DUMP_UNDEF means + * "use existing kmsg_dump() filtering, based on the + * printk.always_kmsg_dump boot param" (which is either + * KMSG_DUMP_OOPS when false, or KMSG_DUMP_MAX when + * tree); see printk.always_kmsg_dump for more details. * @data: backend-private pointer passed back during callbacks * * Callbacks: @@ -179,6 +185,7 @@ struct pstore_info { struct mutex read_mutex; int flags; + int max_reason; void *data; int (*open)(struct pstore_info *psi); -- 2.20.1