From patchwork Thu Dec 1 04:01:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 28184 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp62674wrr; Wed, 30 Nov 2022 20:09:13 -0800 (PST) X-Google-Smtp-Source: AA0mqf5GsV4UJHmOKL4Cru5b6HrLhc67GupmgjZU5nV4/l6N6zEM9NZW5rB08vwApQRRN+iWSMKH X-Received: by 2002:a17:902:b613:b0:188:f570:7bd6 with SMTP id b19-20020a170902b61300b00188f5707bd6mr45731574pls.97.1669867753184; Wed, 30 Nov 2022 20:09:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669867753; cv=none; d=google.com; s=arc-20160816; b=Ec8THK+EQGQp6I0hhQGfO/LJqSvdd36qSXtUUhEIFYk74HlqghV08odAA94QyrNwzV YiXzdVpjM/vlpQAYLw1SS6nn7hZmsOl+W4pbY2Ez2ad2fWJA4CVfkGwOroGoMfN0Qfwa cGfRqc1G0oIby/fYpDPil4QxDMqznuuDnIftks6zAmVnBsFSROowSoPCKD2v3vK2dlK2 QSCnb6z726frkdC3gMmnYXyQPI0/ZzlnzZ9ynKL5fSukcMokU2bX/Ew1PfsyxlcTYK2g DIGyJ7ampIL6gvFmnulKa8WGO52qHJdpTxoRvZkc70kPcDcjg2VxFyHkEC3sxF1U4bQA HjsQ== 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=5Ww0UppS7eh3NW3UvrOtJnxOM7FAOY0bBSoExnpBdUI=; b=vuAE+4VltbzyafH2jiZtOsDVOvxrE5lkFDeuY/iv6ptr+4EK+fpuIw/utgkwjWRbIb ggW0g/Nz9vWIDmubBVaPz1L3vSq2tQhbRwOOK1txgmuOB7qp5kz9Y/mLN2KD+pTvjWhz kKH6ASBlkxbZtSNcg32d1DWLDkGAhqBAIRrNclF2wdHYm0TpND7ssw6UzIf1V8uy8k1Q PoD5M0V+lVB2y/fcwyFdn+sjrqFYUd3+JjDwVm4mah3x/lsu6YalbACthhwPVzbeGRGU qELE/jWPLC/RkoRm9tk+rmGCzDVSftmDIOzlJV+Xvo8QUJkFpq21LTel6OA+fLG33vOp C5WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=j8CeyG5K; 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 i14-20020a17090332ce00b00186f035eda3si3522099plr.579.2022.11.30.20.09.00; Wed, 30 Nov 2022 20:09:13 -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=@intel.com header.s=Intel header.b=j8CeyG5K; 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 S229614AbiLAEIv (ORCPT + 99 others); Wed, 30 Nov 2022 23:08:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229608AbiLAEIt (ORCPT ); Wed, 30 Nov 2022 23:08:49 -0500 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32ECD77422 for ; Wed, 30 Nov 2022 20:08:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669867729; x=1701403729; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=r8ZxO0P+bgikDq55sQqKBRK6c8+nVfCJ+RSELC/xG0I=; b=j8CeyG5KAt9cIa5U7ewGh2jzdk9c6AcHHl/jvLGs3CSI2rswVfLix09x G7h/gUvh+xy56BYbP6+dwUooftNutv0wwhU80p3loMqFaPWLah5Pwp1Ox kxGRfWnIO0JlH92NMbzRpUTvvn5PIFfYWyJE9kSL9WJEacRv7S5GI87yc Umb38AlQABx97Sh0t/wHve8WeKFW8t9aIZVnQd/ASslshQYn1an+gDuCh D+0IGB7SH1qG1Lbzuy7rwAPwtg+P0FGVPUbdUnejII/ON9UJ8AZhAmEY9 Y0PPwdAgT5nUSggCjPtmFiNRlbkTL5tmNC0zdN+4AbhkvWyKq7+3F9c3E Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10547"; a="377745747" X-IronPort-AV: E=Sophos;i="5.96,207,1665471600"; d="scan'208";a="377745747" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2022 20:08:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10547"; a="707911656" X-IronPort-AV: E=Sophos;i="5.96,207,1665471600"; d="scan'208";a="707911656" Received: from allen-box.sh.intel.com ([10.239.159.48]) by fmsmga008.fm.intel.com with ESMTP; 30 Nov 2022 20:08:44 -0800 From: Lu Baolu To: Joerg Roedel Cc: Xiongfeng Wang , Yang Yingliang , Jacob Pan , iommu@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] iommu/vt-d: Fix PCI device refcount leak in prq_event_thread() Date: Thu, 1 Dec 2022 12:01:25 +0800 Message-Id: <20221201040127.1962750-3-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221201040127.1962750-1-baolu.lu@linux.intel.com> References: <20221201040127.1962750-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE 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?1750983249350918351?= X-GMAIL-MSGID: =?utf-8?q?1750983249350918351?= From: Yang Yingliang As comment of pci_get_domain_bus_and_slot() says, it returns a pci device with refcount increment, when finish using it, the caller must decrease the reference count by calling pci_dev_put(). So call pci_dev_put() after using the 'pdev' to avoid refcount leak. Besides, if the 'pdev' is null or intel_svm_prq_report() returns error, there is no need to trace this fault. Fixes: 06f4b8d09dba ("iommu/vt-d: Remove unnecessary SVA data accesses in page fault path") Suggested-by: Lu Baolu Signed-off-by: Yang Yingliang Link: https://lore.kernel.org/r/20221119144028.2452731-1-yangyingliang@huawei.com Signed-off-by: Lu Baolu --- drivers/iommu/intel/svm.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index fe615c53479c..03b25358946c 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -748,12 +748,16 @@ static irqreturn_t prq_event_thread(int irq, void *d) * If prq is to be handled outside iommu driver via receiver of * the fault notifiers, we skip the page response here. */ - if (!pdev || intel_svm_prq_report(iommu, &pdev->dev, req)) - handle_bad_prq_event(iommu, req, QI_RESP_INVALID); + if (!pdev) + goto bad_req; - trace_prq_report(iommu, &pdev->dev, req->qw_0, req->qw_1, - req->priv_data[0], req->priv_data[1], - iommu->prq_seq_number++); + if (intel_svm_prq_report(iommu, &pdev->dev, req)) + handle_bad_prq_event(iommu, req, QI_RESP_INVALID); + else + trace_prq_report(iommu, &pdev->dev, req->qw_0, req->qw_1, + req->priv_data[0], req->priv_data[1], + iommu->prq_seq_number++); + pci_dev_put(pdev); prq_advance: head = (head + sizeof(*req)) & PRQ_RING_MASK; }