From patchwork Wed Oct 6 16:49:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12539873 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA790C433EF for ; Wed, 6 Oct 2021 17:02:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 751D7610E5 for ; Wed, 6 Oct 2021 17:02:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 751D7610E5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:54088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYAJD-00063a-JP for qemu-devel@archiver.kernel.org; Wed, 06 Oct 2021 13:02:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYA7F-0004RO-Fk for qemu-devel@nongnu.org; Wed, 06 Oct 2021 12:50:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23468) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYA7C-0007ab-Ph for qemu-devel@nongnu.org; Wed, 06 Oct 2021 12:50:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633538998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d3SY8kt+0eUr16xiO6WRv5UUaNaOH2E74e2h2BTlxRY=; b=RBuZldxpt2+H8VjqJj4puyGxU/7Es5yOPD4FU4N4GKJc//omfMXbpSMoN9JNhbbZAy5EKf 93d3/cviQK/G5JBPUc1VGSilgnNf1zbHJo1CLKC5egJkJkK5dG8msqWdveLySDGPXCQQ7Y khG4DQzTYg3394gsYVIYzq8OMq/TdT8= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-375-aaKbAiqeM4mRfsOKcDCgeg-1; Wed, 06 Oct 2021 12:49:57 -0400 X-MC-Unique: aaKbAiqeM4mRfsOKcDCgeg-1 Received: by mail-wr1-f69.google.com with SMTP id d13-20020adfa34d000000b00160aa1cc5f1so2547211wrb.14 for ; Wed, 06 Oct 2021 09:49:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d3SY8kt+0eUr16xiO6WRv5UUaNaOH2E74e2h2BTlxRY=; b=o87He0HME8O9T07Bku/qmXECDkGv38ZqdXEFs99+bSNsJl/u2/I/JEV9jvE+jkD220 gjaER/Vk4PD63WgrDwPfUn2dBpznSsUcrtWWB7ujmFALeYRFAEzdoFIebE6lZT7+hKRC yZEK48OKuGzSXtXLbIf69w2cXjLuAKWBcnACSbH83v+Pm9fOxSK5eIMLtgDQhEqbaSNb SYEHCGHKYXt3uVJNy1kPQBUKlfxEP01ryy3LX9zUBA1i5CTVjvL0dz8a0smq0OcR/nsb Tfwk4pgL82yuPRFdIneCz4OMwovEeA2xX6PfHuSOKAeAcZh5/6Zc9KbVScrosZGwB2Bu Rtag== X-Gm-Message-State: AOAM530t+RRHrsRmxxGepVuuApyzGJ9zddFqqiJhgArwQCsrwVQXmQLQ 071ZTxP2dkxSNKp5CuDjjp1fekNb4ADeQcaiOpwfw0IRDsfHTmePcIr6XhSM6gH4Z+ea1ziMVRR KIDUju+yVR6NnVXjZQDirzksm14KzW6H9i08nQ61zftE+2mOl0ROn3dIFMaVK+6ce X-Received: by 2002:a1c:158:: with SMTP id 85mr10873941wmb.187.1633538995662; Wed, 06 Oct 2021 09:49:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYXrWDPsnysXoTslg9CNi8EtDOIX+tHxKAHzrlnJ6h+EnzldDiVm9QAyPTkus4yIScFH6FPg== X-Received: by 2002:a1c:158:: with SMTP id 85mr10873911wmb.187.1633538995379; Wed, 06 Oct 2021 09:49:55 -0700 (PDT) Received: from x1w.redhat.com (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id k22sm21875271wrd.59.2021.10.06.09.49.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Oct 2021 09:49:54 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 5/5] block/nvme: Fix memory leak from nvme_init_queue() Date: Wed, 6 Oct 2021 18:49:31 +0200 Message-Id: <20211006164931.172349-6-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211006164931.172349-1-philmd@redhat.com> References: <20211006164931.172349-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.05, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Max Reitz , Hanna Reitz , Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" nvme_create_queue_pair() allocates resources with qemu_vfio_dma_map(), but we never release them. Do it in nvme_free_queue() which is called from nvme_free_queue_pair(). Reported by valgrind: ==252858== 520,192 bytes in 1 blocks are still reachable in loss record 8,293 of 8,302 ==252858== at 0x4846803: memalign (vg_replace_malloc.c:1265) ==252858== by 0x484691F: posix_memalign (vg_replace_malloc.c:1429) ==252858== by 0xB8AFE4: qemu_try_memalign (oslib-posix.c:210) ==252858== by 0xA9E315: nvme_create_queue_pair (nvme.c:229) ==252858== by 0xAA0125: nvme_init (nvme.c:799) ==252858== by 0xAA081C: nvme_file_open (nvme.c:953) ==252858== by 0xA23DDD: bdrv_open_driver (block.c:1550) ==252858== by 0xA24806: bdrv_open_common (block.c:1827) ==252858== by 0xA2889B: bdrv_open_inherit (block.c:3747) ==252858== by 0xA28DE4: bdrv_open (block.c:3840) ==252858== by 0x9E0F8E: bds_tree_init (blockdev.c:675) ==252858== by 0x9E7C74: qmp_blockdev_add (blockdev.c:3551) Fixes: bdd6a90a9e5 ("block: Add VFIO based NVMe driver") Signed-off-by: Philippe Mathieu-Daudé --- block/nvme.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/nvme.c b/block/nvme.c index 6e476f54b9f..903c8ffa060 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -185,6 +185,7 @@ static bool nvme_init_queue(BDRVNVMeState *s, NVMeQueue *q, static void nvme_free_queue(BDRVNVMeState *s, NVMeQueue *q) { + qemu_vfio_dma_unmap(s->vfio, q->queue); qemu_vfree(q->queue); }