From patchwork Tue Jan 24 12:50:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Schnelle X-Patchwork-Id: 47698 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2132591wrn; Tue, 24 Jan 2023 04:59:54 -0800 (PST) X-Google-Smtp-Source: AK7set+6NOY17FaXSY7tCz0hXBnLcVic1cZiTXkRI72ciw2oOIJuUzKPxcaWDtPdtcUBxrGNBxpW X-Received: by 2002:a17:902:dacc:b0:196:11dd:b464 with SMTP id q12-20020a170902dacc00b0019611ddb464mr3323635plx.27.1674565193701; Tue, 24 Jan 2023 04:59:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674565193; cv=none; d=google.com; s=arc-20160816; b=d7lHIre948L+pg6ebQr7zXA15NotZSiYS6Hhzpeg+x253rk/5wqPw/2oTY/kRfdkn4 HqS0VRnA2lfE9G94/uxOCWPqGD+T8FGiWjNx/huLwBUbGKW27//0Wq9CHgQtO+B9NsfL P6j3Vh/TeG57ExHAMKr8ZINqJsilehIksB9PhaV3DjXrg2NtpeivL8nvjT5mqR/WgLr1 uoU0y91/lPhXx5zpmX4ANpBwxJWzhJ7ux/o2ImipTMIQ5updikWq8G/3fteezTZLptgY phs0MeluIfPxVY85J6YKSZUkG5E2EkBR/TN9mBo8Yx5yVJ5/hOVFpf/2g3tyNcAQO7yy +/kg== 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=FzJPQIWID7udwDzccsSaQMdjKv9trlQdgcA+VWM69VE=; b=mlzCCrwq9Zn8kFf8uBiZnnW+8Vn12jBmQScyzz6UHxv86Npo9yn6roN7i7fKmgGVqc sFhySP9by/0QhfI+6Qv6UTVM2mnOLcf1t5B3VA6cgoKtskWOLczr2reerXUPsIOinkWg 2IalG5MNADJCu+n5g/hkUcdqkFPYDVEPkC3U1Pe3N/8XZ3ibu/abxxzy2Gi9sjtyJHQj mrHbOixTEA8FKpa8QSos97mRsOX3T8e5OY5VjKd/Aax/a2VgQ32fBuCjNiM9d/sjHYWU RdySXrFsqJ6sSB5ZCeWXGSX/0XWNocUDzNx8QjLu/i9hYjJohJ2vrCCpEnP5a7ZqX0DS Vt7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=oqLCylEk; 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 j4-20020a170903028400b00194bb2ac8dfsi2534912plr.269.2023.01.24.04.59.41; Tue, 24 Jan 2023 04:59:53 -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=oqLCylEk; 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 S234172AbjAXMwj (ORCPT + 99 others); Tue, 24 Jan 2023 07:52:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233806AbjAXMwV (ORCPT ); Tue, 24 Jan 2023 07:52:21 -0500 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B980013DC8; Tue, 24 Jan 2023 04:51:57 -0800 (PST) Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30OC8WpS005410; Tue, 24 Jan 2023 12:50:45 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=FzJPQIWID7udwDzccsSaQMdjKv9trlQdgcA+VWM69VE=; b=oqLCylEkwEAyqfmdWEtrRCOlHiky6PL6uuBkLEjnt8q0wCF/PbgFVhg+U4h2RK4Oaqlf l2x9qbCT0baJTmGopnDmRs4YlXy3ipcqrdGjHvXYSW+xxUF1Y3w03v5ZcIi0uMyzIDtO jCFUX7hVIyLLAfavjSW/iQoDdsl0Ux25rmjeK1boSyG0vBx6ECMEM/R4eTMHpnpWceco 3TWFphBQwds+I86t8uBH5WmCqIRh2Zvba1XfhY0UK9/K7Ufm4Q7qX9hIb7PkI9iOWOrj UFGIwVsuH4zLFE8J2aUwiQM9bUOZRFHVHzdjcrWAYov5IH08+OjLBvdv6BH2X1F4WDMf 0w== 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 3na9vbrasc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Jan 2023 12:50:45 +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 30OBhRXO029852; Tue, 24 Jan 2023 12:50:43 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma06fra.de.ibm.com (PPS) with ESMTPS id 3n87afarpw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Jan 2023 12:50:43 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 30OCoeal46662086 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Jan 2023 12:50:40 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id ED80520040; Tue, 24 Jan 2023 12:50:39 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6AF792004D; Tue, 24 Jan 2023 12:50:39 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 24 Jan 2023 12:50:39 +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 v5 3/7] s390/pci: prepare is_passed_through() for dma-iommu Date: Tue, 24 Jan 2023 13:50:33 +0100 Message-Id: <20230124125037.3201345-4-schnelle@linux.ibm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230124125037.3201345-1-schnelle@linux.ibm.com> References: <20230124125037.3201345-1-schnelle@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: x4qsvnitCnYyjOppkm1UAqR1vyj-I4SF X-Proofpoint-ORIG-GUID: x4qsvnitCnYyjOppkm1UAqR1vyj-I4SF X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-23_12,2023-01-24_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 phishscore=0 mlxlogscore=984 clxscore=1015 spamscore=0 adultscore=0 priorityscore=1501 malwarescore=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301240114 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,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?1755908872252393038?= X-GMAIL-MSGID: =?utf-8?q?1755908872252393038?= 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)