Drop selftests-bpf-fix-overflow-tests-to-reflect-iter-siz.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.8/selftests-bpf-fix-overflow-tests-to-reflect-iter-siz.patch b/queue-5.8/selftests-bpf-fix-overflow-tests-to-reflect-iter-siz.patch
deleted file mode 100644 (file)
index 2280552..0000000
--- a/queue-5.8/selftests-bpf-fix-overflow-tests-to-reflect-iter-siz.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From ae7bbfe6edebea2c8576f6a3e973682d7226efa0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 28 Sep 2020 12:31:08 +0100
-Subject: selftests/bpf: Fix overflow tests to reflect iter size increase
-
-From: Alan Maguire <alan.maguire@oracle.com>
-
-[ Upstream commit eb58bbf2e5c7917aa30bf8818761f26bbeeb2290 ]
-
-bpf iter size increase to PAGE_SIZE << 3 means overflow tests assuming
-page size need to be bumped also.
-
-Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
-Signed-off-by: Alexei Starovoitov <ast@kernel.org>
-Link: https://lore.kernel.org/bpf/1601292670-1616-7-git-send-email-alan.maguire@oracle.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
-index 87c29dde1cf96..669f195de2fa0 100644
---- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
-+++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
-@@ -249,7 +249,7 @@ static void test_overflow(bool test_e2big_overflow, bool ret1)
-       struct bpf_map_info map_info = {};
-       struct bpf_iter_test_kern4 *skel;
-       struct bpf_link *link;
--      __u32 page_size;
-+      __u32 iter_size;
-       char *buf;
- 
-       skel = bpf_iter_test_kern4__open();
-@@ -271,19 +271,19 @@ static void test_overflow(bool test_e2big_overflow, bool ret1)
-                 "map_creation failed: %s\n", strerror(errno)))
-               goto free_map1;
- 
--      /* bpf_seq_printf kernel buffer is one page, so one map
-+      /* bpf_seq_printf kernel buffer is 8 pages, so one map
-        * bpf_seq_write will mostly fill it, and the other map
-        * will partially fill and then trigger overflow and need
-        * bpf_seq_read restart.
-        */
--      page_size = sysconf(_SC_PAGE_SIZE);
-+      iter_size = sysconf(_SC_PAGE_SIZE) << 3;
- 
-       if (test_e2big_overflow) {
--              skel->rodata->print_len = (page_size + 8) / 8;
--              expected_read_len = 2 * (page_size + 8);
-+              skel->rodata->print_len = (iter_size + 8) / 8;
-+              expected_read_len = 2 * (iter_size + 8);
-       } else if (!ret1) {
--              skel->rodata->print_len = (page_size - 8) / 8;
--              expected_read_len = 2 * (page_size - 8);
-+              skel->rodata->print_len = (iter_size - 8) / 8;
-+              expected_read_len = 2 * (iter_size - 8);
-       } else {
-               skel->rodata->print_len = 1;
-               expected_read_len = 2 * 8;
--- 
-2.25.1
-

diff --git a/queue-5.8/series b/queue-5.8/series
index 9d7010916e6c01a49d646e52896926e085eb43bf..33e12393809d5aff4f2b18afbbf6aaffc88f4d4a 100644 (file)
--- a/queue-5.8/series
+++ b/queue-5.8/series
@@ -572,7 +572,6 @@ rtw88-pci-power-cycle-device-during-shutdown.patch
 udf-limit-sparing-table-size.patch
 udf-avoid-accessing-uninitialized-data-on-failed-ino.patch
 rtw88-increse-the-size-of-rx-buffer-size.patch
-selftests-bpf-fix-overflow-tests-to-reflect-iter-siz.patch
 usb-cdc-acm-handle-broken-union-descriptors.patch
 usb-dwc3-simple-add-support-for-hikey-970.patch
 habanalabs-cast-to-u64-before-shift-31-bits.patch

diff --git a/queue-5.9/selftests-bpf-fix-overflow-tests-to-reflect-iter-siz.patch b/queue-5.9/selftests-bpf-fix-overflow-tests-to-reflect-iter-siz.patch
deleted file mode 100644 (file)
index 1b74720..0000000
--- a/queue-5.9/selftests-bpf-fix-overflow-tests-to-reflect-iter-siz.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 2e44d65560510500f71cfe93ccbcd93f0ae5f5ad Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 28 Sep 2020 12:31:08 +0100
-Subject: selftests/bpf: Fix overflow tests to reflect iter size increase
-
-From: Alan Maguire <alan.maguire@oracle.com>
-
-[ Upstream commit eb58bbf2e5c7917aa30bf8818761f26bbeeb2290 ]
-
-bpf iter size increase to PAGE_SIZE << 3 means overflow tests assuming
-page size need to be bumped also.
-
-Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
-Signed-off-by: Alexei Starovoitov <ast@kernel.org>
-Link: https://lore.kernel.org/bpf/1601292670-1616-7-git-send-email-alan.maguire@oracle.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
-index 7375d9a6d2427..a8924cbc7509d 100644
---- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
-+++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
-@@ -331,7 +331,7 @@ static void test_overflow(bool test_e2big_overflow, bool ret1)
-       struct bpf_map_info map_info = {};
-       struct bpf_iter_test_kern4 *skel;
-       struct bpf_link *link;
--      __u32 page_size;
-+      __u32 iter_size;
-       char *buf;
- 
-       skel = bpf_iter_test_kern4__open();
-@@ -353,19 +353,19 @@ static void test_overflow(bool test_e2big_overflow, bool ret1)
-                 "map_creation failed: %s\n", strerror(errno)))
-               goto free_map1;
- 
--      /* bpf_seq_printf kernel buffer is one page, so one map
-+      /* bpf_seq_printf kernel buffer is 8 pages, so one map
-        * bpf_seq_write will mostly fill it, and the other map
-        * will partially fill and then trigger overflow and need
-        * bpf_seq_read restart.
-        */
--      page_size = sysconf(_SC_PAGE_SIZE);
-+      iter_size = sysconf(_SC_PAGE_SIZE) << 3;
- 
-       if (test_e2big_overflow) {
--              skel->rodata->print_len = (page_size + 8) / 8;
--              expected_read_len = 2 * (page_size + 8);
-+              skel->rodata->print_len = (iter_size + 8) / 8;
-+              expected_read_len = 2 * (iter_size + 8);
-       } else if (!ret1) {
--              skel->rodata->print_len = (page_size - 8) / 8;
--              expected_read_len = 2 * (page_size - 8);
-+              skel->rodata->print_len = (iter_size - 8) / 8;
-+              expected_read_len = 2 * (iter_size - 8);
-       } else {
-               skel->rodata->print_len = 1;
-               expected_read_len = 2 * 8;
--- 
-2.25.1
-

diff --git a/queue-5.9/series b/queue-5.9/series
index 375fd13ad41e861e2a9ff4ad78f2a06327fb8a04..fad586ef27011ed4f65f615ecbafa64a4b6d3769 100644 (file)
--- a/queue-5.9/series
+++ b/queue-5.9/series
@@ -688,7 +688,6 @@ rtw88-pci-power-cycle-device-during-shutdown.patch
 udf-limit-sparing-table-size.patch
 udf-avoid-accessing-uninitialized-data-on-failed-ino.patch
 rtw88-increse-the-size-of-rx-buffer-size.patch
-selftests-bpf-fix-overflow-tests-to-reflect-iter-siz.patch
 usb-cdc-acm-handle-broken-union-descriptors.patch
 mt76-mt7915-do-not-do-any-work-in-napi-poll-after-ca.patch
 usb-dwc3-simple-add-support-for-hikey-970.patch