From patchwork Fri Mar 19 13:25:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 404789 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1377487jai; Fri, 19 Mar 2021 06:31:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyH2QFw+2AxMSKS1+YEE8tkqh03DBZshQWz8PzPk4maK+PmB3cuPjdsXeqMFOTITgnhNdaB X-Received: by 2002:a17:907:3d8d:: with SMTP id he13mr4431160ejc.530.1616160675103; Fri, 19 Mar 2021 06:31:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616160675; cv=none; d=google.com; s=arc-20160816; b=ucYng9R5d6thkAZBatSTMM5+2Q4Hfa9Y7UL5oMqV8+7WHl9nt2MVSsozK5Cv2eeO28 mAYPi6laLW1OyViLRZTyUR0YwsKRMLcanPsRNNfe+HNAYwm6ubYcmcxt1/PHSINy5Nek V4yvks2b0Kq7+5LuWI2+sjfd6/4ag8DGQdADzXwBtBnKc5zaao0vDjsPDmJVVEk7Xzco clZxdo3DPrmietcDrpLRzOIgHguXDSr8HQ+foTVT1iM3JcA5AiImJqZS8FTPXM9PSq5z jC6WqLl/i0+78blbVNtU0bmjZYtSVk3R64VR765xVGGozOviMEh1M0kGYrPAZSew38y4 ZRrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=f/NaN5kAMcJJ+RWjoo33AdA4S8t135bYBtGSZSAf9Ws=; b=DpjP13NrFcUaqdfhKUfD0M7RNJhN9cxEbLitTUaOmn/TEhoEKTPrANAuqnJ/0lfedC 0x2LMUb5OQbMiDHRBNup8f4JVRkEj0beJLVCD1nk5Nn8812myxFVDsTnW9klGqgLsUhJ 4NWDexDqj4F3iHVvK5fsYNha4mhMtbPB0tUQk6FIKg8W+FU3t8mQFGBp+gl9/vLRMHR0 mIah+oAhl6o6Al2U4NPsAQcRNoJ6WKBgZGZsK5UCGhXe2Z6Ek6exLNgOZad2a9O7rtxO RI8HnqqShWlpqcZSLR3fszJ3Rq7d3rl9xq6zHVsdaljEW8tSXAEZXRe+3M0isKUSfYp1 9e4g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m21si4292630ejx.725.2021.03.19.06.31.14 for ; Fri, 19 Mar 2021 06:31:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230241AbhCSNap (ORCPT ); Fri, 19 Mar 2021 09:30:45 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:14018 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230251AbhCSNaT (ORCPT ); Fri, 19 Mar 2021 09:30:19 -0400 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4F24T25scqzPkWX; Fri, 19 Mar 2021 21:27:50 +0800 (CST) Received: from localhost.localdomain (10.69.192.58) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.498.0; Fri, 19 Mar 2021 21:30:07 +0800 From: John Garry To: , , , , , , CC: , , , , John Garry Subject: [PATCH 2/6] iova: Add a per-domain count of reserved nodes Date: Fri, 19 Mar 2021 21:25:44 +0800 Message-ID: <1616160348-29451-3-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1616160348-29451-1-git-send-email-john.garry@huawei.com> References: <1616160348-29451-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org To help learn if the domain has regular IOVA nodes, add a count of reserved nodes, calculated at init time. Signed-off-by: John Garry --- drivers/iommu/iova.c | 2 ++ include/linux/iova.h | 1 + 2 files changed, 3 insertions(+) -- 2.26.2 diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c index e62e9e30b30c..cecc74fb8663 100644 --- a/drivers/iommu/iova.c +++ b/drivers/iommu/iova.c @@ -717,6 +717,8 @@ reserve_iova(struct iova_domain *iovad, * or need to insert remaining non overlap addr range */ iova = __insert_new_range(iovad, pfn_lo, pfn_hi); + if (iova) + iovad->reserved_node_count++; finish: spin_unlock_irqrestore(&iovad->iova_rbtree_lock, flags); diff --git a/include/linux/iova.h b/include/linux/iova.h index c834c01c0a5b..fd3217a605b2 100644 --- a/include/linux/iova.h +++ b/include/linux/iova.h @@ -95,6 +95,7 @@ struct iova_domain { flush-queues */ atomic_t fq_timer_on; /* 1 when timer is active, 0 when not */ + int reserved_node_count; }; static inline unsigned long iova_size(struct iova *iova)