From: David Howells <dhowells@redhat•com>
To: Jens Axboe <axboe@kernel•dk>
Cc: David Howells <dhowells@redhat•com>,
Al Viro <viro@zeniv•linux.org.uk>,
Linus Torvalds <torvalds@linux-foundation•org>,
Christoph Hellwig <hch@lst•de>,
Christian Brauner <christian@brauner•io>,
David Laight <David.Laight@ACULAB•COM>,
Matthew Wilcox <willy@infradead•org>,
Jeff Layton <jlayton@kernel•org>,
linux-fsdevel@vger•kernel.org, linux-block@vger•kernel.org,
linux-mm@kvack•org, netdev@vger•kernel.org,
linux-kernel@vger•kernel.org,
"David S. Miller" <davem@davemloft•net>,
Eric Dumazet <edumazet@google•com>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>
Subject: [PATCH v5 09/11] iov_iter, net: Fold in csum_and_memcpy()
Date: Wed, 20 Sep 2023 23:22:29 +0100 [thread overview]
Message-ID: <20230920222231.686275-10-dhowells@redhat.com> (raw)
In-Reply-To: <20230920222231.686275-1-dhowells@redhat.com>
Fold csum_and_memcpy() in to its callers.
Signed-off-by: David Howells <dhowells@redhat•com>
cc: Alexander Viro <viro@zeniv•linux.org.uk>
cc: Jens Axboe <axboe@kernel•dk>
cc: Christoph Hellwig <hch@lst•de>
cc: Christian Brauner <christian@brauner•io>
cc: Matthew Wilcox <willy@infradead•org>
cc: Linus Torvalds <torvalds@linux-foundation•org>
cc: David Laight <David.Laight@ACULAB•COM>
cc: "David S. Miller" <davem@davemloft•net>
cc: Eric Dumazet <edumazet@google•com>
cc: Jakub Kicinski <kuba@kernel•org>
cc: Paolo Abeni <pabeni@redhat•com>
cc: linux-block@vger•kernel.org
cc: linux-fsdevel@vger•kernel.org
cc: linux-mm@kvack•org
cc: netdev@vger•kernel.org
---
include/linux/skbuff.h | 7 -------
net/core/datagram.c | 3 ++-
net/core/skbuff.c | 3 ++-
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index d0656cc11c16..c81ef5d76953 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -3679,13 +3679,6 @@ static inline int __must_check skb_put_padto(struct sk_buff *skb, unsigned int l
return __skb_put_padto(skb, len, true);
}
-static inline __wsum csum_and_memcpy(void *to, const void *from, size_t len,
- __wsum sum, size_t off)
-{
- __wsum next = csum_partial_copy_nocheck(from, to, len);
- return csum_block_add(sum, next, off);
-}
-
struct csum_state {
__wsum csum;
size_t off;
diff --git a/net/core/datagram.c b/net/core/datagram.c
index 37c89d0933b7..452620dd41e4 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -732,8 +732,9 @@ size_t memcpy_to_iter_csum(void *iter_to, size_t progress,
size_t len, void *from, void *priv2)
{
__wsum *csum = priv2;
+ __wsum next = csum_partial_copy_nocheck(from, iter_to, len);
- *csum = csum_and_memcpy(iter_to, from + progress, len, *csum, progress);
+ *csum = csum_block_add(*csum, next, progress);
return 0;
}
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 5dbdfce2d05f..3efed86321db 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -6938,8 +6938,9 @@ size_t memcpy_from_iter_csum(void *iter_from, size_t progress,
size_t len, void *to, void *priv2)
{
__wsum *csum = priv2;
+ __wsum next = csum_partial_copy_nocheck(iter_from, to + progress, len);
- *csum = csum_and_memcpy(to + progress, iter_from, len, *csum, progress);
+ *csum = csum_block_add(*csum, next, progress);
return 0;
}
next prev parent reply other threads:[~2023-09-20 22:23 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-20 22:22 [PATCH v5 00/11] iov_iter: Convert the iterator macros into inline funcs David Howells
2023-09-20 22:22 ` [PATCH v5 01/11] sound: Fix snd_pcm_readv()/writev() to use iov access functions David Howells
2023-09-21 6:08 ` Jaroslav Kysela
2023-09-21 13:14 ` Takashi Iwai
2023-09-21 15:03 ` David Howells
2023-09-21 15:10 ` Takashi Iwai
2023-09-20 22:22 ` [PATCH v5 02/11] infiniband: Use user_backed_iter() to see if iterator is UBUF/IOVEC David Howells
2023-09-20 22:22 ` [PATCH v5 03/11] iov_iter: Renumber ITER_* constants David Howells
2023-09-20 22:22 ` [PATCH v5 04/11] iov_iter: Derive user-backedness from the iterator type David Howells
2023-09-20 22:22 ` [PATCH v5 05/11] iov_iter: Convert iterate*() to inline funcs David Howells
2023-09-22 9:32 ` Simon Horman
2023-09-22 11:38 ` David Howells
2023-09-20 22:22 ` [PATCH v5 06/11] iov_iter: Don't deal with iter->copy_mc in memcpy_from_iter_mc() David Howells
2023-09-20 22:22 ` [PATCH v5 07/11] iov_iter: Add a kernel-type iterator-only iteration function David Howells
2023-09-22 9:34 ` Simon Horman
2023-09-20 22:22 ` [PATCH v5 08/11] iov_iter, net: Move csum_and_copy_to/from_iter() to net/ David Howells
2023-09-20 22:22 ` David Howells [this message]
2023-09-20 22:22 ` [PATCH v5 10/11] iov_iter, net: Merge csum_and_copy_from_iter{,_full}() together David Howells
2023-09-20 22:22 ` [PATCH v5 11/11] iov_iter, net: Move hash_and_copy_to_iter() to net/ David Howells
2023-09-21 14:04 ` [PATCH v5 00/11] iov_iter: Convert the iterator macros into inline funcs David Laight
2023-09-22 12:01 ` David Howells
2023-09-23 6:59 ` Willem de Bruijn
2023-09-23 10:31 ` David Laight
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230920222231.686275-10-dhowells@redhat.com \
--to=dhowells@redhat$(echo .)com \
--cc=David.Laight@ACULAB$(echo .)COM \
--cc=axboe@kernel$(echo .)dk \
--cc=christian@brauner$(echo .)io \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=jlayton@kernel$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=linux-block@vger$(echo .)kernel.org \
--cc=linux-fsdevel@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-mm@kvack$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=viro@zeniv$(echo .)linux.org.uk \
--cc=willy@infradead$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox