May 2023 - Linux-stable-mirror

[PATCH AUTOSEL 6.3 01/44] drm/displayid: add displayid_get_header() and check bounds better

by Sasha Levin

From: Jani Nikula <jani.nikula(a)intel.com> [ Upstream commit 5bacecc3c56131c31f18b23d366f2184328fd9cf ] Add a helper to get a pointer to struct displayid_header. To be pedantic, add buffer overflow checks to not touch the base if that itself would overflow. Cc: Iaroslav Boliukin <iam(a)lach.pw> Cc: Dmitry Osipenko <dmitry.osipenko(a)collabora.com> Signed-off-by: Jani Nikula <jani.nikula(a)intel.com> Tested-by: Dmitry Osipenko <dmitry.osipenko(a)collabora.com> Reviewed-by: Dmitry Osipenko <dmitry.osipenko(a)collabora.com> Signed-off-by: Dmitry Osipenko <dmitry.osipenko(a)collabora.com> Link: https://patchwork.freedesktop.org/patch/msgid/4a03b3a5132642d3cdb6d4c264142… Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/gpu/drm/drm_displayid.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_displayid.c b/drivers/gpu/drm/drm_displayid.c index 38ea8203df45b..7d03159dc1461 100644 --- a/drivers/gpu/drm/drm_displayid.c +++ b/drivers/gpu/drm/drm_displayid.c @@ -7,13 +7,28 @@ #include <drm/drm_edid.h> #include <drm/drm_print.h> +static const struct displayid_header * +displayid_get_header(const u8 *displayid, int length, int index) +{ + const struct displayid_header *base; + + if (sizeof(*base) > length - index) + return ERR_PTR(-EINVAL); + + base = (const struct displayid_header *)&displayid[index]; + + return base; +} + static int validate_displayid(const u8 *displayid, int length, int idx) { int i, dispid_length; u8 csum = 0; const struct displayid_header *base; - base = (const struct displayid_header *)&displayid[idx]; + base = displayid_get_header(displayid, length, idx); + if (IS_ERR(base)) + return PTR_ERR(base); DRM_DEBUG_KMS("base revision 0x%x, length %d, %d %d\n", base->rev, base->bytes, base->prod_id, base->ext_count); -- 2.39.2

1 year, 5 months

2
45
0 0

[PATCH RESEND net] ipv{4,6}/raw: fix output xfrm lookup wrt protocol

by Nicolas Dichtel

With a raw socket bound to IPPROTO_RAW (ie with hdrincl enabled), the protocol field of the flow structure, build by raw_sendmsg() / rawv6_sendmsg()), is set to IPPROTO_RAW. This breaks the ipsec policy lookup when some policies are defined with a protocol in the selector. For ipv6, the sin6_port field from 'struct sockaddr_in6' could be used to specify the protocol. Just accept all values for IPPROTO_RAW socket. For ipv4, the sin_port field of 'struct sockaddr_in' could not be used without breaking backward compatibility (the value of this field was never checked). Let's add a new kind of control message, so that the userland could specify which protocol is used. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") CC: stable(a)vger.kernel.org Signed-off-by: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> --- The first version has been marked 'Awaiting Upstream'. Steffen confirmed that the 'net' tree should be the target, thus I resend this patch. I also CC stable(a)vger.kernel.org. include/net/ip.h | 2 ++ include/uapi/linux/in.h | 1 + net/ipv4/ip_sockglue.c | 15 ++++++++++++++- net/ipv4/raw.c | 5 ++++- net/ipv6/raw.c | 3 ++- 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/include/net/ip.h b/include/net/ip.h index c3fffaa92d6e..acec504c469a 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -76,6 +76,7 @@ struct ipcm_cookie { __be32 addr; int oif; struct ip_options_rcu *opt; + __u8 protocol; __u8 ttl; __s16 tos; char priority; @@ -96,6 +97,7 @@ static inline void ipcm_init_sk(struct ipcm_cookie *ipcm, ipcm->sockc.tsflags = inet->sk.sk_tsflags; ipcm->oif = READ_ONCE(inet->sk.sk_bound_dev_if); ipcm->addr = inet->inet_saddr; + ipcm->protocol = inet->inet_num; } #define IPCB(skb) ((struct inet_skb_parm*)((skb)->cb)) diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h index 4b7f2df66b99..e682ab628dfa 100644 --- a/include/uapi/linux/in.h +++ b/include/uapi/linux/in.h @@ -163,6 +163,7 @@ struct in_addr { #define IP_MULTICAST_ALL 49 #define IP_UNICAST_IF 50 #define IP_LOCAL_PORT_RANGE 51 +#define IP_PROTOCOL 52 #define MCAST_EXCLUDE 0 #define MCAST_INCLUDE 1 diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index b511ff0adc0a..ec0fbe874426 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -317,7 +317,17 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc, ipc->tos = val; ipc->priority = rt_tos2priority(ipc->tos); break; - + case IP_PROTOCOL: + if (cmsg->cmsg_len == CMSG_LEN(sizeof(int))) + val = *(int *)CMSG_DATA(cmsg); + else if (cmsg->cmsg_len == CMSG_LEN(sizeof(u8))) + val = *(u8 *)CMSG_DATA(cmsg); + else + return -EINVAL; + if (val < 1 || val > 255) + return -EINVAL; + ipc->protocol = val; + break; default: return -EINVAL; } @@ -1761,6 +1771,9 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, case IP_LOCAL_PORT_RANGE: val = inet->local_port_range.hi << 16 | inet->local_port_range.lo; break; + case IP_PROTOCOL: + val = inet_sk(sk)->inet_num; + break; default: sockopt_release_sock(sk); return -ENOPROTOOPT; diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index ff712bf2a98d..eadf1c9ef7e4 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -532,6 +532,9 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) } ipcm_init_sk(&ipc, inet); + /* Keep backward compat */ + if (hdrincl) + ipc.protocol = IPPROTO_RAW; if (msg->msg_controllen) { err = ip_cmsg_send(sk, msg, &ipc, false); @@ -599,7 +602,7 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) flowi4_init_output(&fl4, ipc.oif, ipc.sockc.mark, tos, RT_SCOPE_UNIVERSE, - hdrincl ? IPPROTO_RAW : sk->sk_protocol, + hdrincl ? ipc.protocol : sk->sk_protocol, inet_sk_flowi_flags(sk) | (hdrincl ? FLOWI_FLAG_KNOWN_NH : 0), daddr, saddr, 0, 0, sk->sk_uid); diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 7d0adb612bdd..44ee7a2e72ac 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -793,7 +793,8 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) if (!proto) proto = inet->inet_num; - else if (proto != inet->inet_num) + else if (proto != inet->inet_num && + inet->inet_num != IPPROTO_RAW) return -EINVAL; if (proto > 255) -- 2.39.2

1 year, 5 months

2
1
0 0

[PATCH net 1/7] can: kvaser_pciefd: Set CAN_STATE_STOPPED in kvaser_pciefd_stop()

by Marc Kleine-Budde

From: Jimmy Assarsson <extja(a)kvaser.com> Set can.state to CAN_STATE_STOPPED in kvaser_pciefd_stop(). Without this fix, wrong CAN state was repported after the interface was brought down. Fixes: 26ad340e582d ("can: kvaser_pciefd: Add driver for Kvaser PCIEcan devices") Cc: stable(a)vger.kernel.org Signed-off-by: Jimmy Assarsson <extja(a)kvaser.com> Link: https://lore.kernel.org/r/20230516134318.104279-2-extja@kvaser.com Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/kvaser_pciefd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/can/kvaser_pciefd.c b/drivers/net/can/kvaser_pciefd.c index 53e8a914c88b..867b421b9506 100644 --- a/drivers/net/can/kvaser_pciefd.c +++ b/drivers/net/can/kvaser_pciefd.c @@ -719,6 +719,7 @@ static int kvaser_pciefd_stop(struct net_device *netdev) iowrite32(0, can->reg_base + KVASER_PCIEFD_KCAN_IEN_REG); del_timer(&can->bec_poll_timer); } + can->can.state = CAN_STATE_STOPPED; close_candev(netdev); return ret; base-commit: 6ad85ed0ebf7ece0f376950a6b3b3c6048093d35 -- 2.39.2

1 year, 5 months

2
1
0 0

[PATCH v2] ceph: force updating the msg pointer in non-split case

by xiubli＠redhat.com

From: Xiubo Li <xiubli(a)redhat.com> When the MClientSnap reqeust's op is not CEPH_SNAP_OP_SPLIT the request may still contain a list of 'split_realms', and we need to skip it anyway. Or it will be parsed as a corrupt snaptrace. Cc: stable(a)vger.kernel.org Cc: Frank Schilder <frans(a)dtu.dk> Reported-by: Frank Schilder <frans(a)dtu.dk> URL: https://tracker.ceph.com/issues/61200 Signed-off-by: Xiubo Li <xiubli(a)redhat.com> --- V2: - Add a detail comment for the code. fs/ceph/snap.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c index 0e59e95a96d9..0f00f977c0f0 100644 --- a/fs/ceph/snap.c +++ b/fs/ceph/snap.c @@ -1114,6 +1114,19 @@ void ceph_handle_snap(struct ceph_mds_client *mdsc, continue; adjust_snap_realm_parent(mdsc, child, realm->ino); } + } else { + /* + * In non-SPLIT op case both the 'num_split_inos' and + * 'num_split_realms' should always be 0 and this will + * do nothing. But the MDS has one bug that in one of + * the UPDATE op cases it will pass a 'split_realms' + * list by mistake, and then will corrupted the snap + * trace in ceph_update_snap_trace(). + * + * So we should skip them anyway here. + */ + p += sizeof(u64) * num_split_inos; + p += sizeof(u64) * num_split_realms; } /* -- 2.40.1

1 year, 5 months

3
2
0 0

stable-rc/queue/6.1 baseline: 159 runs, 11 regressions (v6.1.29-35-gb931b5f255d58)

by kernelci.org bot

stable-rc/queue/6.1 baseline: 159 runs, 11 regressions (v6.1.29-35-gb931b5f255d58) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ asus-C436FA-Flip-hatch | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 asus-CM1400CXA-dalboz | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 asus-cx9400-volteer | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 hp-x360-12b-c...4020-octopus | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 hp-x360-14-G1-sona | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 hp-x360-14a-cb0001xx-zork | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 lenovo-TPad-C13-Yoga-zork | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 meson-g12b-a311d-khadas-vim3 | arm64 | lab-baylibre | gcc-10 | defconfig | 1 mt8183-kukui-...uniper-sku16 | arm64 | lab-collabora | gcc-10 | defconfig+arm64-chromebook | 2 qemu_mips-malta | mips | lab-collabora | gcc-10 | malta_defconfig | 1 Details: https://kernelci.org/test/job/stable-rc/branch/queue%2F6.1/kernel/v6.1.29-3… Test: baseline Tree: stable-rc Branch: queue/6.1 Describe: v6.1.29-35-gb931b5f255d58 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: b931b5f255d58f4cc30e7bfc2a42386f286ad8ea Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ asus-C436FA-Flip-hatch | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 Details: https://kernelci.org/test/plan/id/6465a3f275f4a874df2e863e Results: 6 PASS, 1 FAIL, 0 SKIP Full config: x86_64_defconfig+x86-chromebook Compiler: gcc-10 (gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… HTML log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/6465a3f275f4a874df2e8643 failing since 50 days (last pass: v6.1.21-104-gd5eb32be5b26, first fail: v6.1.21-224-g1abeb39fad59) 2023-05-18T04:04:58.000493 + set +x 2023-05-18T04:04:58.007094 <8>[ 8.538380] <LAVA_SIGNAL_ENDRUN 0_dmesg 10367542_1.4.2.3.1> 2023-05-18T04:04:58.111363 / # # 2023-05-18T04:04:58.212070 export SHELL=/bin/sh 2023-05-18T04:04:58.212923 # 2023-05-18T04:04:58.314490 / # export SHELL=/bin/sh. /lava-10367542/environment 2023-05-18T04:04:58.315328 2023-05-18T04:04:58.416839 / # . /lava-10367542/environment/lava-10367542/bin/lava-test-runner /lava-10367542/1 2023-05-18T04:04:58.417136 2023-05-18T04:04:58.422478 / # /lava-10367542/bin/lava-test-runner /lava-10367542/1 ... (12 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ asus-CM1400CXA-dalboz | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 Details: https://kernelci.org/test/plan/id/6465a4019cdfefdd882e8633 Results: 6 PASS, 1 FAIL, 0 SKIP Full config: x86_64_defconfig+x86-chromebook Compiler: gcc-10 (gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… HTML log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/6465a4019cdfefdd882e8638 failing since 50 days (last pass: v6.1.21-104-gd5eb32be5b26, first fail: v6.1.21-224-g1abeb39fad59) 2023-05-18T04:04:55.835642 + <8>[ 11.687857] <LAVA_SIGNAL_ENDRUN 0_dmesg 10367538_1.4.2.3.1> 2023-05-18T04:04:55.836227 set +x 2023-05-18T04:04:55.944260 / # # 2023-05-18T04:04:56.046818 export SHELL=/bin/sh 2023-05-18T04:04:56.047702 # 2023-05-18T04:04:56.149176 / # export SHELL=/bin/sh. /lava-10367538/environment 2023-05-18T04:04:56.150007 2023-05-18T04:04:56.251508 / # . /lava-10367538/environment/lava-10367538/bin/lava-test-runner /lava-10367538/1 2023-05-18T04:04:56.252804 2023-05-18T04:04:56.257401 / # /lava-10367538/bin/lava-test-runner /lava-10367538/1 ... (12 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ asus-cx9400-volteer | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 Details: https://kernelci.org/test/plan/id/6465a3e827f97e455e2e8631 Results: 6 PASS, 1 FAIL, 0 SKIP Full config: x86_64_defconfig+x86-chromebook Compiler: gcc-10 (gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… HTML log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/6465a3e827f97e455e2e8636 failing since 50 days (last pass: v6.1.21-104-gd5eb32be5b26, first fail: v6.1.21-224-g1abeb39fad59) 2023-05-18T04:04:45.893971 <8>[ 10.467324] <LAVA_SIGNAL_ENDRUN 0_dmesg 10367555_1.4.2.3.1> 2023-05-18T04:04:45.897441 + set +x 2023-05-18T04:04:46.003192 2023-05-18T04:04:46.104817 / # #export SHELL=/bin/sh 2023-05-18T04:04:46.105465 2023-05-18T04:04:46.206784 / # export SHELL=/bin/sh. /lava-10367555/environment 2023-05-18T04:04:46.207438 2023-05-18T04:04:46.308850 / # . /lava-10367555/environment/lava-10367555/bin/lava-test-runner /lava-10367555/1 2023-05-18T04:04:46.309914 2023-05-18T04:04:46.315032 / # /lava-10367555/bin/lava-test-runner /lava-10367555/1 ... (12 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ hp-x360-12b-c...4020-octopus | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 Details: https://kernelci.org/test/plan/id/6465a3e627f97e455e2e8626 Results: 6 PASS, 1 FAIL, 0 SKIP Full config: x86_64_defconfig+x86-chromebook Compiler: gcc-10 (gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… HTML log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/6465a3e627f97e455e2e862b failing since 50 days (last pass: v6.1.21-104-gd5eb32be5b26, first fail: v6.1.21-224-g1abeb39fad59) 2023-05-18T04:04:36.929341 <8>[ 11.343435] <LAVA_SIGNAL_ENDRUN 0_dmesg 10367551_1.4.2.3.1> 2023-05-18T04:04:37.033841 / # # 2023-05-18T04:04:37.134538 export SHELL=/bin/sh 2023-05-18T04:04:37.134740 # 2023-05-18T04:04:37.235299 / # export SHELL=/bin/sh. /lava-10367551/environment 2023-05-18T04:04:37.235508 2023-05-18T04:04:37.336098 / # . /lava-10367551/environment/lava-10367551/bin/lava-test-runner /lava-10367551/1 2023-05-18T04:04:37.336409 2023-05-18T04:04:37.340744 / # /lava-10367551/bin/lava-test-runner /lava-10367551/1 2023-05-18T04:04:37.361067 + export 'TESTRUN_ID=1_bootrr' ... (10 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ hp-x360-14-G1-sona | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 Details: https://kernelci.org/test/plan/id/6465a3d0a97aaef32e2e861d Results: 6 PASS, 1 FAIL, 0 SKIP Full config: x86_64_defconfig+x86-chromebook Compiler: gcc-10 (gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… HTML log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/6465a3d0a97aaef32e2e8622 failing since 50 days (last pass: v6.1.21-104-gd5eb32be5b26, first fail: v6.1.21-224-g1abeb39fad59) 2023-05-18T04:04:14.596912 + set +x 2023-05-18T04:04:14.603588 <8>[ 7.762829] <LAVA_SIGNAL_ENDRUN 0_dmesg 10367500_1.4.2.3.1> 2023-05-18T04:04:14.708147 / # # 2023-05-18T04:04:14.808833 export SHELL=/bin/sh 2023-05-18T04:04:14.809038 # 2023-05-18T04:04:14.909552 / # export SHELL=/bin/sh. /lava-10367500/environment 2023-05-18T04:04:14.909736 2023-05-18T04:04:15.010248 / # . /lava-10367500/environment/lava-10367500/bin/lava-test-runner /lava-10367500/1 2023-05-18T04:04:15.010575 2023-05-18T04:04:15.015989 / # /lava-10367500/bin/lava-test-runner /lava-10367500/1 ... (12 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ hp-x360-14a-cb0001xx-zork | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 Details: https://kernelci.org/test/plan/id/6465a3eb27f97e455e2e863e Results: 6 PASS, 1 FAIL, 0 SKIP Full config: x86_64_defconfig+x86-chromebook Compiler: gcc-10 (gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… HTML log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/6465a3eb27f97e455e2e8643 failing since 50 days (last pass: v6.1.21-104-gd5eb32be5b26, first fail: v6.1.21-224-g1abeb39fad59) 2023-05-18T04:04:41.248406 + set<8>[ 11.588329] <LAVA_SIGNAL_ENDRUN 0_dmesg 10367510_1.4.2.3.1> 2023-05-18T04:04:41.248493 +x 2023-05-18T04:04:41.352460 / # # 2023-05-18T04:04:41.453088 export SHELL=/bin/sh 2023-05-18T04:04:41.453302 # 2023-05-18T04:04:41.553799 / # export SHELL=/bin/sh. /lava-10367510/environment 2023-05-18T04:04:41.554010 2023-05-18T04:04:41.654529 / # . /lava-10367510/environment/lava-10367510/bin/lava-test-runner /lava-10367510/1 2023-05-18T04:04:41.654884 2023-05-18T04:04:41.659611 / # /lava-10367510/bin/lava-test-runner /lava-10367510/1 ... (12 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ lenovo-TPad-C13-Yoga-zork | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 Details: https://kernelci.org/test/plan/id/6465a3d89a103c41512e85e7 Results: 6 PASS, 1 FAIL, 0 SKIP Full config: x86_64_defconfig+x86-chromebook Compiler: gcc-10 (gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… HTML log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/6465a3d89a103c41512e85ec failing since 50 days (last pass: v6.1.21-104-gd5eb32be5b26, first fail: v6.1.21-224-g1abeb39fad59) 2023-05-18T04:04:28.433000 <8>[ 11.045324] <LAVA_SIGNAL_ENDRUN 0_dmesg 10367520_1.4.2.3.1> 2023-05-18T04:04:28.541193 / # # 2023-05-18T04:04:28.642456 export SHELL=/bin/sh 2023-05-18T04:04:28.643173 # 2023-05-18T04:04:28.744509 / # export SHELL=/bin/sh. /lava-10367520/environment 2023-05-18T04:04:28.745186 2023-05-18T04:04:28.846666 / # . /lava-10367520/environment/lava-10367520/bin/lava-test-runner /lava-10367520/1 2023-05-18T04:04:28.848070 2023-05-18T04:04:28.852640 / # /lava-10367520/bin/lava-test-runner /lava-10367520/1 2023-05-18T04:04:28.859287 + export 'TESTRUN_ID=1_bootrr' ... (11 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ meson-g12b-a311d-khadas-vim3 | arm64 | lab-baylibre | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/6465a135f57bf60c602e8637 Results: 5 PASS, 1 FAIL, 1 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… HTML log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/6465a135f57bf60c602e863c new failure (last pass: v6.1.29) 2023-05-18T03:52:52.147393 <8>[ 24.703860] <LAVA_SIGNAL_ENDRUN 0_dmesg 3598926_1.5.2.4.1> 2023-05-18T03:52:52.252507 / # # 2023-05-18T03:52:52.354382 export SHELL=/bin/sh 2023-05-18T03:52:52.354909 # 2023-05-18T03:52:52.456278 / # export SHELL=/bin/sh. /lava-3598926/environment 2023-05-18T03:52:52.456819 2023-05-18T03:52:52.457054 / # . /lava-3598926/environment<3>[ 25.008945] brcmfmac: brcmf_sdio_htclk: HT Avail timeout (1000000): clkctl 0x50 2023-05-18T03:52:52.558423 /lava-3598926/bin/lava-test-runner /lava-3598926/1 2023-05-18T03:52:52.559206 2023-05-18T03:52:52.576096 / # /lava-3598926/bin/lava-test-runner /lava-3598926/1 ... (17 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ mt8183-kukui-...uniper-sku16 | arm64 | lab-collabora | gcc-10 | defconfig+arm64-chromebook | 2 Details: https://kernelci.org/test/plan/id/64659f67695eb5f68f2e860a Results: 166 PASS, 5 FAIL, 0 SKIP Full config: defconfig+arm64-chromebook Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… HTML log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.mt6577-auxadc-probed: https://kernelci.org/test/case/id/64659f67695eb5f68f2e861e failing since 11 days (last pass: v6.1.22-704-ga3dcd1f09de2, first fail: v6.1.22-1160-g24230ce6f2e2) 2023-05-18T03:45:28.831691 /lava-10367266/1/../bin/lava-test-case 2023-05-18T03:45:28.837915 <8>[ 23.093102] <LAVA_SIGNAL_TESTCASE TEST_CASE_ID=mt6577-auxadc-probed RESULT=fail> * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/64659f67695eb5f68f2e86aa failing since 11 days (last pass: v6.1.22-704-ga3dcd1f09de2, first fail: v6.1.22-1160-g24230ce6f2e2) 2023-05-18T03:45:23.347543 + set +x 2023-05-18T03:45:23.354044 <8>[ 17.607067] <LAVA_SIGNAL_ENDRUN 0_dmesg 10367266_1.5.2.3.1> 2023-05-18T03:45:23.463029 / # # 2023-05-18T03:45:23.565604 export SHELL=/bin/sh 2023-05-18T03:45:23.566415 # 2023-05-18T03:45:23.667825 / # export SHELL=/bin/sh. /lava-10367266/environment 2023-05-18T03:45:23.668095 2023-05-18T03:45:23.768597 / # . /lava-10367266/environment/lava-10367266/bin/lava-test-runner /lava-10367266/1 2023-05-18T03:45:23.768907 2023-05-18T03:45:23.774714 / # /lava-10367266/bin/lava-test-runner /lava-10367266/1 ... (13 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ qemu_mips-malta | mips | lab-collabora | gcc-10 | malta_defconfig | 1 Details: https://kernelci.org/test/plan/id/6465a33cfd4ba5682c2e85f6 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: malta_defconfig Compiler: gcc-10 (mips-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… HTML log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.29-35-gb931b5f255d58… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.login: https://kernelci.org/test/case/id/6465a33cfd4ba5682c2e85f7 new failure (last pass: v6.1.29)

1 year, 5 months

1
0
0 0

[PATCH net 6/7] can: kvaser_pciefd: Disable interrupts in probe error path

by Marc Kleine-Budde

From: Jimmy Assarsson <extja(a)kvaser.com> Disable interrupts in error path of probe function. Fixes: 26ad340e582d ("can: kvaser_pciefd: Add driver for Kvaser PCIEcan devices") Cc: stable(a)vger.kernel.org Signed-off-by: Jimmy Assarsson <extja(a)kvaser.com> Link: https://lore.kernel.org/r/20230516134318.104279-7-extja@kvaser.com Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/kvaser_pciefd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/can/kvaser_pciefd.c b/drivers/net/can/kvaser_pciefd.c index 4fafb7658349..be189edb256c 100644 --- a/drivers/net/can/kvaser_pciefd.c +++ b/drivers/net/can/kvaser_pciefd.c @@ -1861,6 +1861,8 @@ static int kvaser_pciefd_probe(struct pci_dev *pdev, return 0; err_free_irq: + /* Disable PCI interrupts */ + iowrite32(0, pcie->reg_base + KVASER_PCIEFD_IEN_REG); free_irq(pcie->pci->irq, pcie); err_teardown_can_ctrls: -- 2.39.2

1 year, 5 months

1
0
0 0

[PATCH net 5/7] can: kvaser_pciefd: Do not send EFLUSH command on TFD interrupt

by Marc Kleine-Budde

From: Jimmy Assarsson <extja(a)kvaser.com> Under certain circumstances we send two EFLUSH commands, resulting in two EFLUSH ack packets, while only expecting a single EFLUSH ack. This can cause the driver Tx flush completion to get out of sync. To avoid this problem, don't enable the "Transmit buffer flush done" (TFD) interrupt and remove the code handling it. Now we only send EFLUSH command after receiving status packet with "Init detected" (IDET) bit set. Fixes: 26ad340e582d ("can: kvaser_pciefd: Add driver for Kvaser PCIEcan devices") Cc: stable(a)vger.kernel.org Signed-off-by: Jimmy Assarsson <extja(a)kvaser.com> Link: https://lore.kernel.org/r/20230516134318.104279-6-extja@kvaser.com Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/kvaser_pciefd.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/drivers/net/can/kvaser_pciefd.c b/drivers/net/can/kvaser_pciefd.c index 0e03c1cd47b3..4fafb7658349 100644 --- a/drivers/net/can/kvaser_pciefd.c +++ b/drivers/net/can/kvaser_pciefd.c @@ -531,7 +531,7 @@ static int kvaser_pciefd_set_tx_irq(struct kvaser_pciefd_can *can) KVASER_PCIEFD_KCAN_IRQ_TOF | KVASER_PCIEFD_KCAN_IRQ_ABD | KVASER_PCIEFD_KCAN_IRQ_TAE | KVASER_PCIEFD_KCAN_IRQ_TAL | KVASER_PCIEFD_KCAN_IRQ_FDIC | KVASER_PCIEFD_KCAN_IRQ_BPP | - KVASER_PCIEFD_KCAN_IRQ_TAR | KVASER_PCIEFD_KCAN_IRQ_TFD; + KVASER_PCIEFD_KCAN_IRQ_TAR; iowrite32(msk, can->reg_base + KVASER_PCIEFD_KCAN_IEN_REG); @@ -579,7 +579,7 @@ static void kvaser_pciefd_start_controller_flush(struct kvaser_pciefd_can *can) spin_lock_irqsave(&can->lock, irq); iowrite32(-1, can->reg_base + KVASER_PCIEFD_KCAN_IRQ_REG); - iowrite32(KVASER_PCIEFD_KCAN_IRQ_ABD | KVASER_PCIEFD_KCAN_IRQ_TFD, + iowrite32(KVASER_PCIEFD_KCAN_IRQ_ABD, can->reg_base + KVASER_PCIEFD_KCAN_IEN_REG); status = ioread32(can->reg_base + KVASER_PCIEFD_KCAN_STAT_REG); @@ -622,7 +622,7 @@ static int kvaser_pciefd_bus_on(struct kvaser_pciefd_can *can) iowrite32(0, can->reg_base + KVASER_PCIEFD_KCAN_IEN_REG); iowrite32(-1, can->reg_base + KVASER_PCIEFD_KCAN_IRQ_REG); - iowrite32(KVASER_PCIEFD_KCAN_IRQ_ABD | KVASER_PCIEFD_KCAN_IRQ_TFD, + iowrite32(KVASER_PCIEFD_KCAN_IRQ_ABD, can->reg_base + KVASER_PCIEFD_KCAN_IEN_REG); mode = ioread32(can->reg_base + KVASER_PCIEFD_KCAN_MODE_REG); @@ -1015,8 +1015,7 @@ static int kvaser_pciefd_setup_can_ctrls(struct kvaser_pciefd *pcie) SET_NETDEV_DEV(netdev, &pcie->pci->dev); iowrite32(-1, can->reg_base + KVASER_PCIEFD_KCAN_IRQ_REG); - iowrite32(KVASER_PCIEFD_KCAN_IRQ_ABD | - KVASER_PCIEFD_KCAN_IRQ_TFD, + iowrite32(KVASER_PCIEFD_KCAN_IRQ_ABD, can->reg_base + KVASER_PCIEFD_KCAN_IEN_REG); pcie->can[i] = can; @@ -1443,9 +1442,6 @@ static int kvaser_pciefd_handle_status_packet(struct kvaser_pciefd *pcie, cmd = KVASER_PCIEFD_KCAN_CMD_AT; cmd |= ++can->cmd_seq << KVASER_PCIEFD_KCAN_CMD_SEQ_SHIFT; iowrite32(cmd, can->reg_base + KVASER_PCIEFD_KCAN_CMD_REG); - - iowrite32(KVASER_PCIEFD_KCAN_IRQ_TFD, - can->reg_base + KVASER_PCIEFD_KCAN_IEN_REG); } else if (p->header[0] & KVASER_PCIEFD_SPACK_IDET && p->header[0] & KVASER_PCIEFD_SPACK_IRM && cmdseq == (p->header[1] & KVASER_PCIEFD_PACKET_SEQ_MSK) && @@ -1732,15 +1728,6 @@ static int kvaser_pciefd_transmit_irq(struct kvaser_pciefd_can *can) if (irq & KVASER_PCIEFD_KCAN_IRQ_TOF) netdev_err(can->can.dev, "Tx FIFO overflow\n"); - if (irq & KVASER_PCIEFD_KCAN_IRQ_TFD) { - u8 count = ioread32(can->reg_base + - KVASER_PCIEFD_KCAN_TX_NPACKETS_REG) & 0xff; - - if (count == 0) - iowrite32(KVASER_PCIEFD_KCAN_CTRL_EFLUSH, - can->reg_base + KVASER_PCIEFD_KCAN_CTRL_REG); - } - if (irq & KVASER_PCIEFD_KCAN_IRQ_BPP) netdev_err(can->can.dev, "Fail to change bittiming, when not in reset mode\n"); -- 2.39.2

1 year, 5 months

1
0
0 0

[PATCH net 4/7] can: kvaser_pciefd: Empty SRB buffer in probe

by Marc Kleine-Budde

From: Jimmy Assarsson <extja(a)kvaser.com> Empty the "Shared receive buffer" (SRB) in probe, to assure we start in a known state, and don't process any irrelevant packets. Fixes: 26ad340e582d ("can: kvaser_pciefd: Add driver for Kvaser PCIEcan devices") Cc: stable(a)vger.kernel.org Signed-off-by: Jimmy Assarsson <extja(a)kvaser.com> Link: https://lore.kernel.org/r/20230516134318.104279-5-extja@kvaser.com Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/kvaser_pciefd.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/net/can/kvaser_pciefd.c b/drivers/net/can/kvaser_pciefd.c index 4b8591d48735..0e03c1cd47b3 100644 --- a/drivers/net/can/kvaser_pciefd.c +++ b/drivers/net/can/kvaser_pciefd.c @@ -71,10 +71,12 @@ MODULE_DESCRIPTION("CAN driver for Kvaser CAN/PCIe devices"); #define KVASER_PCIEFD_SYSID_BUILD_REG (KVASER_PCIEFD_SYSID_BASE + 0x14) /* Shared receive buffer registers */ #define KVASER_PCIEFD_SRB_BASE 0x1f200 +#define KVASER_PCIEFD_SRB_FIFO_LAST_REG (KVASER_PCIEFD_SRB_BASE + 0x1f4) #define KVASER_PCIEFD_SRB_CMD_REG (KVASER_PCIEFD_SRB_BASE + 0x200) #define KVASER_PCIEFD_SRB_IEN_REG (KVASER_PCIEFD_SRB_BASE + 0x204) #define KVASER_PCIEFD_SRB_IRQ_REG (KVASER_PCIEFD_SRB_BASE + 0x20c) #define KVASER_PCIEFD_SRB_STAT_REG (KVASER_PCIEFD_SRB_BASE + 0x210) +#define KVASER_PCIEFD_SRB_RX_NR_PACKETS_REG (KVASER_PCIEFD_SRB_BASE + 0x214) #define KVASER_PCIEFD_SRB_CTRL_REG (KVASER_PCIEFD_SRB_BASE + 0x218) /* EPCS flash controller registers */ #define KVASER_PCIEFD_SPI_BASE 0x1fc00 @@ -111,6 +113,9 @@ MODULE_DESCRIPTION("CAN driver for Kvaser CAN/PCIe devices"); /* DMA support */ #define KVASER_PCIEFD_SRB_STAT_DMA BIT(24) +/* SRB current packet level */ +#define KVASER_PCIEFD_SRB_RX_NR_PACKETS_MASK 0xff + /* DMA Enable */ #define KVASER_PCIEFD_SRB_CTRL_DMA_ENABLE BIT(0) @@ -1061,6 +1066,7 @@ static int kvaser_pciefd_setup_dma(struct kvaser_pciefd *pcie) { int i; u32 srb_status; + u32 srb_packet_count; dma_addr_t dma_addr[KVASER_PCIEFD_DMA_COUNT]; /* Disable the DMA */ @@ -1088,6 +1094,15 @@ static int kvaser_pciefd_setup_dma(struct kvaser_pciefd *pcie) KVASER_PCIEFD_SRB_CMD_RDB1, pcie->reg_base + KVASER_PCIEFD_SRB_CMD_REG); + /* Empty Rx FIFO */ + srb_packet_count = ioread32(pcie->reg_base + KVASER_PCIEFD_SRB_RX_NR_PACKETS_REG) & + KVASER_PCIEFD_SRB_RX_NR_PACKETS_MASK; + while (srb_packet_count) { + /* Drop current packet in FIFO */ + ioread32(pcie->reg_base + KVASER_PCIEFD_SRB_FIFO_LAST_REG); + srb_packet_count--; + } + srb_status = ioread32(pcie->reg_base + KVASER_PCIEFD_SRB_STAT_REG); if (!(srb_status & KVASER_PCIEFD_SRB_STAT_DI)) { dev_err(&pcie->pci->dev, "DMA not idle before enabling\n"); -- 2.39.2

1 year, 5 months

1
0
0 0

[PATCH net 3/7] can: kvaser_pciefd: Call request_irq() before enabling interrupts

by Marc Kleine-Budde

From: Jimmy Assarsson <extja(a)kvaser.com> Make sure the interrupt handler is registered before enabling interrupts. Fixes: 26ad340e582d ("can: kvaser_pciefd: Add driver for Kvaser PCIEcan devices") Cc: stable(a)vger.kernel.org Signed-off-by: Jimmy Assarsson <extja(a)kvaser.com> Link: https://lore.kernel.org/r/20230516134318.104279-4-extja@kvaser.com Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/kvaser_pciefd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/can/kvaser_pciefd.c b/drivers/net/can/kvaser_pciefd.c index cdc894d12885..4b8591d48735 100644 --- a/drivers/net/can/kvaser_pciefd.c +++ b/drivers/net/can/kvaser_pciefd.c @@ -1827,6 +1827,11 @@ static int kvaser_pciefd_probe(struct pci_dev *pdev, if (err) goto err_teardown_can_ctrls; + err = request_irq(pcie->pci->irq, kvaser_pciefd_irq_handler, + IRQF_SHARED, KVASER_PCIEFD_DRV_NAME, pcie); + if (err) + goto err_teardown_can_ctrls; + iowrite32(KVASER_PCIEFD_SRB_IRQ_DPD0 | KVASER_PCIEFD_SRB_IRQ_DPD1, pcie->reg_base + KVASER_PCIEFD_SRB_IRQ_REG); @@ -1847,11 +1852,6 @@ static int kvaser_pciefd_probe(struct pci_dev *pdev, iowrite32(KVASER_PCIEFD_SRB_CMD_RDB1, pcie->reg_base + KVASER_PCIEFD_SRB_CMD_REG); - err = request_irq(pcie->pci->irq, kvaser_pciefd_irq_handler, - IRQF_SHARED, KVASER_PCIEFD_DRV_NAME, pcie); - if (err) - goto err_teardown_can_ctrls; - err = kvaser_pciefd_reg_candev(pcie); if (err) goto err_free_irq; -- 2.39.2

1 year, 5 months

1
0
0 0

[PATCH net 2/7] can: kvaser_pciefd: Clear listen-only bit if not explicitly requested

by Marc Kleine-Budde

From: Jimmy Assarsson <extja(a)kvaser.com> The listen-only bit was never cleared, causing the controller to always use listen-only mode, if previously set. Fixes: 26ad340e582d ("can: kvaser_pciefd: Add driver for Kvaser PCIEcan devices") Cc: stable(a)vger.kernel.org Signed-off-by: Jimmy Assarsson <extja(a)kvaser.com> Link: https://lore.kernel.org/r/20230516134318.104279-3-extja@kvaser.com Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/kvaser_pciefd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/can/kvaser_pciefd.c b/drivers/net/can/kvaser_pciefd.c index 867b421b9506..cdc894d12885 100644 --- a/drivers/net/can/kvaser_pciefd.c +++ b/drivers/net/can/kvaser_pciefd.c @@ -554,6 +554,8 @@ static void kvaser_pciefd_setup_controller(struct kvaser_pciefd_can *can) if (can->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) mode |= KVASER_PCIEFD_KCAN_MODE_LOM; + else + mode &= ~KVASER_PCIEFD_KCAN_MODE_LOM; mode |= KVASER_PCIEFD_KCAN_MODE_EEN; mode |= KVASER_PCIEFD_KCAN_MODE_EPEN; -- 2.39.2

1 year, 5 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror May 2023