The patch titled
knfsd: avoid checksum checks when collecting metadata for a UDP packet
has been added to the -mm tree. Its filename is
knfsd-avoid-checksum-checks-when-collecting-metadata-for-a-udp-packet.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: knfsd: avoid checksum checks when collecting metadata for a UDP packet
From: NeilBrown <neilb@xxxxxxx>
When recv_msg is called with a size of 0 and MSG_PEEK (and sunrpc/svcsock.c
does), it is clear that we only interested in metadata (from/to addresses) and
not the data, so don't do any checksum checking at this point. Leave that
until the data is requested.
Signed-off-by: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/ipv4/udp.c | 3 +++
net/ipv6/udp.c | 4 ++++
2 files changed, 7 insertions(+)
diff -puN net/ipv4/udp.c~knfsd-avoid-checksum-checks-when-collecting-metadata-for-a-udp-packet net/ipv4/udp.c
--- a/net/ipv4/udp.c~knfsd-avoid-checksum-checks-when-collecting-metadata-for-a-udp-packet
+++ a/net/ipv4/udp.c
@@ -846,6 +846,9 @@ try_again:
goto csum_copy_err;
copy_only = 1;
}
+ if (len == 0 && (flags & MSG_PEEK))
+ /* avoid checksum concerns when just getting metadata */
+ copy_only = 1;
if (copy_only)
err = skb_copy_datagram_iovec(skb, sizeof(struct udphdr),
diff -puN net/ipv6/udp.c~knfsd-avoid-checksum-checks-when-collecting-metadata-for-a-udp-packet net/ipv6/udp.c
--- a/net/ipv6/udp.c~knfsd-avoid-checksum-checks-when-collecting-metadata-for-a-udp-packet
+++ a/net/ipv6/udp.c
@@ -151,6 +151,10 @@ try_again:
copy_only = 1;
}
+ if (len == 0 && (flags & MSG_PEEK))
+ /* avoid checksum concerns when just getting metadata */
+ copy_only = 1;
+
if (copy_only)
err = skb_copy_datagram_iovec(skb, sizeof(struct udphdr),
msg->msg_iov, copied );
_
Patches currently in -mm which might be from neilb@xxxxxxx are
origin.patch
fix-failure-paths-in-modules-init-in-umemc.patch
md-fix-raid10-recovery-problem.patch
md-raid6-clean-up-cpuid-and-fpu-enter-exit-code.patch
md-move-warning-about-creating-a-raid-array-on-partitions-of-the-one-device.patch
md-clean-out-unplug-and-other-queue-function-on-md-shutdown.patch
md-restart-a-raid5-reshape-that-has-been-aborted-due-to-a-read-write-error.patch
md-add-support-for-reshape-of-a-raid6.patch
knfsd-use-recv_msg-to-get-peer-address-for-nfsd-instead-of-code-copying.patch
knfsd-avoid-checksum-checks-when-collecting-metadata-for-a-udp-packet.patch
knfsd-remove-config_ipv6-ifdefs-from-sunrpc-server-code.patch
revert-md-avoid-possible-bug_on-in-md-bitmap-handling-for-git-block.patch
fix-quadratic-behavior-of-shrink_dcache_parent.patch
fix-__d_path-for-lazy-unmounts-and-make-it-unambiguous.patch
fix-__d_path-for-lazy-unmounts-and-make-it-unambiguous-tidy.patch
the-nfsv2-nfsv3-server-does-not-handle-zero-length-write.patch
readahead-nfsd-case.patch
readahead-nfsd-case-fix.patch
drivers-mdc-use-array_size-macro-when-appropriate.patch
md-dm-reduce-stack-usage-with-stacked-block-devices.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
