diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb | 2 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch | 66 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb | 1 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb (renamed from meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb) | 2 |
4 files changed, 70 insertions, 1 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb index 5df44f21f..e40e1cd26 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb @@ -10,3 +10,5 @@ S = "${WORKDIR}/git" inherit module EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}" + +PNBLACKLIST[can-isotp] = "Kernel module Needs forward porting to kernel 5.2+" diff --git a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch new file mode 100644 index 000000000..39f899cf1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch @@ -0,0 +1,66 @@ +From 4e4c8c7a1cca2125e2bf2a67cbab0bdbd78fdb86 Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Tue, 30 Jul 2019 13:24:22 +0800 +Subject: [PATCH] ptts: Set recv buffer size too max to receive as many + packets as possible + +Flooding multicast may make the rcv buffer overrun and is considered +premature messages later and thus cause the following error. + +"Ignoring premature msg 16, currently handling 12" + +This patch sets SO_RCVBUF the of socket to max int value to receive as many +packets as possible, and give a hint to user when possible overrun occurs. Note +that the value of SO_RCVBUF will be limited up to min(INT_MAX/2, +sysctl_rmem_max) in kernel. + +Signed-off-by: He Zhe <zhe.he@windriver.com> + +Upstream-Status: Backport + +Signed-off-by: Li Zhou <li.zhou@windriver.com> +--- + ptts/tipc_ts_server.c | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/ptts/tipc_ts_server.c b/ptts/tipc_ts_server.c +index a286daa..3a2f96f 100644 +--- a/ptts/tipc_ts_server.c ++++ b/ptts/tipc_ts_server.c +@@ -641,8 +641,9 @@ void server_mcast + if (rc < 0) + err("multicast message not received"); + if (msgno != *(int*) buf) { +- dbg1("Ignoring premature msg %u, currently handling %u\n", +- *(int*)buf, msgno); ++ dbg1("Ignoring premature msg %u, currently handling %u\n" ++ "You can enlarge /proc/sys/net/core/rmem_max and try again\n", ++ *(int*)buf, msgno); + continue; + } + rc = recvfrom(sd[i], buf, expected_szs[numSubTest], +@@ -687,8 +688,21 @@ void server_test_multicast(void) + FD_ZERO(&readfds); + + for (i = 0; i < TIPC_MCAST_SOCKETS; i++) { ++ int optval = (int)(~0U >> 1); ++ socklen_t optlen = sizeof(optval); ++ int rc = 0; ++ + sd[i] = createSocketTIPC (SOCK_RDM); + FD_SET(sd[i], &readfds); ++ ++ /* ++ * Flooding multicast may make the rcv buffer overrun and considered premature msg later. ++ * Set SO_RCVBUF to max int value to receive as many packets as possible. ++ * Note that it will be limited up to min(INT_MAX/2, sysctl_rmem_max) in kernel. ++ */ ++ rc = setsockopt(sd[i], SOL_SOCKET, SO_RCVBUF, (const char*)&optval, optlen); ++ if(rc != 0) ++ printf("Failed to set SO_RCVBUF of %d: %s\n", sd[i], strerror(errno)); + } + + server_bindMulticast( 0, 99, sd[0]); +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb index 054e0acc8..637770af2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb @@ -6,6 +6,7 @@ SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils \ file://0001-include-sys-select.h-for-FD_-definitions.patch \ file://0002-replace-non-standard-uint-with-unsigned-int.patch \ file://0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch \ + file://0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch \ " SRCREV = "7ab2211b87414ba240b0b2e4af219c1057c9cf9a" PV = "2.2.0+git${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb index b5d95d940..e97b4efb2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1" -SRCREV = "ff304e9e65e7cde17a637eea190a874c26c48634" +SRCREV = "a3d655d2255481333e09ecca9855f1b37f757c52" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" |