From patchwork Wed Apr 22 09:56:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 227091 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 45F4DC5518A for ; Wed, 22 Apr 2020 10:51:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1928F2076E for ; Wed, 22 Apr 2020 10:51:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587552667; bh=fL9fnzJr3b736mjTeKAqS6MF9bED42tZ1GIzikhz2JQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TetMDqCag5m3HW4ZQQvS9J6t/BlexGie89iIi4FEdqutf9mz8yGjugmkVzwGnGFIw QEbhwteh7clYPhOazyPwXNXljH5psSrScjbe7dIwsgWFARAp0v83O5wcg7zf4NGvnW OQqbJmqrCsQsPTfxSvNXmPbnr8w6zN5xRhJEiH9c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727042AbgDVKLW (ORCPT ); Wed, 22 Apr 2020 06:11:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:42806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729160AbgDVKLS (ORCPT ); Wed, 22 Apr 2020 06:11:18 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2592920776; Wed, 22 Apr 2020 10:11:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587550277; bh=fL9fnzJr3b736mjTeKAqS6MF9bED42tZ1GIzikhz2JQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SACM/CRTzRQ3+C7PXw2r++mrE9MEW53kDaP1TWkN2w5Ntt9AX70Kk+o6D6L5YKFX5 4BxAq9TJzfUmu/nX6fWpnLrkFL2SGq2DCIJwNVQmK2bcotyrSZO613w3hWvrexbRlh LXSZXN4ERqafWAx7eXQuLBfuV1nlzuVpy9njX8zA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michael Mueller , Heiko Carstens , Vasily Gorbik Subject: [PATCH 4.14 081/199] s390/diag: fix display of diagnose call statistics Date: Wed, 22 Apr 2020 11:56:47 +0200 Message-Id: <20200422095106.204217180@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095057.806111593@linuxfoundation.org> References: <20200422095057.806111593@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Michael Mueller commit 6c7c851f1b666a8a455678a0b480b9162de86052 upstream. Show the full diag statistic table and not just parts of it. The issue surfaced in a KVM guest with a number of vcpus defined smaller than NR_DIAG_STAT. Fixes: 1ec2772e0c3c ("s390/diag: add a statistic for diagnose calls") Cc: stable@vger.kernel.org Signed-off-by: Michael Mueller Reviewed-by: Heiko Carstens Signed-off-by: Vasily Gorbik Signed-off-by: Greg Kroah-Hartman --- arch/s390/kernel/diag.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/s390/kernel/diag.c +++ b/arch/s390/kernel/diag.c @@ -79,7 +79,7 @@ static int show_diag_stat(struct seq_fil static void *show_diag_stat_start(struct seq_file *m, loff_t *pos) { - return *pos <= nr_cpu_ids ? (void *)((unsigned long) *pos + 1) : NULL; + return *pos <= NR_DIAG_STAT ? (void *)((unsigned long) *pos + 1) : NULL; } static void *show_diag_stat_next(struct seq_file *m, void *v, loff_t *pos)