From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KhPWbto8" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97C88D3 for ; Mon, 4 Dec 2023 12:13:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701720806; 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=qN1XS3PUQh/SNdnH3l3+prVnbHkxP15eE1jftD1eXYs=; b=KhPWbto8CXvVFyNyWOnULyaM8Uk88at93P288NFlOMUAc7fYrO2SrEiJmG/WIMxF9UhWP/ mgCIpVomGLDJhbBe+SVh4SmHDK/qGwDpyAfSrrNA6tMHLLyB9folk6p1IAoxTKcCEQZw+s lvp3ghxvv3/VPSBWJ2Eh+kGcgckaDdg= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-96-ZT21uXY5Pmy68EDQYoiG9A-1; Mon, 04 Dec 2023 15:13:25 -0500 X-MC-Unique: ZT21uXY5Pmy68EDQYoiG9A-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a00dd93a5f9so374987166b.1 for ; Mon, 04 Dec 2023 12:13:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701720804; x=1702325604; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qN1XS3PUQh/SNdnH3l3+prVnbHkxP15eE1jftD1eXYs=; b=aDdc6z+kgo2ZKt4JgqMYjckSRnHexrTmXqrlQ7vtWECmnV/hwBAhxBlD9RsJyTS2I9 aegxxSUSKlILor6M7f6Oz35YRCB/IFMyba9n4TfMh3mrEjtSUFI27YMSfJVq3EUkbrMN GPzHzEFkt6pNaw9EZkV07hhpcTxjOYjQrKwmASXyT6vCAweiAm1hbxXFPQIh9zawy3gk WAs2S7O9AdG1RYAPRkuLE1qgAiazGyJ5dMp1VaDmwg9uRcaGHrOM919607EnZj1aq/xK zQSLFkSp1xnoFMOpLDCLXN2elIotiOlUtR2CiM7uG8wtxrA1wDgE+xIe5qDgmvaXrcCZ R0GQ== X-Gm-Message-State: AOJu0Yy/kfFG2OGGXPR8CfP7STAjiZbvq0IFqha6GYSJoe52ajNPJqgr peFtpxpJBNiq4n6xLAyEoRmp7P8mTqx5yzgu9v9qy2ZKr8JLpbxetRO+Xa475rOuCkrPrlJE5YN BI1e2ZGG3yzBeXzwcm0EYIW4wRPOtc9dNng== X-Received: by 2002:a17:906:f208:b0:a19:a1ba:bac1 with SMTP id gt8-20020a170906f20800b00a19a1babac1mr1760281ejb.103.1701720804520; Mon, 04 Dec 2023 12:13:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IG12sa5b7+OknahXWvg9yd0qj58CQVbsVs+TZzhIj6nsfRZSX/F6rgqg/YLanQEjq6/MLCeEw== X-Received: by 2002:a17:906:f208:b0:a19:a1ba:bac1 with SMTP id gt8-20020a170906f20800b00a19a1babac1mr1760277ejb.103.1701720804225; Mon, 04 Dec 2023 12:13:24 -0800 (PST) Received: from ?IPV6:2001:1c00:c32:7800:5bfa:a036:83f0:f9ec? (2001-1c00-0c32-7800-5bfa-a036-83f0-f9ec.cable.dynamic.v6.ziggo.nl. [2001:1c00:c32:7800:5bfa:a036:83f0:f9ec]) by smtp.gmail.com with ESMTPSA id lj8-20020a170906f9c800b009fe1dd221a3sm5614430ejb.92.2023.12.04.12.13.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 04 Dec 2023 12:13:23 -0800 (PST) Message-ID: Date: Mon, 4 Dec 2023 21:13:22 +0100 Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH V6 01/20] platform/x86/intel/vsec: Fix xa_alloc memory leak Content-Language: en-US, nl To: david.e.box@linux.intel.com, =?UTF-8?Q?Ilpo_J=C3=A4rvinen?= Cc: LKML , platform-driver-x86@vger.kernel.org, rajvi.jingar@linux.intel.com References: <20231129222132.2331261-1-david.e.box@linux.intel.com> <20231129222132.2331261-2-david.e.box@linux.intel.com> <5c21230-1176-4168-f31f-a0c1f1713ca8@linux.intel.com> <198aadd7a91152393ec56d421fa042d30378af40.camel@linux.intel.com> From: Hans de Goede In-Reply-To: <198aadd7a91152393ec56d421fa042d30378af40.camel@linux.intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hi, On 12/4/23 20:57, David E. Box wrote: > Hi Hans, > > On Mon, 2023-12-04 at 14:51 +0100, Hans de Goede wrote: >> Hi, >> >> On 11/30/23 12:02, Ilpo Järvinen wrote: >>> On Wed, 29 Nov 2023, David E. Box wrote: >>> >>>> Commit 936874b77dd0 ("platform/x86/intel/vsec: Add PCI error recovery >>>> support to Intel PMT") added an xarray to track the list of vsec devices >>>> to >>>> be recovered after a PCI error. But it did not provide cleanup for the >>>> list >>>> leading to a memory leak that was caught by kmemleak.  Do xa_alloc() >>>> before >>>> devm_add_action_or_reset() so that the list may be cleaned up with >>>> xa_erase() in the release function. >>>> >>>> Fixes: 936874b77dd0 ("platform/x86/intel/vsec: Add PCI error recovery >>>> support to Intel PMT") >>>> Signed-off-by: David E. Box >>>> --- >>>> >>>> V6 - Move xa_alloc() before ida_alloc() to reduce mutex use during error >>>>      recovery. >>>>    - Fix return value after id_alloc() fail >>>>    - Add Fixes tag >>>>    - Add more detail to changelog >>>> >>>> V5 - New patch >>>> >>>>  drivers/platform/x86/intel/vsec.c | 24 ++++++++++++++---------- >>>>  drivers/platform/x86/intel/vsec.h |  1 + >>>>  2 files changed, 15 insertions(+), 10 deletions(-) >>>> >>>> diff --git a/drivers/platform/x86/intel/vsec.c >>>> b/drivers/platform/x86/intel/vsec.c >>>> index c1f9e4471b28..2d568466b4e2 100644 >>>> --- a/drivers/platform/x86/intel/vsec.c >>>> +++ b/drivers/platform/x86/intel/vsec.c >>>> @@ -120,6 +120,8 @@ static void intel_vsec_dev_release(struct device *dev) >>>>  { >>>>         struct intel_vsec_device *intel_vsec_dev = dev_to_ivdev(dev); >>>>   >>>> +       xa_erase(&auxdev_array, intel_vsec_dev->id); >>>> + >>>>         mutex_lock(&vsec_ida_lock); >>>>         ida_free(intel_vsec_dev->ida, intel_vsec_dev->auxdev.id); >>>>         mutex_unlock(&vsec_ida_lock); >>>> @@ -135,19 +137,27 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct >>>> device *parent, >>>>         struct auxiliary_device *auxdev = &intel_vsec_dev->auxdev; >>>>         int ret, id; >>>>   >>>> -       mutex_lock(&vsec_ida_lock); >>>> -       ret = ida_alloc(intel_vsec_dev->ida, GFP_KERNEL); >>>> -       mutex_unlock(&vsec_ida_lock); >>>> +       ret = xa_alloc(&auxdev_array, &intel_vsec_dev->id, intel_vsec_dev, >>>> +                      PMT_XA_LIMIT, GFP_KERNEL); >>>>         if (ret < 0) { >>>>                 kfree(intel_vsec_dev->resource); >>>>                 kfree(intel_vsec_dev); >>>>                 return ret; >>>>         } >>>>   >>>> +       mutex_lock(&vsec_ida_lock); >>>> +       id = ida_alloc(intel_vsec_dev->ida, GFP_KERNEL); >>>> +       mutex_unlock(&vsec_ida_lock); >>>> +       if (id < 0) { >>>> +               kfree(intel_vsec_dev->resource); >>>> +               kfree(intel_vsec_dev); >>>> +               return id; >>> >>> Thanks, this looks much better this way around but it is missing >>> xa_alloc() rollback now that the order is reversed. >>> >>> Once that is fixed, >>> >>> Reviewed-by: Ilpo Järvinen >> >> I have fixed this up, adding the missing: >> >>         xa_erase(&auxdev_array, intel_vsec_dev->id); >> >> to this error-exit path while merging this. > > Thanks. Does that include the rest of the series which was all reviewed by Ilpo? Yes the entire series has been merged into the pdx86/review-hans branch now. Regards, Hans