From patchwork Sun Nov 13 13:38:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harry Song X-Patchwork-Id: 19356 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1686115wru; Sun, 13 Nov 2022 05:46:31 -0800 (PST) X-Google-Smtp-Source: AA0mqf77WAgSbH+uZP5XTsCVkMPTf3jKBcvXIJrLKxxgJXRtzmINTHrIrGhReGnf/vZt3i2keC5e X-Received: by 2002:a05:6402:1949:b0:467:9864:9463 with SMTP id f9-20020a056402194900b0046798649463mr4031984edz.360.1668347191100; Sun, 13 Nov 2022 05:46:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668347191; cv=none; d=google.com; s=arc-20160816; b=jbeDToEh37Gp8IBL5GyhEhA4BXq23TxB8SX3tVXI+qGeMVZKQjXwt+13X2XEJ1i2JV tUlqi8spxkJa354krcWHuqpyk7wAIpHbyqHFnpaSUh8jUPiSuWAsneDV0mSpecLZu0RB ylLRyU7fRldrrDgteexGZD3vIF7Nm6VPnYd2M6/y/8wwqF1W+bsVBCMv9O7v1zSbrkrJ pDpETdMiXxuMkFgFdWADm8q5bQ6WgiiIPKa/k8jtycz+iIhzwsIjz59b2MGXmlMxcJzO Ji26yeM5NkIdsQzULGTZkQ6FPB6ToIMj2EFrwCGYioDBncVSt5Pks1mV1ByVZ5nKAb6N H1tw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=zYxv6p0OLRmJkUIoXHmmBGT6rx0buZmGw9eP/QrShps=; b=sRVPllX+sE1ODfhnnzqbSbINGNu3kR35D2LQkYOZJIG50ksxlsI36yruspWHHNuqnL YLfKHu5sYFKvZW20duQ/y6fPEyqBhU2eqF9+fcWqVW8RX8lR2h02V52MCDAcQ5BKoqjv HygpkzTABS5EEDObNl1b7C05nu5FEljyxeZ4O5B21RFv6cekChKRwEa93aF+CKnq0Fs7 lGwvvPEOzoOKC2/Lw6d+YC3ct5WGarqZYA8Q18KSgKw56dsY3U04mBe8d3nwnzgagcdl ntIkoVgPjhjkPMRh0HzTb2kAy8gQBLBceRvHP/BetLvxI8uUafEUpVqika5ApOW0GOOo eU1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="Rj/iJfv0"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qw32-20020a1709066a2000b007a20c586f4esi7237752ejc.876.2022.11.13.05.46.07; Sun, 13 Nov 2022 05:46:31 -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=@gmail.com header.s=20210112 header.b="Rj/iJfv0"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235350AbiKMNkY (ORCPT + 99 others); Sun, 13 Nov 2022 08:40:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234073AbiKMNkX (ORCPT ); Sun, 13 Nov 2022 08:40:23 -0500 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6650CE090 for ; Sun, 13 Nov 2022 05:40:22 -0800 (PST) Received: by mail-pj1-x1043.google.com with SMTP id l6so8235692pjj.0 for ; Sun, 13 Nov 2022 05:40:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zYxv6p0OLRmJkUIoXHmmBGT6rx0buZmGw9eP/QrShps=; b=Rj/iJfv0rIsMHplpy1NT9E5C+qNpv1eGioa3tlmokQmPmawH3NQbixi4zClFuG799m ABH7U671c2WbWgSazv3xIRQDn+vnVD7PwaywOVNLx0IiOEfR3eBYWDn9YQefSO3hUpoe uAXcUVoCjsc6TFITDVamWW/jsmuYTMMYAIlENTehZOZMYMUfXaDfyfFAl7QAMtR+Cz17 v14VZORKrWWCoxpqAo7+ytUQHjHqBCX9YdGmE6ihvbrBGy57Z79pwawHo+jUa/TLMot6 SFzO0s0E74e5HoBfIgfaTBpmuKIEIMs4prl5KimNZ3M+bjtWf16HPhFXsqrk082mRAFS gE2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zYxv6p0OLRmJkUIoXHmmBGT6rx0buZmGw9eP/QrShps=; b=J1PW08b5ive5LLprUw7LjH9PaHWICYlPvVl208T6Htyx4IIKS5RGz07zjchvwL0Ys+ UdLwL505g/4aBa67Bttoz6bzIvD9R+3xrmZ8XP8Upl+QM/f8vCugfdblzKsuKbZVaDdT Rz0AKKmt/FzdAF1wEaYnxucbaCejPt7mVdS1FuRCXc9SqxFA402/td+HeINjKE9glLpx INXzTKvBJJwvaPO40PdGl1VsYlmsmGgk35FQz5SOJc/rJoY5HhjWj+Ykf1kol3XAgPcW RlNMD9hmoL2WqUTMKaL+tDpG35Ru8nxrfBiDbY1wVQWuIXsDTsuqQuQbN6jWCGzpC/JS vC1Q== X-Gm-Message-State: ANoB5pnVTogcDRoqGsVOSD/i5qFnMR43F5YO0Xy5JCCY13R7pSo+ZqJ2 YaBwGwvoc6+U17hzJHiHXQs= X-Received: by 2002:a17:90a:f286:b0:20a:6106:a283 with SMTP id fs6-20020a17090af28600b0020a6106a283mr10119996pjb.107.1668346821873; Sun, 13 Nov 2022 05:40:21 -0800 (PST) Received: from junjun.localdomain ([1.83.223.231]) by smtp.gmail.com with ESMTPSA id k11-20020a170902d58b00b001868d4600b8sm5204943plh.158.2022.11.13.05.40.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Nov 2022 05:40:21 -0800 (PST) From: Harry Song To: will@kernel.org Cc: robin.murphy@arm.com, joro@8bytes.org, jundongsong1@gmail.com, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] iommu/arm-smmu-v3: Optimize checking for invalid values Date: Sun, 13 Nov 2022 21:38:55 +0800 Message-Id: <20221113133855.6219-1-jundongsong1@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,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?1749388824202843404?= X-GMAIL-MSGID: =?utf-8?q?1749388824202843404?= Move the check of invalid value (iotlb_gather->pgsize = 0) from arm_smmu_iotlb_sync() to __arm_smmu_tlb_inv_range() for iotlb sync to make the code clearer. Signed-off-by: Harry Song --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 6d5df91c5..e51b9f506 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1873,7 +1873,7 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd, size_t inv_range = granule; struct arm_smmu_cmdq_batch cmds; - if (!size) + if (!size || !inv_range) return; if (smmu->features & ARM_SMMU_FEAT_RANGE_INV) { @@ -2507,9 +2507,6 @@ static void arm_smmu_iotlb_sync(struct iommu_domain *domain, { struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); - if (!gather->pgsize) - return; - arm_smmu_tlb_inv_range_domain(gather->start, gather->end - gather->start + 1, gather->pgsize, true, smmu_domain);