Received: by 2002:a25:1104:0:0:0:0:0 with SMTP id 4csp1013609ybr; Sat, 23 May 2020 04:19:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwwD/w3qGjiw3PX79Qx0Aw+3VFFzkY0fezlXKgKlXSp9eOV3jDcynfKPks0lfjIAFNx855B X-Received: by 2002:a05:6402:1cad:: with SMTP id cz13mr6820669edb.56.1590232765298; Sat, 23 May 2020 04:19:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590232765; cv=none; d=google.com; s=arc-20160816; b=czDqsTx7IJUjFEIbCajrcRVQkjCREjIGydHMmBGDgYGcPH49DjCyVLeWAmRDpqv+aE m5Fshvn9mT70C+qXOvsc9oRjFZXshzKhZdfaIuQ9Og7I6IHXODU6/+9pHakErSqf6OBv dAXxmUQfEG5+8AAeticoRuAer/xO3Wz+zNqNjCv2YqDHuMijntRcDygbw2tkDRSNG4lX YDLtpLvJASbUN9cSLEOso+mUzhSE57Sr7Q+CpY5yM6ZuEogIM/WEwj501DkOPNpD6dZv DA95uZhytljU2UF/EuW9yWKtOZUgEGtt/mQjqehJZ6riu5FG8X1BfE7HSdBgt+GIa3EQ BdJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:dkim-signature; bh=FwT5huIaDxJcSkz6pWfGor2JZB0f356RjFSp2AGFj5M=; b=xFCqJGDyuZZU7Pr82vg7l5nLN9qjO6vuwce+x5BcXlwlFaR9VmxDn4lV9rC0Dlo0Tg KNISOjNpwso5bKRKZcHzv6LDfvqlfCpKoGR8hg4zFDsqNSnM3bPfz0VRAXyNGwiIHd93 GffBQqFol/kVXzi3eAUvX11ulBkBaswyz8Xz/CIYy3PnnUxYPkoMhZYC6SBbzEiIRzyX 4gm5kpuC6UEhoK9Qc3CPmPa2iD1h8fIfp1fB93gFIBhXhrvsVwmg9alN9/PpXwpfRqnp 1gsjcK/Pc1Uw2OXKRz8S53vzE47fgptFTX7DEJkMKIIGQIU9eHijKkPLDlc3hFz+jLnj WL8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ellerman.id.au header.s=201909 header.b=F5eKxJj+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n4si6675761eje.295.2020.05.23.04.18.47; Sat, 23 May 2020 04:19:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ellerman.id.au header.s=201909 header.b=F5eKxJj+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387741AbgEWLQP (ORCPT + 99 others); Sat, 23 May 2020 07:16:15 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:52279 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728006AbgEWLQP (ORCPT ); Sat, 23 May 2020 07:16:15 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49TglX39TCz9sRK; Sat, 23 May 2020 21:16:08 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ellerman.id.au; s=201909; t=1590232573; bh=XdJ4GsUtyCeZgpbb9v8CA5sMkmlRwqHwNrM4xAXS61k=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=F5eKxJj+Hlk8PWkkgX8L7qfqOyREq18UpzzW44RqnKPs0k1u3h76rDnoVchsW4VM+ MxQ+0faOCx2NxDdKdOSyGLXnN1BXavZQ4kLw+q+SzvtRFC8KDpJscsm/MZ8RXvZMli Uik9xq6s4cn6WDZB8RPYvlPHJT9+AX4PoHzD6RdUnV2nqz75vbevwWu8uL+pnDNM+6 HusW3zRwShhbSgnylftW/6wvDZ1VPVzMrZC88gNUrOk09sKOUTn0KYLirLPXVJPpxe muBDDnC/UwyxIqgqk0NEPRmFf7T7Cj4eCZitvEX+FQehuYA+CSviqkgXAzKN7rrxc8 ZS3RyK3piRHSw== From: Michael Ellerman To: Kees Cook , Pavel Tatashin Cc: Kees Cook , Petr Mladek , Anton Vorontsov , Colin Cross , Tony Luck , Jonathan Corbet , Benson Leung , Rob Herring , Benjamin Herrenschmidt , Paul Mackerras , Enric Balletbo i Serra , Sergey Senozhatsky , Steven Rostedt , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v4 1/6] printk: Collapse shutdown types into a single dump reason In-Reply-To: <20200515184434.8470-2-keescook@chromium.org> References: <20200515184434.8470-1-keescook@chromium.org> <20200515184434.8470-2-keescook@chromium.org> Date: Sat, 23 May 2020 21:16:30 +1000 Message-ID: <87pnaugaup.fsf@mpe.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Kees Cook writes: > To turn the KMSG_DUMP_* reasons into a more ordered list, collapse > the redundant KMSG_DUMP_(RESTART|HALT|POWEROFF) reasons into > KMSG_DUMP_SHUTDOWN. The current users already don't meaningfully > distinguish between them, so there's no need to, as discussed here: > https://lore.kernel.org/lkml/CA+CK2bAPv5u1ih5y9t5FUnTyximtFCtDYXJCpuyjOyHNOkRdqw@mail.gmail.com/ > > Signed-off-by: Kees Cook > --- > arch/powerpc/kernel/nvram_64.c | 4 +--- > fs/pstore/platform.c | 8 ++------ > include/linux/kmsg_dump.h | 4 +--- > kernel/reboot.c | 6 +++--- > 4 files changed, 7 insertions(+), 15 deletions(-) > > diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c > index fb4f61096613..0cd1c88bfc8b 100644 > --- a/arch/powerpc/kernel/nvram_64.c > +++ b/arch/powerpc/kernel/nvram_64.c > @@ -655,9 +655,7 @@ static void oops_to_nvram(struct kmsg_dumper *dumper, > int rc = -1; > > switch (reason) { > - case KMSG_DUMP_RESTART: > - case KMSG_DUMP_HALT: > - case KMSG_DUMP_POWEROFF: > + case KMSG_DUMP_SHUTDOWN: > /* These are almost always orderly shutdowns. */ > return; > case KMSG_DUMP_OOPS: Acked-by: Michael Ellerman (powerpc) cheers