Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp2100078rwd; Tue, 13 Jun 2023 20:20:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ZVu4x6Zit6sj4wGTtPZZ1br5fIl2+7yu8n2v10C0bX2pLhLdBqyNe2xNO6TvwPbdsEHUb X-Received: by 2002:a17:902:ea01:b0:1ac:4735:45d7 with SMTP id s1-20020a170902ea0100b001ac473545d7mr14038454plg.6.1686712813977; Tue, 13 Jun 2023 20:20:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686712813; cv=none; d=google.com; s=arc-20160816; b=00Y/Y9UsS4+NOS3wNAOFtjwjg8BFk4DTtMvpjUDWKweHUvcECIjC3tThSJIYFkdo79 gxjEewcGdwWdH8+HhSX5qU+R+NtIN6xFBUriNRbDxTzLO/L58UI47lxxBdkT4J+8NTin uN5zEgaFJ5GXtM8mtsv9WO5PdLqdOmhhYsKmWBQQoc9VzBdmuW6n/kMnF+3cwok6kwJj Qpxia7Ep11wYUc8Q/rCSACWpR4ztlocswuF1mciGNop7eUvz9ajA78OAaD6FktVFuA5+ UWQo+aXwOaoqHubmDYZj/Ha7x4963jvUDHsRfVcDoXcag0MEFIpDeFUR/N2fDPnlecOk asqA== 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=3Wun2HSOBUkOFZ7qTb7kHFI0eZLJy98pwU3EbUQB0M8=; b=jfKHGYZ2+y8Q8r6ws0es8fAMjgytKAWu+Q/pWu6mVZniS3ziTQcLkv1a3pEPYB8N4p wNN9PMALpVXsP+5WdOD0Q+c2QvkVHzRwpVdhbE4mnA/H/AraFVu0nIGwJtPhLuTW23z4 1jb1G9ZIXDVdcdQqpPpsOZOtxE7rcS+3IGYHw/mOi73WifF1sOkxlSL0ztkxoyATSu9t sKf8HBOWJtwJLR1NXtbAFOy6S/Tj6FRFUwjZKA72KelKK35W9Fohe6Y7tthnIkn7LiLy plyKgLYBGHFWGFx3ltjvS1UpB1yV4DgYqnvW0jY88Mk3CBdV84/O8t5PaGJAhguKiJHM 7WxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="lgqSQ/Nq"; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u14-20020a170902e80e00b001ae014d8d03si3699103plg.432.2023.06.13.20.20.00; Tue, 13 Jun 2023 20:20:13 -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="lgqSQ/Nq"; 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 S242329AbjFNCtL (ORCPT + 99 others); Tue, 13 Jun 2023 22:49:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242356AbjFNCst (ORCPT ); Tue, 13 Jun 2023 22:48:49 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CA1B2112 for ; Tue, 13 Jun 2023 19:48:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686710900; x=1718246900; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WrDuSdB9iYumVVBXtypeizwCzmEr0vrCm5Dy+N+kwxM=; b=lgqSQ/Nq5pVoN7RZymWTRPB3e6GlTrC65cBoX81IJlXvgQbYKxSS1+Sn 7BCapw+C+o0ICOsvSJnN7MKRU/GtmvzMvA3vKCjEeUgaeyrHzuZ+8jHIN M8/xMgwy2BOfKQPDfUNjHQruTbLfY9H7cOblWrDvirDWdK6TZXekw3M22 N3k/jHpvEpZ7N3tbrzYkTkHFTDZ1Rw2vqFxlp/y7Io9jrRjE4FoH3fgU9 KdSho4jdRciYB33hx4EGLp3fb0GeA9spqa0EKrZ1UIzfSY+LgFc0ez9AC VugGJcNmnTuUPMn4s/1AolL3m7FkHHnhWmQCGOMGY+2w/5qexVx0X4Xed g==; X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="348164462" X-IronPort-AV: E=Sophos;i="6.00,241,1681196400"; d="scan'208";a="348164462" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2023 19:48:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="711884211" X-IronPort-AV: E=Sophos;i="6.00,241,1681196400"; d="scan'208";a="711884211" Received: from allen-box.sh.intel.com ([10.239.159.127]) by orsmga002.jf.intel.com with ESMTP; 13 Jun 2023 19:48:18 -0700 From: Lu Baolu To: Joerg Roedel Cc: Yanfei Xu , Suhui , iommu@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] iommu/vt-d: Remove two WARN_ON in domain_context_mapping_one() Date: Wed, 14 Jun 2023 10:47:04 +0800 Message-Id: <20230614024705.88878-4-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230614024705.88878-1-baolu.lu@linux.intel.com> References: <20230614024705.88878-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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 From: Yanfei Xu Remove the WARN_ON(did == 0) as the domain id 0 is reserved and set once the domain_ids is allocated. So iommu_init_domains will never return 0. Remove the WARN_ON(!table) as this pointer will be accessed in the following code, if empty "table" really happens, the kernel will report a NULL pointer reference warning at the first place. Signed-off-by: Yanfei Xu Link: https://lore.kernel.org/r/20230605112659.308981-3-yanfei.xu@intel.com Signed-off-by: Lu Baolu --- drivers/iommu/intel/iommu.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index e83fe243680b..4c0b7424c45e 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -1897,8 +1897,6 @@ static int domain_context_mapping_one(struct dmar_domain *domain, struct context_entry *context; int ret; - WARN_ON(did == 0); - if (hw_pass_through && domain_type_is_si(domain)) translation = CONTEXT_TT_PASS_THROUGH; @@ -1944,8 +1942,6 @@ static int domain_context_mapping_one(struct dmar_domain *domain, if (sm_supported(iommu)) { unsigned long pds; - WARN_ON(!table); - /* Setup the PASID DIR pointer: */ pds = context_get_sm_pds(table); context->lo = (u64)virt_to_phys(table->table) | -- 2.34.1