From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17FD3C77B75 for ; Mon, 15 May 2023 13:10:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 76C3F90000C; Mon, 15 May 2023 09:10:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 71BD090000B; Mon, 15 May 2023 09:10:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 546C790000C; Mon, 15 May 2023 09:10:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 3B29D90000B for ; Mon, 15 May 2023 09:10:21 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id EE9D98125B for ; Mon, 15 May 2023 13:10:20 +0000 (UTC) X-FDA: 80792523000.14.EDD08EA Received: from instance-20230316-1848.icoremail.net (sgoci-sdnproxy-4.icoremail.net [129.150.39.64]) by imf28.hostedemail.com (Postfix) with ESMTP id C3EE5C0009 for ; Mon, 15 May 2023 13:10:15 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=pku.edu.cn header.s=dkim header.b=HnCW9Ni1; spf=pass (imf28.hostedemail.com: domain of lrh2000@pku.edu.cn designates 129.150.39.64 as permitted sender) smtp.mailfrom=lrh2000@pku.edu.cn; dmarc=pass (policy=none) header.from=pku.edu.cn ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684156216; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=hM6wTF99Qb2+CWCASa87DqYXF4HjiX77nILI5iBwlYI=; b=deVUDSu/TffqMWKzNY1QLBOiTCxT74TmcjddMGKNVcuW/+ADtCK0h3iH6ZAJA6FMaEkZyB akd0/IMh/CQngK+b5UYGGBIBFIeHJKy8vP4gelRJNACtf4/pT4w3jMR7zjz1apEnYE0pj8 4esJkXq0WAlWzdgWvGqMAWWoLSDA03I= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684156216; a=rsa-sha256; cv=none; b=Nan8GCyd9TOeVVx19VefzEYN67WmFvS0p2X4a4glnSP95NyUPSSIYw8I5K3//tTFBS2lhl wH30nSYf5rwhh7MDvHl8LXuZEI0/VICpIRcCkmrymcao3twLwoE7SWbwGrwpz2jtFmY0Qa 8Cp2H3DEGk9fDcKaTa831M+Groek2Ls= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=pku.edu.cn header.s=dkim header.b=HnCW9Ni1; spf=pass (imf28.hostedemail.com: domain of lrh2000@pku.edu.cn designates 129.150.39.64 as permitted sender) smtp.mailfrom=lrh2000@pku.edu.cn; dmarc=pass (policy=none) header.from=pku.edu.cn DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pku.edu.cn; s=dkim; h=Received:From:To:Cc:Subject:Date: Message-Id:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=hM6wTF99Qb2+CWCASa87DqYXF4HjiX77nI LI5iBwlYI=; b=HnCW9Ni1T0Tk+222800B1cmPfEly+gG4RGJeMSMFYlHY414w8v BuDsdMB+SoMr0TsFPwjHXOkbUFnA5m7Ff7hb9q5n2+yd3zD9xr8PUJMrbZ1fR+cw jk52PpM3hfOhed4KHvHJJL93lVBKRXU7e1bWVmSsXCjA1a15ZeYc4aAYg= Received: from localhost.localdomain (unknown [10.7.98.243]) by front02 (Coremail) with SMTP id 54FpogAnLDgqL2JkVboyFA--.10053S4; Mon, 15 May 2023 21:10:07 +0800 (CST) From: Ruihan Li To: linux-mm@kvack.org, linux-usb@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Pasha Tatashin , David Hildenbrand , Matthew Wilcox , Andrew Morton , Christoph Hellwig , Alan Stern , Greg Kroah-Hartman , Ruihan Li , stable@vger.kernel.org Subject: [PATCH v2 2/4] usb: usbfs: Use consistent mmap functions Date: Mon, 15 May 2023 21:09:56 +0800 Message-Id: <20230515130958.32471-3-lrh2000@pku.edu.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230515130958.32471-1-lrh2000@pku.edu.cn> References: <20230515130958.32471-1-lrh2000@pku.edu.cn> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:54FpogAnLDgqL2JkVboyFA--.10053S4 X-Coremail-Antispam: 1UD129KBjvJXoW7tFyUZryUCFWrJr47Zw4kCrg_yoW8KF13pF WrK3yYkr40gF1Svr1q9an5WF95Gwn5KFyUWrW2v3s8u3W3Jr1SkFySya4Yqr17tr1kXr1f tFWqyw13C3W5uFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBI1xkIjI8I6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AE w4v_Jr0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2 IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2 z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2vYz4IE04k24V AvwVAKI4IrM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xf McIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7 v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4IIrI8v6xkF 7I0E8cxan2IY04v7MxkIecxEwVCm-wCF04k20xvY0x0EwIxGrwCF04k20xvE74AGY7Cv6c x26w4UJr1UMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2Iq xVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42 IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY 6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aV CY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbHa0DUUUUU== X-CM-SenderInfo: yssqiiarrvmko6sn3hxhgxhubq/1tbiAgEMBVPy77495QAAsi X-Rspamd-Queue-Id: C3EE5C0009 X-Stat-Signature: jc7o6ec5u867xuyqjq5pamxuaxteyriu X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1684156215-715931 X-HE-Meta: U2FsdGVkX1+1jweuswDlxSUZRd1imW8uhEsl9A7jTJLdL7tIfGIBaZj0IJeAhegZ/Rm7mtoi0Gds4Xmk7XzOdvYkltzeBAYXoYL68kKsMaGzphefYQMcv3aN66Sx5b7Wb7LY/UtuwRyXxzP+VjbKk8BGerIQvkPoZDPa2kdZMzkoDmxqeWunl0VA87sFGIl5irfWBVUomedhSgig9Yho8n8Yy7JY3TpW+eFnBkfHxVWsemgVX1E4tN7D3f8nTjNOcGAHYmveYH9nZEyMbmcJnavOmKJAb6r9c7eA/xmxL+6ImPRg3WpY87ow+C4HXsXpuU7rdycp+xSPxZ4q2FSPk+X9KV+/F4iY06qgx2OydhEwjoT4XK3NvCFIFbnVqkVSdsrhspA9vIjAfl2MUhP/mbGw+tya8/9oJ1EMbC0q92SPkHoZDgWv2JoVgnczbXUpiDxjXBW/QXO7PfhA7EHv9fzii7kGLByoUQ2NvDZzaDR9A7yImgdxA23H+OV4JCWfHH9vqRYEssOI89zD/J6ZxJulJ+SIPyWiAfcupQgiP0s/TXLa53C3PiLlBXsA7rSisVSCTnXUVVSC7xV1Uxxob9ZT6saj77dJV1PtZ7SygaikG7nRahBTaCknMz6+3ogVQnQjkSn7RNFB+i9t6Z4knaQDaAR5AX/eJGX+Rr9Os/vQ8EIXjGmY9/7Clyvju/GDfA6qQAj2SwFHkWK8VGugUiUk2PV6uEqUDuZXlF3qjXz3gUiluwDlwgSesmB460J9b0tDmJbQxllYB+bkDwZaO/Nv2oPmC4EwQUCrY/g7p3nGXr1be1ida9faBTJWvTdF1ANeUQiXu7DzdUEwBSYTibVs4kvTYmirH/b+fUKYAzc7R2+82wDnczLyjpN04G4/UCtU3Arjp3eUdpU1aAFvvzm1C2oeoLDZA7GT7Q9J63yITqQef789atBfYKuWJlv65rbxp2o7th+bQuUozuv 12ZQQCOj seyHVBtYWfI7VhRQjBJpXKMsCdiCGmr7pkK/G1OwfeRCCgXrg5AWD2+256fuJm7Ram+ahibKBdi7sKP2NP3yRRiKS+xWHstV3IdgPQW+VlXGBccaXpMBsGNdgL6TYew5vI3RT54uDZ89gHmUC10M+anxsbliZKoBV0woOCQYEexklDi7o7WMZnZoP706j0EftEtC1ghz/KGr85GGuY5qq4gyzx0Agcex3iJoIeI5x3/V3FejYxMo3dXivehqq+FXpxM0UU65A8Ul8kXEd891mzAuk61A2BuFlXMqPRflhLbL4xhCFQqnLfg6ewQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: When hcd->localmem_pool is non-null, localmem_pool is used to allocate DMA memory. In this case, the dma address will be properly returned (in dma_handle), and dma_mmap_coherent should be used to map this memory into the user space. However, the current implementation uses pfn_remap_range, which is supposed to map normal pages. Instead of repeating the logic in the memory allocation function, this patch introduces a more robust solution. Here, the type of allocated memory is checked by testing whether dma_handle is properly set. If dma_handle is properly returned, it means some DMA pages are allocated and dma_mmap_coherent should be used to map them. Otherwise, normal pages are allocated and pfn_remap_range should be called. This ensures that the correct mmap functions are used consistently, independently with logic details that determine which type of memory gets allocated. Fixes: a0e710a7def4 ("USB: usbfs: fix mmap dma mismatch") Cc: stable@vger.kernel.org Signed-off-by: Ruihan Li --- drivers/usb/core/devio.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c index 3936ca7f7..fcf68818e 100644 --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c @@ -235,7 +235,7 @@ static int usbdev_mmap(struct file *file, struct vm_area_struct *vma) size_t size = vma->vm_end - vma->vm_start; void *mem; unsigned long flags; - dma_addr_t dma_handle; + dma_addr_t dma_handle = DMA_MAPPING_ERROR; int ret; ret = usbfs_increase_memory_usage(size + sizeof(struct usb_memory)); @@ -265,7 +265,14 @@ static int usbdev_mmap(struct file *file, struct vm_area_struct *vma) usbm->vma_use_count = 1; INIT_LIST_HEAD(&usbm->memlist); - if (hcd->localmem_pool || !hcd_uses_dma(hcd)) { + /* + * In DMA-unavailable cases, hcd_buffer_alloc_pages allocates + * normal pages and assigns DMA_MAPPING_ERROR to dma_handle. Check + * whether we are in such cases, and then use remap_pfn_range (or + * dma_mmap_coherent) to map normal (or DMA) pages into the user + * space, respectively. + */ + if (dma_handle == DMA_MAPPING_ERROR) { if (remap_pfn_range(vma, vma->vm_start, virt_to_phys(usbm->mem) >> PAGE_SHIFT, size, vma->vm_page_prot) < 0) { -- 2.40.1