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.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 77A59C433E0 for ; Tue, 9 Jun 2020 07:15:17 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1E534207F9 for ; Tue, 9 Jun 2020 07:15:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dLt+OcvG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E534207F9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49h1bl47LZzDqq8 for ; Tue, 9 Jun 2020 17:15:15 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::541; helo=mail-pg1-x541.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=dLt+OcvG; dkim-atps=neutral Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49h0JN0cPNzDqQv for ; Tue, 9 Jun 2020 16:16:52 +1000 (AEST) Received: by mail-pg1-x541.google.com with SMTP id p21so9819791pgm.13 for ; Mon, 08 Jun 2020 23:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8Oa+WR6zHDc4KFducblu1u/8O5kXvk2yTl9b+EY3rFY=; b=dLt+OcvG0BsesaJEI9fkNJW8KCYq46o4MtUkeTGOQQDV80LiV/w+K0cJpy4KSD/pmM n7kozvB0kFLhPymFTQruXAzX/t79MMIfBKz2fkFW4p1+C/jQTwoKxZG5EPs2+zbnlB9K 25DmVawhfKEzYhHBk8CFF48oUqTuerDJFAYCp43+9pull805H0UWYF6X+t/oXvSDV/k2 v/D+7FO4Uco8YW7Oes0jOCqUjnkZShcDGhHSyi9tUkWXzP3S21mxbLl4TL93niCEAnIS YVvrVRFQGCmUoIYdgsTIdfCmEcesGXtM5BsNDNRxJNm9iLKe++iFzsHULxdl0oIZ6g0K 7Wcg== 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=8Oa+WR6zHDc4KFducblu1u/8O5kXvk2yTl9b+EY3rFY=; b=t3YDfn+OpS7of2CZm1a0z+/unRM1K3N59uFB0puCuxKpadQuxRvYUREbDkR3HONSdY J0iC1DZ5+u0wtuzp+8kKayy0PeHzJGY8ctB5pUE84D9ityWGV5Nyj4+YBeYFbJNFOiXE eWl8o3H/uKE2nxkQZGilRaNjqiwD3anuEKie5OkwIlFyq0mWvjFbFVaP5VBAxE1U0MqH /Qe2nkrOPiqLE8MRDymP1MpdxogHTigGM49kqoC2KibW380IDTAn7Hp0OL3X10vbR0mX pEdSKuil347sIbVkN64HLX3cJ5CGMj+8a23bq8bWLRqW13PSUzmO802l7ektcp3FHFvm 4+uw== X-Gm-Message-State: AOAM531AtaiMV4zpu3A+MvckQnU4YRfCg7dVrVW0Zh4pgqhLCCZSjXFA 2CJOVcTWnV7+sueVjgj0WKk= X-Google-Smtp-Source: ABdhPJweoG11SKkF27ifmX9RRnl9Hy38TVjKFzQ1+X0+VV7SAA0CAzWbhK3u+0fsI97+ebnT3/Pp0g== X-Received: by 2002:a63:e550:: with SMTP id z16mr22299297pgj.92.1591683410082; Mon, 08 Jun 2020 23:16:50 -0700 (PDT) Received: from bobo.ozlabs.ibm.com ([61.68.71.10]) by smtp.gmail.com with ESMTPSA id k12sm7567981pgm.11.2020.06.08.23.16.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 23:16:49 -0700 (PDT) From: Nicholas Piggin To: Subject: [PATCH 3/7] powerpc/security: make display of branch cache flush more consistent Date: Tue, 9 Jun 2020 16:16:27 +1000 Message-Id: <20200609061631.844390-4-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200609061631.844390-1-npiggin@gmail.com> References: <20200609061631.844390-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org, Nicholas Piggin Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Make the count-cache and link-stack messages look the same Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/security.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kernel/security.c b/arch/powerpc/kernel/security.c index 28f4cb062f69..659ef6a92bb9 100644 --- a/arch/powerpc/kernel/security.c +++ b/arch/powerpc/kernel/security.c @@ -430,7 +430,7 @@ device_initcall(stf_barrier_debugfs_init); static void no_count_cache_flush(void) { count_cache_flush_type = BRANCH_CACHE_FLUSH_NONE; - pr_info("count-cache-flush: software flush disabled.\n"); + pr_info("count-cache-flush: flush disabled.\n"); } static void toggle_branch_cache_flush(bool enable) @@ -446,7 +446,7 @@ static void toggle_branch_cache_flush(bool enable) patch_instruction_site(&patch__call_kvm_flush_link_stack, ppc_inst(PPC_INST_NOP)); #endif - pr_info("link-stack-flush: software flush disabled.\n"); + pr_info("link-stack-flush: flush disabled.\n"); link_stack_flush_type = BRANCH_CACHE_FLUSH_NONE; no_count_cache_flush(); return; @@ -475,13 +475,13 @@ static void toggle_branch_cache_flush(bool enable) if (!security_ftr_enabled(SEC_FTR_BCCTR_FLUSH_ASSIST)) { count_cache_flush_type = BRANCH_CACHE_FLUSH_SW; - pr_info("count-cache-flush: full software flush sequence enabled.\n"); + pr_info("count-cache-flush: software flush enabled.\n"); return; } patch_instruction_site(&patch__flush_count_cache_return, ppc_inst(PPC_INST_BLR)); count_cache_flush_type = BRANCH_CACHE_FLUSH_HW; - pr_info("count-cache-flush: hardware assisted flush sequence enabled\n"); + pr_info("count-cache-flush: hardware flush enabled.\n"); } void setup_count_cache_flush(void) -- 2.23.0