From nobody Mon Nov 25 22:56:17 2024 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 467241C8781; Wed, 23 Oct 2024 15:39:46 +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=1729697987; cv=none; b=FdUnm/hQG98J2D2F3rpb0guUu8ZRDXLXtaYC/V2uH36JdRiVqfJEF9hPnnau1CWr8GVvZ7H2T5rcY8dotogBIEITPvzCNc10AhmpTOptoUXQBwtKZnsEuY23IGx8UrSSHXj4G/T+T9Zt1Y4fXMZiiZ4GUoLNiHQsd73NT0oH+X0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729697987; c=relaxed/simple; bh=ewTQi8vvMjY2tDN+rwCGUkIKwCDc2H1+fYWUrCoOJYU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=k+y3SiEArS8tu+tYEmuluQa1MNvy20VIvDW7JcmgWU3xvxCZwREZUWEt3cqYXkLPP2O5eBhinhohzDx0On6wz3Mr45UEQccslYYzN6uG2S5aoDiyoMY/Cw9plj6cVuPZjA694RQyHF0vqcg9AsSqsxIcmPWJsGLld6UoTzfEK90= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dh8ceyXz; 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="dh8ceyXz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66695C4CEC6; Wed, 23 Oct 2024 15:39:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729697986; bh=ewTQi8vvMjY2tDN+rwCGUkIKwCDc2H1+fYWUrCoOJYU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=dh8ceyXz5u5QQMbCEoEHeP0xSKZ4uIoXgtgkuhEcUSkOpfAJulmJKqh8W2RKuXr2+ Ov+Q7/pZkE0RHW0c7Dpi9oB606f339GA7ThVoZwFRwdb/sOC8OVslxR1M191apFcXR ojf/hrt4/LJsITLt6m+YAfEV0nixevr7h1CxjyHlNzqZF7toRZNmk3K0/pzcx3KA4Q lwRFG+sVi//FCVdqm9NHW/5CbbfX5jL+dbvMm7qtz7ocOp+TvhK3Me5dNoOxCboDou heffJRjCKzh04XNttacz9V7HVSiQZ0ZWcNmgMBqJ6B4Rr4cIgz90BZiEvfm2zkaPbX s1+SWPD7ICZmw== From: Puranjay Mohan To: Albert Ou , Alexei Starovoitov , Andrew Morton , Andrii Nakryiko , bpf@vger.kernel.org, Daniel Borkmann , "David S. Miller" , Eduard Zingerman , Eric Dumazet , Hao Luo , Helge Deller , Jakub Kicinski , "James E.J. Bottomley" , Jiri Olsa , John Fastabend , KP Singh , linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org, Martin KaFai Lau , Mykola Lysenko , netdev@vger.kernel.org, Palmer Dabbelt , Paolo Abeni , Paul Walmsley , Puranjay Mohan , Puranjay Mohan , Shuah Khan , Song Liu , Stanislav Fomichev , Yonghong Song Subject: [PATCH bpf-next v2 1/4] net: checksum: move from32to16() to generic header Date: Wed, 23 Oct 2024 15:39:19 +0000 Message-Id: <20241023153922.86909-2-puranjay@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20241023153922.86909-1-puranjay@kernel.org> References: <20241023153922.86909-1-puranjay@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable from32to16() is used by lib/checksum.c and also by arch/parisc/lib/checksum.c. The next patch will use it in the bpf_csum_diff helper. Move from32to16() to the include/net/checksum.h as csum_from32to16() and remove other implementations. Signed-off-by: Puranjay Mohan Acked-by: Daniel Borkmann Reviewed-by: Toke H=C3=B8iland-J=C3=B8rgensen --- arch/parisc/lib/checksum.c | 13 ++----------- include/net/checksum.h | 6 ++++++ lib/checksum.c | 11 +---------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/arch/parisc/lib/checksum.c b/arch/parisc/lib/checksum.c index 4818f3db84a5c..59d8c15d81bd0 100644 --- a/arch/parisc/lib/checksum.c +++ b/arch/parisc/lib/checksum.c @@ -25,15 +25,6 @@ : "=3Dr"(_t) \ : "r"(_r), "0"(_t)); =20 -static inline unsigned short from32to16(unsigned int x) -{ - /* 32 bits --> 16 bits + carry */ - x =3D (x & 0xffff) + (x >> 16); - /* 16 bits + carry --> 16 bits including carry */ - x =3D (x & 0xffff) + (x >> 16); - return (unsigned short)x; -} - static inline unsigned int do_csum(const unsigned char * buff, int len) { int odd, count; @@ -85,7 +76,7 @@ static inline unsigned int do_csum(const unsigned char * = buff, int len) } if (len & 1) result +=3D le16_to_cpu(*buff); - result =3D from32to16(result); + result =3D csum_from32to16(result); if (odd) result =3D swab16(result); out: @@ -102,7 +93,7 @@ __wsum csum_partial(const void *buff, int len, __wsum su= m) { unsigned int result =3D do_csum(buff, len); addc(result, sum); - return (__force __wsum)from32to16(result); + return (__force __wsum)csum_from32to16(result); } =20 EXPORT_SYMBOL(csum_partial); diff --git a/include/net/checksum.h b/include/net/checksum.h index 1338cb92c8e72..243f972267b8d 100644 --- a/include/net/checksum.h +++ b/include/net/checksum.h @@ -151,6 +151,12 @@ static inline void csum_replace(__wsum *csum, __wsum o= ld, __wsum new) *csum =3D csum_add(csum_sub(*csum, old), new); } =20 +static inline unsigned short csum_from32to16(unsigned int sum) +{ + sum +=3D (sum >> 16) | (sum << 16); + return (unsigned short)(sum >> 16); +} + struct sk_buff; void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb, __be32 from, __be32 to, bool pseudohdr); diff --git a/lib/checksum.c b/lib/checksum.c index 6860d6b05a171..025ba546e1ec6 100644 --- a/lib/checksum.c +++ b/lib/checksum.c @@ -34,15 +34,6 @@ #include =20 #ifndef do_csum -static inline unsigned short from32to16(unsigned int x) -{ - /* add up 16-bit and 16-bit for 16+c bit */ - x =3D (x & 0xffff) + (x >> 16); - /* add up carry.. */ - x =3D (x & 0xffff) + (x >> 16); - return x; -} - static unsigned int do_csum(const unsigned char *buff, int len) { int odd; @@ -90,7 +81,7 @@ static unsigned int do_csum(const unsigned char *buff, in= t len) #else result +=3D (*buff << 8); #endif - result =3D from32to16(result); + result =3D csum_from32to16(result); if (odd) result =3D ((result >> 8) & 0xff) | ((result & 0xff) << 8); out: --=20 2.40.1 From nobody Mon Nov 25 22:56:17 2024 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 875331C8781; Wed, 23 Oct 2024 15:39: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=1729697991; cv=none; b=IsNEQZxMXmLd11uODeL3hQXzw4YVPWjFmD5J040XGxNDFbrA8NGVNgn9rNidMgsvl0SyZ5mYNP2XP/rArvYrmQ4a0CiGPKDBGRYY4dvF/i/qY5eR/4oI7PPmvfDBkoCpDbCahU/wY3tfLlHeYUAQnX6xX36TsIgLctcgR3ct4nI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729697991; c=relaxed/simple; bh=hs0lXbcOH7c9T/cGcTNkAHvTScTMvbdw0SB7nKBj1RE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=kcUdXed+z/ChqTQNtw0bSgWGVnSOyMAcC7iYt9jMScqQD0aXMaWIaq/U38JM1/7/4mQ8VxRb5UjiV8wyZxwMxejjX0aY7bqrPi265FhOTQ7xhBK99P66dXzuI+ZnHPyIHVjlz64fk2Ew+7XCiH4yWUa9WD6JuvschetVa4tQjbM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CLXkRVYM; 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="CLXkRVYM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B94B1C4CEC6; Wed, 23 Oct 2024 15:39:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729697991; bh=hs0lXbcOH7c9T/cGcTNkAHvTScTMvbdw0SB7nKBj1RE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=CLXkRVYMKhLzKMnLaS5EdZKHPPcUn+76PrLIXutI7U7lnmOtG7xAlx/T6eUgfP9Lf iRnHCzrrhQzMSO30G8hyKYGiQlNWbYQe1UdjYh5qk3fEm4Sw4L9HlRQUGDG92IZIdR 1lPKPE9Z580GvVAMZTQ2iKxapj4MdVIlSXR425bYdCaYVAPgEfK2iu+wAQ7G9XtgXr zCWqbwuHW48kEEQtTny3dFmZrnujNEy13djB4XQ2HLJ4x+ZB3GdEHZ1J5QqqCeu5rB DdlQrflJp4OHqetFDcsmUWeCSGAL94qex3lkro+Q2P8LUDd/4rOvs7STpUIijFgyoU HbU94z2on57xA== From: Puranjay Mohan To: Albert Ou , Alexei Starovoitov , Andrew Morton , Andrii Nakryiko , bpf@vger.kernel.org, Daniel Borkmann , "David S. Miller" , Eduard Zingerman , Eric Dumazet , Hao Luo , Helge Deller , Jakub Kicinski , "James E.J. Bottomley" , Jiri Olsa , John Fastabend , KP Singh , linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org, Martin KaFai Lau , Mykola Lysenko , netdev@vger.kernel.org, Palmer Dabbelt , Paolo Abeni , Paul Walmsley , Puranjay Mohan , Puranjay Mohan , Shuah Khan , Song Liu , Stanislav Fomichev , Yonghong Song Subject: [PATCH bpf-next v2 2/4] bpf: bpf_csum_diff: optimize and homogenize for all archs Date: Wed, 23 Oct 2024 15:39:20 +0000 Message-Id: <20241023153922.86909-3-puranjay@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20241023153922.86909-1-puranjay@kernel.org> References: <20241023153922.86909-1-puranjay@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 1. Optimization ------------ The current implementation copies the 'from' and 'to' buffers to a scratchpad and it takes the bitwise NOT of 'from' buffer while copying. In the next step csum_partial() is called with this scratchpad. so, mathematically, the current implementation is doing: result =3D csum(to - from) Here, 'to' and '~ from' are copied in to the scratchpad buffer, we need it in the scratchpad buffer because csum_partial() takes a single contiguous buffer and not two disjoint buffers like 'to' and 'from'. We can re write this equation to: result =3D csum(to) - csum(from) using the distributive property of csum(). this allows 'to' and 'from' to be at different locations and therefore this scratchpad and copying is not needed. This in C code will look like: result =3D csum_sub(csum_partial(to, to_size, seed), csum_partial(from, from_size, 0)); 2. Homogenization -------------- The bpf_csum_diff() helper calls csum_partial() which is implemented by some architectures like arm and x86 but other architectures rely on the generic implementation in lib/checksum.c The generic implementation in lib/checksum.c returns a 16 bit value but the arch specific implementations can return more than 16 bits, this works out in most places because before the result is used, it is passed through csum_fold() that turns it into a 16-bit value. bpf_csum_diff() directly returns the value from csum_partial() and therefore the returned values could be different on different architectures. see discussion in [1]: for the int value 28 the calculated checksums are: x86 : -29 : 0xffffffe3 generic (arm64, riscv) : 65507 : 0x0000ffe3 arm : 131042 : 0x0001ffe2 Pass the result of bpf_csum_diff() through from32to16() before returning to homogenize this result for all architectures. NOTE: from32to16() is used instead of csum_fold() because csum_fold() does from32to16() + bitwise NOT of the result, which is not what we want to do here. [1] https://lore.kernel.org/bpf/CAJ+HfNiQbOcqCLxFUP2FMm5QrLXUUaj852Fxe3hn_2= JNiucn6g@mail.gmail.com/ Signed-off-by: Puranjay Mohan Acked-by: Daniel Borkmann Reviewed-by: Toke H=C3=B8iland-J=C3=B8rgensen --- net/core/filter.c | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index bd0d08bf76bb8..e00bec7de9edd 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -1654,18 +1654,6 @@ void sk_reuseport_prog_free(struct bpf_prog *prog) bpf_prog_destroy(prog); } =20 -struct bpf_scratchpad { - union { - __be32 diff[MAX_BPF_STACK / sizeof(__be32)]; - u8 buff[MAX_BPF_STACK]; - }; - local_lock_t bh_lock; -}; - -static DEFINE_PER_CPU(struct bpf_scratchpad, bpf_sp) =3D { - .bh_lock =3D INIT_LOCAL_LOCK(bh_lock), -}; - static inline int __bpf_try_make_writable(struct sk_buff *skb, unsigned int write_len) { @@ -2022,11 +2010,6 @@ static const struct bpf_func_proto bpf_l4_csum_repla= ce_proto =3D { BPF_CALL_5(bpf_csum_diff, __be32 *, from, u32, from_size, __be32 *, to, u32, to_size, __wsum, seed) { - struct bpf_scratchpad *sp =3D this_cpu_ptr(&bpf_sp); - u32 diff_size =3D from_size + to_size; - int i, j =3D 0; - __wsum ret; - /* This is quite flexible, some examples: * * from_size =3D=3D 0, to_size > 0, seed :=3D csum --> pushing data @@ -2035,19 +2018,17 @@ BPF_CALL_5(bpf_csum_diff, __be32 *, from, u32, from= _size, * * Even for diffing, from_size and to_size don't need to be equal. */ - if (unlikely(((from_size | to_size) & (sizeof(__be32) - 1)) || - diff_size > sizeof(sp->diff))) - return -EINVAL; =20 - local_lock_nested_bh(&bpf_sp.bh_lock); - for (i =3D 0; i < from_size / sizeof(__be32); i++, j++) - sp->diff[j] =3D ~from[i]; - for (i =3D 0; i < to_size / sizeof(__be32); i++, j++) - sp->diff[j] =3D to[i]; + if (from_size && to_size) + return csum_from32to16(csum_sub(csum_partial(to, to_size, seed), + csum_partial(from, from_size, 0))); + if (to_size) + return csum_from32to16(csum_partial(to, to_size, seed)); =20 - ret =3D csum_partial(sp->diff, diff_size, seed); - local_unlock_nested_bh(&bpf_sp.bh_lock); - return ret; + if (from_size) + return csum_from32to16(~csum_partial(from, from_size, ~seed)); + + return seed; } =20 static const struct bpf_func_proto bpf_csum_diff_proto =3D { --=20 2.40.1 From nobody Mon Nov 25 22:56:17 2024 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 192DF1C830D; Wed, 23 Oct 2024 15:39:58 +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=1729697999; cv=none; b=u61BmkoyMmFVLIQx/3zRBSiXNdYY6cDd4S/v45C4mbLu9RUl8fUiHNyiGEPDWnvzd45RgQJu0VRSVRkH1Sb5CHWiK8apl/O217BtJLikZ24gcqUoy43i5anVKCAOHUmXIiWAEIx4OKy4Ya6a7tyRhEdNXTd6LY+S+Kr+kFOJ0T4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729697999; c=relaxed/simple; bh=iKa9bcxI6W9fsHF/fh/13PtU+WQ5xvNEzWBxiNVZ7eU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=S1pZ489+sgdMiE5hCqxsDOTDNDSJd4CM3CZtaakhhle6EUDU0bmpKgBQZmSbMr/6+7rtvQIzMgrMenGKmULCO3hRjDR7av8amyUNJ1kebqqzDhjHmY3FI5tFbsIhRRgEEr1PuPQ2nzVL2x8CK3QrW/ivvwIvoOpK7aeNuIORWME= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OOlIQD7j; 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="OOlIQD7j" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47E74C4CEC6; Wed, 23 Oct 2024 15:39:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729697998; bh=iKa9bcxI6W9fsHF/fh/13PtU+WQ5xvNEzWBxiNVZ7eU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=OOlIQD7juHvuvkhsOoG+/kUGScwiJurQiWGsl4I4bILYyLzGx6igrE/Ko+XkW62sZ JkU0TTtOjREB4eintBt4Nv0IL82qybWWFnPX4nYHaTqVH76y58z3hTTiaLFXK2VY5g T+SWopByQfU9fbMR5m+6ZvIFLhOmz2xghWxrVrWt+EtGXSXvDIem7eYstRyxhsgTID hu4JpFrAQBpSerM1QMdMxV+AG+9MwwzBkJA60mPBGfbkjUysBB/LeEiezzTP0U7YUp bMOzvcDSdKhj3HxMxVjtV+odXbBPb+5pKkIooFR2Jzd4efOUP498DNakBTV/TV7+Zc xEjo1cJQ4kcvA== From: Puranjay Mohan To: Albert Ou , Alexei Starovoitov , Andrew Morton , Andrii Nakryiko , bpf@vger.kernel.org, Daniel Borkmann , "David S. Miller" , Eduard Zingerman , Eric Dumazet , Hao Luo , Helge Deller , Jakub Kicinski , "James E.J. Bottomley" , Jiri Olsa , John Fastabend , KP Singh , linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org, Martin KaFai Lau , Mykola Lysenko , netdev@vger.kernel.org, Palmer Dabbelt , Paolo Abeni , Paul Walmsley , Puranjay Mohan , Puranjay Mohan , Shuah Khan , Song Liu , Stanislav Fomichev , Yonghong Song Subject: [PATCH bpf-next v2 3/4] selftests/bpf: don't mask result of bpf_csum_diff() in test_verifier Date: Wed, 23 Oct 2024 15:39:21 +0000 Message-Id: <20241023153922.86909-4-puranjay@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20241023153922.86909-1-puranjay@kernel.org> References: <20241023153922.86909-1-puranjay@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The bpf_csum_diff() helper has been fixed to return a 16-bit value for all archs, so now we don't need to mask the result. This commit is basically reverting the below: commit 6185266c5a85 ("selftests/bpf: Mask bpf_csum_diff() return value to 16 bits in test_verifier") Signed-off-by: Puranjay Mohan Acked-by: Daniel Borkmann Reviewed-by: Toke H=C3=B8iland-J=C3=B8rgensen --- tools/testing/selftests/bpf/progs/verifier_array_access.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/verifier_array_access.c b/to= ols/testing/selftests/bpf/progs/verifier_array_access.c index 95d7ecc12963b..4195aa824ba55 100644 --- a/tools/testing/selftests/bpf/progs/verifier_array_access.c +++ b/tools/testing/selftests/bpf/progs/verifier_array_access.c @@ -368,8 +368,7 @@ __naked void a_read_only_array_2_1(void) r4 =3D 0; \ r5 =3D 0; \ call %[bpf_csum_diff]; \ -l0_%=3D: r0 &=3D 0xffff; \ - exit; \ +l0_%=3D: exit; \ " : : __imm(bpf_csum_diff), __imm(bpf_map_lookup_elem), --=20 2.40.1 From nobody Mon Nov 25 22:56:17 2024 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 524581CF28A; Wed, 23 Oct 2024 15:40:01 +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=1729698002; cv=none; b=iyhLMEp0xwaE+wJ7iv7ZM2IT2SODFE1D1OHeTRFENYlRFCBSuSkq8CNU7DZEh3PAb/CHKNzSXZfWy6HJFuAXP+E6geOlA8at69srDz1tZaAnRM6nD2bGgHlQXc0YUxT2DY6AvEfX1TT93i8Ia9Eb11I8CNlV+NGu5kaPxXPxvq4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729698002; c=relaxed/simple; bh=nSdVA5MW1We6lUcKc4+jRLpfFEwr2d4DMmlFJ4WTfIs=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VrlKBmKeQiu4dfvZ3fbvBanJf+3hPz+vvGYzIuXaoV1GBY1zwn7BD3td2ex0RT6j/FKxuLAcyc6QRU/q6pc15No/zrTDwFtuQ4lH7uDl0nDRToF87I81KFRhvOfZqTNLcJcRez2zmAifFkTdZs3CcG15sXC+f8PgRB7XhIK3jzM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=roqLfdSd; 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="roqLfdSd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E4C4C4CEC6; Wed, 23 Oct 2024 15:40:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729698001; bh=nSdVA5MW1We6lUcKc4+jRLpfFEwr2d4DMmlFJ4WTfIs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=roqLfdSdbvS+1R9+FXLW8/9YB4n5M46Bp0zOYYV9lVHZ3Hw8HOXGfUylGhQKjKVjA pEbGrx/RQA+m1qxUSfFikYm4gfcKKtxaRyRy2luWjIF2LsGEMdwMrZxLiZAZ/SSplR K9SItAmEtaZwmq8bO6D4PQpprbnSSU/GCgyRGirfksipGPlW8DUzAg1kSc8bXoxr59 nY+B+zYt/3RCvIO9GE/TGMAkrg61+u9F9WKpnZQ1ZT5thap3Ea0/V49lAmqcauKkce mhY/MPYvFDODpBPmRQSIIi9JpJFklR1dx1iTZT8ys1UCMuGi46cHphtXnoWfWphX3r VHerPMOpmJShQ== From: Puranjay Mohan To: Albert Ou , Alexei Starovoitov , Andrew Morton , Andrii Nakryiko , bpf@vger.kernel.org, Daniel Borkmann , "David S. Miller" , Eduard Zingerman , Eric Dumazet , Hao Luo , Helge Deller , Jakub Kicinski , "James E.J. Bottomley" , Jiri Olsa , John Fastabend , KP Singh , linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org, Martin KaFai Lau , Mykola Lysenko , netdev@vger.kernel.org, Palmer Dabbelt , Paolo Abeni , Paul Walmsley , Puranjay Mohan , Puranjay Mohan , Shuah Khan , Song Liu , Stanislav Fomichev , Yonghong Song Subject: [PATCH bpf-next v2 4/4] selftests/bpf: Add a selftest for bpf_csum_diff() Date: Wed, 23 Oct 2024 15:39:22 +0000 Message-Id: <20241023153922.86909-5-puranjay@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20241023153922.86909-1-puranjay@kernel.org> References: <20241023153922.86909-1-puranjay@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a selftest for the bpf_csum_diff() helper. This selftests runs the helper in all three configurations(push, pull, and diff) and verifies its output. The correct results have been computed by hand and by the helper's older implementation. Signed-off-by: Puranjay Mohan Acked-by: Daniel Borkmann --- .../selftests/bpf/prog_tests/test_csum_diff.c | 408 ++++++++++++++++++ .../selftests/bpf/progs/csum_diff_test.c | 42 ++ 2 files changed, 450 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/test_csum_diff.c create mode 100644 tools/testing/selftests/bpf/progs/csum_diff_test.c diff --git a/tools/testing/selftests/bpf/prog_tests/test_csum_diff.c b/tool= s/testing/selftests/bpf/prog_tests/test_csum_diff.c new file mode 100644 index 0000000000000..107b20d43e839 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/test_csum_diff.c @@ -0,0 +1,408 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright Amazon.com Inc. or its affiliates */ +#include +#include "csum_diff_test.skel.h" + +#define BUFF_SZ 512 + +struct testcase { + unsigned long long to_buff[BUFF_SZ / 8]; + unsigned int to_buff_len; + unsigned long long from_buff[BUFF_SZ / 8]; + unsigned int from_buff_len; + unsigned short seed; + unsigned short result; +}; + +#define NUM_PUSH_TESTS 4 + +struct testcase push_tests[NUM_PUSH_TESTS] =3D { + { + .to_buff =3D { + 0xdeadbeefdeadbeef, + }, + .to_buff_len =3D 8, + .from_buff =3D {}, + .from_buff_len =3D 0, + .seed =3D 0, + .result =3D 0x3b3b + }, + { + .to_buff =3D { + 0xdeadbeefdeadbeef, + 0xbeefdeadbeefdead, + }, + .to_buff_len =3D 16, + .from_buff =3D {}, + .from_buff_len =3D 0, + .seed =3D 0x1234, + .result =3D 0x88aa + }, + { + .to_buff =3D { + 0xdeadbeefdeadbeef, + 0xbeefdeadbeefdead, + }, + .to_buff_len =3D 15, + .from_buff =3D {}, + .from_buff_len =3D 0, + .seed =3D 0x1234, +#if __BYTE_ORDER__ =3D=3D __ORDER_LITTLE_ENDIAN__ + .result =3D 0xcaa9 +#else + .result =3D 0x87fd +#endif + }, + { + .to_buff =3D { + 0x327b23c66b8b4567, + 0x66334873643c9869, + 0x19495cff74b0dc51, + 0x625558ec2ae8944a, + 0x46e87ccd238e1f29, + 0x507ed7ab3d1b58ba, + 0x41b71efb2eb141f2, + 0x7545e14679e2a9e3, + 0x5bd062c2515f007c, + 0x4db127f812200854, + 0x1f16e9e80216231b, + 0x66ef438d1190cde7, + 0x3352255a140e0f76, + 0x0ded7263109cf92e, + 0x1befd79f7fdcc233, + 0x6b68079a41a7c4c9, + 0x25e45d324e6afb66, + 0x431bd7b7519b500d, + 0x7c83e4583f2dba31, + 0x62bbd95a257130a3, + 0x628c895d436c6125, + 0x721da317333ab105, + 0x2d1d5ae92443a858, + 0x75a2a8d46763845e, + 0x79838cb208edbdab, + 0x0b03e0c64353d0cd, + 0x54e49eb4189a769b, + 0x2ca8861171f32454, + 0x02901d820836c40e, + 0x081386413a95f874, + 0x7c3dbd3d1e7ff521, + 0x6ceaf087737b8ddc, + 0x4516dde922221a70, + 0x614fd4a13006c83e, + 0x5577f8e1419ac241, + 0x05072367440badfc, + 0x77465f013804823e, + 0x5c482a977724c67e, + 0x5e884adc2463b9ea, + 0x2d51779651ead36b, + 0x153ea438580bd78f, + 0x70a64e2a3855585c, + 0x2a487cb06a2342ec, + 0x725a06fb1d4ed43b, + 0x57e4ccaf2cd89a32, + 0x4b588f547a6d8d3c, + 0x6de91b18542289ec, + 0x7644a45c38437fdb, + 0x684a481a32fff902, + 0x749abb43579478fe, + 0x1ba026fa3dc240fb, + 0x75c6c33a79a1deaa, + 0x70c6a52912e685fb, + 0x374a3fe6520eedd1, + 0x23f9c13c4f4ef005, + 0x275ac794649bb77c, + 0x1cf10fd839386575, + 0x235ba861180115be, + 0x354fe9f947398c89, + 0x741226bb15b5af5c, + 0x10233c990d34b6a8, + 0x615740953f6ab60f, + 0x77ae35eb7e0c57b1, + 0x310c50b3579be4f1, + }, + .to_buff_len =3D 512, + .from_buff =3D {}, + .from_buff_len =3D 0, + .seed =3D 0xffff, + .result =3D 0xca45 + }, +}; + +#define NUM_PULL_TESTS 4 + +struct testcase pull_tests[NUM_PULL_TESTS] =3D { + { + .from_buff =3D { + 0xdeadbeefdeadbeef, + }, + .from_buff_len =3D 8, + .to_buff =3D {}, + .to_buff_len =3D 0, + .seed =3D 0, + .result =3D 0xc4c4 + }, + { + .from_buff =3D { + 0xdeadbeefdeadbeef, + 0xbeefdeadbeefdead, + }, + .from_buff_len =3D 16, + .to_buff =3D {}, + .to_buff_len =3D 0, + .seed =3D 0x1234, + .result =3D 0x9bbd + }, + { + .from_buff =3D { + 0xdeadbeefdeadbeef, + 0xbeefdeadbeefdead, + }, + .from_buff_len =3D 15, + .to_buff =3D {}, + .to_buff_len =3D 0, + .seed =3D 0x1234, +#if __BYTE_ORDER__ =3D=3D __ORDER_LITTLE_ENDIAN__ + .result =3D 0x59be +#else + .result =3D 0x9c6a +#endif + }, + { + .from_buff =3D { + 0x327b23c66b8b4567, + 0x66334873643c9869, + 0x19495cff74b0dc51, + 0x625558ec2ae8944a, + 0x46e87ccd238e1f29, + 0x507ed7ab3d1b58ba, + 0x41b71efb2eb141f2, + 0x7545e14679e2a9e3, + 0x5bd062c2515f007c, + 0x4db127f812200854, + 0x1f16e9e80216231b, + 0x66ef438d1190cde7, + 0x3352255a140e0f76, + 0x0ded7263109cf92e, + 0x1befd79f7fdcc233, + 0x6b68079a41a7c4c9, + 0x25e45d324e6afb66, + 0x431bd7b7519b500d, + 0x7c83e4583f2dba31, + 0x62bbd95a257130a3, + 0x628c895d436c6125, + 0x721da317333ab105, + 0x2d1d5ae92443a858, + 0x75a2a8d46763845e, + 0x79838cb208edbdab, + 0x0b03e0c64353d0cd, + 0x54e49eb4189a769b, + 0x2ca8861171f32454, + 0x02901d820836c40e, + 0x081386413a95f874, + 0x7c3dbd3d1e7ff521, + 0x6ceaf087737b8ddc, + 0x4516dde922221a70, + 0x614fd4a13006c83e, + 0x5577f8e1419ac241, + 0x05072367440badfc, + 0x77465f013804823e, + 0x5c482a977724c67e, + 0x5e884adc2463b9ea, + 0x2d51779651ead36b, + 0x153ea438580bd78f, + 0x70a64e2a3855585c, + 0x2a487cb06a2342ec, + 0x725a06fb1d4ed43b, + 0x57e4ccaf2cd89a32, + 0x4b588f547a6d8d3c, + 0x6de91b18542289ec, + 0x7644a45c38437fdb, + 0x684a481a32fff902, + 0x749abb43579478fe, + 0x1ba026fa3dc240fb, + 0x75c6c33a79a1deaa, + 0x70c6a52912e685fb, + 0x374a3fe6520eedd1, + 0x23f9c13c4f4ef005, + 0x275ac794649bb77c, + 0x1cf10fd839386575, + 0x235ba861180115be, + 0x354fe9f947398c89, + 0x741226bb15b5af5c, + 0x10233c990d34b6a8, + 0x615740953f6ab60f, + 0x77ae35eb7e0c57b1, + 0x310c50b3579be4f1, + }, + .from_buff_len =3D 512, + .to_buff =3D {}, + .to_buff_len =3D 0, + .seed =3D 0xffff, + .result =3D 0x35ba + }, +}; + +#define NUM_DIFF_TESTS 4 + +struct testcase diff_tests[NUM_DIFF_TESTS] =3D { + { + .from_buff =3D { + 0xdeadbeefdeadbeef, + }, + .from_buff_len =3D 8, + .to_buff =3D { + 0xabababababababab, + }, + .to_buff_len =3D 8, + .seed =3D 0, + .result =3D 0x7373 + }, + { + .from_buff =3D { + 0xdeadbeefdeadbeef, + }, + .from_buff_len =3D 7, + .to_buff =3D { + 0xabababababababab, + }, + .to_buff_len =3D 7, + .seed =3D 0, +#if __BYTE_ORDER__ =3D=3D __ORDER_LITTLE_ENDIAN__ + .result =3D 0xa673 +#else + .result =3D 0x73b7 +#endif + }, + { + .from_buff =3D { + 0, + }, + .from_buff_len =3D 8, + .to_buff =3D { + 0xabababababababab, + }, + .to_buff_len =3D 8, + .seed =3D 0, + .result =3D 0xaeae + }, + { + .from_buff =3D { + 0xdeadbeefdeadbeef + }, + .from_buff_len =3D 8, + .to_buff =3D { + 0, + }, + .to_buff_len =3D 8, + .seed =3D 0xffff, + .result =3D 0xc4c4 + }, +}; + +#define NUM_EDGE_TESTS 4 + +struct testcase edge_tests[NUM_EDGE_TESTS] =3D { + { + .from_buff =3D {}, + .from_buff_len =3D 0, + .to_buff =3D {}, + .to_buff_len =3D 0, + .seed =3D 0, + .result =3D 0 + }, + { + .from_buff =3D { + 0x1234 + }, + .from_buff_len =3D 0, + .to_buff =3D { + 0x1234 + }, + .to_buff_len =3D 0, + .seed =3D 0, + .result =3D 0 + }, + { + .from_buff =3D {}, + .from_buff_len =3D 0, + .to_buff =3D {}, + .to_buff_len =3D 0, + .seed =3D 0x1234, + .result =3D 0x1234 + }, + { + .from_buff =3D {}, + .from_buff_len =3D 512, + .to_buff =3D {}, + .to_buff_len =3D 0, + .seed =3D 0xffff, + .result =3D 0xffff + }, +}; + +static unsigned short trigger_csum_diff(const struct csum_diff_test *skel) +{ + u8 tmp_out[64 << 2] =3D {}; + u8 tmp_in[64] =3D {}; + int err; + int pfd; + + LIBBPF_OPTS(bpf_test_run_opts, topts, + .data_in =3D tmp_in, + .data_size_in =3D sizeof(tmp_in), + .data_out =3D tmp_out, + .data_size_out =3D sizeof(tmp_out), + .repeat =3D 1, + ); + pfd =3D bpf_program__fd(skel->progs.compute_checksum); + err =3D bpf_prog_test_run_opts(pfd, &topts); + if (err) + return -1; + + return skel->bss->result; +} + +static void test_csum_diff(struct testcase *tests, int num_tests) +{ + struct csum_diff_test *skel; + unsigned short got; + int err; + + for (int i =3D 0; i < num_tests; i++) { + skel =3D csum_diff_test__open(); + if (!ASSERT_OK_PTR(skel, "csum_diff_test open")) + return; + + skel->rodata->to_buff_len =3D tests[i].to_buff_len; + skel->rodata->from_buff_len =3D tests[i].from_buff_len; + + err =3D csum_diff_test__load(skel); + if (!ASSERT_EQ(err, 0, "csum_diff_test load")) + goto out; + + memcpy(skel->bss->to_buff, tests[i].to_buff, tests[i].to_buff_len); + memcpy(skel->bss->from_buff, tests[i].from_buff, tests[i].from_buff_len); + skel->bss->seed =3D tests[i].seed; + + got =3D trigger_csum_diff(skel); + ASSERT_EQ(got, tests[i].result, "csum_diff result"); + + csum_diff_test__destroy(skel); + } + + return; +out: + csum_diff_test__destroy(skel); +} + +void test_test_csum_diff(void) +{ + if (test__start_subtest("csum_diff_push")) + test_csum_diff(push_tests, NUM_PUSH_TESTS); + if (test__start_subtest("csum_diff_pull")) + test_csum_diff(pull_tests, NUM_PULL_TESTS); + if (test__start_subtest("csum_diff_diff")) + test_csum_diff(diff_tests, NUM_DIFF_TESTS); + if (test__start_subtest("csum_diff_edge")) + test_csum_diff(edge_tests, NUM_EDGE_TESTS); +} diff --git a/tools/testing/selftests/bpf/progs/csum_diff_test.c b/tools/tes= ting/selftests/bpf/progs/csum_diff_test.c new file mode 100644 index 0000000000000..9438f1773a589 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/csum_diff_test.c @@ -0,0 +1,42 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright Amazon.com Inc. or its affiliates */ +#include +#include +#include +#include + +#define BUFF_SZ 512 + +/* Will be updated by benchmark before program loading */ +char to_buff[BUFF_SZ]; +const volatile unsigned int to_buff_len =3D 0; +char from_buff[BUFF_SZ]; +const volatile unsigned int from_buff_len =3D 0; +unsigned short seed =3D 0; + +short result; + +char _license[] SEC("license") =3D "GPL"; + +SEC("tc") +int compute_checksum(void *ctx) +{ + int to_len_half =3D to_buff_len / 2; + int from_len_half =3D from_buff_len / 2; + short result2; + + /* Calculate checksum in one go */ + result2 =3D bpf_csum_diff((void *)from_buff, from_buff_len, + (void *)to_buff, to_buff_len, seed); + + /* Calculate checksum by concatenating bpf_csum_diff()*/ + result =3D bpf_csum_diff((void *)from_buff, from_buff_len - from_len_half, + (void *)to_buff, to_buff_len - to_len_half, seed); + + result =3D bpf_csum_diff((void *)from_buff + (from_buff_len - from_len_ha= lf), from_len_half, + (void *)to_buff + (to_buff_len - to_len_half), to_len_half, resu= lt); + + result =3D (result =3D=3D result2) ? result : 0; + + return 0; +} --=20 2.40.1