From patchwork Fri Aug 11 13:02:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangzekun (A)" X-Patchwork-Id: 134527 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1119791vqi; Fri, 11 Aug 2023 07:06:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE5SIPZmufOVBo1OjDXHV/CmUPgsAgrpNQlvgk5Grzxyz6+Ek86bOQzAGnaxiiu8lwFDn3n X-Received: by 2002:a05:6a00:9a3:b0:67e:bf65:ae68 with SMTP id u35-20020a056a0009a300b0067ebf65ae68mr2353808pfg.3.1691762765923; Fri, 11 Aug 2023 07:06:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691762765; cv=none; d=google.com; s=arc-20160816; b=Yf75v37yu1vxUOWE2nsHu5kozF/hSAgQZXcujevx+poz6TGSw+tKftMm8AckGdIu0e MdbwH3YYP+Amh6WJvaedafUyseUjLUJ56XRU0pGm1NAbFs5JtssocggCiw7RiUymnPMw nw7sEcJo0IL04I2EVUCF2XiSDs9ZwgTmoAOXuPv2ztH+ORIQJZSGiz/TXNJa3W72Bb9R ULfAlrQpo5Iw0cXfuQppuM4K+kDIZInHly/7IYlLGwFua2lKhwclX8O4xNaoB4pDG6vl xYBVtuD/WA0WMkxBIV5M9sokZIf43WW24vAWaYiWg5xSOKnJKUqNr7o+IyEclBy+TcF+ /yHQ== 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=9/U+pD5oRHnqpzvvvJZGZULfZp9IgaQsblFITN+uEmE=; fh=j+d8Qji3Kd78Y5wikuIe56W4rxsMj0I3YfL77K4ftaQ=; b=swc6XhiFlxqcC0dfQ5mLfbiHuw0wkPoYlQ6byzbCRWPYayjNllxOIc7GoZyldaj0+d +4FAE2u1dlkrM2wRSrSO/sE8aAJWjz2ZS7sysANpZmDtlyfK7IkPsdJKGM5lHf3+xHAE /T/LxaG6zIFna7Gqjz5YOjCbZINKZ2oj6Izz6oi3Xmi6aTPPYqw3lbLxrsQP9JkTUKN+ +nUTva/9lI07LnWg5tkVtifT0vFRLXUcNdx3qW6yask0mpYziY4FaoZwEBco0zJNJJmY ru0jNyt9yEbfCWuIcBt/THVCXjbzqpa1K3y8Ahpg+ylFxVU4NYvxVd3koh3QOeJYEcEp gLCQ== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f20-20020a056a0022d400b006875170380asi3563923pfj.121.2023.08.11.07.05.49; Fri, 11 Aug 2023 07:06:05 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234059AbjHKNLP (ORCPT + 99 others); Fri, 11 Aug 2023 09:11:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229994AbjHKNLL (ORCPT ); Fri, 11 Aug 2023 09:11:11 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC84518B for ; Fri, 11 Aug 2023 06:11:09 -0700 (PDT) Received: from kwepemi500019.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4RMkcb0k0TzqSg0; Fri, 11 Aug 2023 21:08:15 +0800 (CST) Received: from huawei.com (10.175.112.208) by kwepemi500019.china.huawei.com (7.221.188.117) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 11 Aug 2023 21:11:06 +0800 From: Zhang Zekun To: , , CC: , , , , , , Subject: [RESEND PATCH 1/2] iommu/iova: Add check for cpu_rcache in free_iova_rcaches Date: Fri, 11 Aug 2023 21:02:45 +0800 Message-ID: <20230811130246.42719-2-zhangzekun11@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230811130246.42719-1-zhangzekun11@huawei.com> References: <20230811130246.42719-1-zhangzekun11@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.208] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500019.china.huawei.com (7.221.188.117) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,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: INBOX X-GMAIL-THRID: 1773941834442183914 X-GMAIL-MSGID: 1773941834442183914 free_iova_rcaches() needs to check if cpu_rcache->loaded and cpu_rcache->prev is NULL before freeing them. Because iova_domain_init_rcaches() may fail to alloc magazine for cpu_rcache->loaded and cpu_rcache->prev, but they will be freed for all cpus. Fixes: 32e92d9f6f87 ("iommu/iova: Separate out rcache init") Signed-off-by: Zhang Zekun --- drivers/iommu/iova.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c index 10b964600948..3c784a28e9ed 100644 --- a/drivers/iommu/iova.c +++ b/drivers/iommu/iova.c @@ -746,8 +746,12 @@ int iova_domain_init_rcaches(struct iova_domain *iovad) spin_lock_init(&cpu_rcache->lock); cpu_rcache->loaded = iova_magazine_alloc(GFP_KERNEL); + if (!cpu_rcache->loaded) { + ret = -ENOMEM; + goto out_err; + } cpu_rcache->prev = iova_magazine_alloc(GFP_KERNEL); - if (!cpu_rcache->loaded || !cpu_rcache->prev) { + if (!cpu_rcache->prev) { ret = -ENOMEM; goto out_err; } @@ -903,7 +907,11 @@ static void free_iova_rcaches(struct iova_domain *iovad) break; for_each_possible_cpu(cpu) { cpu_rcache = per_cpu_ptr(rcache->cpu_rcaches, cpu); + if (!cpu_rcache->loaded) + break; iova_magazine_free(cpu_rcache->loaded); + if (!cpu_rcache->prev) + break; iova_magazine_free(cpu_rcache->prev); } free_percpu(rcache->cpu_rcaches);