From patchwork Wed Feb 15 12:03:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Schnelle X-Patchwork-Id: 57511 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp154940wrn; Wed, 15 Feb 2023 04:12:27 -0800 (PST) X-Google-Smtp-Source: AK7set8nVIa5muNRkSSg9mBHVdyQ16tG6pH4QYF17qGK9lf1mKWnNppHucco3VHcZvbicDgMR8Ln X-Received: by 2002:a17:907:766e:b0:88e:d435:3fd6 with SMTP id kk14-20020a170907766e00b0088ed4353fd6mr2210123ejc.63.1676463147215; Wed, 15 Feb 2023 04:12:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676463147; cv=none; d=google.com; s=arc-20160816; b=ggLZEpPKfhqapVzittCjCqzwvALUvd1p9qH1KUx09CEKYE3CgUHEKR80wwuCIO2aHM HKiJ+y9BLaJTL4YLk0g0RM+YJREEIHIeLTH9B942JU0ZoN4JVvFTal5KJxVLJSXoTdtf BZTmurEmwziqj+Yjjf8zr4u8ZlunhDkjUZ3BZvJ1mXuEctxGRYfR/I2SxOQem96q60/l ql4zsONYbXRVs+wg6e9Lc1O38QSvLuTaKqjPv3ykg2Tr6ET5XMc9FBMPUhrEZMW81u3y vlcF4jmoCUeaJvNHtFQGrJw+v90AxDbrdsDvHmCDX6liv2tkrnfw769QU8th7tu3vzKG 2n4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Ac90uGhf/T5m+1S/3rArlS6chgzl/olsKFs1JCJluak=; b=y+yaa0qXEL+E1dGF2Rr4wScAVCXuJmMUTucfPK/fZRA+IwXpc4pEsglNWUG96TmPMo /sUOf2r4ejiP0FYqGhYj8JOmqA1EvvmaeV853fmHkSzplOX7pEfjuJgf96t4lo8wZUCA wsLHf52tbpmzO+p3Kv3edq+9wQHnWjQxWG9ooytsZdSOyu6OV4iAXIj/mghbs7RkITk7 V5pzCA0Iwp/sa7UrMncv39T9zP4IeeZ/xkX2j9rBlriy4sOuNYNBNMLdZ7Xuxjv9YJRT 5i95XgVeLEHBg4yyPFtxacmiltI+pCPnFO2Egwm/tdfTFmL6gTXiBCol2iM4BYEVaJbX mD0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=l+XqDzoX; 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=NONE dis=NONE) header.from=ibm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e22-20020a170906749600b008b128c10e7asi6671090ejl.215.2023.02.15.04.12.03; Wed, 15 Feb 2023 04:12:27 -0800 (PST) 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=@ibm.com header.s=pp1 header.b=l+XqDzoX; 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=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233907AbjBOMEC (ORCPT + 99 others); Wed, 15 Feb 2023 07:04:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231408AbjBOMD6 (ORCPT ); Wed, 15 Feb 2023 07:03:58 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EF7D2A6F7; Wed, 15 Feb 2023 04:03:57 -0800 (PST) Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31FBBivx019488; Wed, 15 Feb 2023 12:03:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=Ac90uGhf/T5m+1S/3rArlS6chgzl/olsKFs1JCJluak=; b=l+XqDzoXcwRSZ4m11rrmGteYdnL0wtZp790gpQ+uFFf+I34ggBSg0xd6C/+3vPgj7EEA N7AzXif6H3+RFzGVoFMOB8Ovxya/3pL+vctygQpLqAmasIFjYGqom/JfEkJ9l7DM+EN1 uVP2mqEwaJijE1l7r5BR3Xelq/XUp3jpPc2LBhvc+pIhfMD/USE8GKPDzcn//z5Ix6TN ruU9R2QXrcUetI8ce9IMdTqO3YCpt89fdHLY3Eor00lUJYBviRh69Zr8ZlJ717KJvAfx Ivz9rwur4OX/LBN2lcwXYtpJrwPu3AIM0DCgYlfW4pCeWgPZ//TtGo6qJ2Q85uKSaT/n rA== Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3nrvcdd16t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Feb 2023 12:03:35 +0000 Received: from pps.filterd (ppma06fra.de.ibm.com [127.0.0.1]) by ppma06fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 31F1es81007478; Wed, 15 Feb 2023 12:03:33 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma06fra.de.ibm.com (PPS) with ESMTPS id 3np29fbx9m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Feb 2023 12:03:33 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 31FC3Tv249349078 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Feb 2023 12:03:29 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8387220040; Wed, 15 Feb 2023 12:03:29 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 31D8E2004B; Wed, 15 Feb 2023 12:03:29 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 15 Feb 2023 12:03:29 +0000 (GMT) From: Niklas Schnelle To: Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Wenjia Zhang Cc: Matthew Rosato , Gerd Bayer , Pierre Morel , iommu@lists.linux.dev, linux-s390@vger.kernel.org, borntraeger@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com, gerald.schaefer@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, linux-kernel@vger.kernel.org, Julian Ruess Subject: [PATCH v6 3/6] s390/pci: prepare is_passed_through() for dma-iommu Date: Wed, 15 Feb 2023 13:03:24 +0100 Message-Id: <20230215120327.947336-4-schnelle@linux.ibm.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230215120327.947336-1-schnelle@linux.ibm.com> References: <20230215120327.947336-1-schnelle@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: fn8v-3PqAV9m08V9HB-5l-2iTiDNX4Qt X-Proofpoint-GUID: fn8v-3PqAV9m08V9HB-5l-2iTiDNX4Qt X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-15_06,2023-02-15_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxscore=0 impostorscore=0 bulkscore=0 adultscore=0 spamscore=0 suspectscore=0 malwarescore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302150109 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757899020912379050?= X-GMAIL-MSGID: =?utf-8?q?1757899020912379050?= With the IOMMU always controlled through the IOMMU driver testing for zdev->s390_domain is not a valid indication of the device being passed-through. Instead test if zdev->kzdev is set. Reviewed-by: Pierre Morel Reviewed-by: Matthew Rosato Signed-off-by: Niklas Schnelle --- arch/s390/pci/pci_event.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c index b9324ca2eb94..4ef5a6a1d618 100644 --- a/arch/s390/pci/pci_event.c +++ b/arch/s390/pci/pci_event.c @@ -59,9 +59,16 @@ static inline bool ers_result_indicates_abort(pci_ers_result_t ers_res) } } -static bool is_passed_through(struct zpci_dev *zdev) +static bool is_passed_through(struct pci_dev *pdev) { - return zdev->s390_domain; + struct zpci_dev *zdev = to_zpci(pdev); + bool ret; + + mutex_lock(&zdev->kzdev_lock); + ret = !!zdev->kzdev; + mutex_unlock(&zdev->kzdev_lock); + + return ret; } static bool is_driver_supported(struct pci_driver *driver) @@ -176,7 +183,7 @@ static pci_ers_result_t zpci_event_attempt_error_recovery(struct pci_dev *pdev) } pdev->error_state = pci_channel_io_frozen; - if (is_passed_through(to_zpci(pdev))) { + if (is_passed_through(pdev)) { pr_info("%s: Cannot be recovered in the host because it is a pass-through device\n", pci_name(pdev)); goto out_unlock; @@ -239,7 +246,7 @@ static void zpci_event_io_failure(struct pci_dev *pdev, pci_channel_state_t es) * we will inject the error event and let the guest recover the device * itself. */ - if (is_passed_through(to_zpci(pdev))) + if (is_passed_through(pdev)) goto out; driver = to_pci_driver(pdev->dev.driver); if (driver && driver->err_handler && driver->err_handler->error_detected)