From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C6CE79DA8 for ; Sun, 3 Mar 2024 19:41:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709494901; cv=none; b=RptC80EvId7+/+iQ6VOwHOC6fu6/d6QZwJpqS7Dis6UHycBhQNCKEikPtCuRQM/aOdfPw3DAmeZXfs7/iBI0HiJIUcZW3CiUr03MngrlPBZQWDQyQ//aHY8npSJcSZOtoqMVKSHUsXvlwViEqHnAvrnWLJhl0vvx1RH8pe9kMjE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709494901; c=relaxed/simple; bh=+E5ggpM/hP5EXhzqfsuNKFSQ5CtjgjuoKpGUYJW27cQ=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=dGaYE625zSDjUtDfYo3O88EPtuBccv/bBWW37DThQkXi/DHDetEEruvjNubfyYJaZ021q7QCFOni4bcVyLwaywE2XAirGYYVbbxgEGR9PB76QCaGFx303WKPPAfzNezM792MAcEWTFX4NaF2HLVRNr6gRNFjy2bJDt+YhoxTG/4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=TFlGJsi2; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="TFlGJsi2" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709494898; 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=CrZqCaxS9s67B9eUeOozSgFserucqgwctSw84bcfIM8=; b=TFlGJsi2blITaf/kl5Or1BSclqAhmidWOKr7hpeMQuMqpLVV1bslhpsuk7F4qq3lBnV7r8 NUVu+5P71z4APD9hcC0rsRds+zpPudZB+2op+722U8e69euShIdVkb1oAR7aWb1EJD1AuW i1mEUi9HTbUiYCno/GmXuEc1Qfk4FsY= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-468-YonSfsiiMzSdOHjz8yLP-g-1; Sun, 03 Mar 2024 14:41:36 -0500 X-MC-Unique: YonSfsiiMzSdOHjz8yLP-g-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a44508b6b22so201899666b.2 for ; Sun, 03 Mar 2024 11:41:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709494895; x=1710099695; 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=CrZqCaxS9s67B9eUeOozSgFserucqgwctSw84bcfIM8=; b=ZvffJcuPSlZC1ZwkggNOkGAGLImF5PBEoFHHSKpvV4oQTvXsE7UEoYIiIMM/2ovMMb bG0oebztRKmXOzelhNvk76mssjoyhhBbkKOCVULwUTPAU8aEQzGSoFZM3tZGxTkgpBCu N1w5ScziWNqUyXsXSv9GGQ6YSght1mgOwnVGO3jMWHXHQ1PvCtfO6ud3DgMIWENGQdmh j6pvM1+Rqj9//3u8+ARgGuu8had1MSYWKoEnSQ1Gzuafr6hRUzAzlDiaZr4yGzoCpK2P C2oHkqyMjgZ60bdAILEAGTP6gHSoyACq56OssdpQSGx0FFbldG/03OsMydXJ5c6blevf M4LQ== X-Forwarded-Encrypted: i=1; AJvYcCX7fFfkrnyxmt2P0SwsrFdUgS6GH+SITv/yjXLnjEuFmN/GrRQPNYhiwzGAqzIxCmFM0Z1YYH46NkHo6r+pNs5bm+UUY6od46GN X-Gm-Message-State: AOJu0YzOUjk0U4esm2kyNbrqDAUhzoKkBgYaYH3G17lcy2UGh/GgqGub VeNnCdg7Y9yXJX8R/n6ItPTW15ttTBCQAbfZ8UyfZc1ndO8qTqVGWTUNQ3abCvPTjR+mn7XEaMQ GWFNk8ymj2F/PgKOlg7Yr/qCy5HNEcy+Aa0S3/9V5uyS5H6cHO0KUJD7OJA== X-Received: by 2002:a17:906:bc48:b0:a44:958:c3a4 with SMTP id s8-20020a170906bc4800b00a440958c3a4mr4451496ejv.32.1709494895270; Sun, 03 Mar 2024 11:41:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IFu1jxPV7cPS+/fsucBMIlB97ZiWQ90zg1WuMlonpMMThfwE6bnawsbVY/blo0sj3F2RYlgDg== X-Received: by 2002:a17:906:bc48:b0:a44:958:c3a4 with SMTP id s8-20020a170906bc4800b00a440958c3a4mr4451489ejv.32.1709494894956; Sun, 03 Mar 2024 11:41:34 -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 tk2-20020a170907c28200b00a43ab3e38d6sm3933441ejc.114.2024.03.03.11.41.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 03 Mar 2024 11:41:34 -0800 (PST) Message-ID: <0f6180b5-92ef-4fb5-8df9-734ec4105c68@redhat.com> Date: Sun, 3 Mar 2024 20:41:33 +0100 Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 10/10] drm/vboxvideo: fix mapping leaks Content-Language: en-US, nl To: Philipp Stanner , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Bjorn Helgaas , Sam Ravnborg , dakr@redhat.com Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, stable@kernel.vger.org References: <20240301112959.21947-1-pstanner@redhat.com> <20240301112959.21947-11-pstanner@redhat.com> From: Hans de Goede In-Reply-To: <20240301112959.21947-11-pstanner@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi, On 3/1/24 12:29, Philipp Stanner wrote: > When the PCI devres API was introduced to this driver, it was wrongly > assumed that initializing the device with pcim_enable_device() instead > of pci_enable_device() will make all PCI functions managed. > > This is wrong and was caused by the quite confusing PCI devres API in > which some, but not all, functions become managed that way. > > The function pci_iomap_range() is never managed. > > Replace pci_iomap_range() with the actually managed function > pcim_iomap_range(). > > CC: # v5.10+ > Fixes: 8558de401b5f ("drm/vboxvideo: use managed pci functions") > Signed-off-by: Philipp Stanner Thanks, patch looks good to me: Reviewed-by: Hans de Goede Since this depends on the pcim_iomap_range() function which is new in this series and since the vboxvideo code does not see a lot of changes I think that it would be best for this patch to be merged through the PCI tree together with the rest of the series. Regards, Hans > --- > drivers/gpu/drm/vboxvideo/vbox_main.c | 20 +++++++++----------- > 1 file changed, 9 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/vboxvideo/vbox_main.c b/drivers/gpu/drm/vboxvideo/vbox_main.c > index 42c2d8a99509..d4ade9325401 100644 > --- a/drivers/gpu/drm/vboxvideo/vbox_main.c > +++ b/drivers/gpu/drm/vboxvideo/vbox_main.c > @@ -42,12 +42,11 @@ static int vbox_accel_init(struct vbox_private *vbox) > /* Take a command buffer for each screen from the end of usable VRAM. */ > vbox->available_vram_size -= vbox->num_crtcs * VBVA_MIN_BUFFER_SIZE; > > - vbox->vbva_buffers = pci_iomap_range(pdev, 0, > - vbox->available_vram_size, > - vbox->num_crtcs * > - VBVA_MIN_BUFFER_SIZE); > - if (!vbox->vbva_buffers) > - return -ENOMEM; > + vbox->vbva_buffers = pcim_iomap_range( > + pdev, 0, vbox->available_vram_size, > + vbox->num_crtcs * VBVA_MIN_BUFFER_SIZE); > + if (IS_ERR(vbox->vbva_buffers)) > + return PTR_ERR(vbox->vbva_buffers); > > for (i = 0; i < vbox->num_crtcs; ++i) { > vbva_setup_buffer_context(&vbox->vbva_info[i], > @@ -116,11 +115,10 @@ int vbox_hw_init(struct vbox_private *vbox) > DRM_INFO("VRAM %08x\n", vbox->full_vram_size); > > /* Map guest-heap at end of vram */ > - vbox->guest_heap = > - pci_iomap_range(pdev, 0, GUEST_HEAP_OFFSET(vbox), > - GUEST_HEAP_SIZE); > - if (!vbox->guest_heap) > - return -ENOMEM; > + vbox->guest_heap = pcim_iomap_range(pdev, 0, > + GUEST_HEAP_OFFSET(vbox), GUEST_HEAP_SIZE); > + if (IS_ERR(vbox->guest_heap)) > + return PTR_ERR(vbox->guest_heap); > > /* Create guest-heap mem-pool use 2^4 = 16 byte chunks */ > vbox->guest_pool = devm_gen_pool_create(vbox->ddev.dev, 4, -1,