From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 D027620C49E for ; Wed, 4 Dec 2024 16:53:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733331191; cv=none; b=U++z7fSVmLaNHbUs5SPN1Jt9rRSNzdzHqT+6ummBG5CGh0Q28/vzWsQc4uSTuGXyD/lDeH/dkifNIRaWCOWXBT1EPEyBVHUmKDLac3iXLjW6XWEQOJ0carPBWjyq3QI20K9qpbl0CoTRmekjzaflUY0elCMe3+CVp4Absyqjnl8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733331191; c=relaxed/simple; bh=fZIVqrZFFGxqymQZnyFPFtS90nvILddWC5ln/4bTJrs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MoSoFl+L2+nXArHq5lsghHXwDXnTw/qfKfUeCtZyj9TKvSGZ7EoGPzZsSTx387c1opmabD0+MSmFhCArWKB2k9TmiHUJWiwuGk67YfYP/WIUPNg/B8LCfMqCYoC7jl8EO81hybA8t7FN8Ly6JbyaFiay7IcJDQz2YyiIqMUFAZE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hbB8ARSk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hbB8ARSk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C418AC4CECD; Wed, 4 Dec 2024 16:53:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733331191; bh=fZIVqrZFFGxqymQZnyFPFtS90nvILddWC5ln/4bTJrs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hbB8ARSkdR22sbIntS8f9eIxJLgJTAJwi39hnFQjqhtOnW5LEEwjlpx+DMGMqxWlR 8TmmeGvVlHuVMGzlhBQQ1fLo4BmsF0NEw0ba78cTXLppPjvl9WFeTHvMSnjnB0G77N lqU/I8ZYmr41PLFC7wvOGDgfWIyOk/6qTyGY5JyQltarVspjUQmPwExdE4NIokrW9q tbHWYWvsPneGM86KrDjQ3fKeZnxIHaXL4Zl0Ya2wzJIEDSAC7ewlwrj9819Tv0ouP6 fNjGpyLyWrfrm2yjXLf4HeOA/c6OgP3ap7pIHlEcTciyS73/Iky0FS9W1wLDNnV8nH K25ULaa1VR4FQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Andrey Kalachev , Sasha Levin Subject: Re: [PATCH v5.4-v6.1] udmabuf: use vmf_insert_pfn and VM_PFNMAP for handling mmap Date: Wed, 4 Dec 2024 10:41:51 -0500 Message-ID: <20241204102728-fdfe0de6777432df@stable.kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241204151735.141277-3-kalachev@swemel.ru> References: Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit [ Sasha's backport helper bot ] Hi, The upstream commit SHA1 provided is correct: 7d79cd784470395539bda91bf0b3505ff5b2ab6d WARNING: Author mismatch between patch and upstream commit: Backport author: Andrey Kalachev Commit author: Vivek Kasireddy Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.11.y | Present (exact SHA1) 6.6.y | Not found 6.1.y | Not found Note: The patch differs from the upstream commit: --- 1: 7d79cd7844703 ! 1: 14a0c0b74cf0d udmabuf: use vmf_insert_pfn and VM_PFNMAP for handling mmap @@ Metadata ## Commit message ## udmabuf: use vmf_insert_pfn and VM_PFNMAP for handling mmap + [ Upstream commit 7d79cd784470395539bda91bf0b3505ff5b2ab6d ] + Add VM_PFNMAP to vm_flags in the mmap handler to ensure that the mappings would be managed without using struct page. @@ Commit message Cc: Oscar Salvador Cc: Shuah Khan Signed-off-by: Andrew Morton + Reported-by: syzbot+3d218f7b6c5511a83a79@syzkaller.appspotmail.com + [ Andrey: Backport required minor change: replace call + to vm_flags_set() in mmap_udmabuf() by direct + modification of the vma->vm_flags, because the set + of vm_flags_*() functions is not in this versions. ] + Signed-off-by: Andrey Kalachev ## drivers/dma-buf/udmabuf.c ## @@ drivers/dma-buf/udmabuf.c: static vm_fault_t udmabuf_vm_fault(struct vm_fault *vmf) @@ drivers/dma-buf/udmabuf.c: static int mmap_udmabuf(struct dma_buf *buf, struct v vma->vm_ops = &udmabuf_vm_ops; vma->vm_private_data = ubuf; -+ vm_flags_set(vma, VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP); ++ vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP; return 0; } --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.1.y | Success | Success | | stable/linux-5.4.y | Success | Success | From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 12F4119DF66 for ; Wed, 4 Dec 2024 23:22:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733354572; cv=none; b=IEXSvC0xO1OJjugcR57vMBHXt+jkLOebyTWsJ8v47z507ANXU3lnFQbxb8BqsudTwIMkBxqRX7o+2KbG228NZbkd5BlYIi+DRxqPcNT3s2rY1rd36Z6aLKUUf1ZLfn2i2ucDnHZstKJMpQMrUfwOzKGkH31FuL0maOyebVciu4o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733354572; c=relaxed/simple; bh=fZIVqrZFFGxqymQZnyFPFtS90nvILddWC5ln/4bTJrs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W4S2NqtZ/r3Hve9HSuG9H0OVpeKjriUG/d6SxyA13MXSI2iW46luTwLk68oZjHFwwRsNJBUpyHUFku+z93iRX6qgIwn6M+3RGtj//+5lYh1+N4NsXrNN8R+U4BFd+lIv0nGsoS/ANT9zImOaSFtiOxeap7hbyu9T+UPxmVndhMI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qR06ktCa; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qR06ktCa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C381C4CECD; Wed, 4 Dec 2024 23:22:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733354571; bh=fZIVqrZFFGxqymQZnyFPFtS90nvILddWC5ln/4bTJrs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qR06ktCapC/+iXnHfREUnaF15xSAFoBVgYNkbYOswjotHvJUpRMCIYNd1/2OF3vcE IyHSYfELFXkwSRpjg4vM7ha9wHFmENHSI44Jd+BGTzDFqKDkfDlZPoTG+kMIhwrVHp fn5vymGV4xLWEy0q/MXgMuDG8OH/fvNXbaiFKWsDdSoenlrgVsAGjVuwt1xkOjOXTw 8AuRhWsATYJoqBAz1BplMoIm72UTo3Y5N7GPRVu4GofdMAOi3CiZOILLRwt11XEqaw DkMkmD1N7N029HsX1+kLG+BHyK5C34WqP5YGQAz5pFcu0iOroBTIxPJ9QTL5njlAzp g4+D6Skavu1cg== From: Sasha Levin To: stable@vger.kernel.org Cc: Andrey Kalachev , Sasha Levin Subject: Re: [PATCH v5.4-v6.1] udmabuf: use vmf_insert_pfn and VM_PFNMAP for handling mmap Date: Wed, 4 Dec 2024 17:11:32 -0500 Message-ID: <20241204102728-fdfe0de6777432df@stable.kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241204151735.141277-3-kalachev@swemel.ru> References: Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID: <20241204221132.S3MDwZ543W4SBazszrn-HzL-eh0El3BkItJyU8CmIig@z> [ Sasha's backport helper bot ] Hi, The upstream commit SHA1 provided is correct: 7d79cd784470395539bda91bf0b3505ff5b2ab6d WARNING: Author mismatch between patch and upstream commit: Backport author: Andrey Kalachev Commit author: Vivek Kasireddy Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.11.y | Present (exact SHA1) 6.6.y | Not found 6.1.y | Not found Note: The patch differs from the upstream commit: --- 1: 7d79cd7844703 ! 1: 14a0c0b74cf0d udmabuf: use vmf_insert_pfn and VM_PFNMAP for handling mmap @@ Metadata ## Commit message ## udmabuf: use vmf_insert_pfn and VM_PFNMAP for handling mmap + [ Upstream commit 7d79cd784470395539bda91bf0b3505ff5b2ab6d ] + Add VM_PFNMAP to vm_flags in the mmap handler to ensure that the mappings would be managed without using struct page. @@ Commit message Cc: Oscar Salvador Cc: Shuah Khan Signed-off-by: Andrew Morton + Reported-by: syzbot+3d218f7b6c5511a83a79@syzkaller.appspotmail.com + [ Andrey: Backport required minor change: replace call + to vm_flags_set() in mmap_udmabuf() by direct + modification of the vma->vm_flags, because the set + of vm_flags_*() functions is not in this versions. ] + Signed-off-by: Andrey Kalachev ## drivers/dma-buf/udmabuf.c ## @@ drivers/dma-buf/udmabuf.c: static vm_fault_t udmabuf_vm_fault(struct vm_fault *vmf) @@ drivers/dma-buf/udmabuf.c: static int mmap_udmabuf(struct dma_buf *buf, struct v vma->vm_ops = &udmabuf_vm_ops; vma->vm_private_data = ubuf; -+ vm_flags_set(vma, VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP); ++ vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP; return 0; } --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.1.y | Success | Success | | stable/linux-5.4.y | Success | Success |