From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1857EC33CAD for ; Mon, 13 Jan 2020 14:39:14 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E072C20678 for ; Mon, 13 Jan 2020 14:39:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jtZK0ma/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E072C20678 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=2p/SpGl2JFeiPKJ76l4hPbrqFhmQ2InojhMLvdJpCpY=; b=jtZK0ma/ogZfkf +WL5wyAQSokKXCOEtD154oLJ8zqHYQUAWixBW5W2AepcZnnvXjeKZHsz/EQGj0077HdgNzsnJ6T6a F2h/rVCRZYdE2G9z7bOciLZSilm2RHBK62Riw2ZWqe08Dr4ytIS28vl0LlOpicorM+ABvQca2O305 ad09srf0nLASp6aZhJL3w0PRMR1V8LlRZoPSYB50OkHK6okeWCs1H/agcDH5Q3IWTs8UoE5Ef8dUg IqHp+6FjDfQFjx+hVl8xBBFPxJTdeasUFtutgthmcwlX07k9QMdjbnvJjB16/GCLQc/GbNl+uAUJG E3LoJTLy0+9UUjKvYPxQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ir0s5-0003yf-8m; Mon, 13 Jan 2020 14:39:13 +0000 Received: from mail-ot1-f67.google.com ([209.85.210.67]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ir0s2-0003xx-B3 for linux-arm-kernel@lists.infradead.org; Mon, 13 Jan 2020 14:39:11 +0000 Received: by mail-ot1-f67.google.com with SMTP id a15so9132971otf.1 for ; Mon, 13 Jan 2020 06:39:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=VtgiiMw/nSVvHGkHXZg14Y2SSF3Fx9R0a3AgHhFUHIk=; b=FOXbARjg3QhYE1haiqO2FDmEhIr2YhYcq1vnF8Wj1Iq9t2+DWK9ncbgtwvZCt7Cz/e fcEsu7mLc39OlFVKl0jx0ehw0uBv9QxKyXAs1SksP7Il7wOfAFCt7lImZ8STZk8J1c6c M/wuVSggJiBNide7gZYrFZtpTFE97ScMuo6qcxBX+LKENibFe2XHWzkH4d/dX2HwJkiy cHxFOYOmAqNgfNNNryDmTqmGEOAPmK87H1Mi4Cq/lFccO89c/03kwYs/NAF9303wJztd b2ZAw3Tb1iCSCD4s5q9QnU0rgRhIL59pJjzOBZMs3/PmGE0IB1Pl8HdvZ4r1KgCPNZxx Qr4Q== X-Gm-Message-State: APjAAAXkWzzaRLsu0Kv7LA2md99RFYCmzMfDmQ3gys5UHKW5Yja1Ngvd RToD0JqFKwTL0o3sU9+X1g== X-Google-Smtp-Source: APXvYqx40v9ylI3py5hHwlwa3VsVzEwMz5HBJYylHRKFudS95stYyegw9PC7rrp0iP+RxFjgsgWYcw== X-Received: by 2002:a9d:7e8a:: with SMTP id m10mr12380578otp.27.1578926347370; Mon, 13 Jan 2020 06:39:07 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id m3sm4188519otf.13.2020.01.13.06.39.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jan 2020 06:39:06 -0800 (PST) From: Rob Herring To: iommu@lists.linux-foundation.org Subject: [PATCH] iommu/arm-smmu-v3: Batch ATC invalidation commands Date: Mon, 13 Jan 2020 08:39:06 -0600 Message-Id: <20200113143906.11121-1-robh@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200113_063910_375485_EAF13317 X-CRM114-Status: GOOD ( 12.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jean-Philippe Brucker , Joerg Roedel , Will Deacon , Robin Murphy , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Similar to commit 2af2e72b18b4 ("iommu/arm-smmu-v3: Defer TLB invalidation until ->iotlb_sync()"), build up a list of ATC invalidation commands and submit them all at once to the command queue instead of one-by-one. Cc: Jean-Philippe Brucker Cc: Will Deacon Cc: Robin Murphy Cc: Joerg Roedel Signed-off-by: Rob Herring --- drivers/iommu/arm-smmu-v3.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index effe72eb89e7..e91b4a098215 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -1919,10 +1919,11 @@ static int arm_smmu_atc_inv_master(struct arm_smmu_master *master, static int arm_smmu_atc_inv_domain(struct arm_smmu_domain *smmu_domain, int ssid, unsigned long iova, size_t size) { - int ret = 0; + int i, cmdn = 0; unsigned long flags; struct arm_smmu_cmdq_ent cmd; struct arm_smmu_master *master; + u64 cmds[CMDQ_BATCH_ENTRIES * CMDQ_ENT_DWORDS]; if (!(smmu_domain->smmu->features & ARM_SMMU_FEAT_ATS)) return 0; @@ -1947,11 +1948,25 @@ static int arm_smmu_atc_inv_domain(struct arm_smmu_domain *smmu_domain, arm_smmu_atc_inv_to_cmd(ssid, iova, size, &cmd); spin_lock_irqsave(&smmu_domain->devices_lock, flags); - list_for_each_entry(master, &smmu_domain->devices, domain_head) - ret |= arm_smmu_atc_inv_master(master, &cmd); + list_for_each_entry(master, &smmu_domain->devices, domain_head) { + if (!master->ats_enabled) + continue; + + for (i = 0; i < master->num_sids; i++) { + if (cmdn == CMDQ_BATCH_ENTRIES) { + arm_smmu_cmdq_issue_cmdlist(smmu_domain->smmu, + cmds, cmdn, false); + cmdn = 0; + } + + cmd.atc.sid = master->sids[i]; + arm_smmu_cmdq_build_cmd(&cmds[cmdn * CMDQ_ENT_DWORDS], &cmd); + cmdn++; + } + } spin_unlock_irqrestore(&smmu_domain->devices_lock, flags); - return ret ? -ETIMEDOUT : 0; + return arm_smmu_cmdq_issue_cmdlist(smmu_domain->smmu, cmds, cmdn, true); } /* IO_PGTABLE API */ -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel