From patchwork Mon Feb 20 15:22:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Schnelle X-Patchwork-Id: 59537 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1370183wrn; Mon, 20 Feb 2023 07:34:09 -0800 (PST) X-Google-Smtp-Source: AK7set+os30pskK938QtDsn+8WRUijlMgJZ4tvEVHIYojDbv8cjEr4oZWtz4rWSlrVYgESOAOrJe X-Received: by 2002:a17:906:9f25:b0:8b1:7569:ad58 with SMTP id fy37-20020a1709069f2500b008b17569ad58mr6142452ejc.2.1676907248868; Mon, 20 Feb 2023 07:34:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676907248; cv=none; d=google.com; s=arc-20160816; b=VhnP4ErP8OWJVmC5WUinXqC+/T66W9p70zFB45yMlOUXzucbSbBqQ5Xyh+FHSdy3sy sQP8vBG9HcCitOoPkCiF4uAovssA6eOzFv2P2TBG5KNZjM3tInwclpuWzj+EJV1w3uf5 lmTf7SIX1ZK8Wbzr5ZXPLyfekqUFa07PNxu/M/kDYHOIVARuJgb6eIdI/8enjF9WYRck X7LV5RYFKD0HD2Kb/cOw03JK/hzgXzZjCaTAsIYKtuiA7/03Hs+9SJsD3CCJDzvNHVoi IfToGMatUCWc539sxqAKSuTulyuKM6G8f7FcVNPmy56YcPS7sHojhSslyh/2Ew0wB81q 0Lgg== 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=JoiK9Wao7gA3WkxGQFCezstm/m4la13D+zwfQ685GH0PQYzBhll1efC7ULdlYymh9z 5KExjWzqgYbnx9zCONv7h0csL6MDaaFchEeJVVribLNl8BW6K1Xp3YBgbRd7n4+R+rCv wL2xqoLUWIMW62ckar0IbBzonZ015rhr26Z/TbrHXlG5d+qAAD/xIHGCaaHT1CIR7iQS KfC6gF7Z9fVkCjC6azYNZOeZChqRnM5qWW8jOf274AFimJgbAd/vzBJjXP8HvBy3bdbf v44rXHBNWCl9SJNA59j+XwUGNUIeMiY/QXkvo6bULzdH5GkLpFqtHq3Ep6fIZJRgPcXq 2JpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=MUocQLs+; 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 u25-20020a170906109900b008d3be841cc9si3824708eju.665.2023.02.20.07.33.45; Mon, 20 Feb 2023 07:34:08 -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=MUocQLs+; 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 S232345AbjBTPW6 (ORCPT + 99 others); Mon, 20 Feb 2023 10:22:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232176AbjBTPW4 (ORCPT ); Mon, 20 Feb 2023 10:22:56 -0500 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 884316EA4; Mon, 20 Feb 2023 07:22:51 -0800 (PST) Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31KDHeAd028801; Mon, 20 Feb 2023 15:22:30 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=MUocQLs+qSNYRKbtVBQ3Ztl9PGmkr5F/nqRxobsGV47tuv/QJ3ZDNmDf84UwKiif8xgn 0hxLX7NsM9oxqOOHNCxBT3e3T8AMc8ZQycB/Lg0NHn1Sp1i961wt7oTEEEL8ffZ9g4fr erUvIomGjYKSbhD62XvBNJf6jLAbnlfU/t+L3+t804X/ef8c4pFXpuI5u/PV2+szjynB gjUR8moJJ8Ikkod/cclJnrhw++PjpJH8nfCsKbM3TRtWWrqKIhO4QC9gYvSTKXdYlTDM bME+YtpVUPwcPrJafNcK9KUpCVFqaGMb5I/2O9v8bSgBOYQEgf8j60fdcEy2H8N5NIRg gA== Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3nv9mcud7v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Feb 2023 15:22:29 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 31KFJJ71019836; Mon, 20 Feb 2023 15:22:28 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma06ams.nl.ibm.com (PPS) with ESMTPS id 3ntnxf2uqy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Feb 2023 15:22:28 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 31KFMOMq45416722 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 Feb 2023 15:22:24 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8A04F2004B; Mon, 20 Feb 2023 15:22:24 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 29B9D2004D; Mon, 20 Feb 2023 15:22:24 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 20 Feb 2023 15:22:24 +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 v7 3/6] s390/pci: prepare is_passed_through() for dma-iommu Date: Mon, 20 Feb 2023 16:22:19 +0100 Message-Id: <20230220152222.1818344-4-schnelle@linux.ibm.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230220152222.1818344-1-schnelle@linux.ibm.com> References: <20230220152222.1818344-1-schnelle@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: ESDYMclVNZy9rZ2gb1gaaKKxHUNuM4Or X-Proofpoint-ORIG-GUID: ESDYMclVNZy9rZ2gb1gaaKKxHUNuM4Or 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-20_12,2023-02-20_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 malwarescore=0 suspectscore=0 impostorscore=0 adultscore=0 clxscore=1015 mlxlogscore=999 phishscore=0 spamscore=0 lowpriorityscore=0 priorityscore=1501 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302200138 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?1758364695344950371?= X-GMAIL-MSGID: =?utf-8?q?1758364695344950371?= 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)