csum_partial_copy_nocheck(): drop the last argument
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 11 Jul 2020 04:12:07 +0000 (00:12 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 20 Aug 2020 19:45:14 +0000 (15:45 -0400)
It's always 0.  Note that we theoretically could use ~0U as well -
result will be the same modulo 0xffff, _if_ the damn thing did the
right thing for any value of initial sum; later we'll make use of
that when convenient.

However, unlike csum_and_copy_..._user(), there are instances that
did not work for arbitrary initial sums; c6x is one such.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
27 files changed:
arch/alpha/include/asm/checksum.h
arch/alpha/lib/csum_partial_copy.c
arch/arm/include/asm/checksum.h
arch/arm/lib/csumpartialcopy.S
arch/c6x/include/asm/checksum.h
arch/c6x/lib/csum_64plus.S
arch/m68k/include/asm/checksum.h
arch/m68k/lib/checksum.c
arch/mips/include/asm/checksum.h
arch/mips/lib/csum_partial.S
arch/powerpc/include/asm/checksum.h
arch/sh/include/asm/checksum_32.h
arch/sparc/include/asm/checksum_32.h
arch/sparc/include/asm/checksum_64.h
arch/sparc/lib/csum_copy.S
arch/x86/include/asm/checksum_32.h
arch/x86/include/asm/checksum_64.h
arch/x86/lib/csum-wrappers_64.c
arch/xtensa/include/asm/checksum.h
drivers/net/ethernet/3com/typhoon.c
include/net/checksum.h
lib/iov_iter.c
net/core/skbuff.c
net/ipv4/icmp.c
net/ipv4/ip_output.c
net/ipv4/raw.c
net/ipv6/raw.c

index 7e8e4fa4362dc008359764cc59b12ac789397acb..84f9faea864ad274689a3c4ecc722b73fba22713 100644 (file)
@@ -45,7 +45,7 @@ extern __wsum csum_partial(const void *buff, int len, __wsum sum);
 #define _HAVE_ARCH_CSUM_AND_COPY
 __wsum csum_and_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *errp);
 
-__wsum csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
+__wsum csum_partial_copy_nocheck(const void *src, void *dst, int len);
 
 
 /*
index af1dad74e9333ecf8992e56ce7cd2115664ebc16..f363dc89fcbec13f336325c4a66419fe1a74e64f 100644 (file)
@@ -372,13 +372,13 @@ csum_and_copy_from_user(const void __user *src, void *dst, int len,
 EXPORT_SYMBOL(csum_and_copy_from_user);
 
 __wsum
-csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
+csum_partial_copy_nocheck(const void *src, void *dst, int len)
 {
        __wsum checksum;
        mm_segment_t oldfs = get_fs();
        set_fs(KERNEL_DS);
        checksum = csum_and_copy_from_user((__force const void __user *)src,
-                                               dst, len, sum, NULL);
+                                               dst, len, 0, NULL);
        set_fs(oldfs);
        return checksum;
 }
index 53f76950854027aba31099950b5672eac06267ee..7612b2bd4e9b3266964b61bb9fd51e21ed07d887 100644 (file)
@@ -35,7 +35,7 @@ __wsum csum_partial(const void *buff, int len, __wsum sum);
  */
 
 __wsum
-csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
+csum_partial_copy_nocheck(const void *src, void *dst, int len);
 
 __wsum
 csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
index 184d97254a7a2de14cdf83e312383c6fe3071b8f..aab914fbc86bef16c6a5a62500fbc970281344ad 100644 (file)
@@ -9,13 +9,14 @@
 
                .text
 
-/* Function: __u32 csum_partial_copy_nocheck(const char *src, char *dst, int len, __u32 sum)
- * Params  : r0 = src, r1 = dst, r2 = len, r3 = checksum
+/* Function: __u32 csum_partial_copy_nocheck(const char *src, char *dst, int len)
+ * Params  : r0 = src, r1 = dst, r2 = len
  * Returns : r0 = new checksum
  */
 
                .macro  save_regs
                stmfd   sp!, {r1, r4 - r8, lr}
+               mov     r3, #0
                .endm
 
                .macro  load_regs
index fa31bdc186b237cc981c30fca147289ff9f52d82..934918def6327bea64f42070282075d74a8a81e0 100644 (file)
@@ -27,7 +27,7 @@ csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,
 #define csum_tcpudp_nofold csum_tcpudp_nofold
 
 #define _HAVE_ARCH_CSUM_AND_COPY
-extern __wsum csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
+extern __wsum csum_partial_copy_nocheck(const void *src, void *dst, int len);
 
 #include <asm-generic/checksum.h>
 
index 9c07127485d16518580cf51badd6ea557b232ea2..57148866d8d31702aa11cbf3a7e8f410fc28d644 100644 (file)
@@ -24,7 +24,6 @@
 ENTRY(csum_partial_copy_nocheck)
        MVC     .S2     ILC,B30
 
-       MV      .D1X    B6,A31          ; given csum
        ZERO    .D1     A9              ; csum (a side)
 ||     ZERO    .D2     B9              ; csum (b side)
 ||     SHRU    .S2X    A6,2,B5         ; len / 4
@@ -144,8 +143,7 @@ L91:        SHRU    .S2X    A9,16,B4
        SHRU    .S1     A9,16,A0
    [A0]        BNOP    .S1     L91,5
 
-L10:   ADD     .D1     A31,A9,A9
-       MV      .D1     A9,A4
+L10:   MV      .D1     A9,A4
 
        BNOP    .S2     B3,4
        MVC     .S2     B30,ILC
index ab16881d84cbdec015cd0e1a13a4f127217c5fd0..d5e74c64b6cda0ffad0ab5bfaa3b045b490d79fb 100644 (file)
@@ -38,8 +38,7 @@ extern __wsum csum_and_copy_from_user(const void __user *src,
                                                int *csum_err);
 
 extern __wsum csum_partial_copy_nocheck(const void *src,
-                                             void *dst, int len,
-                                             __wsum sum);
+                                             void *dst, int len);
 
 /*
  *     This is a version of ip_fast_csum() optimized for IP headers,
index 31797be9a3dc49b4e4196032f7f68d71a1811789..86ddd2ee187dd3cfbeab091cd566c3f6e7229017 100644 (file)
@@ -324,9 +324,10 @@ EXPORT_SYMBOL(csum_and_copy_from_user);
  */
 
 __wsum
-csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
+csum_partial_copy_nocheck(const void *src, void *dst, int len)
 {
        unsigned long tmp1, tmp2;
+       __wsum sum = 0;
        __asm__("movel %2,%4\n\t"
                "btst #1,%4\n\t"        /* Check alignment */
                "jeq 2f\n\t"
index abdf1086873dfe8562808c5ff26de183733f6882..ec3159dbc1b37d35250024a5d895c26d1d6b5676 100644 (file)
@@ -102,8 +102,11 @@ __wsum csum_and_copy_to_user(const void *src, void __user *dst, int len,
  * we have just one address space, so this is identical to the above)
  */
 #define _HAVE_ARCH_CSUM_AND_COPY
-__wsum csum_partial_copy_nocheck(const void *src, void *dst,
-                                      int len, __wsum sum);
+__wsum __csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
+static inline __wsum csum_partial_copy_nocheck(const void *src, void *dst, int len)
+{
+       return __csum_partial_copy_nocheck(src, dst, len, 0);
+}
 
 /*
  *     Fold a partial checksum without adding pseudo headers
index 87fda0713b84b701a363433c880f063178cff164..8d70855b09145862e4dc102390e5216f89d5ad2e 100644 (file)
@@ -462,8 +462,8 @@ EXPORT_SYMBOL(csum_partial)
        lw      errptr, 16(sp)
 #endif
        .if \__nocheck == 1
-       FEXPORT(csum_partial_copy_nocheck)
-       EXPORT_SYMBOL(csum_partial_copy_nocheck)
+       FEXPORT(__csum_partial_copy_nocheck)
+       EXPORT_SYMBOL(__csum_partial_copy_nocheck)
        .endif
        move    sum, zero
        move    odd, zero
index d75fc5bf8f3732b78158e65ca8246266d6bc9edd..64299785f639a2d1934efee7e3a26e5c693ba566 100644 (file)
@@ -30,8 +30,8 @@ extern __wsum csum_and_copy_to_user(const void *src, void __user *dst,
                                    int len, __wsum sum, int *err_ptr);
 
 #define _HAVE_ARCH_CSUM_AND_COPY
-#define csum_partial_copy_nocheck(src, dst, len, sum)   \
-        csum_partial_copy_generic((src), (dst), (len), (sum), NULL, NULL)
+#define csum_partial_copy_nocheck(src, dst, len)   \
+        csum_partial_copy_generic((src), (dst), (len), 0, NULL, NULL)
 
 
 /*
index 87269642d78d1b30cdc2dc51853d7faffae03dce..e8bf84d3b84338eae25621693545cfe38b8621ac 100644 (file)
@@ -43,10 +43,9 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
  *     access_ok().
  */
 static inline
-__wsum csum_partial_copy_nocheck(const void *src, void *dst,
-                                int len, __wsum sum)
+__wsum csum_partial_copy_nocheck(const void *src, void *dst, int len)
 {
-       return csum_partial_copy_generic(src, dst, len, sum, NULL, NULL);
+       return csum_partial_copy_generic(src, dst, len, 0, NULL, NULL);
 }
 
 #define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER
index 479a0b812af50a59ada387e54fc1f697cfe068ff..d21d114436ba48175db79bfe997a4fcbe5f54616 100644 (file)
@@ -42,7 +42,7 @@ __wsum csum_partial(const void *buff, int len, __wsum sum);
 unsigned int __csum_partial_copy_sparc_generic (const unsigned char *, unsigned char *);
 
 static inline __wsum
-csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
+csum_partial_copy_nocheck(const void *src, void *dst, int len)
 {
        register unsigned int ret asm("o0") = (unsigned int)src;
        register char *d asm("o1") = dst;
@@ -52,7 +52,7 @@ csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
                "call __csum_partial_copy_sparc_generic\n\t"
                " mov %6, %%g7\n"
        : "=&r" (ret), "=&r" (d), "=&r" (l)
-       : "0" (ret), "1" (d), "2" (l), "r" (sum)
+       : "0" (ret), "1" (d), "2" (l), "r" (0)
        : "o2", "o3", "o4", "o5", "o7",
          "g2", "g3", "g4", "g5", "g7",
          "memory", "cc");
index 0fa4433f5662ba77309957e0ae28ae7bc6b64a23..7aebdbe3ac96e00177aa159951daf547f904fff2 100644 (file)
@@ -38,8 +38,12 @@ __wsum csum_partial(const void * buff, int len, __wsum sum);
  * here even more important to align src and dst on a 32-bit (or even
  * better 64-bit) boundary
  */
-__wsum csum_partial_copy_nocheck(const void *src, void *dst,
-                                int len, __wsum sum);
+__wsum __csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
+
+static inline __wsum csum_partial_copy_nocheck(const void *src, void *dst, int len)
+{
+       return __csum_partial_copy_nocheck(src, dst, len, 0);
+}
 
 long __csum_partial_copy_from_user(const void __user *src,
                                   void *dst, int len,
index 26c644ba3ecb0acc4c42bdc47cf7f7f5a12a6525..72c900d21b128deeeda76f59404bb25fc533d416 100644 (file)
@@ -33,7 +33,7 @@
 #endif
 
 #ifndef FUNC_NAME
-#define FUNC_NAME      csum_partial_copy_nocheck
+#define FUNC_NAME      __csum_partial_copy_nocheck
 #endif
 
        .register       %g2, #scratch
index 11624c8a9d8d375356b5b4ebc88af150a773699e..137a3033edccae98359e4b0450a898b5e2a29ec2 100644 (file)
@@ -38,10 +38,9 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
  *     If you use these functions directly please don't forget the
  *     access_ok().
  */
-static inline __wsum csum_partial_copy_nocheck(const void *src, void *dst,
-                                              int len, __wsum sum)
+static inline __wsum csum_partial_copy_nocheck(const void *src, void *dst, int len)
 {
-       return csum_partial_copy_generic(src, dst, len, sum, NULL, NULL);
+       return csum_partial_copy_generic(src, dst, len, 0, NULL, NULL);
 }
 
 static inline __wsum csum_and_copy_from_user(const void __user *src,
index 0a289b87e8722a998c85f0a4ae954a5f38f14dd0..5339f5dfc776056d4eeb70b57d95b79a43ab8e2b 100644 (file)
@@ -139,8 +139,7 @@ extern __wsum csum_and_copy_from_user(const void __user *src, void *dst,
                                          int len, __wsum isum, int *errp);
 extern __wsum csum_and_copy_to_user(const void *src, void __user *dst,
                                        int len, __wsum isum, int *errp);
-extern __wsum csum_partial_copy_nocheck(const void *src, void *dst,
-                                       int len, __wsum sum);
+extern __wsum csum_partial_copy_nocheck(const void *src, void *dst, int len);
 
 /**
  * ip_compute_csum - Compute an 16bit IP checksum.
index ee63d7576fd2c17094dfb66b142b2f7778ec2495..245f929a1c2c38cd1947a1ebf8a5c0c7b0e568a4 100644 (file)
@@ -129,9 +129,9 @@ EXPORT_SYMBOL(csum_and_copy_to_user);
  * Returns an 32bit unfolded checksum of the buffer.
  */
 __wsum
-csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
+csum_partial_copy_nocheck(const void *src, void *dst, int len)
 {
-       return csum_partial_copy_generic(src, dst, len, sum, NULL, NULL);
+       return csum_partial_copy_generic(src, dst, len, 0, NULL, NULL);
 }
 EXPORT_SYMBOL(csum_partial_copy_nocheck);
 
index 0c879099977f1ae5f2905189e5b5e5ecdba38e94..dc09448935bf35a9c1cc3dd98adcd2e822d3ccd9 100644 (file)
@@ -47,10 +47,9 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
  *     passed in an incorrect kernel address to one of these functions.
  */
 static inline
-__wsum csum_partial_copy_nocheck(const void *src, void *dst,
-                                       int len, __wsum sum)
+__wsum csum_partial_copy_nocheck(const void *src, void *dst, int len)
 {
-       return csum_partial_copy_generic(src, dst, len, sum, NULL, NULL);
+       return csum_partial_copy_generic(src, dst, len, 0, NULL, NULL);
 }
 
 #define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER
index d3b30bacc94e3d7630ae80f5f043bc698b180a85..049cc0158a64e608a0f4dffd61fcc5abf773c9e6 100644 (file)
@@ -1419,8 +1419,7 @@ typhoon_download_firmware(struct typhoon *tp)
                         * the checksum, we can do this once, at the end.
                         */
                        csum = csum_fold(csum_partial_copy_nocheck(image_data,
-                                                                  dpage, len,
-                                                                  0));
+                                                                  dpage, len));
 
                        iowrite32(len, ioaddr + TYPHOON_REG_BOOT_LENGTH);
                        iowrite32(le16_to_cpu((__force __le16)csum),
index db9d02b5f88ace991a62dfddb3bfe68f09f0da59..1029191986e38b85ec39374662ab2b751ac32c3b 100644 (file)
@@ -49,10 +49,10 @@ static __inline__ __wsum csum_and_copy_to_user
 
 #ifndef _HAVE_ARCH_CSUM_AND_COPY
 static inline __wsum
-csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
+csum_partial_copy_nocheck(const void *src, void *dst, int len)
 {
        memcpy(dst, src, len);
-       return csum_partial(dst, len, sum);
+       return csum_partial(dst, len, 0);
 }
 #endif
 
index 5e40786c8f123254bcc6272b67769ccc0ed040ed..84f3a9156684f6f807ee673667d61ab4129afdf9 100644 (file)
@@ -581,7 +581,7 @@ static size_t copy_pipe_to_iter(const void *addr, size_t bytes,
 static __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, 0);
+       __wsum next = csum_partial_copy_nocheck(from, to, len);
        return csum_block_add(sum, next, off);
 }
 
index 6e806da2913ea92f120e62b066aaeb380e2ca1e7..48dd4757b898d9ded170e0950ce49278005f9d5a 100644 (file)
@@ -2736,7 +2736,7 @@ __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,
                if (copy > len)
                        copy = len;
                csum = csum_partial_copy_nocheck(skb->data + offset, to,
-                                                copy, 0);
+                                                copy);
                if ((len -= copy) == 0)
                        return csum;
                offset += copy;
@@ -2766,7 +2766,7 @@ __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,
                                vaddr = kmap_atomic(p);
                                csum2 = csum_partial_copy_nocheck(vaddr + p_off,
                                                                  to + copied,
-                                                                 p_len, 0);
+                                                                 p_len);
                                kunmap_atomic(vaddr);
                                csum = csum_block_add(csum, csum2, pos);
                                pos += p_len;
index e23dd5fc2e73b8a34bcd182071fc5bb47d83bdae..bdaaee52c41b3d3fa9d874833fb5430ede67bf84 100644 (file)
@@ -381,7 +381,7 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param,
 
                csum = csum_partial_copy_nocheck((void *)&icmp_param->data,
                                                 (char *)icmph,
-                                                icmp_param->head_len, 0);
+                                                icmp_param->head_len);
                skb_queue_walk(&sk->sk_write_queue, skb1) {
                        csum = csum_add(csum, skb1->csum);
                }
index 5bd059853376ede9f4228d0e7e363b6ddfc3bdd0..bd79ea3e8c4482450d73db700d9fd2c604f1ecee 100644 (file)
@@ -1648,7 +1648,7 @@ static int ip_reply_glue_bits(void *dptr, char *to, int offset,
 {
        __wsum csum;
 
-       csum = csum_partial_copy_nocheck(dptr+offset, to, len, 0);
+       csum = csum_partial_copy_nocheck(dptr+offset, to, len);
        skb->csum = csum_block_add(skb->csum, csum, odd);
        return 0;
 }
index 6fd4330287c279cb010827cff3790428df73cedc..79392154c30a521c22f3f5bfddeb9e3ab970a19a 100644 (file)
@@ -478,7 +478,7 @@ static int raw_getfrag(void *from, char *to, int offset, int len, int odd,
                        skb->csum = csum_block_add(
                                skb->csum,
                                csum_partial_copy_nocheck(rfv->hdr.c + offset,
-                                                         to, copy, 0),
+                                                         to, copy),
                                odd);
 
                odd = 0;
index 874f01cd7aec42d0ef5e0bd4dea89b92d96af445..6e4ab80a3b94420a85769edf45bbf69e2ba74e39 100644 (file)
@@ -746,7 +746,7 @@ static int raw6_getfrag(void *from, char *to, int offset, int len, int odd,
                        skb->csum = csum_block_add(
                                skb->csum,
                                csum_partial_copy_nocheck(rfv->c + offset,
-                                                         to, copy, 0),
+                                                         to, copy),
                                odd);
 
                odd = 0;