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 B8F3A12CDB6; Tue, 9 Jul 2024 11:30:44 +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=1720524644; cv=none; b=jCPx3ZyG4f9JM5z/3lY6etsRWfFZlQBlyRhkHXtet0Vq6BZNIH7mBc0xdTzNlYld+K91oWML2zc2uqFe3CxU7Iyb2L7CnspbmS+WczeevVVRKOZAyivNfxhRXKgQLXtwe4WCxvgno2GhaCL4hlX6HF27PmcNtMZ9P2oQH0olLSA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720524644; c=relaxed/simple; bh=DflMp2wkhCF3LFr15T0FXPONPbTggblVNmYBVPMGQq8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BqZ1ulVr5M0fEV7RY0McDQX4Z5VS1y8mjFEtYjV8pteS8M7Q94l+4y0/fXc9yfBLq4SvNaut+JO20a//xrtkWqNB9heFdBN/+TIIWVxHCtIMJzEurTWiOT7kkgStmIhwnwDh46QCEZUw9VIrTC796BB4ItnEAgfTMmYJP/M4z1c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KiFZqRGC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="KiFZqRGC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3C586C3277B; Tue, 9 Jul 2024 11:30:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1720524644; bh=DflMp2wkhCF3LFr15T0FXPONPbTggblVNmYBVPMGQq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KiFZqRGCL4BeRZK5bgEQwizhUjfF8vHIwa9YphgByP/zC9gGIIeV5satIpdi5H1tV bAkYM6R+bsI9na+Arp6GIeefbjygcUqQtb39E134nyF1BQ/nKBFh68hKpSRPmn8E1D sBYGI7NYevtYGYp939Fpf3lTVppcNKvcelXdecyo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, kernel test robot , Sagi Grimberg , Paolo Abeni , Sasha Levin Subject: [PATCH 6.1 051/102] net: allow skb_datagram_iter to be called from any context Date: Tue, 9 Jul 2024 13:10:14 +0200 Message-ID: <20240709110653.366618110@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240709110651.353707001@linuxfoundation.org> References: <20240709110651.353707001@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sagi Grimberg [ Upstream commit d2d30a376d9cc94c6fb730c58b3e5b7426ecb6de ] We only use the mapping in a single context, so kmap_local is sufficient and cheaper. Make sure to use skb_frag_foreach_page as skb frags may contain compound pages and we need to map page by page. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-lkp/202406161539.b5ff7b20-oliver.sang@intel.com Fixes: 950fcaecd5cc ("datagram: consolidate datagram copy to iter helpers") Signed-off-by: Sagi Grimberg Link: https://patch.msgid.link/20240626100008.831849-1-sagi@grimberg.me Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/core/datagram.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/net/core/datagram.c b/net/core/datagram.c index 8dabb9a74cb17..cdd65ca3124a4 100644 --- a/net/core/datagram.c +++ b/net/core/datagram.c @@ -434,15 +434,22 @@ static int __skb_datagram_iter(const struct sk_buff *skb, int offset, end = start + skb_frag_size(frag); if ((copy = end - offset) > 0) { - struct page *page = skb_frag_page(frag); - u8 *vaddr = kmap(page); + u32 p_off, p_len, copied; + struct page *p; + u8 *vaddr; if (copy > len) copy = len; - n = INDIRECT_CALL_1(cb, simple_copy_to_iter, - vaddr + skb_frag_off(frag) + offset - start, - copy, data, to); - kunmap(page); + + skb_frag_foreach_page(frag, + skb_frag_off(frag) + offset - start, + copy, p, p_off, p_len, copied) { + vaddr = kmap_local_page(p); + n = INDIRECT_CALL_1(cb, simple_copy_to_iter, + vaddr + p_off, p_len, data, to); + kunmap_local(vaddr); + } + offset += n; if (n != copy) goto short_copy; -- 2.43.0