From patchwork Fri Nov 4 14:22:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Gonda X-Patchwork-Id: 15596 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp435892wru; Fri, 4 Nov 2022 07:26:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6vVvIX/ioC2/KAckCoHYMLoscqeH9uL1tw5XKtmw39na4hoHpzKPsLapWjgk6v58IGsyXw X-Received: by 2002:a17:906:c44:b0:7ae:749:1659 with SMTP id t4-20020a1709060c4400b007ae07491659mr13463002ejf.759.1667571968517; Fri, 04 Nov 2022 07:26:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667571968; cv=none; d=google.com; s=arc-20160816; b=yqtCZQ2f8aLwNR7myN5KEWl+mT3TG+LqqjFBIXouKY82zvzFwipzkBaRiGeO0xmk0i SUL2klCZUE0MGqNuwjwPwdvNX2kkNI9GVGh2caFf0MI+sMOID4/u9u4nUbKCUQeH+Spy YQMqQVIxdBV/f+8r1s5qdLih7tKAOe4VhHzalwmZcXTXfvWo7OSmG1nPW6JQph/oQ37V UidPF9xSXFH8wZsHM18UKhnTM37ZCGYG+FrrGEUIZaXUTzTnqolc7So56guP+Bm9SQ8/ po2t06w/nCqJXSjkfklbanYWPC9QEUK2lPSxPMWs0o9vs5akILbLAcOqC0vDOeTZYGHm XK9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:mime-version:message-id:date :dkim-signature; bh=GJuNcXrLdCJM1KRVKwlMJhT9Ctl3812baupy3AQpKHQ=; b=NsWMe8FItzc/na5yuHfg5IlQiCYrxX0QzxuqAQOJIyKDcFnDWZ3iPFdetUKg68HpfP nzksXU6vysnP4L9z0RI9gZaTUeAtyEXHnTOHYQR0JR3u6ULyYLHiIygrhZlADVhGlI56 d+rQ52wgHC9EKh7odlVkN+I2qBFpqslEjPtX9NbBPbem8MKnjmF2y6dsghFOSFdX7i/t CklO3+5lxx+SaSHGYTuJ6yq8bbNXhQEiYBGkCJbRlGspwvR2TsBhA+irlaka8nl9Rwu1 rjPpCfDfgDxGP33Rs05lPtvZXO8yr1TsK0fnq+v0sOcz28EVF6xTyxsPPu3hSog6XJYp o38Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=NvxTKOjy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x13-20020aa7dacd000000b004605f289f68si4302569eds.158.2022.11.04.07.25.43; Fri, 04 Nov 2022 07:26:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=NvxTKOjy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231854AbiKDOYc (ORCPT + 99 others); Fri, 4 Nov 2022 10:24:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232042AbiKDOYB (ORCPT ); Fri, 4 Nov 2022 10:24:01 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7FD631F85 for ; Fri, 4 Nov 2022 07:22:25 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id a33-20020a630b61000000b00429d91cc649so2595963pgl.8 for ; Fri, 04 Nov 2022 07:22:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=GJuNcXrLdCJM1KRVKwlMJhT9Ctl3812baupy3AQpKHQ=; b=NvxTKOjydC+TNUTauQOMqIoVQIhy8wyIsJQZgTbtv4gowJBgmNmHsQZ2uQT4jOpJpu cgOLSN/XknwgE8zS2VEZ6Xu/+QDoiwpwedkgzSP6I7VtqFN8rdxNtywdyqbQfWyTNp+E C5P0a/SDyqh4CoDhXiVBzpx0c2rYGpOCfTx2GN8h4yZSn0IraIJLVDAau3g1QCNC3HQ+ uNZ4jeFwSaeob8aFCnBxhvSDhs3aTJo+G/CSqUNHIEj63GVy1z6xDDJEP5Gb3P80gd1r iccq3ssoZuxqPZKTFhBtHpU6nlFX8HZUt3vCeMd36Uv5yqXvQBwioLA3HdIbDntifi9Y 6lVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=GJuNcXrLdCJM1KRVKwlMJhT9Ctl3812baupy3AQpKHQ=; b=XEuXVVgJElxMYmMMy1H4FP6kYzYYojTXP3Mkn7/eT/qgTyqW3OBq88YuS1Wuft7+Gx DepQmK0OBknJz7U+wtAh0oxfTQ8KduDuHcNYQZJWi/kdkwS3U49UlbEppLvppyTjiKhC 2vya/hsoISP9oPIcP/fAeVIp0bj+Z34WE53KeKFapcUG8PSThvSn41QZolG4R5StH54T w0r5UrTPrS6w0c3oYC1qpoU4Srs75JPioe/i9ViEI734XrcLl82Qhds9u7wY9hO64U/v SsbB0xZyyiBlL4WWJbj7y0AU/zEX0hGSOUxgi0edRmcgIqW/UWS7qZEgq/2McmpbEr5q b3rg== X-Gm-Message-State: ACrzQf2J3LUhe2fEDLqbEiTv9YSP+Bx1QBr9qVGtNEEc0xhUnJMUwfC1 4Zi81pgcxfgcbSY7eHHnj2kWtlsViWs= X-Received: from pgonda1.kir.corp.google.com ([2620:0:1008:11:45e5:86a8:76c:1f1c]) (user=pgonda job=sendgmr) by 2002:a05:6a00:22cf:b0:56d:1c55:45d0 with SMTP id f15-20020a056a0022cf00b0056d1c5545d0mr33328315pfj.54.1667571744258; Fri, 04 Nov 2022 07:22:24 -0700 (PDT) Date: Fri, 4 Nov 2022 07:22:20 -0700 Message-Id: <20221104142220.469452-1-pgonda@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog Subject: [PATCH V2] KVM: SVM: Only dump VSMA to klog for debugging From: Peter Gonda To: jarkko@kernel.org Cc: Peter Gonda , Sean Christopherson , Harald Hoyer , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748575943954381723?= X-GMAIL-MSGID: =?utf-8?q?1748575943954381723?= Explicitly print the VMSA dump at KERN_DEBUG log level, KERN_CONT uses KERNEL_DEFAULT if the previous log line has a newline, i.e. if there's nothing to continuing, and as a result the VMSA gets dumped when it shouldn't. The KERN_CONT documentation says it defaults back to KERNL_DEFAULT if the previous log line has a newline. So switch from KERN_CONT to print_hex_dump_debug(). Jarkko pointed this out in reference to the original patch. See: https://lore.kernel.org/all/YuPMeWX4uuR1Tz3M@kernel.org/ print_hex_dump(KERN_DEBUG, ...) was pointed out there, but print_hex_dump_debug() should similar. Fixes: 6fac42f127b8 ("KVM: SVM: Dump Virtual Machine Save Area (VMSA) to klog") Signed-off-by: Peter Gonda Reviewed-by: Sean Christopherson Cc: Jarkko Sakkinen Cc: Harald Hoyer Cc: Paolo Bonzini Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Cc: "H. Peter Anvin" Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org Acked-by: Jarkko Sakkinen --- arch/x86/kvm/svm/sev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index c0c9ed5e279cb..9b8db157cf773 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -605,7 +605,7 @@ static int sev_es_sync_vmsa(struct vcpu_svm *svm) save->dr6 = svm->vcpu.arch.dr6; pr_debug("Virtual Machine Save Area (VMSA):\n"); - print_hex_dump(KERN_CONT, "", DUMP_PREFIX_NONE, 16, 1, save, sizeof(*save), false); + print_hex_dump_debug("", DUMP_PREFIX_NONE, 16, 1, save, sizeof(*save), false); return 0; }