From patchwork Wed Oct 4 08:56:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Schnelle X-Patchwork-Id: 148182 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2616913vqb; Wed, 4 Oct 2023 01:56:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGVM3U2N8doqYdqhVCrw9EHP4mRAKrraeydTDXRJv3nEcTlpQljAlYfppz1zd4z1KXEerjP X-Received: by 2002:a05:6808:19a0:b0:3ab:73a6:1469 with SMTP id bj32-20020a05680819a000b003ab73a61469mr2113631oib.14.1696409809952; Wed, 04 Oct 2023 01:56:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696409809; cv=none; d=google.com; s=arc-20160816; b=JiCm72Qz09G8YvzQOn+g7FH0TEKTAG5Wl6BuTuXUrCV+60mY+qL7L+7StzMtO8njmh XAlKffEx+S+ZjpOctmsE9fDpkZj6xvUQ7C+rJL6jnJhYuUM6NpvYAZ9uwEY+DtEp4+9s bGGvB4odLiOCTv+g7XWOoZ0gd7oPLgvwJ4i8mi01+opIbpQy0yLAhSzXE/Kk7632L6pu a5nu1RjrswSeLDTLA6lldIqrhUYiVW87xoflKSwuNZaeNrt4VmWsA2mrF4MQZGtZfuX8 xd8fBHfVKTXL45jTLZxgxqK6Rlmd7XfZ/ttF+XueOm8UosdSjKlV4WRHKggaZyuEPjuI krwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding:cc:to :message-id:subject:date:from:dkim-signature; bh=Obkl1GMWxBS6IO9KRTWJRxho2HtrWuWdgU6R2ARUbfU=; fh=hX9cNT6i4IFWmGXZBpnSsT8ZURLJdWXYL3dGthKPRJM=; b=hcTbofZJ1QgOTvYtSG9Hsrj0AvnzlS72SkryuQ7CKlsUgZBAvNNFmtX9tfHJzXilpO EUC/Vn1kG8zBbAf/EC+ODNZng7FLTkawM9TIo4dXcBoU47aTpMBdDdeIVuVh542YwufM KZVG66OMvaC4VelpAAWi2LhF9dZvSrFGxn4kH7Nd/S2fR1A52xyyOlJs2srZtI9seV9g SWf1EdLhZwzmQMba+K0DG6CPnafsQWvwQycA/NW3OqzUOunWKSUTT7KYq5mZi0M3i4Nv cWvaXkesQGrTitCmc+itAqDBFagIMsrVHtlpPN6g74DCWAgF9mOrMu++dLTQ+vIykpnj NVRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=oqdOCAmR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id a4-20020a634d04000000b005698cf29f75si3336729pgb.222.2023.10.04.01.56.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 01:56:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=oqdOCAmR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 505CC81E0209; Wed, 4 Oct 2023 01:56:46 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241861AbjJDI4i (ORCPT + 18 others); Wed, 4 Oct 2023 04:56:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241846AbjJDI4h (ORCPT ); Wed, 4 Oct 2023 04:56:37 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DAF03A7; Wed, 4 Oct 2023 01:56:33 -0700 (PDT) Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3948k4Mj013396; Wed, 4 Oct 2023 08:56:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : date : subject : content-type : message-id : to : cc : content-transfer-encoding : mime-version; s=pp1; bh=Obkl1GMWxBS6IO9KRTWJRxho2HtrWuWdgU6R2ARUbfU=; b=oqdOCAmRPtiKIe+KvRpnAD51ZhvDemhBQ9X26sGgR37XaGFAj3gnFGwoC5YvEMaBlHg0 Ok7fRog73EmhTx7E2+IG5gqY8aClbdVXKgIS/PcUMRERSMGOkYQf2/7zWog5b1mNa7eG CfdaOFa1JBiFsQ4I0nYpO6mvRvT/1VzXl84ndnDxDMJXZTRF034roIqqWZ2PHPeKORF8 r8/K+KH1kZdYQXcRvD3USptOM+eEWMw0A86ffaKI90Dgk2epWU4FmYFv/NxR4MwkVO38 4H4vyK0YOYxfEqJt81+n3gMfg/bR1m1S34Hnd4d8pG7CLm1oBC4rCpbUvMCsZk+vd/bS Wg== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3th4a0924d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Oct 2023 08:56:26 +0000 Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3948NGAG005869; Wed, 4 Oct 2023 08:56:26 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3tex0stg3r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Oct 2023 08:56:25 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3948uNZG40173984 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 4 Oct 2023 08:56:23 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 267932004D; Wed, 4 Oct 2023 08:56:23 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C8C2E20043; Wed, 4 Oct 2023 08:56:22 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 4 Oct 2023 08:56:22 +0000 (GMT) From: Niklas Schnelle Date: Wed, 04 Oct 2023 10:56:12 +0200 Subject: [PATCH] s390/pci: Fix reset of IOMMU software counters Message-Id: <20231004-dma_iommu_fix-v1-1-129777cd8232@linux.ibm.com> X-B4-Tracking: v=1; b=H4sIAKsoHWUC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDI2NDAwMj3ZTcxPjM/Nzc0vi0zApdg0RTY0tzS0ujNENTJaCegqJUoDDYvOj Y2loA9OLeo18AAAA= To: Robin Murphy , Matthew Rosato , Gerd Bayer , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer , Joerg Roedel Cc: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, Niklas Schnelle X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2844; i=schnelle@linux.ibm.com; h=from:subject:message-id; bh=H90IBelQNG7rhfTWySXD+NU46UuE+9PSGFOR8fcgG4U=; b=owGbwMvMwCH2Wz534YHOJ2GMp9WSGFJlNTasnrGecZ+I1t/be2uWcmlInPjbetvrYf6ENf8nf qjc++QYS0cpC4MYB4OsmCLLoi5nv3UFU0z3BPV3wMxhZQIZwsDFKQATebac4Z/qln2OF1ft925s cX0otWzXlkxR0ejqW/3lM2bXvYv5HPGCkaFLM6F+KkfS+fvPGjdfniX6bodmrkOihtnOrjiLtQn 2qmwA X-Developer-Key: i=schnelle@linux.ibm.com; a=openpgp; fpr=9DB000B2D2752030A5F72DDCAFE43F15E8C26090 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 9-TEznx7mp5zg37bZc5FgD7uyTqWdBNH X-Proofpoint-GUID: 9-TEznx7mp5zg37bZc5FgD7uyTqWdBNH X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-04_01,2023-10-02_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=718 priorityscore=1501 suspectscore=0 malwarescore=0 impostorscore=0 bulkscore=0 adultscore=0 clxscore=1011 lowpriorityscore=0 mlxscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310040049 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 04 Oct 2023 01:56:46 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778814612537081981 X-GMAIL-MSGID: 1778814612537081981 Together with enabling the Function Measurement Block zpci_fmb_enable_device() also resets the software counters. This allows to use "echo 0 > /sys/kernel/debug/pci//statistics" followed by echo "1 > /../statistics" to reset all counters. In commit c76c067e488c ("s390/pci: Use dma-iommu layer") this use of the now obsolete counters in struct zpci_device was missed as was their removal. Fix this by resetting the new counters and removing the old ones. Fixes: c76c067e488c ("s390/pci: Use dma-iommu layer") Signed-off-by: Niklas Schnelle Reviewed-by: Matthew Rosato --- Note: This is based on and references commit IDs from Joerg Roedel's iommu/next branch and should go in via the iommu tree. --- arch/s390/include/asm/pci.h | 4 ---- arch/s390/pci/pci.c | 13 ++++++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) --- base-commit: 8e5ab3f54a1061c2be3e1fbcda01fbe604c3450e change-id: 20231002-dma_iommu_fix-0a5397992f15 Best regards, diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h index 3f74f1cf37df..e91cd6bbc330 100644 --- a/arch/s390/include/asm/pci.h +++ b/arch/s390/include/asm/pci.h @@ -173,10 +173,6 @@ struct zpci_dev { struct zpci_fmb *fmb; u16 fmb_update; /* update interval */ u16 fmb_length; - /* software counters */ - atomic64_t allocated_pages; - atomic64_t mapped_pages; - atomic64_t unmapped_pages; u8 version; enum pci_bus_speed max_bus_speed; diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index 563cb72d9ed0..63fd9e1d9f22 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -157,6 +157,7 @@ int zpci_unregister_ioat(struct zpci_dev *zdev, u8 dmaas) int zpci_fmb_enable_device(struct zpci_dev *zdev) { u64 req = ZPCI_CREATE_REQ(zdev->fh, 0, ZPCI_MOD_FC_SET_MEASURE); + struct zpci_iommu_ctrs *ctrs; struct zpci_fib fib = {0}; u8 cc, status; @@ -169,9 +170,15 @@ int zpci_fmb_enable_device(struct zpci_dev *zdev) WARN_ON((u64) zdev->fmb & 0xf); /* reset software counters */ - atomic64_set(&zdev->allocated_pages, 0); - atomic64_set(&zdev->mapped_pages, 0); - atomic64_set(&zdev->unmapped_pages, 0); + ctrs = zpci_get_iommu_ctrs(zdev); + if (ctrs) { + atomic64_set(&ctrs->mapped_pages, 0); + atomic64_set(&ctrs->unmapped_pages, 0); + atomic64_set(&ctrs->global_rpcits, 0); + atomic64_set(&ctrs->sync_map_rpcits, 0); + atomic64_set(&ctrs->sync_rpcits, 0); + } + fib.fmb_addr = virt_to_phys(zdev->fmb); fib.gd = zdev->gisa;