From patchwork Tue Apr 11 06:48:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 81766 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2372751vqo; Mon, 10 Apr 2023 23:53:40 -0700 (PDT) X-Google-Smtp-Source: AKy350Z/zfhzicNUqZxYq6bgqVyc+vpXdrfaoHXibmBoDbindZOt3i5gFWwFxG2XbQFjSMEeOgcU X-Received: by 2002:a17:907:3207:b0:906:4739:d73e with SMTP id xg7-20020a170907320700b009064739d73emr10738610ejb.2.1681196020043; Mon, 10 Apr 2023 23:53:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681196020; cv=none; d=google.com; s=arc-20160816; b=KNdobMha9o9siN41z/IQVdMxwcjq5tSjuZqDYYe5B32gbYrzDqK9pROWUmIKyRnY2M qG4oZZAO1jZaoY4dmJi0LoS7hwrNj/Bu7zRrjqPf+I0Yg5eCEY/a1/+JN1PUNsblz5DH 6KmNRquMAoQ++Q6EwwzDGENKpmn944xBv10izzTJ9iseuWLS6oGE2K/qzuRM08NyT3h6 tHe0bWKPtHOdHMCZfr5z3W5UuCgcmTmvPqa3tz2DN+FN3lunBlf50m2L6DNDJf5srOkj 0vJiH/OAE4JUuqX9ocYo5kzOtM4EnBjkSVuuZdTZhWePRYOkAK40/J1momBs5VXBRW9Q Bd3A== 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=7KMmoJ12NTX1568WzI4DJfvmxwgNN4bnTRZjclGJFyY=; b=g+ivQIeAuZBKkChQ9wh87pd4T8YMZTWHZ/9j1LrNrLtLlrBb2u/itph1cS0QZc5EyV kDlPThufJV4EZ7Iee91xcPvDEYIJNkwdKzJeu+LI8PyRAlVbqA9reZFRQtRxiVjfYzYV pfWkOx4u8lFH8gf5EWTqrbxLdD1LMTpeQtOmAyKDrMUI0TDtsWvNNK7BSIhPjJeeOKVW QBDLoiQghCuxJz3wbI+f/VZTo5B+AN4q7BubIXY3qIEs6hv2F6tSfDs2NL52YoTc094T MZQ8CzkxFD/n5YHy09qTOFKt5tz3TvUaO01jkT+eUIyh5v2/UD8irjeopBtIL0oBr/yy 3qew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="PX8tR4A/"; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d14-20020aa7c1ce000000b00501e4be89e6si10537468edp.280.2023.04.10.23.53.16; Mon, 10 Apr 2023 23:53:40 -0700 (PDT) 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=@intel.com header.s=Intel header.b="PX8tR4A/"; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230448AbjDKGts (ORCPT + 99 others); Tue, 11 Apr 2023 02:49:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230393AbjDKGtP (ORCPT ); Tue, 11 Apr 2023 02:49:15 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0ED093C00 for ; Mon, 10 Apr 2023 23:48:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681195734; x=1712731734; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sDMJTalig0nzuhTIrI4QQ+mFyR3+Py8XwH5/FAztKD8=; b=PX8tR4A/a6qiofo1J0yikA1lOt+pphZCIffvIeq4NNrjm/tJp2gXgRWt nyWSSpp95c71fiwGa5SxdPQBlhoCnHhcejSPhstpLR9HSj4GyUEK88tGm 40R3Ux91WJlMpSLYPPbd+DjmCpUUBHDGH60AlLAKcazVakckggKodhpD1 gQ9hVyi+XCnsUhiirj4mp8MItk9lLBAdkU6w/v8LZRN7/xV18O5BSW3cM bsOUduwx309ZKUe+P8NYZOE1XZucmaHvbC0cZ/rtC4kPxLd+N2Ux0LWLF hwUcyBWkKef4522qWX9DH+0ra4VM1OKWfys7YmT4r+y2txI1K95VcebtI Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10676"; a="341028540" X-IronPort-AV: E=Sophos;i="5.98,336,1673942400"; d="scan'208";a="341028540" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2023 23:48:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10676"; a="1018256574" X-IronPort-AV: E=Sophos;i="5.98,336,1673942400"; d="scan'208";a="1018256574" Received: from allen-box.sh.intel.com ([10.239.159.127]) by fmsmga005.fm.intel.com with ESMTP; 10 Apr 2023 23:48:22 -0700 From: Lu Baolu To: Joerg Roedel Cc: Vinod Koul , Tina Zhang , Jacob Pan , Christophe JAILLET , iommu@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/17] iommu/vt-d: Remove unnecessary checks in iopf disabling path Date: Tue, 11 Apr 2023 14:48:04 +0800 Message-Id: <20230411064815.31456-7-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230411064815.31456-1-baolu.lu@linux.intel.com> References: <20230411064815.31456-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1762861797659664201?= X-GMAIL-MSGID: =?utf-8?q?1762861797659664201?= iommu_unregister_device_fault_handler() and iopf_queue_remove_device() are called after device has stopped issuing new page falut requests and all outstanding page requests have been drained. They should never fail. Trigger a warning if it happens unfortunately. Reviewed-by: Kevin Tian Signed-off-by: Lu Baolu Link: https://lore.kernel.org/r/20230324120234.313643-7-baolu.lu@linux.intel.com --- drivers/iommu/intel/iommu.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index cd3a3c4b5e64..c771233d6f2a 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -4707,7 +4707,6 @@ static int intel_iommu_disable_iopf(struct device *dev) { struct device_domain_info *info = dev_iommu_priv_get(dev); struct intel_iommu *iommu = info->iommu; - int ret; if (!info->pri_enabled) return -EINVAL; @@ -4723,15 +4722,15 @@ static int intel_iommu_disable_iopf(struct device *dev) pci_disable_pri(to_pci_dev(dev)); info->pri_enabled = 0; - ret = iommu_unregister_device_fault_handler(dev); - if (ret) - return ret; - - ret = iopf_queue_remove_device(iommu->iopf_queue, dev); - if (ret) - iommu_register_device_fault_handler(dev, iommu_queue_iopf, dev); + /* + * With PRI disabled and outstanding PRQs drained, unregistering + * fault handler and removing device from iopf queue should never + * fail. + */ + WARN_ON(iommu_unregister_device_fault_handler(dev)); + WARN_ON(iopf_queue_remove_device(iommu->iopf_queue, dev)); - return ret; + return 0; } static int