6.5.3-rc1 review
Subsystems (13)
Greg Kroah-Hartman
maintainerPATCH 105/739 wifi: ath11k: fix band selection for ppdu received in channel 177 of 5 GHz
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aditya Kumar Singh <[email protected]>
[ Upstream commit 72c8caf904aed2caed5d6e75233294b6159ddb5d ]
5 GHz band channel 177 support was added with the commit e5e94d10c856 ("wifi:
ath11k: add channel 177 into 5 GHz channel list"). However, during processing for the received ppdu in ath11k_dp_rx_h_ppdu(), channel number is checked only till 173. This leads to driver code checking for channel and then fetching the band from it which is extra effort since firmware has already given the channel number in the metadata.
Fix this issue by checking the channel number till 177 since we support it now.
Found via code review. Compile tested only.
--- drivers/net/wireless/ath/ath11k/dp_rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/dp_rx.c +1 -1
@@ -2408,7 +2408,7 @@ static void ath11k_dp_rx_h_ppdu(struct ath11k *ar, struct hal_rx_desc *rx_desc, rx_status->freq = center_freq; }else if (channel_num >=1 && channel_num <=14 ) { rx_status->band =NL80211_BAND_2GHZ ; - }else if (channel_num >=36 && channel_num <=173 ) { + }else if (channel_num >=36 && channel_num <=177 ) { rx_status->band =NL80211_BAND_5GHZ ; }else {spin_lock_bh (&ar->data_lock);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 106/739 wifi: ath12k: fix memcpy array overflow in ath12k_peer_assoc_h_he()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 603cf6c2fcdcbc38f1daa316794e7268852677a7 ]
Two memory copies in this function copy from a short array into a longer one, using the wrong size, which leads to an out-of-bounds access:
include/linux/fortify-string.h:592:4: error: call to '__read_overflow2_field' declared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Werror,-Wattribute-warning]
__read_overflow2_field(q_size_field, size);
^include/linux/fortify-string.h:592:4: error: call to '__read_overflow2_field' declared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Werror,-Wattribute-warning] 2 errors generated.
--- drivers/net/wireless/ath/ath12k/mac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath12k/mac.c +2 -2
@@ -1637,9 +1637,9 @@ static void ath12k_peer_assoc_h_he(struct ath12k *ar, arg->peer_nss =min (sta->deflink.rx_nss, max_nss);memcpy (&arg->peer_he_cap_macinfo, he_cap->he_cap_elem.mac_cap_info, -sizeof (arg->peer_he_cap_macinfo)); +sizeof (he_cap->he_cap_elem.mac_cap_info));memcpy (&arg->peer_he_cap_phyinfo, he_cap->he_cap_elem.phy_cap_info, -sizeof (arg->peer_he_cap_phyinfo)); +sizeof (he_cap->he_cap_elem.phy_cap_info)); arg->peer_he_ops = vif->bss_conf.he_oper.params;/* the top most byte is used to indicate BSS color info */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 107/739 selftests/bpf: fix static assert compilation issue for test_cls_*.c
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Maguire <[email protected]>
[ Upstream commit 416c6d01244ecbf0abfdb898fd091b50ef951b48 ]
commit bdeeed3498c7 ("libbpf: fix offsetof() and container_of() to work with CO-RE")
...was backported to stable trees such as 5.15. The problem is that with older LLVM/clang (14/15) - which is often used for older kernels - we see compilation failures in BPF selftests now:
In file included from progs/test_cls_redirect_subprogs.c:2:progs/test_cls_redirect.c:90:2: error: static assertion expression is not an integral constant expression
sizeof(flow_ports_t) !=
^~~~~~~~~~~~~~~~~~~~~~~progs/test_cls_redirect.c:91:3: note: cast that performs the conversions of a reinterpret_cast is not allowed in a constant expression
offsetofend(struct bpf_sock_tuple, ipv4.dport) -
^progs/test_cls_redirect.c:32:3: note: expanded from macro 'offsetofend'
(offsetof(TYPE, MEMBER) + sizeof((((TYPE *)0)->MEMBER)))
^
tools/testing/selftests/bpf/tools/include/bpf/bpf_helpers.h:86:33: note: expanded from macro 'offsetof'
^
In file included from progs/test_cls_redirect_subprogs.c:2:
progs/test_cls_redirect.c:95:2: error: static assertion expression is not an integral constant expression
sizeof(flow_ports_t) !=
^~~~~~~~~~~~~~~~~~~~~~~progs/test_cls_redirect.c:96:3: note: cast that performs the conversions of a reinterpret_cast is not allowed in a constant expression
offsetofend(struct bpf_sock_tuple, ipv6.dport) -
^progs/test_cls_redirect.c:32:3: note: expanded from macro 'offsetofend'
(offsetof(TYPE, MEMBER) + sizeof((((TYPE *)0)->MEMBER)))
^
tools/testing/selftests/bpf/tools/include/bpf/bpf_helpers.h:86:33: note: expanded from macro 'offsetof'
^2 errors generated.
make: *** [Makefile:594: tools/testing/selftests/bpf/test_cls_redirect_subprogs.bpf.o] Error 1
The problem is the new offsetof() does not play nice with static asserts. Given that the context is a static assert (and CO-RE relocation is not needed at compile time), offsetof() usage can be replaced by restoring the original offsetof() definition as __builtin_offsetof().
--- tools/testing/selftests/bpf/progs/test_cls_redirect.h | 9 +++++++++ 1 file changed, 9 insertions(+)
tools/testing/selftests/bpf/progs/test_cls_redirect.h +9 -0
@@ -12,6 +12,15 @@#include <linux/ipv6.h> #include <linux/udp.h> +/* offsetof() is used in static asserts, and the libbpf-redefined CO-RE +* friendly version breaks compilation for older clang versions <= 15 +* when invoked in a static assert. Restore original here. +*/ +#ifdef offsetof +#undef offsetof +#define offsetof (type, member) __builtin_offsetof(type, member) +#endif +struct gre_base_hdr {uint16_t flags;uint16_t protocol;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 108/739 power: supply: qcom_pmi8998_charger: fix uninitialized variable
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Liao <[email protected]>
[ Upstream commit 13a0d1088c8fea1565e30a169188b59bdd77759e ]
smatch warnings:
drivers/power/supply/qcom_pmi8998_charger.c:565 smb2_status_change_work() error: uninitialized symbol 'usb_online'.
usb_online is used uninitialized whenever smb2_get_prop_usb_online() returns a negative value.
Thus, fix the issue by initializing usb_online to 0.
--- drivers/power/supply/qcom_pmi8998_charger.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/power/supply/qcom_pmi8998_charger.c +2 -1
@@ -556,7 +556,8 @@ static int smb2_set_current_limit(struct smb2_chip *chip, unsigned int val)static void smb2_status_change_work (struct work_struct *work) {unsigned int charger_type, current_ua; -int usb_online, count, rc; +int usb_online =0 ; +int count, rc;struct smb2_chip *chip; chip = container_of(work, struct smb2_chip, status_change_work.work);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 109/739 spi: mpc5xxx-psc: Fix unsigned expression compared with zero
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Zetao <[email protected]>
[ Upstream commit de5e92cb5cefd2968b96075995a36e28298edf71 ]
There is two warnings reported by coccinelle:
./drivers/spi/spi-mpc512x-psc.c:493:5-13: WARNING:
Unsigned expression compared with zero: mps -> irq < 0 ./drivers/spi/spi-mpc52xx-psc.c:332:5-13: WARNING: Unsigned expression compared with zero: mps -> irq < 0
The commit "208ee586f862"
("spi: mpc5xxx-psc: Return immediately if IRQ resource is unavailable") was to check whether the IRQ resource is unavailable. When the IRQ resource is unavailable, an error code is returned, however, the type of "mps->irq" is "unsigned int", causing the error code to flip. Modify the type of "mps->irq" to solve this problem.
--- drivers/spi/spi-mpc512x-psc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-mpc512x-psc.c +1 -1
@@ -53,7 +53,7 @@ struct mpc512x_psc_spi {int type;void __iomem *psc;struct mpc512x_psc_fifo __iomem *fifo; -unsigned int irq; +int irq;u8 bits_per_word;u32 mclk_rate;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 110/739 crypto: af_alg - Fix missing initialisation affecting gcm-aes-s390
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 6a4b8aa0a916b39a39175584c07222434fa6c6ef ]
Fix af_alg_alloc_areq() to initialise areq->first_rsgl.sgl.sgt.sgl to point to the scatterlist array in areq->first_rsgl.sgl.sgl.
Without this, the gcm-aes-s390 driver will oops when it tries to do gcm_walk_start() on req->dst because req->dst is set to the value of areq->first_rsgl.sgl.sgl by _aead_recvmsg() calling aead_request_set_crypt().
The problem comes if an empty ciphertext is passed: the loop in af_alg_get_rsgl() just passes straight out and doesn't set areq->first_rsgl up.
This isn't a problem on x86_64 using gcmaes_crypt_by_sg() because, as far as I can tell, that ignores req->dst and only uses req->src[*].
[*] Is this a bug in aesni-intel_glue.c?
The s390x oops looks something like:
Unable to handle kernel pointer dereference in virtual kernel address space Failing address: 0000000a00000000 TEID: 0000000a00000803 Fault in home space mode while using kernel ASCE. AS:00000000a43a0007 R3:0000000000000024 Oops: 003b ilc:2 [#1] SMP ... Call Trace: [<000003ff7fc3d47e>] gcm_walk_start+0x16/0x28 [aes_s390] [<00000000a2a342f2>] crypto_aead_decrypt+0x9a/0xb8 [<00000000a2a60888>] aead_recvmsg+0x478/0x698 [<00000000a2e519a0>] sock_recvmsg+0x70/0xb0 [<00000000a2e51a56>] sock_read_iter+0x76/0xa0 [<00000000a273e066>] vfs_read+0x26e/0x2a8 [<00000000a273e8c4>] ksys_read+0xbc/0x100 [<00000000a311d808>] __do_syscall+0x1d0/0x1f8 [<00000000a312ff30>] system_call+0x70/0x98 Last Breaking-Event-Address: [<000003ff7fc3e6b4>] gcm_aes_crypt+0x104/0xa68 [aes_s390]
--- crypto/af_alg.c | 1 + 1 file changed, 1 insertion(+)
crypto/af_alg.c +1 -0
@@ -1192,6 +1192,7 @@ struct af_alg_async_req *af_alg_alloc_areq(struct sock *sk, areq->areqlen = areqlen; areq->sk = sk; + areq->first_rsgl.sgl.sgt.sgl = areq->first_rsgl.sgl.sgl; areq->last_rsgl =NULL ;INIT_LIST_HEAD (&areq->rsgl_list); areq->tsgl =NULL ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 111/739 bpf: fix bpf_dynptr_slice() to stop return an ERR_PTR.
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kui-Feng Lee <[email protected]>
[ Upstream commit 5426700e6841bf72e652e34b5cec68eadf442435 ]
Verify if the pointer obtained from bpf_xdp_pointer() is either an error or NULL before returning it.
The function bpf_dynptr_slice() mistakenly returned an ERR_PTR. Instead of solely checking for NULL, it should also verify if the pointer returned by bpf_xdp_pointer() is an error or NULL.
--- kernel/bpf/helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/helpers.c +1 -1
@@ -2243,7 +2243,7 @@ __bpf_kfunc void *bpf_dynptr_slice(const struct bpf_dynptr_kern *ptr, u32 offsetcase BPF_DYNPTR_TYPE_XDP : {void *xdp_ptr =bpf_xdp_pointer (ptr->data, ptr->offset + offset, len); -if (xdp_ptr) +if (!IS_ERR_OR_NULL (xdp_ptr))return xdp_ptr;if (!buffer__opt)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 112/739 kbuild: rust_is_available: remove -v option
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
[ Upstream commit d824d2f98565e7c4cb1b862c230198fbe1a968be ]
The -v option is passed when this script is invoked from Makefile, but not when invoked from Kconfig.
As you can see in scripts/Kconfig.include, the 'success' macro suppresses stdout and stderr anyway, so this script does not need to be quiet.
Stable-dep-of: dee3a6b819c9 ("kbuild: rust_is_available: fix version check when CC has multiple arguments")
--- Makefile | 4 +- scripts/rust_is_available.sh | 96 +++++++++++++++--------------------- 2 files changed, 42 insertions(+), 58 deletions(-)
Makefile +2 -2
@@ -1289,7 +1289,7 @@ prepare0: archprepare # All the preparing.. prepare: prepare0 ifdef CONFIG_RUST - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh -v + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh $(Q)$(MAKE) $(build)=rust endif
@@ -1825,7 +1825,7 @@ $(DOC_TARGETS): # "Is Rust available?" target PHONY += rustavailable rustavailable: - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh -v && echo "Rust is available!" + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh && echo "Rust is available!" # Documentation target #
scripts/rust_is_available.sh +40 -56
146 lines not on this page · raw message
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 113/739 kbuild: rust_is_available: fix version check when CC has multiple arguments
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell Currey <[email protected]>
[ Upstream commit dee3a6b819c96fc8b1907577f585fd66f5c0fefe ]
rust_is_available.sh uses cc-version.sh to identify which C compiler is in use, as scripts/Kconfig.include does. cc-version.sh isn't designed to be able to handle multiple arguments in one variable, i.e. "ccache clang". Its invocation in rust_is_available.sh quotes "$CC", which makes $1 == "ccache clang" instead of the intended $1 == ccache & $2 == clang.
cc-version.sh could also be changed to handle having "ccache clang" as one argument, but it only has the one consumer upstream, making it simpler to fix the caller here.
--- scripts/rust_is_available.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/rust_is_available.sh +2 -2
@@ -113,10 +113,10 @@ fi # # In the future, we might be able to perform a full version check, see # https://github.com/rust-lang/rust-bindgen/issues/2138. -cc_name=$($(dirname $0)/cc-version.sh "$CC" | cut -f1 -d' ') +cc_name=$($(dirname $0)/cc-version.sh $CC | cut -f1 -d' ') if [ "$cc_name" = Clang ]; then clang_version=$( \ - LC_ALL=C "$CC" --version 2>/dev/null \ + LC_ALL=C $CC --version 2>/dev/null \ | sed -nE '1s:.*version ([0-9]+\.[0-9]+\.[0-9]+).*:\1:p' ) if [ "$clang_version" != "$bindgen_libclang_version" ]; then
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 114/739 kbuild: rust_is_available: add check for `bindgen` invocation
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miguel Ojeda <[email protected]>
[ Upstream commit 52cae7f28ed6c3992489f16bb355f5b623f0912e ]
scripts/rust_is_available.sh calls bindgen with a special header in order to check whether the libclang version in use is suitable.
However, the invocation itself may fail if, for instance, bindgen cannot locate libclang. This is fine for Kconfig (since the script will still fail and therefore disable Rust as it should), but it is pretty confusing for users of the rustavailable target given the error will be unrelated:
./scripts/rust_is_available.sh: 21: arithmetic expression: expecting primary: "100000 * + 100 * + "
make: *** [Makefile:1816: rustavailable] Error 2Instead, run the bindgen invocation independently in a previous step, saving its output and return code. If it fails, then show the user a proper error message. Otherwise, continue as usual with the saved output.
Since the previous patch we show a reference to the docs, and the docs now explain how bindgen looks for libclang, thus the error message can leverage the documentation, avoiding duplication here (and making users aware of the setup guide in the documentation).
--- scripts/rust_is_available.sh | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
scripts/rust_is_available.sh +21 -1
@@ -90,8 +90,28 @@ if [ "$rust_bindings_generator_cversion" -gt "$rust_bindings_generator_min_cvers fi # Check that the `libclang` used by the Rust bindings generator is suitable. +# +# In order to do that, first invoke `bindgen` to get the `libclang` version +# found by `bindgen`. This step may already fail if, for instance, `libclang` +# is not found, thus inform the user in such a case. +bindgen_libclang_output=$( \ + LC_ALL=C "$BINDGEN" $(dirname $0)/rust_is_available_bindgen_libclang.h 2>&1 >/dev/null +) || bindgen_libclang_code=$? +if [ -n "$bindgen_libclang_code" ]; then + echo >&2 "***" + echo >&2 "*** Running '$BINDGEN' to check the libclang version (used by the Rust" + echo >&2 "*** bindings generator) failed with code $bindgen_libclang_code. This may be caused by" + echo >&2 "*** a failure to locate libclang. See output and docs below for details:" + echo >&2 "***" + echo >&2 "$bindgen_libclang_output" + echo >&2 "***" + exit 1 +fi + +# `bindgen` returned successfully, thus use the output to check that the version +# of the `libclang` found by the Rust bindings generator is suitable. bindgen_libclang_version=$( \ - LC_ALL=C "$BINDGEN" $(dirname $0)/rust_is_available_bindgen_libclang.h 2>&1 >/dev/null \ + echo "$bindgen_libclang_output" \ | grep -F 'clang version ' \ | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' \ | head -n 1 \
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 115/739 kbuild: rust_is_available: fix confusion when a version appears in the path
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miguel Ojeda <[email protected]>
[ Upstream commit 9eb7e20e0c5cd069457845f965b3e8a7d736ecb7 ]
bindgen's output for libclang's version check contains paths, which in turn may contain strings that look like version numbers [1][2]:
.../6.1.0-dev/.../rust_is_available_bindgen_libclang.h:2:9: warning: clang version 11.1.0 [-W#pragma-messages], err: false
which the script will pick up as the version instead of the latter.
It is also the case that versions may appear after the actual version (e.g. distribution's version text), which was the reason behind head [3]:
.../rust-is-available-bindgen-libclang.h:2:9: warning: clang version 13.0.0 (Fedora 13.0.0-3.fc35) [-W#pragma-messages], err: false
Thus instead ask for a match after the clang version string.
--- scripts/rust_is_available.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
scripts/rust_is_available.sh +1 -3
@@ -112,9 +112,7 @@ fi # of the `libclang` found by the Rust bindings generator is suitable. bindgen_libclang_version=$( \ echo "$bindgen_libclang_output" \ - | grep -F 'clang version ' \ - | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' \ - | head -n 1 \ + | sed -nE 's:.*clang version ([0-9]+\.[0-9]+\.[0-9]+).*:\1:p' ) bindgen_libclang_min_version=$($min_tool_version llvm) bindgen_libclang_cversion=$(get_canonical_version $bindgen_libclang_version)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 116/739 crypto: stm32 - Properly handle pm_runtime_get failing
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit aec48805163338f8413118796c1dd035661b9140 ]
If pm_runtime_get() (disguised as pm_runtime_resume_and_get()) fails, this means the clk wasn't prepared and enabled. Returning early in this case however is wrong as then the following resource frees are skipped and this is never catched up. So do all the cleanups but clk_disable_unprepare().
Also don't emit a warning, as stm32_hash_runtime_resume() already emitted one.
Note that the return value of stm32_hash_remove() is mostly ignored by the device core. The only effect of returning zero instead of an error value is to suppress another warning in platform_remove(). So return 0 even if pm_runtime_resume_and_get() failed.
--- drivers/crypto/stm32/stm32-hash.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/crypto/stm32/stm32-hash.c +3 -4
@@ -1705,9 +1705,7 @@ static int stm32_hash_remove(struct platform_device *pdev)if (!hdev)return -ENODEV ; - ret =pm_runtime_resume_and_get (hdev->dev); -if (ret <0 ) -return ret; + ret =pm_runtime_get_sync (hdev->dev);stm32_hash_unregister_algs (hdev);
@@ -1723,7 +1721,8 @@ static int stm32_hash_remove(struct platform_device *pdev)pm_runtime_disable (hdev->dev);pm_runtime_put_noidle (hdev->dev); -clk_disable_unprepare (hdev->clk); +if (ret >=0 ) +clk_disable_unprepare (hdev->clk);return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 117/739 crypto: api - Use work queue in crypto_destroy_instance
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
[ Upstream commit 9ae4577bc077a7e32c3c7d442c95bc76865c0f17 ]
The function crypto_drop_spawn expects to be called in process context. However, when an instance is unregistered while it still has active users, the last user may cause the instance to be freed in atomic context.
Fix this by delaying the freeing to a work queue.
--- crypto/algapi.c | 16 ++++++++++++++-- include/crypto/algapi.h | 3 +++ 2 files changed, 17 insertions(+), 2 deletions(-)
crypto/algapi.c +14 -2
@@ -17,6 +17,7 @@#include <linux/rtnetlink.h> #include <linux/slab.h> #include <linux/string.h> +#include <linux/workqueue.h> #include "internal.h"
@@ -74,15 +75,26 @@ static void crypto_free_instance(struct crypto_instance *inst) inst->alg.cra_type->free (inst); } -static void crypto_destroy_instance (struct crypto_alg *alg) +static void crypto_destroy_instance_workfn (struct work_struct *w) { -struct crypto_instance *inst = (void *)alg; + struct crypto_instance *inst = container_of(w, struct crypto_instance, + free_work);struct crypto_template *tmpl = inst->tmpl;crypto_free_instance (inst);crypto_tmpl_put (tmpl); } +static void crypto_destroy_instance (struct crypto_alg *alg) +{ +struct crypto_instance *inst =container_of (alg, + struct crypto_instance, + alg); + +INIT_WORK (&inst->free_work, crypto_destroy_instance_workfn); +schedule_work (&inst->free_work); +} +/* * This function adds a spawn to the list secondary_spawns which * will be used at the end of crypto_remove_spawns to unregister
include/crypto/algapi.h +3 -0
@@ -12,6 +12,7 @@#include <linux/cache.h> #include <linux/crypto.h> #include <linux/types.h> +#include <linux/workqueue.h> /* * Maximum values for blocksize and alignmask, used to allocate
@@ -82,6 +83,8 @@ struct crypto_instance {struct crypto_spawn *spawns; }; +struct work_struct free_work; + void *__ctx[] CRYPTO_MINALIGN_ATTR; };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 118/739 Bluetooth: ISO: Add support for connecting multiple BISes
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Iulia Tanasescu <[email protected]>
[ Upstream commit a0bfde167b506423111ddb8cd71930497a40fc54 ]
It is required for some configurations to have multiple BISes as part of the same BIG.
Similar to the flow implemented for unicast, DEFER_SETUP will also be used to bind multiple BISes for the same BIG, before starting Periodic Advertising and creating the BIG.
The user will have to open a new socket for each BIS. By setting the BT_DEFER_SETUP socket option and calling connect, a new connection will be added for the BIG and advertising handle set by the socket QoS parameters. Since all BISes will be bound for the same BIG and advertising handle, the socket QoS options and base parameters should match for all connections.
By calling connect on a socket that does not have the BT_DEFER_SETUP option set, periodic advertising will be started and the BIG will be created, with a BIS for each previously bound connection. Since a BIG cannot be reconfigured with additional BISes after creation, no more connections can be bound for the BIG after the start periodic advertising and create BIG commands have been queued.
The bis_cleanup function has also been updated, so that the advertising set and the BIG will not be terminated unless there are no more bound or connected BISes.
The HCI_CONN_BIG_CREATED connection flag has been added to indicate that the BIG has been successfully created. This flag is checked at bis_cleanup, so that the BIG is only terminated if the HCI_LE_Create_BIG_Complete has been received.
This implementation has been tested on hardware, using the "isotest" tool with an additional command line option, to specify the number of BISes to create as part of the desired BIG:
tools/isotest -i hci0 -s 00:00:00:00:00:00 -N 2 -G 1 -T 1
The btmon log shows that a BIG containing 2 BISes has been created:
< HCI Command: LE Create Broadcast Isochronous Group (0x08|0x0068) plen 31
Handle: 0x01
Advertising Handle: 0x01
Number of BIS: 2
SDU Interval: 10000 us (0x002710)
Maximum SDU size: 40
Maximum Latency: 10 ms (0x000a)
RTN: 0x02
PHY: LE 2M (0x02)
Packing: Sequential (0x00)
Framing: Unframed (0x00)
Encryption: 0x00
Broadcast Code: 00000000000000000000000000000000Quoted 1 line
HCI Event: Command Status (
0x0f) plen 4
LE Create Broadcast Isochronous Group (0x08|0x0068) ncmd 1
Status: Success (0x00)Quoted 1 line
HCI Event: LE Meta Event (
0x3e) plen 23
LE Broadcast Isochronous Group Complete (0x1b)
Status: Success (0x00)
Handle: 0x01
BIG Synchronization Delay: 1974 us (0x0007b6)
Transport Latency: 1974 us (0x0007b6)
PHY: LE 2M (0x02)
NSE: 3
BN: 1
PTO: 1
IRC: 3
Maximum PDU: 40
ISO Interval: 10.00 msec (0x0008)
Connection Handle #0: 10
Connection Handle #1: 11< HCI Command: LE Setup Isochronous Data Path (0x08|0x006e) plen 13
Handle: 10
Data Path Direction: Input (Host to Controller) (0x00)
Data Path: HCI (0x00)
Coding Format: Transparent (0x03)
Company Codec ID: Ericsson Technology Licensing (0)
Vendor Codec ID: 0
Controller Delay: 0 us (0x000000)
Codec Configuration Length: 0
Codec Configuration:Quoted 1 line
HCI Event: Command Complete (
0x0e) plen 6
LE Setup Isochronous Data Path (0x08|0x006e) ncmd 1
Status: Success (0x00)
Handle: 10< HCI Command: LE Setup Isochronous Data Path (0x08|0x006e) plen 13
Handle: 11
Data Path Direction: Input (Host to Controller) (0x00)
Data Path: HCI (0x00)
Coding Format: Transparent (0x03)
Company Codec ID: Ericsson Technology Licensing (0)
Vendor Codec ID: 0
Controller Delay: 0 us (0x000000)
Codec Configuration Length: 0
Codec Configuration:Quoted 1 line
HCI Event: Command Complete (
0x0e) plen 6
LE Setup Isochronous Data Path (0x08|0x006e) ncmd 1
Status: Success (0x00)
Handle: 11< ISO Data TX: Handle 10 flags 0x02 dlen 44
< ISO Data TX: Handle 11 flags 0x02 dlen 44
Quoted 1 line
HCI Event: Number of Completed Packets (
0x13) plen 5
Num handles: 1
Handle: 10
Count: 1
Quoted 1 line
HCI Event: Number of Completed Packets (
0x13) plen 5
Num handles: 1
Handle: 11
Count: 1
Stable-dep-of: 7f74563e6140 ("Bluetooth: ISO: do not emit new LE Create CIS if previous is pending")
--- include/net/bluetooth/hci_core.h | 30 ++++++ net/bluetooth/hci_conn.c | 152 +++++++++++++++++++++---------- net/bluetooth/hci_event.c | 52 +++++++---- net/bluetooth/iso.c | 28 ++++-- 4 files changed, 189 insertions(+), 73 deletions(-)
include/net/bluetooth/hci_core.h +30 -0
@@ -974,6 +974,7 @@ enum {HCI_CONN_SCANNING ,HCI_CONN_AUTH_FAILURE ,HCI_CONN_PER_ADV , + HCI_CONN_BIG_CREATED, };static inline bool hci_conn_ssp_enabled (struct hci_conn *conn)
@@ -1115,6 +1116,32 @@ static inline struct hci_conn *hci_conn_hash_lookup_bis(struct hci_dev *hdev,return NULL ; } +static inline struct hci_conn * +hci_conn_hash_lookup_per_adv_bis (struct hci_dev *hdev, +bdaddr_t *ba, +__u8 big,__u8 bis) +{ +struct hci_conn_hash *h = &hdev->conn_hash; +struct hci_conn *c; + +rcu_read_lock (); + +list_for_each_entry_rcu (c, &h->list, list) { +if (bacmp (&c->dst, ba) || c->type !=ISO_LINK || + !test_bit (HCI_CONN_PER_ADV , &c->flags)) +continue ; + +if (c->iso_qos.bcast.big == big && + c->iso_qos.bcast.bis == bis) { +rcu_read_unlock (); +return c; + } + } +rcu_read_unlock (); + +return NULL ; +} +static inline struct hci_conn *hci_conn_hash_lookup_handle (struct hci_dev *hdev,__u16 handle) {
@@ -1351,6 +1378,9 @@ struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst, __u16 setting, struct bt_codec *codec);struct hci_conn *hci_bind_cis (struct hci_dev *hdev,bdaddr_t *dst,__u8 dst_type,struct bt_iso_qos *qos); +struct hci_conn *hci_bind_bis (struct hci_dev *hdev,bdaddr_t *dst, +struct bt_iso_qos *qos, +__u8 base_len,__u8 *base);struct hci_conn *hci_connect_cis (struct hci_dev *hdev,bdaddr_t *dst,__u8 dst_type,struct bt_iso_qos *qos); struct hci_conn *hci_connect_bis(struct hci_dev *hdev, bdaddr_t *dst,
net/bluetooth/hci_conn.c +106 -46
255 lines not on this page · raw message
net/bluetooth/hci_event.c +32 -20
71 lines not on this page · raw message
net/bluetooth/iso.c +21 -7
@@ -287,13 +287,24 @@ static int iso_connect_bis(struct sock *sk) goto unlock; } - hcon =hci_connect_bis (hdev, &iso_pi (sk)->dst, -le_addr_type (iso_pi (sk)->dst_type), - &iso_pi (sk)->qos,iso_pi (sk)->base_len, -iso_pi (sk)->base); -if (IS_ERR (hcon)) { - err =PTR_ERR (hcon); - goto unlock; +/* Just bind if DEFER_SETUP has been set */ +if (test_bit (BT_SK_DEFER_SETUP , &bt_sk (sk)->flags)) { + hcon =hci_bind_bis (hdev, &iso_pi (sk)->dst, + &iso_pi (sk)->qos,iso_pi (sk)->base_len, +iso_pi (sk)->base); +if (IS_ERR (hcon)) { + err =PTR_ERR (hcon); + goto unlock; + } + }else { + hcon =hci_connect_bis (hdev, &iso_pi (sk)->dst, +le_addr_type (iso_pi (sk)->dst_type), + &iso_pi (sk)->qos,iso_pi (sk)->base_len, +iso_pi (sk)->base); +if (IS_ERR (hcon)) { + err =PTR_ERR (hcon); + goto unlock; + } } conn =iso_conn_add (hcon);
@@ -317,6 +328,9 @@ static int iso_connect_bis(struct sock *sk)if (hcon->state ==BT_CONNECTED ) {iso_sock_clear_timer (sk); sk->sk_state =BT_CONNECTED ; + }else if (test_bit (BT_SK_DEFER_SETUP , &bt_sk (sk)->flags)) { +iso_sock_clear_timer (sk); + sk->sk_state =BT_CONNECT ; }else { sk->sk_state =BT_CONNECT ;iso_sock_set_timer (sk, sk->sk_sndtimeo);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 119/739 Bluetooth: ISO: do not emit new LE Create CIS if previous is pending
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pauli Virtanen <[email protected]>
[ Upstream commit 7f74563e6140e42b4ffae62adbef7a65967a3f98 ]
LE Create CIS command shall not be sent before all CIS Established events from its previous invocation have been processed. Currently it is sent via hci_sync but that only waits for the first event, but there can be multiple.
Make it wait for all events, and simplify the CIS creation as follows:
Add new flag HCI_CONN_CREATE_CIS, which is set if Create CIS has been sent for the connection but it is not yet completed.
Make BT_CONNECT state to mean the connection wants Create CIS.
On events after which new Create CIS may need to be sent, send it if possible and some connections need it. These events are:hci_connect_cis, iso_connect_cfm, hci_cs_le_create_cis, hci_le_cis_estabilished_evt.
The Create CIS status/completion events shall queue new Create CIS only if at least one of the connections transitions away from BT_CONNECT, so that we don't loop if controller is sending bogus events.
This fixes sending multiple CIS Create for the same CIS in the "ISO AC 6(i) - Success" BlueZ test case:
< HCI Command: LE Create Co.. (0x08|0x0064) plen 9 #129 [hci0]
Number of CIS: 2
CIS Handle: 257
ACL Handle: 42
CIS Handle: 258
ACL Handle: 42
Quoted 1 line
HCI Event: Command Status (
0x0f) plen 4 #130 [hci0]
LE Create Connected Isochronous Stream (0x08|0x0064) ncmd 1
Status: Success (0x00)Quoted 1 line
HCI Event: LE Meta Event (
0x3e) plen 29 #131 [hci0]
LE Connected Isochronous Stream Established (0x19)
Status: Success (0x00)
Connection Handle: 257
...
< HCI Command: LE Setup Is.. (0x08|0x006e) plen 13 #132 [hci0]
...Quoted 1 line
HCI Event: Command Complete (
0x0e) plen 6 #133 [hci0]
LE Setup Isochronous Data Path (0x08|0x006e) ncmd 1
...< HCI Command: LE Create Co.. (0x08|0x0064) plen 5 #134 [hci0]
Number of CIS: 1
CIS Handle: 258
ACL Handle: 42
Quoted 1 line
HCI Event: Command Status (
0x0f) plen 4 #135 [hci0]
LE Create Connected Isochronous Stream (0x08|0x0064) ncmd 1
Status: ACL Connection Already Exists (0x0b)Quoted 1 line
HCI Event: LE Meta Event (
0x3e) plen 29 #136 [hci0]
LE Connected Isochronous Stream Established (0x19)
Status: Success (0x00)
Connection Handle: 258
...--- include/net/bluetooth/hci_core.h | 4 +- include/net/bluetooth/hci_sync.h | 2 +- net/bluetooth/hci_conn.c | 74 +++++++++++--------------- net/bluetooth/hci_event.c | 25 +++++++-- net/bluetooth/hci_sync.c | 90 ++++++++++++++++++++++---------- net/bluetooth/iso.c | 2 +- 6 files changed, 119 insertions(+), 78 deletions(-)
include/net/bluetooth/hci_core.h +3 -1
@@ -975,6 +975,7 @@ enum {HCI_CONN_AUTH_FAILURE ,HCI_CONN_PER_ADV ,HCI_CONN_BIG_CREATED , + HCI_CONN_CREATE_CIS, };static inline bool hci_conn_ssp_enabled (struct hci_conn *conn)
@@ -1351,7 +1352,8 @@ int hci_disconnect(struct hci_conn *conn, __u8 reason);bool hci_setup_sync (struct hci_conn *conn,__u16 handle);void hci_sco_setup (struct hci_conn *conn,__u8 status);bool hci_iso_setup_path (struct hci_conn *conn); -int hci_le_create_cis (struct hci_conn *conn); +int hci_le_create_cis_pending (struct hci_dev *hdev); +int hci_conn_check_create_cis (struct hci_conn *conn);struct hci_conn *hci_conn_add (struct hci_dev *hdev,int type,bdaddr_t *dst,u8 role);
include/net/bluetooth/hci_sync.h +1 -1
@@ -124,7 +124,7 @@ int hci_abort_conn_sync(struct hci_dev *hdev, struct hci_conn *conn, u8 reason);int hci_le_create_conn_sync (struct hci_dev *hdev,struct hci_conn *conn); -int hci_le_create_cis_sync (struct hci_dev *hdev,struct hci_conn *conn); +int hci_le_create_cis_sync (struct hci_dev *hdev);int hci_le_remove_cig_sync (struct hci_dev *hdev,u8 handle);
net/bluetooth/hci_conn.c +30 -44
100 lines not on this page · raw message
net/bluetooth/hci_event.c +21 -4
@@ -3810,6 +3810,7 @@ static u8 hci_cc_le_set_cig_params(struct hci_dev *hdev, void *data,struct hci_cp_le_set_cig_params *cp;struct hci_conn *conn;u8 status = rp->status; +bool pending = false;int i;bt_dev_dbg (hdev,"status 0x%2.2x" , rp->status);
@@ -3852,13 +3853,15 @@ static u8 hci_cc_le_set_cig_params(struct hci_dev *hdev, void *data,bt_dev_dbg (hdev,"%p handle 0x%4.4x parent %p" , conn, conn->handle, conn->parent); - -/* Create CIS if LE is already connected */ -if (conn->parent && conn->parent->state ==BT_CONNECTED ) -hci_le_create_cis (conn); + +if (conn->state ==BT_CONNECT ) + pending = true; } unlock: +if (pending) +hci_le_create_cis_pending (hdev); +hci_dev_unlock (hdev);return rp->status;
@@ -4224,6 +4227,7 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, void *data,static void hci_cs_le_create_cis (struct hci_dev *hdev,u8 status) {struct hci_cp_le_create_cis *cp; +bool pending = false;int i;bt_dev_dbg (hdev,"status 0x%2.2x" , status);
@@ -4246,12 +4250,18 @@ static void hci_cs_le_create_cis(struct hci_dev *hdev, u8 status) conn =hci_conn_hash_lookup_handle (hdev, handle);if (conn) { +if (test_and_clear_bit (HCI_CONN_CREATE_CIS , + &conn->flags)) + pending = true; conn->state =BT_CLOSED ;hci_connect_cfm (conn, status);hci_conn_del (conn); } } +if (pending) +hci_le_create_cis_pending (hdev); +hci_dev_unlock (hdev); }
@@ -6790,6 +6800,7 @@ static void hci_le_cis_estabilished_evt(struct hci_dev *hdev, void *data,struct hci_evt_le_cis_established *ev = data;struct hci_conn *conn;struct bt_iso_qos *qos; +bool pending = false;u16 handle =__le16_to_cpu (ev->handle);bt_dev_dbg (hdev,"status 0x%2.2x" , ev->status);
@@ -6813,6 +6824,8 @@ static void hci_le_cis_estabilished_evt(struct hci_dev *hdev, void *data, qos = &conn->iso_qos; + pending =test_and_clear_bit (HCI_CONN_CREATE_CIS , &conn->flags); +/* Convert ISO Interval (1.25 ms slots) to SDU Interval (us) */ qos->ucast.in.interval =le16_to_cpu (ev->interval) *1250 ; qos->ucast.out.interval = qos->ucast.in.interval;
@@ -6854,10 +6867,14 @@ static void hci_le_cis_estabilished_evt(struct hci_dev *hdev, void *data, goto unlock; } + conn->state =BT_CLOSED ;hci_connect_cfm (conn, ev->status);hci_conn_del (conn); unlock: +if (pending) +hci_le_create_cis_pending (hdev); +hci_dev_unlock (hdev); }
net/bluetooth/hci_sync.c +63 -27
119 lines not on this page · raw message
net/bluetooth/iso.c +1 -1
@@ -1690,7 +1690,7 @@ static void iso_connect_cfm(struct hci_conn *hcon, __u8 status) }/* Create CIS if pending */ -hci_le_create_cis (hcon); +hci_le_create_cis_pending (hcon->hdev);return ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 120/739 Bluetooth: nokia: fix value check in nokia_bluetooth_serdev_probe()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuanjun Gong <[email protected]>
[ Upstream commit e8b5aed31355072faac8092ead4938ddec3111fd ]
in nokia_bluetooth_serdev_probe(), check the return value of clk_prepare_enable() and return the error code if clk_prepare_enable() returns an unexpected value.
--- drivers/bluetooth/hci_nokia.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/bluetooth/hci_nokia.c +5 -1
@@ -734,7 +734,11 @@ static int nokia_bluetooth_serdev_probe(struct serdev_device *serdev)return err; } -clk_prepare_enable (sysclk); + err =clk_prepare_enable (sysclk); +if (err) { +dev_err (dev,"could not enable sysclk: %d" , err); +return err; + } btdev->sysclk_speed =clk_get_rate (sysclk);clk_disable_unprepare (sysclk);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 121/739 Bluetooth: ISO: Fix not checking for valid CIG/CIS IDs
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit b7f923b1ef6a2e76013089d30c9552257056360a ]
Valid range of CIG/CIS are 0x00 to 0xEF, so this checks they are properly checked before attempting to use HCI_OP_LE_SET_CIG_PARAMS.
--- net/bluetooth/iso.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/bluetooth/iso.c +6 -0
@@ -1216,6 +1216,12 @@ static bool check_io_qos(struct bt_iso_io_qos *qos)static bool check_ucast_qos (struct bt_iso_qos *qos) { +if (qos->ucast.cig >0xef && qos->ucast.cig !=BT_ISO_QOS_CIG_UNSET ) +return false; + +if (qos->ucast.cis >0xef && qos->ucast.cis !=BT_ISO_QOS_CIS_UNSET ) +return false; +if (qos->ucast.sca >0x07 )return false;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 122/739 Bluetooth: hci_conn: Fix not allowing valid CIS ID
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit f2f84a70f9d0c9a3263194ca9d82e7bc6027d356 ]
Only the number of CIS shall be limited to 0x1f, the CIS ID in the other hand is up to 0xef.
--- net/bluetooth/hci_conn.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/bluetooth/hci_conn.c +6 -3
@@ -1862,9 +1862,12 @@ static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos *qos)cis_add (&data, qos); } -/* Reprogram all CIS(s) with the same CIG */ -for (data.cig = qos->ucast.cig, data.cis =0x00 ; data.cis <0x11 ; - data.cis++) { +/* Reprogram all CIS(s) with the same CIG, valid range are: +* num_cis: 0x00 to 0x1F +* cis_id: 0x00 to 0xEF +*/ +for (data.cig = qos->ucast.cig, data.cis =0x00 ; data.cis <0xf0 && + data.pdu.cp.num_cis <ARRAY_SIZE (data.pdu.cis); data.cis++) { data.count =0 ; hci_conn_hash_list_state(hdev, cis_list, ISO_LINK, BT_BOUND,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 123/739 Bluetooth: hci_conn: Fix hci_le_set_cig_params
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit a091289218202bc09d9b9caa8afcde1018584aec ]
When running with concurrent task only one CIS was being assigned so this attempts to rework the way the PDU is constructed so it is handled later at the callback instead of in place.
--- net/bluetooth/hci_conn.c | 157 ++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 94 deletions(-)
net/bluetooth/hci_conn.c +63 -94
@@ -791,7 +791,6 @@ struct iso_list_data {u16 sync_handle; };int count; -struct iso_cig_params pdu;bool big_term; };
@@ -1719,42 +1718,6 @@ struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst,return sco; } -static void cis_add (struct iso_list_data *d,struct bt_iso_qos *qos) -{ -struct hci_cis_params *cis = &d->pdu.cis[d->pdu.cp.num_cis]; - - cis->cis_id = qos->ucast.cis; - cis->c_sdu =cpu_to_le16 (qos->ucast.out.sdu); - cis->p_sdu =cpu_to_le16 (qos->ucast.in.sdu); - cis->c_phy = qos->ucast.out.phy ? qos->ucast.out.phy : qos->ucast.in.phy; - cis->p_phy = qos->ucast.in.phy ? qos->ucast.in.phy : qos->ucast.out.phy; - cis->c_rtn = qos->ucast.out.rtn; - cis->p_rtn = qos->ucast.in.rtn; - - d->pdu.cp.num_cis++; -} - -static void cis_list (struct hci_conn *conn,void *data) -{ -struct iso_list_data *d = data; - -/* Skip if broadcast/ANY address */ -if (!bacmp (&conn->dst,BDADDR_ANY )) -return ; - -if (d->cig != conn->iso_qos.ucast.cig || d->cis ==BT_ISO_QOS_CIS_UNSET || - d->cis != conn->iso_qos.ucast.cis) -return ; - - d->count++; - -if (d->pdu.cp.cig_id ==BT_ISO_QOS_CIG_UNSET || - d->count >=ARRAY_SIZE (d->pdu.cis)) -return ; - -cis_add (d, &conn->iso_qos); -} -static int hci_le_create_big (struct hci_conn *conn,struct bt_iso_qos *qos) {struct hci_dev *hdev = conn->hdev;
@@ -1787,25 +1750,62 @@ static int hci_le_create_big(struct hci_conn *conn, struct bt_iso_qos *qos)return hci_send_cmd (hdev,HCI_OP_LE_CREATE_BIG ,sizeof (cp), &cp); } -static void set_cig_params_complete (struct hci_dev *hdev,void *data,int err) +static int set_cig_params_sync (struct hci_dev *hdev,void *data) { -struct iso_cig_params *pdu = data; +u8 cig_id =PTR_ERR (data); +struct hci_conn *conn; +struct bt_iso_qos *qos; +struct iso_cig_params pdu; +u8 cis_id; -bt_dev_dbg (hdev,"" ); + conn =hci_conn_hash_lookup_cig (hdev, cig_id); +if (!conn) +return 0 ; -if (err) -bt_dev_err (hdev,"Unable to set CIG parameters: %d" , err); +memset (&pdu,0 ,sizeof (pdu)); -kfree (pdu); -} + qos = &conn->iso_qos; + pdu.cp.cig_id = cig_id; +hci_cpu_to_le24 (qos->ucast.out.interval, pdu.cp.c_interval); +hci_cpu_to_le24 (qos->ucast.in.interval, pdu.cp.p_interval); + pdu.cp.sca = qos->ucast.sca; + pdu.cp.packing = qos->ucast.packing; + pdu.cp.framing = qos->ucast.framing; + pdu.cp.c_latency =cpu_to_le16 (qos->ucast.out.latency); + pdu.cp.p_latency =cpu_to_le16 (qos->ucast.in.latency); -static int set_cig_params_sync (struct hci_dev *hdev,void *data) -{ -struct iso_cig_params *pdu = data; -u32 plen; +/* Reprogram all CIS(s) with the same CIG, valid range are: +* num_cis: 0x00 to 0x1F +* cis_id: 0x00 to 0xEF +*/ +for (cis_id =0x00 ; cis_id <0xf0 && + pdu.cp.num_cis <ARRAY_SIZE (pdu.cis); cis_id++) { +struct hci_cis_params *cis; + + conn =hci_conn_hash_lookup_cis (hdev,NULL ,0 , cig_id, cis_id); +if (!conn) +continue ; - plen =sizeof (pdu->cp) + pdu->cp.num_cis *sizeof (pdu->cis[0 ]); -return __hci_cmd_sync_status (hdev,HCI_OP_LE_SET_CIG_PARAMS , plen, pdu, + qos = &conn->iso_qos; + + cis = &pdu.cis[pdu.cp.num_cis++]; + cis->cis_id = cis_id; + cis->c_sdu =cpu_to_le16 (conn->iso_qos.ucast.out.sdu); + cis->p_sdu =cpu_to_le16 (conn->iso_qos.ucast.in.sdu); + cis->c_phy = qos->ucast.out.phy ? qos->ucast.out.phy : + qos->ucast.in.phy; + cis->p_phy = qos->ucast.in.phy ? qos->ucast.in.phy : + qos->ucast.out.phy; + cis->c_rtn = qos->ucast.out.rtn; + cis->p_rtn = qos->ucast.in.rtn; + } + +if (!pdu.cp.num_cis) +return 0 ; + +return __hci_cmd_sync_status (hdev,HCI_OP_LE_SET_CIG_PARAMS , +sizeof (pdu.cp) + + pdu.cp.num_cis *sizeof (pdu.cis[0 ]), &pdu,HCI_CMD_TIMEOUT ); }
@@ -1813,7 +1813,6 @@ static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos *qos) {struct hci_dev *hdev = conn->hdev;struct iso_list_data data; -struct iso_cig_params *pdu;memset (&data,0 ,sizeof (data));
@@ -1840,61 +1839,31 @@ static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos *qos) qos->ucast.cig = data.cig; } - data.pdu.cp.cig_id = qos->ucast.cig; -hci_cpu_to_le24 (qos->ucast.out.interval, data.pdu.cp.c_interval); -hci_cpu_to_le24 (qos->ucast.in.interval, data.pdu.cp.p_interval); - data.pdu.cp.sca = qos->ucast.sca; - data.pdu.cp.packing = qos->ucast.packing; - data.pdu.cp.framing = qos->ucast.framing; - data.pdu.cp.c_latency =cpu_to_le16 (qos->ucast.out.latency); - data.pdu.cp.p_latency =cpu_to_le16 (qos->ucast.in.latency); -if (qos->ucast.cis !=BT_ISO_QOS_CIS_UNSET ) { - data.count =0 ; - data.cig = qos->ucast.cig; - data.cis = qos->ucast.cis; - -hci_conn_hash_list_state (hdev, cis_list,ISO_LINK ,BT_BOUND , - &data); -if (data.count) +if (hci_conn_hash_lookup_cis (hdev,NULL ,0 , qos->ucast.cig, + qos->ucast.cis))return false; - -cis_add (&data, qos); + goto done; } -/* Reprogram all CIS(s) with the same CIG, valid range are: -* num_cis: 0x00 to 0x1F -* cis_id: 0x00 to 0xEF -*/ -for (data.cig = qos->ucast.cig, data.cis =0x00 ; data.cis <0xf0 && - data.pdu.cp.num_cis <ARRAY_SIZE (data.pdu.cis); data.cis++) { - data.count =0 ; - -hci_conn_hash_list_state (hdev, cis_list,ISO_LINK ,BT_BOUND , - &data); -if (data.count) -continue ; - -/* Allocate a CIS if not set */ -if (qos->ucast.cis ==BT_ISO_QOS_CIS_UNSET ) { +/* Allocate first available CIS if not set */ +for (data.cig = qos->ucast.cig, data.cis =0x00 ; data.cis <0xf0 ; + data.cis++) { +if (!hci_conn_hash_lookup_cis (hdev,NULL ,0 , data.cig, + data.cis)) {/* Update CIS */ qos->ucast.cis = data.cis; -cis_add (&data, qos); +break ; } } -if (qos->ucast.cis ==BT_ISO_QOS_CIS_UNSET || !data.pdu.cp.num_cis) +if (qos->ucast.cis ==BT_ISO_QOS_CIS_UNSET )return false; - pdu =kmemdup (&data.pdu,sizeof (*pdu),GFP_KERNEL ); -if (!pdu) -return false; - -if (hci_cmd_sync_queue (hdev, set_cig_params_sync, pdu, - set_cig_params_complete) <0 ) { -kfree (pdu); +done: +if (hci_cmd_sync_queue (hdev, set_cig_params_sync, +ERR_PTR (qos->ucast.cig),NULL ) <0 )return false; - }return true; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 124/739 Bluetooth: Fix potential use-after-free when clear keys
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Min Li <[email protected]>
[ Upstream commit 3673952cf0c6cf81b06c66a0b788abeeb02ff3ae ]
Similar to commit c5d2b6fa26b5 ("Bluetooth: Fix use-after-free in hci_remove_ltk/hci_remove_irk"). We can not access k after kfree_rcu() call.
--- net/bluetooth/hci_core.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
net/bluetooth/hci_core.c +8 -8
@@ -1074,9 +1074,9 @@ void hci_uuids_clear(struct hci_dev *hdev)void hci_link_keys_clear (struct hci_dev *hdev) { -struct link_key *key; +struct link_key *key, *tmp; -list_for_each_entry (key, &hdev->link_keys, list) { +list_for_each_entry_safe (key, tmp, &hdev->link_keys, list) {list_del_rcu (&key->list);kfree_rcu (key, rcu); }
@@ -1084,9 +1084,9 @@ void hci_link_keys_clear(struct hci_dev *hdev)void hci_smp_ltks_clear (struct hci_dev *hdev) { -struct smp_ltk *k; +struct smp_ltk *k, *tmp; -list_for_each_entry (k, &hdev->long_term_keys, list) { +list_for_each_entry_safe (k, tmp, &hdev->long_term_keys, list) {list_del_rcu (&k->list);kfree_rcu (k, rcu); }
@@ -1094,9 +1094,9 @@ void hci_smp_ltks_clear(struct hci_dev *hdev)void hci_smp_irks_clear (struct hci_dev *hdev) { -struct smp_irk *k; +struct smp_irk *k, *tmp; -list_for_each_entry (k, &hdev->identity_resolving_keys, list) { +list_for_each_entry_safe (k, tmp, &hdev->identity_resolving_keys, list) {list_del_rcu (&k->list);kfree_rcu (k, rcu); }
@@ -1104,9 +1104,9 @@ void hci_smp_irks_clear(struct hci_dev *hdev)void hci_blocked_keys_clear (struct hci_dev *hdev) { -struct blocked_key *b; +struct blocked_key *b, *tmp; -list_for_each_entry (b, &hdev->blocked_keys, list) { +list_for_each_entry_safe (b, tmp, &hdev->blocked_keys, list) {list_del_rcu (&b->list);kfree_rcu (b, rcu); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 125/739 Bluetooth: hci_sync: Dont double print name in add/remove adv_monitor
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 6f55eea116ba3646fb5fbb31de703f8cf79d8214 ]
The hci_add_adv_monitor() hci_remove_adv_monitor() functions call bt_dev_dbg() to print some debug statements. The bt_dev_dbg() macro automatically adds in the device's name. That means that we shouldn't include the name in the bt_dev_dbg() calls.
Stable-dep-of: a2bcd2b63271 ("Bluetooth: hci_sync: Avoid use-after-free in dbg for hci_add_adv_monitor()")
--- net/bluetooth/hci_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/bluetooth/hci_core.c +5 -5
@@ -1949,14 +1949,14 @@ int hci_add_adv_monitor(struct hci_dev *hdev, struct adv_monitor *monitor)switch (hci_get_adv_monitor_offload_ext (hdev)) {case HCI_ADV_MONITOR_EXT_NONE : -bt_dev_dbg (hdev,"%s add monitor %d status %d" , hdev->name, +bt_dev_dbg (hdev,"add monitor %d status %d" , monitor->handle, status);/* Message was not forwarded to controller - not an error */ break ;case HCI_ADV_MONITOR_EXT_MSFT : status =msft_add_monitor_pattern (hdev, monitor); -bt_dev_dbg (hdev,"%s add monitor %d msft status %d" , hdev->name, +bt_dev_dbg (hdev,"add monitor %d msft status %d" , monitor->handle, status);break ; }
@@ -1976,15 +1976,15 @@ static int hci_remove_adv_monitor(struct hci_dev *hdev,switch (hci_get_adv_monitor_offload_ext (hdev)) {case HCI_ADV_MONITOR_EXT_NONE :/* also goes here when powered off */ -bt_dev_dbg (hdev,"%s remove monitor %d status %d" , hdev->name, +bt_dev_dbg (hdev,"remove monitor %d status %d" , monitor->handle, status); goto free_monitor;case HCI_ADV_MONITOR_EXT_MSFT : handle = monitor->handle; status =msft_remove_monitor (hdev, monitor); -bt_dev_dbg (hdev,"%s remove monitor %d msft status %d" , - hdev->name, handle, status); +bt_dev_dbg (hdev,"remove monitor %d msft status %d" , + handle, status);break ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 126/739 Bluetooth: hci_sync: Avoid use-after-free in dbg for hci_add_adv_monitor()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manish Mandlik <[email protected]>
[ Upstream commit a2bcd2b63271a93a695fabbfbf459c603d956d48 ]
KSAN reports use-after-free in hci_add_adv_monitor().
While adding an adv monitor,
hci_add_adv_monitor() calls ->
msft_add_monitor_pattern() calls ->
msft_add_monitor_sync() calls ->
msft_le_monitor_advertisement_cb() calls in an error case ->
hci_free_adv_monitor() which frees the *moniter.This is referenced by bt_dev_dbg() in hci_add_adv_monitor().
Fix the bt_dev_dbg() by using handle instead of monitor->handle.
--- net/bluetooth/hci_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/hci_core.c +1 -1
@@ -1957,7 +1957,7 @@ int hci_add_adv_monitor(struct hci_dev *hdev, struct adv_monitor *monitor)case HCI_ADV_MONITOR_EXT_MSFT : status =msft_add_monitor_pattern (hdev, monitor);bt_dev_dbg (hdev,"add monitor %d msft status %d" , - monitor->handle, status); + handle, status);break ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 127/739 Bluetooth: hci_conn: Always allocate unique handles
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 9f78191cc9f1b34c2e2afd7b554a83bf034092dd ]
This attempts to always allocate a unique handle for connections so they can be properly aborted by the likes of hci_abort_conn, so this uses the invalid range as a pool of unset handles that way if userspace is trying to create multiple connections at once each will be given a unique handle which will be considered unset.
Stable-dep-of: 66dee21524d9 ("Bluetooth: hci_event: drop only unbound CIS if Set CIG Parameters fails")
--- include/net/bluetooth/hci_core.h | 2 +- net/bluetooth/hci_conn.c | 25 ++++++++++++++++++++++--- net/bluetooth/hci_event.c | 6 +++--- 3 files changed, 26 insertions(+), 7 deletions(-)
include/net/bluetooth/hci_core.h +1 -1
@@ -321,8 +321,8 @@ struct adv_monitor {#define HCI_MAX_SHORT_NAME_LENGTH 10 -#define HCI_CONN_HANDLE_UNSET 0xffff#define HCI_CONN_HANDLE_MAX 0x0eff +#define HCI_CONN_HANDLE_UNSET (_handle) (_handle > HCI_CONN_HANDLE_MAX)/* Min encryption key size to match with SMP */ #define HCI_MIN_ENC_KEY_SIZE 7
net/bluetooth/hci_conn.c +22 -3
@@ -991,6 +991,25 @@ static void cis_cleanup(struct hci_conn *conn)hci_le_remove_cig (hdev, conn->iso_qos.ucast.cig); } +static u16 hci_conn_hash_alloc_unset (struct hci_dev *hdev) +{ +struct hci_conn_hash *h = &hdev->conn_hash; +struct hci_conn *c; +u16 handle =HCI_CONN_HANDLE_MAX +1 ; + +rcu_read_lock (); + +list_for_each_entry_rcu (c, &h->list, list) { +/* Find the first unused handle */ +if (handle ==0xffff || c->handle != handle) +break ; + handle++; + } +rcu_read_unlock (); + +return handle; +} +struct hci_conn *hci_conn_add (struct hci_dev *hdev,int type,bdaddr_t *dst,u8 role) {
@@ -1004,7 +1023,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst,bacpy (&conn->dst, dst);bacpy (&conn->src, &hdev->bdaddr); - conn->handle =HCI_CONN_HANDLE_UNSET ; + conn->handle =hci_conn_hash_alloc_unset (hdev); conn->hdev = hdev; conn->type = type; conn->role = role;
@@ -1117,7 +1136,7 @@ static void hci_conn_unlink(struct hci_conn *conn)*/ if ((child->type ==SCO_LINK || child->type ==ESCO_LINK ) && - child->handle ==HCI_CONN_HANDLE_UNSET ) +HCI_CONN_HANDLE_UNSET (child->handle))hci_conn_del (child); }
@@ -1968,7 +1987,7 @@ int hci_conn_check_create_cis(struct hci_conn *conn)return -EINVAL ;if (!conn->parent || conn->parent->state !=BT_CONNECTED || - conn->state !=BT_CONNECT || conn->handle ==HCI_CONN_HANDLE_UNSET ) + conn->state !=BT_CONNECT ||HCI_CONN_HANDLE_UNSET (conn->handle))return 1 ;return 0 ;
net/bluetooth/hci_event.c +3 -3
@@ -3173,7 +3173,7 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, void *data,* As the connection handle is set here for the first time, it indicates * whether the connection is already set up. */ -if (conn->handle !=HCI_CONN_HANDLE_UNSET ) { +if (!HCI_CONN_HANDLE_UNSET (conn->handle)) {bt_dev_err (hdev,"Ignoring HCI_Connection_Complete for existing connection" ); goto unlock; }
@@ -5009,7 +5009,7 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev, void *data,* As the connection handle is set here for the first time, it indicates * whether the connection is already set up. */ -if (conn->handle !=HCI_CONN_HANDLE_UNSET ) { +if (!HCI_CONN_HANDLE_UNSET (conn->handle)) {bt_dev_err (hdev,"Ignoring HCI_Sync_Conn_Complete event for existing connection" ); goto unlock; }
@@ -5873,7 +5873,7 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,* As the connection handle is set here for the first time, it indicates * whether the connection is already set up. */ -if (conn->handle !=HCI_CONN_HANDLE_UNSET ) { +if (!HCI_CONN_HANDLE_UNSET (conn->handle)) {bt_dev_err (hdev,"Ignoring HCI_Connection_Complete for existing connection" ); goto unlock; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 128/739 Bluetooth: hci_event: drop only unbound CIS if Set CIG Parameters fails
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pauli Virtanen <[email protected]>
[ Upstream commit 66dee21524d9ac6461ec3052652b7bc0603ee0c5 ]
When user tries to connect a new CIS when its CIG is not configurable, that connection shall fail, but pre-existing connections shall not be affected. However, currently hci_cc_le_set_cig_params deletes all CIS of the CIG on error so it doesn't work, even though controller shall not change CIG/CIS configuration if the command fails.
Fix by failing on command error only the connections that are not yet bound, so that we keep the previous CIS configuration like the controller does.
--- net/bluetooth/hci_event.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)
net/bluetooth/hci_event.c +24 -5
@@ -3803,6 +3803,22 @@ static u8 hci_cc_le_read_buffer_size_v2(struct hci_dev *hdev, void *data,return rp->status; } +static void hci_unbound_cis_failed (struct hci_dev *hdev,u8 cig,u8 status) +{ +struct hci_conn *conn, *tmp; + +lockdep_assert_held (&hdev->lock); + +list_for_each_entry_safe (conn, tmp, &hdev->conn_hash.list, list) { +if (conn->type !=ISO_LINK || !bacmp (&conn->dst,BDADDR_ANY ) || + conn->state ==BT_OPEN || conn->iso_qos.ucast.cig != cig) +continue ; + +if (HCI_CONN_HANDLE_UNSET (conn->handle)) +hci_conn_failed (conn, status); + } +} +static u8 hci_cc_le_set_cig_params (struct hci_dev *hdev,void *data,struct sk_buff *skb) {
@@ -3824,12 +3840,15 @@ static u8 hci_cc_le_set_cig_params(struct hci_dev *hdev, void *data,hci_dev_lock (hdev); +/* BLUETOOTH CORE SPECIFICATION Version 5.4 | Vol 4, Part E page 2554 +* +* If the Status return parameter is non-zero, then the state of the CIG +* and its CIS configurations shall not be changed by the command. If +* the CIG did not already exist, it shall not be created. +*/ if (status) { -while ((conn =hci_conn_hash_lookup_cig (hdev, rp->cig_id))) { - conn->state =BT_CLOSED ; -hci_connect_cfm (conn, status); -hci_conn_del (conn); - } +/* Keep current configuration, fail only the unbound CIS */ +hci_unbound_cis_failed (hdev, rp->cig_id, status); goto unlock; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 129/739 net: tcp: fix unexcepted socket die when snd_wnd is 0
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Menglong Dong <[email protected]>
[ Upstream commit e89688e3e97868451a5d05b38a9d2633d6785cd4 ]
In tcp_retransmit_timer(), a window shrunk connection will be regarded as timeout if 'tcp_jiffies32 - tp->rcv_tstamp > TCP_RTO_MAX'. This is not right all the time.
The retransmits will become zero-window probes in tcp_retransmit_timer() if the 'snd_wnd==0'. Therefore, the icsk->icsk_rto will come up to TCP_RTO_MAX sooner or later.
However, the timer can be delayed and be triggered after 122877ms, not TCP_RTO_MAX, as I tested.
Therefore, 'tcp_jiffies32 - tp->rcv_tstamp > TCP_RTO_MAX' is always true once the RTO come up to TCP_RTO_MAX, and the socket will die.
Fix this by replacing the 'tcp_jiffies32' with '(u32)icsk->icsk_timeout', which is exact the timestamp of the timeout.
However, "tp->rcv_tstamp" can restart from idle, then tp->rcv_tstamp could already be a long time (minutes or hours) in the past even on the first RTO. So we double check the timeout with the duration of the retransmission.
Meanwhile, making "2 * TCP_RTO_MAX" as the timeout to avoid the socket dying too soon.
--- net/ipv4/tcp_timer.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
net/ipv4/tcp_timer.c +17 -1
@@ -446,6 +446,22 @@ static void tcp_fastopen_synack_timer(struct sock *sk, struct request_sock *req) req->timeout << req->num_timeout, TCP_RTO_MAX); } +static bool tcp_rtx_probe0_timed_out (const struct sock *sk, +const struct sk_buff *skb) +{ +const struct tcp_sock *tp =tcp_sk (sk); +const int timeout =TCP_RTO_MAX *2 ; +u32 rcv_delta, rtx_delta; + + rcv_delta =inet_csk (sk)->icsk_timeout - tp->rcv_tstamp; +if (rcv_delta <= timeout) +return false; + + rtx_delta = (u32 )msecs_to_jiffies (tcp_time_stamp (tp) - + (tp->retrans_stamp ?:tcp_skb_timestamp (skb))); + +return rtx_delta > timeout; +}/** * tcp_retransmit_timer() - The TCP retransmit timeout handler
@@ -511,7 +527,7 @@ void tcp_retransmit_timer(struct sock *sk) tp->snd_una, tp->snd_nxt); }#endif -if (tcp_jiffies32 - tp->rcv_tstamp >TCP_RTO_MAX ) { +if (tcp_rtx_probe0_timed_out (sk, skb)) {tcp_write_err (sk); goto out; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 130/739 net: pcs: lynx: fix lynx_pcs_link_up_sgmii() not doing anything in fixed-link mode
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit 2f4503f94c5d81d1589842bfb457be466c8c670b ]
lynx_pcs_link_up_sgmii() is supposed to update the PCS speed and duplex for the non-inband operating modes, and prior to the blamed commit, it did just that, but a mistake sneaked into the conversion and reversed the condition.
It is easy for this to go undetected on platforms that also initialize the PCS in the bootloader, because Linux doesn't reset it (although maybe it should). The nature of the bug is that phylink will not touch the IF_MODE_HALF_DUPLEX | IF_MODE_SPEED_MSK fields when it should, and it will apparently keep working if the previous values set by the bootloader were correct.
--- drivers/net/pcs/pcs-lynx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/pcs/pcs-lynx.c +1 -1
@@ -216,7 +216,7 @@ static void lynx_pcs_link_up_sgmii(struct mdio_device *pcs,/* The PCS needs to be configured manually only * when not operating on in-band mode */ -if (neg_mode !=PHYLINK_PCS_NEG_INBAND_ENABLED ) +if (neg_mode ==PHYLINK_PCS_NEG_INBAND_ENABLED )return ;if (duplex ==DUPLEX_HALF )
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 131/739 libbpf: Set close-on-exec flag on gzopen
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Vedovati <[email protected]>
[ Upstream commit 8e50750f122e59ea4cab4b4f696ef22b391bedc9 ]
Enable the close-on-exec flag when using gzopen. This is especially important for multithreaded programs making use of libbpf, where a fork + exec could race with libbpf library calls, potentially resulting in a file descriptor leaked to the new process. This got missed in 59842c5451fe ("libbpf: Ensure libbpf always opens files with O_CLOEXEC").
--- tools/lib/bpf/libbpf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lib/bpf/libbpf.c +2 -2
@@ -1975,9 +1975,9 @@ static int bpf_object__read_kconfig_file(struct bpf_object *obj, void *data)return -ENAMETOOLONG ;/* gzopen also accepts uncompressed files. */ - file =gzopen (buf,"r" ); + file =gzopen (buf,"re" );if (!file) - file =gzopen ("/proc/config.gz" ,"r" ); + file =gzopen ("/proc/config.gz" ,"re" );if (!file) {pr_warn ("failed to open system Kconfig\n" );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 132/739 selftests/bpf: Fix repeat option when kfunc_call verification fails
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yipeng Zou <[email protected]>
[ Upstream commit 811915db674f8daf19bb4fcb67da9017235ce26d ]
There is no way where topts.repeat can be set to 1 when tc_test fails. Fix the typo where the break statement slipped by one line.
--- tools/testing/selftests/bpf/prog_tests/kfunc_call.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/kfunc_call.c +1 -1
@@ -173,8 +173,8 @@ static void verify_fail(struct kfunc_test_params *param)case tc_test: topts.data_in = &pkt_v4; topts.data_size_in =sizeof (pkt_v4); -break ; topts.repeat =1 ; +break ; } skel =kfunc_call_fail__open_opts (&opts);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 133/739 selftests/bpf: Clean up fmod_ret in bench_rename test script
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yipeng Zou <[email protected]>
[ Upstream commit 83a89c4b6ae93481d3f618aba6a29d89208d26ed ]
Running the bench_rename test script, the following error occurs:
# ./benchs/run_bench_rename.sh base : 0.819 ± 0.012M/s kprobe : 0.538 ± 0.009M/s kretprobe : 0.503 ± 0.004M/s rawtp : 0.779 ± 0.020M/s fentry : 0.726 ± 0.007M/s fexit : 0.691 ± 0.007M/s benchmark 'rename-fmodret' not found
The bench_rename_fmodret has been removed in commit b000def2e052 ("selftests: Remove fmod_ret from test_overhead"), thus remove it from the runners in the test script.
--- tools/testing/selftests/bpf/benchs/run_bench_rename.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/benchs/run_bench_rename.sh +1 -1
@@ -2,7 +2,7 @@ set -eufo pipefail -for i in base kprobe kretprobe rawtp fentry fexit fmodret +for i in base kprobe kretprobe rawtp fentry fexit do summary=$(sudo ./bench -w2 -d5 -a rename-$i | tail -n1 | cut -d'(' -f1 | cut -d' ' -f3-) printf "%-10s: %s\n" $i "$summary"
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 134/739 spi: tegra114: Remove unnecessary NULL-pointer checks
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Danilenko <[email protected]>
[ Upstream commit 373c36bf7914e3198ac2654dede499f340c52950 ]
cs_setup, cs_hold and cs_inactive points to fields of spi_device struct, so there is no sense in checking them for NULL.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/spi/spi-tegra114.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
drivers/spi/spi-tegra114.c +7 -11
@@ -723,27 +723,23 @@ static int tegra_spi_set_hw_cs_timing(struct spi_device *spi)struct spi_delay *setup = &spi->cs_setup;struct spi_delay *hold = &spi->cs_hold;struct spi_delay *inactive = &spi->cs_inactive; -u8 setup_dly, hold_dly, inactive_dly; +u8 setup_dly, hold_dly;u32 setup_hold;u32 spi_cs_timing;u32 inactive_cycles;u8 cs_state; -if ((setup && setup->unit !=SPI_DELAY_UNIT_SCK ) || - (hold && hold->unit !=SPI_DELAY_UNIT_SCK ) || - (inactive && inactive->unit !=SPI_DELAY_UNIT_SCK )) { +if (setup->unit !=SPI_DELAY_UNIT_SCK || + hold->unit !=SPI_DELAY_UNIT_SCK || + inactive->unit !=SPI_DELAY_UNIT_SCK ) {dev_err (&spi->dev,"Invalid delay unit %d, should be SPI_DELAY_UNIT_SCK\n" ,SPI_DELAY_UNIT_SCK );return -EINVAL ; } - setup_dly = setup ? setup->value :0 ; - hold_dly = hold ? hold->value :0 ; - inactive_dly = inactive ? inactive->value :0 ; - - setup_dly =min_t (u8, setup_dly,MAX_SETUP_HOLD_CYCLES ); - hold_dly =min_t (u8, hold_dly,MAX_SETUP_HOLD_CYCLES ); + setup_dly =min_t (u8, setup->value,MAX_SETUP_HOLD_CYCLES ); + hold_dly =min_t (u8, hold->value,MAX_SETUP_HOLD_CYCLES );if (setup_dly && hold_dly) { setup_hold =SPI_SETUP_HOLD (setup_dly -1 , hold_dly -1 ); spi_cs_timing = SPI_CS_SETUP_HOLD(tspi->spi_cs_timing1,
@@ -755,7 +751,7 @@ static int tegra_spi_set_hw_cs_timing(struct spi_device *spi) } } - inactive_cycles =min_t (u8, inactive_dly,MAX_INACTIVE_CYCLES ); + inactive_cycles =min_t (u8, inactive->value,MAX_INACTIVE_CYCLES );if (inactive_cycles) inactive_cycles--; cs_state = inactive_cycles ?0 :1 ;
Signature · 1 line
2.40.1
Re: [PATCH 6.5 134/739] spi: tegra114: Remove unnecessary NULL-pointer checks
Quoted 4 lines · Greg Kroah-Hartman
6.5-stable review patch. If anyone has any objections, please let me know.
------------------
Quoted 8 lines
From: Alexander Danilenko <[email protected]>
[ Upstream commit
373c36bf7914e3198ac2654dede499f340c52950]
cs_setup,cs_holdandcs_inactivepoints to fields ofspi_devicestruct, so there is no sense in checking them for NULL.Found by Linux Verification Center (linuxtesting.org) with SVACE.
This is a code cleanup, why is it a stable candidate? It's not a warning fix or anything.
Greg Kroah-Hartman
maintainerRe: [PATCH 6.5 134/739] spi: tegra114: Remove unnecessary NULL-pointer checks
Quoted 9 lines · Mark Brown
Quoted 8 lines · Greg Kroah-Hartman
6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Danilenko <[email protected]>
[ Upstream commit
373c36bf7914e3198ac2654dede499f340c52950]
Quoted 7 lines
Quoted 4 lines
cs_setup,cs_holdandcs_inactivepoints to fields ofspi_devicestruct, so there is no sense in checking them for NULL.Found by Linux Verification Center (linuxtesting.org) with SVACE.
This is a code cleanup, why is it a stable candidate? It's not a warning fix or anything.
{sigh} This is due to the crazy people using SVACE marking stuff as a "fix" when it really isn't to try to boost the chance that their patches will be accepted :(
I'm all but refusing to take their patches now due to all of the problems they have caused in the past. I'll go drop this from all stable queues as well, thanks for catching this.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 135/739 net: Fix slab-out-of-bounds in inet[6]_steal_sock
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lorenz Bauer <[email protected]>
[ Upstream commit 8897562f67b3e61ad736cd5c9f307447d33280e4 ]
Kumar reported a KASAN splat in tcp_v6_rcv:
bash-5.2# ./test_progs -t btf_skc_cls_ingress
...
[ 51.810085] BUG: KASAN: slab-out-of-bounds in tcp_v6_rcv+0x2d7d/0x3440 [ 51.810458] Read of size 2 at addr ffff8881053f038c by task test_progs/226
The problem is that inet[6]_steal_sock accesses sk->sk_protocol without accounting for request or timewait sockets. To fix this we can't just check sock_common->skc_reuseport since that flag is present on timewait sockets.
Instead, add a fullsock check to avoid the out of bands access of sk_protocol.
--- include/net/inet6_hashtables.h | 2 +- include/net/inet_hashtables.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/net/inet6_hashtables.h +1 -1
@@ -107,7 +107,7 @@ struct sock *inet6_steal_sock(struct net *net, struct sk_buff *skb, int doff,if (!sk)return NULL ; -if (!prefetched) +if (!prefetched || !sk_fullsock (sk))return sk;if (sk->sk_protocol ==IPPROTO_TCP ) {
include/net/inet_hashtables.h +1 -1
@@ -455,7 +455,7 @@ struct sock *inet_steal_sock(struct net *net, struct sk_buff *skb, int doff,if (!sk)return NULL ; -if (!prefetched) +if (!prefetched || !sk_fullsock (sk))return sk;if (sk->sk_protocol ==IPPROTO_TCP ) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 136/739 net: hns3: move dump regs function to a separate file
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jijie Shao <[email protected]>
[ Upstream commit 939ccd107ffcade20c9c7055a2e7ae0fd724fb72 ]
The dump register function is being refactored. The first step in refactoring is put the dump regs function into a separate file.
Stable-dep-of: 36122201eeae ("net: hns3: fix wrong rpu tln reg issue")
--- drivers/net/ethernet/hisilicon/hns3/Makefile | 4 +- .../hisilicon/hns3/hns3pf/hclge_debugfs.c | 1 + .../hisilicon/hns3/hns3pf/hclge_main.c | 558 +---------------- .../hisilicon/hns3/hns3pf/hclge_main.h | 2 - .../hisilicon/hns3/hns3pf/hclge_regs.c | 567 ++++++++++++++++++ .../hisilicon/hns3/hns3pf/hclge_regs.h | 17 + .../hisilicon/hns3/hns3vf/hclgevf_main.c | 121 +--- .../hisilicon/hns3/hns3vf/hclgevf_main.h | 1 + .../hisilicon/hns3/hns3vf/hclgevf_regs.c | 127 ++++ .../hisilicon/hns3/hns3vf/hclgevf_regs.h | 13 + 10 files changed, 731 insertions(+), 680 deletions(-) create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.c create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.h create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.h
drivers/net/ethernet/hisilicon/hns3/Makefile +2 -2
@@ -17,11 +17,11 @@ hns3-$(CONFIG_HNS3_DCB) += hns3_dcbnl.o obj-$(CONFIG_HNS3_HCLGEVF) += hclgevf.o -hclgevf-objs = hns3vf/hclgevf_main.o hns3vf/hclgevf_mbx.o hns3vf/hclgevf_devlink.o \ +hclgevf-objs = hns3vf/hclgevf_main.o hns3vf/hclgevf_mbx.o hns3vf/hclgevf_devlink.o hns3vf/hclgevf_regs.o \ hns3_common/hclge_comm_cmd.o hns3_common/hclge_comm_rss.o hns3_common/hclge_comm_tqp_stats.o obj-$(CONFIG_HNS3_HCLGE) += hclge.o -hclge-objs = hns3pf/hclge_main.o hns3pf/hclge_mdio.o hns3pf/hclge_tm.o \ +hclge-objs = hns3pf/hclge_main.o hns3pf/hclge_mdio.o hns3pf/hclge_tm.o hns3pf/hclge_regs.o \ hns3pf/hclge_mbx.o hns3pf/hclge_err.o hns3pf/hclge_debugfs.o hns3pf/hclge_ptp.o hns3pf/hclge_devlink.o \ hns3_common/hclge_comm_cmd.o hns3_common/hclge_comm_rss.o hns3_common/hclge_comm_tqp_stats.o
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c +1 -0
@@ -7,6 +7,7 @@#include "hclge_debugfs.h" #include "hclge_err.h" #include "hclge_main.h" +#include "hclge_regs.h" #include "hclge_tm.h" #include "hnae3.h"
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +1 -557
588 lines not on this page · raw message
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +0 -2
@@ -1142,8 +1142,6 @@ int hclge_push_vf_port_base_vlan_info(struct hclge_vport *vport, u8 vfid,u16 state, struct hclge_vlan_info *vlan_info);void hclge_task_schedule (struct hclge_dev *hdev,unsigned long delay_time); -int hclge_query_bd_num_cmd_send (struct hclge_dev *hdev, -struct hclge_desc *desc);void hclge_report_hw_error (struct hclge_dev *hdev,enum hnae3_hw_error_type type);void hclge_inform_vf_promisc_info (struct hclge_vport *vport);
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.c new file +567 -0
567 lines not on this page · raw message
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +// Copyright (c) 2023 Hisilicon Limited. + +#ifndef __HCLGE_REGS_H +#define __HCLGE_REGS_H +#include <linux/types.h> +#include "hclge_comm_cmd.h" + +struct hnae3_handle ; +struct hclge_dev ; + +int hclge_query_bd_num_cmd_send (struct hclge_dev *hdev, +struct hclge_desc *desc); +int hclge_get_regs_len (struct hnae3_handle *handle); +void hclge_get_regs (struct hnae3_handle *handle,u32 *version, +void *data); +#endif
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +2 -119
145 lines not on this page · raw message
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h +1 -0
@@ -294,4 +294,5 @@ void hclgevf_reset_task_schedule(struct hclgevf_dev *hdev);void hclgevf_mbx_task_schedule (struct hclgevf_dev *hdev);void hclgevf_update_port_base_vlan_info (struct hclgevf_dev *hdev,u16 state,struct hclge_mbx_port_base_vlan *port_base_vlan); +struct hclgevf_dev *hclgevf_ae_get_hdev (struct hnae3_handle *handle);#endif
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c new file +127 -0
127 lines not on this page · raw message
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* Copyright (c) 2023 Hisilicon Limited. */ + +#ifndef __HCLGEVF_REGS_H +#define __HCLGEVF_REGS_H +#include <linux/types.h> + +struct hnae3_handle ; + +int hclgevf_get_regs_len (struct hnae3_handle *handle); +void hclgevf_get_regs (struct hnae3_handle *handle,u32 *version, +void *data); +#endif
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 137/739 net: hns3: Support tlv in regs data for HNS3 PF driver
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jijie Shao <[email protected]>
[ Upstream commit d8634b7c3f62d265fc2ecf29286aa9c5b78f969f ]
The dump register function is being refactored.
The second step in refactoring is to support tlv info in regs data for HNS3 PF driver.
Currently, if we use "ethtool -d" to dump regs value, the output is as follows:
offset1: 00 01 02 03 04 05 ...
offset2:10 11 12 13 14 15 ...
......
We can't get the value of a register directly.
This patch deletes the original separator information and add tag_len_value information in regs data.
ethtool can parse register data in key-value format by -d command.
a patch will be added to the ethtool to parse regs data in the following format:
reg1 : value2
reg2 : value2
......
Stable-dep-of: 36122201eeae ("net: hns3: fix wrong rpu tln reg issue")
--- .../hisilicon/hns3/hns3pf/hclge_regs.c | 167 +++++++++++------- 1 file changed, 102 insertions(+), 65 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.c +102 -65
@@ -106,12 +106,66 @@ static const enum hclge_opcode_type hclge_dfx_reg_opcode_list[] = {HCLGE_OPC_DFX_SSU_REG_2 }; -#define MAX_SEPARATE_NUM 4 -#define SEPARATOR_VALUE 0xFDFCFBFA -#define REG_NUM_PER_LINE 4 -#define REG_LEN_PER_LINE (REG_NUM_PER_LINE * sizeof(u32)) -#define REG_SEPARATOR_LINE 1 -#define REG_NUM_REMAIN_MASK 3 +enum hclge_reg_tag { +HCLGE_REG_TAG_CMDQ =0 , +HCLGE_REG_TAG_COMMON , +HCLGE_REG_TAG_RING , +HCLGE_REG_TAG_TQP_INTR , +HCLGE_REG_TAG_QUERY_32_BIT , +HCLGE_REG_TAG_QUERY_64_BIT , +HCLGE_REG_TAG_DFX_BIOS_COMMON , +HCLGE_REG_TAG_DFX_SSU_0 , +HCLGE_REG_TAG_DFX_SSU_1 , +HCLGE_REG_TAG_DFX_IGU_EGU , +HCLGE_REG_TAG_DFX_RPU_0 , +HCLGE_REG_TAG_DFX_RPU_1 , +HCLGE_REG_TAG_DFX_NCSI , +HCLGE_REG_TAG_DFX_RTC , +HCLGE_REG_TAG_DFX_PPP , +HCLGE_REG_TAG_DFX_RCB , +HCLGE_REG_TAG_DFX_TQP , +HCLGE_REG_TAG_DFX_SSU_2 , +}; + +#pragma pack(4) +struct hclge_reg_tlv { +u16 tag; +u16 len; +}; + +struct hclge_reg_header { +u64 magic_number; +u8 is_vf; +u8 rsv[7 ]; +}; + +#pragma pack() + +#define HCLGE_REG_TLV_SIZE sizeof(struct hclge_reg_tlv) +#define HCLGE_REG_HEADER_SIZE sizeof(struct hclge_reg_header) +#define HCLGE_REG_TLV_SPACE (sizeof(struct hclge_reg_tlv) / sizeof(u32)) +#define HCLGE_REG_HEADER_SPACE (sizeof(struct hclge_reg_header) / sizeof(u32)) +#define HCLGE_REG_MAGIC_NUMBER 0x686e733372656773/* meaning is hns3regs */ + +static u32 hclge_reg_get_header (void *data) +{ +struct hclge_reg_header *header = data; + + header->magic_number =HCLGE_REG_MAGIC_NUMBER ; + header->is_vf =0x0 ; + +return HCLGE_REG_HEADER_SPACE ; +} + +static u32 hclge_reg_get_tlv (u32 tag,u32 regs_num,void *data) +{ +struct hclge_reg_tlv *tlv = data; + + tlv->tag = tag; + tlv->len = regs_num *sizeof (u32) +HCLGE_REG_TLV_SIZE ; + +return HCLGE_REG_TLV_SPACE ; +}static int hclge_get_32_bit_regs (struct hclge_dev *hdev,u32 regs_num,void *data)
@@ -291,31 +345,28 @@ static int hclge_dfx_reg_cmd_send(struct hclge_dev *hdev,static int hclge_dfx_reg_fetch_data (struct hclge_desc *desc_src,int bd_num,void *data) { -int entries_per_desc, reg_num, separator_num, desc_index, index, i; +int entries_per_desc, reg_num, desc_index, index, i;struct hclge_desc *desc = desc_src;u32 *reg = data; entries_per_desc =ARRAY_SIZE (desc->data); reg_num = entries_per_desc * bd_num; - separator_num =REG_NUM_PER_LINE - (reg_num ®_NUM_REMAIN_MASK );for (i =0 ; i < reg_num; i++) { index = i % entries_per_desc; desc_index = i / entries_per_desc; *reg++ =le32_to_cpu (desc[desc_index].data[index]); } -for (i =0 ; i < separator_num; i++) - *reg++ =SEPARATOR_VALUE ; -return reg_num + separator_num; +return reg_num; }static int hclge_get_dfx_reg_len (struct hclge_dev *hdev,int *len) {u32 dfx_reg_type_num =ARRAY_SIZE (hclge_dfx_bd_offset_list); -int data_len_per_desc, bd_num; +int data_len_per_desc;int *bd_num_list; -u32 data_len, i;int ret; +u32 i; bd_num_list =kcalloc (dfx_reg_type_num,sizeof (int ),GFP_KERNEL );if (!bd_num_list)
@@ -330,11 +381,8 @@ static int hclge_get_dfx_reg_len(struct hclge_dev *hdev, int *len) data_len_per_desc = sizeof_field(struct hclge_desc, data); *len =0 ; -for (i =0 ; i < dfx_reg_type_num; i++) { - bd_num = bd_num_list[i]; - data_len = data_len_per_desc * bd_num; - *len += (data_len /REG_LEN_PER_LINE +1 ) *REG_LEN_PER_LINE ; - } +for (i =0 ; i < dfx_reg_type_num; i++) + *len += bd_num_list[i] * data_len_per_desc +HCLGE_REG_TLV_SIZE ; out:kfree (bd_num_list);
@@ -383,6 +431,9 @@ static int hclge_get_dfx_reg(struct hclge_dev *hdev, void *data)break ; } + reg +=hclge_reg_get_tlv (HCLGE_REG_TAG_DFX_BIOS_COMMON + i, +ARRAY_SIZE (desc_src->data) * bd_num, + reg); reg +=hclge_dfx_reg_fetch_data (desc_src, bd_num, reg); }
@@ -398,50 +449,43 @@ static int hclge_fetch_pf_reg(struct hclge_dev *hdev, void *data,#define HCLGE_RING_REG_OFFSET 0x200#define HCLGE_RING_INT_REG_OFFSET 0x4 -int i, j, reg_num, separator_num; +int i, j, reg_num;int data_num_sum;u32 *reg = data;/* fetching per-PF registers valus from PF PCIe register space */ reg_num =ARRAY_SIZE (cmdq_reg_addr_list); - separator_num =MAX_SEPARATE_NUM - (reg_num ®_NUM_REMAIN_MASK ); + reg +=hclge_reg_get_tlv (HCLGE_REG_TAG_CMDQ , reg_num, reg);for (i =0 ; i < reg_num; i++) *reg++ =hclge_read_dev (&hdev->hw, cmdq_reg_addr_list[i]); -for (i =0 ; i < separator_num; i++) - *reg++ =SEPARATOR_VALUE ; - data_num_sum = reg_num + separator_num; + data_num_sum = reg_num +HCLGE_REG_TLV_SPACE ; reg_num =ARRAY_SIZE (common_reg_addr_list); - separator_num =MAX_SEPARATE_NUM - (reg_num ®_NUM_REMAIN_MASK ); + reg +=hclge_reg_get_tlv (HCLGE_REG_TAG_COMMON , reg_num, reg);for (i =0 ; i < reg_num; i++) *reg++ =hclge_read_dev (&hdev->hw, common_reg_addr_list[i]); -for (i =0 ; i < separator_num; i++) - *reg++ =SEPARATOR_VALUE ; - data_num_sum += reg_num + separator_num; + data_num_sum += reg_num +HCLGE_REG_TLV_SPACE ; reg_num =ARRAY_SIZE (ring_reg_addr_list); - separator_num =MAX_SEPARATE_NUM - (reg_num ®_NUM_REMAIN_MASK );for (j =0 ; j < kinfo->num_tqps; j++) { + reg +=hclge_reg_get_tlv (HCLGE_REG_TAG_RING , reg_num, reg);for (i =0 ; i < reg_num; i++) *reg++ =hclge_read_dev (&hdev->hw, ring_reg_addr_list[i] +HCLGE_RING_REG_OFFSET * j); -for (i =0 ; i < separator_num; i++) - *reg++ =SEPARATOR_VALUE ; } - data_num_sum += (reg_num + separator_num) * kinfo->num_tqps; + data_num_sum += (reg_num +HCLGE_REG_TLV_SPACE ) * kinfo->num_tqps; reg_num =ARRAY_SIZE (tqp_intr_reg_addr_list); - separator_num =MAX_SEPARATE_NUM - (reg_num ®_NUM_REMAIN_MASK );for (j =0 ; j < hdev->num_msi_used -1 ; j++) { + reg +=hclge_reg_get_tlv (HCLGE_REG_TAG_TQP_INTR , reg_num, reg);for (i =0 ; i < reg_num; i++) *reg++ =hclge_read_dev (&hdev->hw, tqp_intr_reg_addr_list[i] +HCLGE_RING_INT_REG_OFFSET * j); -for (i =0 ; i < separator_num; i++) - *reg++ =SEPARATOR_VALUE ; } - data_num_sum += (reg_num + separator_num) * (hdev->num_msi_used -1 ); + data_num_sum += (reg_num +HCLGE_REG_TLV_SPACE ) * + (hdev->num_msi_used -1 );return data_num_sum; }
@@ -473,12 +517,12 @@ static int hclge_get_regs_num(struct hclge_dev *hdev, u32 *regs_num_32_bit,int hclge_get_regs_len (struct hnae3_handle *handle) { -int cmdq_lines, common_lines, ring_lines, tqp_intr_lines;struct hnae3_knic_private_info *kinfo = &handle->kinfo;struct hclge_vport *vport =hclge_get_vport (handle); -struct hclge_dev *hdev = vport->back;int regs_num_32_bit, regs_num_64_bit, dfx_regs_len; -int regs_lines_32_bit, regs_lines_64_bit; +int cmdq_len, common_len, ring_len, tqp_intr_len; +int regs_len_32_bit, regs_len_64_bit; +struct hclge_dev *hdev = vport->back;int ret; ret =hclge_get_regs_num (hdev, ®s_num_32_bit, ®s_num_64_bit);
@@ -495,22 +539,17 @@ int hclge_get_regs_len(struct hnae3_handle *handle)return ret; } - cmdq_lines =sizeof (cmdq_reg_addr_list) /REG_LEN_PER_LINE + -REG_SEPARATOR_LINE ; - common_lines =sizeof (common_reg_addr_list) /REG_LEN_PER_LINE + -REG_SEPARATOR_LINE ; - ring_lines =sizeof (ring_reg_addr_list) /REG_LEN_PER_LINE + -REG_SEPARATOR_LINE ; - tqp_intr_lines =sizeof (tqp_intr_reg_addr_list) /REG_LEN_PER_LINE + -REG_SEPARATOR_LINE ; - regs_lines_32_bit = regs_num_32_bit *sizeof (u32) /REG_LEN_PER_LINE + -REG_SEPARATOR_LINE ; - regs_lines_64_bit = regs_num_64_bit *sizeof (u64) /REG_LEN_PER_LINE + -REG_SEPARATOR_LINE ; - -return (cmdq_lines + common_lines + ring_lines * kinfo->num_tqps + - tqp_intr_lines * (hdev->num_msi_used -1 ) + regs_lines_32_bit + - regs_lines_64_bit) *REG_LEN_PER_LINE + dfx_regs_len; + cmdq_len =HCLGE_REG_TLV_SIZE +sizeof (cmdq_reg_addr_list); + common_len =HCLGE_REG_TLV_SIZE +sizeof (common_reg_addr_list); + ring_len =HCLGE_REG_TLV_SIZE +sizeof (ring_reg_addr_list); + tqp_intr_len =HCLGE_REG_TLV_SIZE +sizeof (tqp_intr_reg_addr_list); + regs_len_32_bit =HCLGE_REG_TLV_SIZE + regs_num_32_bit *sizeof (u32); + regs_len_64_bit =HCLGE_REG_TLV_SIZE + regs_num_64_bit *sizeof (u64); + +/* return the total length of all register values */ +return HCLGE_REG_HEADER_SIZE + cmdq_len + common_len + ring_len * + kinfo->num_tqps + tqp_intr_len * (hdev->num_msi_used -1 ) + + regs_len_32_bit + regs_len_64_bit + dfx_regs_len; } void hclge_get_regs(struct hnae3_handle *handle, u32 *version,
@@ -522,8 +561,8 @@ void hclge_get_regs(struct hnae3_handle *handle, u32 *version,struct hclge_vport *vport =hclge_get_vport (handle);struct hclge_dev *hdev = vport->back;u32 regs_num_32_bit, regs_num_64_bit; -int i, reg_num, separator_num, ret;u32 *reg = data; +int ret; *version = hdev->fw_version;
@@ -534,31 +573,29 @@ void hclge_get_regs(struct hnae3_handle *handle, u32 *version,return ; } + reg +=hclge_reg_get_header (reg); reg +=hclge_fetch_pf_reg (hdev, reg, kinfo); + reg +=hclge_reg_get_tlv (HCLGE_REG_TAG_QUERY_32_BIT , + regs_num_32_bit, reg); ret =hclge_get_32_bit_regs (hdev, regs_num_32_bit, reg);if (ret) {dev_err (&hdev->pdev->dev,"Get 32 bit register failed, ret = %d.\n" , ret);return ; } - reg_num = regs_num_32_bit; - reg += reg_num; - separator_num =MAX_SEPARATE_NUM - (reg_num ®_NUM_REMAIN_MASK ); -for (i =0 ; i < separator_num; i++) - *reg++ =SEPARATOR_VALUE ; + reg += regs_num_32_bit; + reg +=hclge_reg_get_tlv (HCLGE_REG_TAG_QUERY_64_BIT , + regs_num_64_bit * +HCLGE_REG_64_BIT_SPACE_MULTIPLE , reg); ret =hclge_get_64_bit_regs (hdev, regs_num_64_bit, reg);if (ret) {dev_err (&hdev->pdev->dev,"Get 64 bit register failed, ret = %d.\n" , ret);return ; } - reg_num = regs_num_64_bit *HCLGE_REG_64_BIT_SPACE_MULTIPLE ; - reg += reg_num; - separator_num =MAX_SEPARATE_NUM - (reg_num ®_NUM_REMAIN_MASK ); -for (i =0 ; i < separator_num; i++) - *reg++ =SEPARATOR_VALUE ; + reg += regs_num_64_bit *HCLGE_REG_64_BIT_SPACE_MULTIPLE ; ret =hclge_get_dfx_reg (hdev, reg);if (ret)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 138/739 net: hns3: fix wrong rpu tln reg issue
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jijie Shao <[email protected]>
[ Upstream commit 36122201eeaefd78547def9681aa5d83b5a00b6a ]
In the original RPU query command, the status register values of multiple RPU tunnels are accumulated by default, which is unreasonable. This patch Fix it by querying the specified tunnel ID.
The tunnel number of the device can be obtained from firmware during initialization.
--- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + .../hisilicon/hns3/hns3pf/hclge_cmd.h | 4 +- .../hisilicon/hns3/hns3pf/hclge_main.c | 2 + .../hisilicon/hns3/hns3pf/hclge_regs.c | 66 ++++++++++++++++++- 4 files changed, 71 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hnae3.h +1 -0
@@ -382,6 +382,7 @@ struct hnae3_dev_specs {u16 umv_size;u16 mc_mac_size;u32 mac_stats_num; +u8 tnl_num; };struct hnae3_client_ops {
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h +3 -1
@@ -826,7 +826,9 @@ struct hclge_dev_specs_1_cmd {u8 rsv0[2 ];__le16 umv_size;__le16 mc_mac_size; -u8 rsv1[12 ]; +u8 rsv1[6 ]; +u8 tnl_num; +u8 rsv2[5 ]; };/* mac speed type defined in firmware command */
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +2 -0
@@ -1326,6 +1326,7 @@ static void hclge_set_default_dev_specs(struct hclge_dev *hdev) ae_dev->dev_specs.max_frm_size =HCLGE_MAC_MAX_FRAME ; ae_dev->dev_specs.max_qset_num =HCLGE_MAX_QSET_NUM ; ae_dev->dev_specs.umv_size =HCLGE_DEFAULT_UMV_SPACE_PER_PF ; + ae_dev->dev_specs.tnl_num =0 ; } static void hclge_parse_dev_specs(struct hclge_dev *hdev,
@@ -1349,6 +1350,7 @@ static void hclge_parse_dev_specs(struct hclge_dev *hdev, ae_dev->dev_specs.max_frm_size =le16_to_cpu (req1->max_frm_size); ae_dev->dev_specs.umv_size =le16_to_cpu (req1->umv_size); ae_dev->dev_specs.mc_mac_size =le16_to_cpu (req1->mc_mac_size); + ae_dev->dev_specs.tnl_num = req1->tnl_num; }static void hclge_check_dev_specs (struct hclge_dev *hdev)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.c +65 -1
113 lines not on this page · raw message
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 139/739 net-memcg: Fix scope of sockmem pressure indicators
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abel Wu <[email protected]>
[ Upstream commit ac8a52962164a50e693fa021d3564d7745b83a7f ]
Now there are two indicators of socket memory pressure sit inside struct mem_cgroup, socket_pressure and tcpmem_pressure, indicating memory reclaim pressure in memcg->memory and ->tcpmem respectively.
When in legacy mode (cgroupv1), the socket memory is charged into ->tcpmem which is independent of ->memory, so socket_pressure has nothing to do with socket's pressure at all. Things could be worse by taking socket_pressure into consideration in legacy mode, as a pressure in ->memory can lead to premature reclamation/throttling in socket.
While for the default mode (cgroupv2), the socket memory is charged into ->memory, and ->tcpmem/->tcpmem_pressure are simply not used.
So {socket,tcpmem}_pressure are only used in default/legacy mode respectively for indicating socket memory pressure. This patch fixes the pieces of code that make mixed use of both.
--- include/linux/memcontrol.h | 9 +++++++-- mm/vmpressure.c | 8 ++++++++ 2 files changed, 15 insertions(+), 2 deletions(-)
include/linux/memcontrol.h +7 -2
@@ -284,6 +284,11 @@ struct mem_cgroup {atomic_long_t memory_events[MEMCG_NR_MEMORY_EVENTS ];atomic_long_t memory_events_local[MEMCG_NR_MEMORY_EVENTS ]; +/* +* Hint of reclaim pressure for socket memroy management. Note +* that this indicator should NOT be used in legacy cgroup mode +* where socket memory is accounted/charged separately. +*/ unsigned long socket_pressure;/* Legacy tcp memory accounting */
@@ -1727,8 +1732,8 @@ void mem_cgroup_sk_alloc(struct sock *sk);void mem_cgroup_sk_free (struct sock *sk);static inline bool mem_cgroup_under_socket_pressure (struct mem_cgroup *memcg) { -if (!cgroup_subsys_on_dfl (memory_cgrp_subsys) && memcg->tcpmem_pressure) -return true; +if (!cgroup_subsys_on_dfl (memory_cgrp_subsys)) +return !!memcg->tcpmem_pressure; do { if (time_before(jiffies, READ_ONCE(memcg->socket_pressure))) return true;
mm/vmpressure.c +8 -0
@@ -244,6 +244,14 @@ void vmpressure(gfp_t gfp, struct mem_cgroup *memcg, bool tree,if (mem_cgroup_disabled ())return ; +/* +* The in-kernel users only care about the reclaim efficiency +* for this @memcg rather than the whole subtree, and there +* isn't and won't be any in-kernel user in a legacy cgroup. +*/ +if (!cgroup_subsys_on_dfl (memory_cgrp_subsys) && !tree) +return ; + vmpr =memcg_to_vmpressure (memcg);/*
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 140/739 ice: ice_aq_check_events: fix off-by-one check when filling buffer
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Przemek Kitszel <[email protected]>
[ Upstream commit e1e8a142c43336e3d25bfa1cb3a4ae7d00875c48 ]
Allow task's event buffer to be filled also in the case that it's size is exactly the size of the message.
--- drivers/net/ethernet/intel/ice/ice_main.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +7 -6
@@ -1346,6 +1346,7 @@ int ice_aq_wait_for_event(struct ice_pf *pf, u16 opcode, unsigned long timeout,static void ice_aq_check_events (struct ice_pf *pf,u16 opcode,struct ice_rq_event_info *event) { +struct ice_rq_event_info *task_ev;struct ice_aq_task *task;bool found = false;
@@ -1354,15 +1355,15 @@ static void ice_aq_check_events(struct ice_pf *pf, u16 opcode,if (task->state || task->opcode != opcode)continue ; -memcpy (&task->event->desc, &event->desc,sizeof (event->desc)); - task->event->msg_len = event->msg_len; + task_ev = task->event; +memcpy (&task_ev->desc, &event->desc,sizeof (event->desc)); + task_ev->msg_len = event->msg_len;/* Only copy the data buffer if a destination was set */ -if (task->event->msg_buf && - task->event->buf_len > event->buf_len) { -memcpy (task->event->msg_buf, event->msg_buf, +if (task_ev->msg_buf && task_ev->buf_len >= event->buf_len) { +memcpy (task_ev->msg_buf, event->msg_buf, event->buf_len); - task->event->buf_len = event->buf_len; + task_ev->buf_len = event->buf_len; } task->state =ICE_AQ_TASK_COMPLETE ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 141/739 crypto: caam - fix unchecked return value error
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gaurav Jain <[email protected]>
[ Upstream commit e30685204711a6be40dec2622606950ccd37dafe ]
error:
Unchecked return value (CHECKED_RETURN)check_return: Calling sg_miter_next without checking return value
fix:
added check if(!sg_miter_next)
--- drivers/crypto/caam/caampkc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/crypto/caam/caampkc.c +3 -1
@@ -225,7 +225,9 @@ static int caam_rsa_count_leading_zeros(struct scatterlist *sgl,if (len && *buff)break ; -sg_miter_next (&miter); +if (!sg_miter_next (&miter)) +break ; + buff = miter.addr; len = miter.length;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 142/739 hwrng: iproc-rng200 - Implement suspend and resume calls
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Fainelli <[email protected]>
[ Upstream commit 8e03dd62e5be811efbf0cbeba47e79e793519105 ]
Chips such as BCM7278 support system wide suspend/resume which will cause the HWRNG block to lose its state and reset to its power on reset register values. We need to cleanup and re-initialize the HWRNG for it to be functional coming out of a system suspend cycle.
--- drivers/char/hw_random/iproc-rng200.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
drivers/char/hw_random/iproc-rng200.c +25 -0
@@ -182,6 +182,8 @@ static int iproc_rng200_probe(struct platform_device *pdev)return PTR_ERR (priv->base); } +dev_set_drvdata (dev, priv); + priv->rng.name ="iproc-rng200" ; priv->rng.read = iproc_rng200_read; priv->rng.init = iproc_rng200_init;
@@ -199,6 +201,28 @@ static int iproc_rng200_probe(struct platform_device *pdev)return 0 ; } +static int __maybe_unused iproc_rng200_suspend (struct device *dev) +{ +struct iproc_rng200_dev *priv =dev_get_drvdata (dev); + +iproc_rng200_cleanup (&priv->rng); + +return 0 ; +} + +static int __maybe_unused iproc_rng200_resume (struct device *dev) +{ +struct iproc_rng200_dev *priv =dev_get_drvdata (dev); + +iproc_rng200_init (&priv->rng); + +return 0 ; +} + +static const struct dev_pm_ops iproc_rng200_pm_ops = { +SET_SYSTEM_SLEEP_PM_OPS (iproc_rng200_suspend, iproc_rng200_resume) +}; +static const struct of_device_id iproc_rng200_of_match[] = { { .compatible ="brcm,bcm2711-rng200" , }, { .compatible ="brcm,bcm7211-rng200" , },
@@ -212,6 +236,7 @@ static struct platform_driver iproc_rng200_driver = { .driver = { .name = "iproc-rng200", .of_match_table = iproc_rng200_of_match, + .pm = &iproc_rng200_pm_ops, }, .probe = iproc_rng200_probe, };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 143/739 lwt: Fix return values of BPF xmit ops
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yan Zhai <[email protected]>
[ Upstream commit 29b22badb7a84b783e3a4fffca16f7768fb31205 ]
BPF encap ops can return different types of positive values, such like NET_RX_DROP, NET_XMIT_CN, NETDEV_TX_BUSY, and so on, from function skb_do_redirect and bpf_lwt_xmit_reroute. At the xmit hook, such return values would be treated implicitly as LWTUNNEL_XMIT_CONTINUE in ip(6)_finish_output2. When this happens, skbs that have been freed would continue to the neighbor subsystem, causing use-after-free bug and kernel crashes.
To fix the incorrect behavior, skb_do_redirect return values can be simply discarded, the same as tc-egress behavior. On the other hand, bpf_lwt_xmit_reroute returns useful errors to local senders, e.g. PMTU information. Thus convert its return values to avoid the conflict with LWTUNNEL_XMIT_CONTINUE.
--- net/core/lwt_bpf.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/core/lwt_bpf.c +3 -4
@@ -60,9 +60,8 @@ static int run_lwt_bpf(struct sk_buff *skb, struct bpf_lwt_prog *lwt, ret =BPF_OK ; }else {skb_reset_mac_header (skb); - ret =skb_do_redirect (skb); -if (ret ==0 ) - ret =BPF_REDIRECT ; +skb_do_redirect (skb); + ret =BPF_REDIRECT ; }break ;
@@ -255,7 +254,7 @@ static int bpf_lwt_xmit_reroute(struct sk_buff *skb) err =dst_output (dev_net (skb_dst (skb)->dev), skb->sk, skb);if (unlikely (err)) -return err; +return net_xmit_errno (err);/* ip[6]_finish_output2 understand LWTUNNEL_XMIT_DONE */ return LWTUNNEL_XMIT_DONE ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 144/739 lwt: Check LWTUNNEL_XMIT_CONTINUE strictly
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yan Zhai <[email protected]>
[ Upstream commit a171fbec88a2c730b108c7147ac5e7b2f5a02b47 ]
LWTUNNEL_XMIT_CONTINUE is implicitly assumed in ip(6)_finish_output2, such that any positive return value from a xmit hook could cause unexpected continue behavior, despite that related skb may have been freed. This could be error-prone for future xmit hook ops. One of the possible errors is to return statuses of dst_output directly.
To make the code safer, redefine LWTUNNEL_XMIT_CONTINUE value to distinguish from dst_output statuses and check the continue condition explicitly.
--- include/net/lwtunnel.h | 5 ++++- net/ipv4/ip_output.c | 2 +- net/ipv6/ip6_output.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-)
include/net/lwtunnel.h +4 -1
@@ -16,9 +16,12 @@#define LWTUNNEL_STATE_INPUT_REDIRECT BIT(1)#define LWTUNNEL_STATE_XMIT_REDIRECT BIT(2) +/* LWTUNNEL_XMIT_CONTINUE should be distinguishable from dst_output return +* values (NET_XMIT_xxx and NETDEV_TX_xxx in linux/netdevice.h) for safety. +*/ enum {LWTUNNEL_XMIT_DONE , -LWTUNNEL_XMIT_CONTINUE , +LWTUNNEL_XMIT_CONTINUE =0x100 , };
net/ipv4/ip_output.c +1 -1
@@ -216,7 +216,7 @@ static int ip_finish_output2(struct net *net, struct sock *sk, struct sk_buff *sif (lwtunnel_xmit_redirect (dst->lwtstate)) {int res =lwtunnel_xmit (skb); -if (res <0 || res ==LWTUNNEL_XMIT_DONE ) +if (res !=LWTUNNEL_XMIT_CONTINUE )return res; }
net/ipv6/ip6_output.c +1 -1
@@ -113,7 +113,7 @@ static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff *if (lwtunnel_xmit_redirect (dst->lwtstate)) {int res =lwtunnel_xmit (skb); -if (res <0 || res ==LWTUNNEL_XMIT_DONE ) +if (res !=LWTUNNEL_XMIT_CONTINUE )return res; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 145/739 usb: typec: tcpm: set initial svdm version based on pd revision
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: RD Babiera <[email protected]>
commit c97cd0b4b54eb42aed7f6c3c295a2d137f6d2416 upstream.
When sending Discover Identity messages to a Port Partner that uses Power Delivery v2 and SVDM v1, we currently send PD v2 messages with SVDM v2.0, expecting the port partner to respond with its highest supported SVDM version as stated in Section 6.4.4.2.3 in the Power Delivery v3 specification. However, sending SVDM v2 to some Power Delivery v2 port partners results in a NAK whereas sending SVDM v1 does not.
NAK messages can be handled by the initiator (PD v3 section 6.4.4.2.5.1), and one solution could be to resend Discover Identity on a lower SVDM version if possible. But, Section 6.4.4.3 of PD v2 states that "A NAK response Should be taken as an indication not to retry that particular Command."
Instead, we can set the SVDM version to the maximum one supported by the negotiated PD revision. When operating in PD v2, this obeys Section 6.4.4.2.3, which states the SVDM field "Shall be set to zero to indicate Version 1.0." In PD v3, the SVDM field "Shall be set to 01b to indicate Version 2.0."
--- drivers/usb/typec/tcpm/tcpm.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-)
drivers/usb/typec/tcpm/tcpm.c +31 -4
@@ -3935,6 +3935,29 @@ static enum typec_cc_status tcpm_pwr_opm } } +static void tcpm_set_initial_svdm_version (struct tcpm_port *port) +{ +switch (port->negotiated_rev) { +case PD_REV30 : +break ; +/* +* 6.4.4.2.3 Structured VDM Version +* 2.0 states "At this time, there is only one version (1.0) defined. +* This field Shall be set to zero to indicate Version 1.0." +* 3.0 states "This field Shall be set to 01b to indicate Version 2.0." +* To ensure that we follow the Power Delivery revision we are currently +* operating on, downgrade the SVDM version to the highest one supported +* by the Power Delivery revision. +*/ +case PD_REV20 : +typec_partner_set_svdm_version (port->partner,SVDM_VER_1_0 ); +break ; +default : +typec_partner_set_svdm_version (port->partner,SVDM_VER_1_0 ); +break ; + } +} +static void run_state_machine (struct tcpm_port *port) {int ret;
@@ -4172,10 +4195,12 @@ static void run_state_machine(struct tcp* For now, this driver only supports SOP for DISCOVER_IDENTITY, thus using * port->explicit_contract to decide whether to send the command. */ -if (port->explicit_contract) +if (port->explicit_contract) { +tcpm_set_initial_svdm_version (port);mod_send_discover_delayed_work (port,0 ); -else + }else { port->send_discover = false; + }/* * 6.3.5
@@ -4462,10 +4487,12 @@ static void run_state_machine(struct tcp* For now, this driver only supports SOP for DISCOVER_IDENTITY, thus using * port->explicit_contract. */ -if (port->explicit_contract) +if (port->explicit_contract) { +tcpm_set_initial_svdm_version (port);mod_send_discover_delayed_work (port,0 ); -else + }else { port->send_discover = false; + }power_supply_changed (port->psy);break ;
Greg Kroah-Hartman
maintainerPATCH 146/739 usb: typec: bus: verify partner exists in typec_altmode_attention
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: RD Babiera <[email protected]>
commit f23643306430f86e2f413ee2b986e0773e79da31 upstream.
Some usb hubs will negotiate DisplayPort Alt mode with the device but will then negotiate a data role swap after entering the alt mode. The data role swap causes the device to unregister all alt modes, however the usb hub will still send Attention messages even after failing to reregister the Alt Mode. type_altmode_attention currently does not verify whether or not a device's altmode partner exists, which results in a NULL pointer error when dereferencing the typec_altmode and typec_altmode_ops belonging to the altmode partner.
Verify the presence of a device's altmode partner before sending the Attention message to the Alt Mode driver.
--- drivers/usb/typec/bus.c | 12 ++++++++++-- drivers/usb/typec/tcpm/tcpm.c | 3 ++- include/linux/usb/typec_altmode.h | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-)
drivers/usb/typec/bus.c +10 -2
@@ -183,12 +183,20 @@ EXPORT_SYMBOL_GPL(typec_altmode_exit);* * Notifies the partner of @adev about Attention command. */ -void typec_altmode_attention (struct typec_altmode *adev,u32 vdo) +int typec_altmode_attention (struct typec_altmode *adev,u32 vdo) { -struct typec_altmode *pdev = &to_altmode (adev)->partner->adev; +struct altmode *partner =to_altmode (adev)->partner; +struct typec_altmode *pdev; + +if (!partner) +return -ENODEV ; + + pdev = &partner->adev;if (pdev->ops && pdev->ops->attention) pdev->ops->attention (pdev, vdo); + +return 0 ; }EXPORT_SYMBOL_GPL (typec_altmode_attention);
drivers/usb/typec/tcpm/tcpm.c +2 -1
@@ -1877,7 +1877,8 @@ static void tcpm_handle_vdm_request(stru }break ;case ADEV_ATTENTION : -typec_altmode_attention (adev, p[1 ]); +if (typec_altmode_attention (adev, p[1 ])) +tcpm_log (port,"typec_altmode_attention no port partner altmode" );break ; } }
include/linux/usb/typec_altmode.h +1 -1
@@ -67,7 +67,7 @@ struct typec_altmode_ops {int typec_altmode_enter (struct typec_altmode *altmode,u32 *vdo);int typec_altmode_exit (struct typec_altmode *altmode); -void typec_altmode_attention (struct typec_altmode *altmode,u32 vdo); +int typec_altmode_attention (struct typec_altmode *altmode,u32 vdo);int typec_altmode_vdm (struct typec_altmode *altmode,const u32 header,const u32 *vdo,int count); int typec_altmode_notify(struct typec_altmode *altmode, unsigned long conf,
Greg Kroah-Hartman
maintainerPATCH 147/739 USB: core: Unite old scheme and new scheme descriptor reads
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 85d07c55621676d47d873d2749b88f783cd4d5a1 upstream.
In preparation for reworking the usb_get_device_descriptor() routine, it is desirable to unite the two different code paths responsible for initially determining endpoint 0's maximum packet size in a newly discovered USB device. Making this determination presents a chicken-and-egg sort of problem, in that the only way to learn the maxpacket value is to get it from the device descriptor retrieved from the device, but communicating with the device to retrieve a descriptor requires us to know beforehand the ep0 maxpacket size.
In practice this problem is solved in two different ways, referred to in hub.c as the "old scheme" and the "new scheme". The old scheme (which is the approach recommended by the USB-2 spec) involves asking the device to send just the first eight bytes of its device descriptor. Such a transfer uses packets containing no more than eight bytes each, and every USB device must have an ep0 maxpacket size
Quoted 1 line
= 8, so this should succeed. Since the bMaxPacketSize0 field of the
device descriptor lies within the first eight bytes, this is all we need.
The new scheme is an imitation of the technique used in an early Windows USB implementation, giving it the happy advantage of working with a wide variety of devices (some of them at the time would not work with the old scheme, although that's probably less true now). It involves making an initial guess of the ep0 maxpacket size, asking the device to send up to 64 bytes worth of its device descriptor (which is only 18 bytes long), and then resetting the device to clear any error condition that might have resulted from the guess being wrong. The initial guess is determined by the connection speed; it should be correct in all cases other than full speed, for which the allowed values are 8, 16, 32, and 64 (in this case the initial guess is 64).
The reason for this patch is that the old- and new-scheme parts of hub_port_init() use different code paths, one involving usb_get_device_descriptor() and one not, for their initial reads of the device descriptor. Since these reads have essentially the same purpose and are made under essentially the same circumstances, this is illogical. It makes more sense to have both of them use a common subroutine.
This subroutine does basically what the new scheme's code did, because that approach is more general than the one used by the old scheme. It only needs to know how many bytes to transfer and whether or not it is being called for the first iteration of a retry loop (in case of certain time-out errors). There are two main differences from the former code:
We initialize the bDescriptorType field of the transfer buffer to 0 before performing the transfer, to avoid possibly accessing an uninitialized value afterward.
We read the device descriptor into a temporary buffer rather than storing it directly into udev->descriptor, which the old scheme implementation used to do.
Since the whole point of this first read of the device descriptor is to determine the bMaxPacketSize0 value, that is what the new routine returns (or an error code). The value is stored in a local variable rather than in udev->descriptor. As a side effect, this necessitates moving a section of code that checks the bcdUSB field for SuperSpeed devices until after the full device descriptor has been retrieved.
--- drivers/usb/core/hub.c | 173 ++++++++++++++++++++++++++----------------------- 1 file changed, 94 insertions(+), 79 deletions(-)
drivers/usb/core/hub.c +94 -79
@@ -4718,6 +4718,67 @@ static int hub_enable_device(struct usb_return hcd->driver->enable_device (hcd, udev); } +/* +* Get the bMaxPacketSize0 value during initialization by reading the +* device's device descriptor. Since we don't already know this value, +* the transfer is unsafe and it ignores I/O errors, only testing for +* reasonable received values. +* +* For "old scheme" initialization, size will be 8 so we read just the +* start of the device descriptor, which should work okay regardless of +* the actual bMaxPacketSize0 value. For "new scheme" initialization, +* size will be 64 (and buf will point to a sufficiently large buffer), +* which might not be kosher according to the USB spec but it's what +* Windows does and what many devices expect. +* +* Returns: bMaxPacketSize0 or a negative error code. +*/ +static int get_bMaxPacketSize0 (struct usb_device *udev, +struct usb_device_descriptor *buf,int size,bool first_time) +{ +int i, rc; + +/* +* Retry on all errors; some devices are flakey. +* 255 is for WUSB devices, we actually need to use +* 512 (WUSB1.0[4.8.1]). +*/ +for (i =0 ; i <GET_MAXPACKET0_TRIES ; ++i) { +/* Start with invalid values in case the transfer fails */ + buf->bDescriptorType = buf->bMaxPacketSize0 =0 ; + rc =usb_control_msg (udev,usb_rcvaddr0pipe (), +USB_REQ_GET_DESCRIPTOR ,USB_DIR_IN , +USB_DT_DEVICE <<8 ,0 , + buf, size, + initial_descriptor_timeout); +switch (buf->bMaxPacketSize0) { +case 8 :case 16 :case 32 :case 64 :case 255 : +if (buf->bDescriptorType ==USB_DT_DEVICE ) { + rc = buf->bMaxPacketSize0; +break ; + } + fallthrough; +default : +if (rc >=0 ) + rc = -EPROTO ; +break ; + } + +/* +* Some devices time out if they are powered on +* when already connected. They need a second +* reset, so return early. But only on the first +* attempt, lest we get into a time-out/reset loop. +*/ +if (rc >0 || (rc == -ETIMEDOUT && first_time && + udev->speed >USB_SPEED_FULL )) +break ; + } +return rc; +} + +#define GET_DESCRIPTOR_BUFSIZE 64 +/* Reset device, (re)assign address, get device descriptor. * Device connection must be stable, no more debouncing needed. * Returns device in USB_STATE_ADDRESS, except on error.
@@ -4742,6 +4803,12 @@ hub_port_init(struct usb_hub *hub, strucint devnum = udev->devnum;const char *driver_name;bool do_new_scheme; +int maxp0; +struct usb_device_descriptor *buf; + + buf =kmalloc (GET_DESCRIPTOR_BUFSIZE ,GFP_NOIO ); +if (!buf) +return -ENOMEM ;/* root hub ports have a slightly longer reset period * (from USB 2.0 spec, section 7.1.7.5)
@@ -4861,9 +4928,6 @@ hub_port_init(struct usb_hub *hub, struc }if (do_new_scheme) { -struct usb_device_descriptor *buf; -int r =0 ; - retval =hub_enable_device (udev);if (retval <0 ) { dev_err(&udev->dev,
@@ -4872,52 +4936,8 @@ hub_port_init(struct usb_hub *hub, struc goto fail; } -#define GET_DESCRIPTOR_BUFSIZE 64 - buf =kmalloc (GET_DESCRIPTOR_BUFSIZE ,GFP_NOIO ); -if (!buf) { - retval = -ENOMEM ; -continue ; - } - -/* Retry on all errors; some devices are flakey. -* 255 is for WUSB devices, we actually need to use -* 512 (WUSB1.0[4.8.1]). -*/ -for (operations =0 ; operations <GET_MAXPACKET0_TRIES ; - ++operations) { - buf->bMaxPacketSize0 =0 ; - r =usb_control_msg (udev,usb_rcvaddr0pipe (), -USB_REQ_GET_DESCRIPTOR ,USB_DIR_IN , -USB_DT_DEVICE <<8 ,0 , - buf,GET_DESCRIPTOR_BUFSIZE , - initial_descriptor_timeout); -switch (buf->bMaxPacketSize0) { -case 8 :case 16 :case 32 :case 64 :case 255 : -if (buf->bDescriptorType == -USB_DT_DEVICE ) { - r =0 ; -break ; - } - fallthrough; -default : -if (r ==0 ) - r = -EPROTO ; -break ; - } -/* -* Some devices time out if they are powered on -* when already connected. They need a second -* reset. But only on the first attempt, -* lest we get into a time out/reset loop -*/ -if (r ==0 || (r == -ETIMEDOUT && - retries ==0 && - udev->speed >USB_SPEED_FULL )) -break ; - } - udev->descriptor.bMaxPacketSize0 = - buf->bMaxPacketSize0; -kfree (buf); + maxp0 =get_bMaxPacketSize0 (udev, buf, +GET_DESCRIPTOR_BUFSIZE , retries ==0 ); retval =hub_port_reset (hub, port1, udev, delay, false);if (retval <0 )/* error or disconnect */
@@ -4928,14 +4948,13 @@ hub_port_init(struct usb_hub *hub, struc retval = -ENODEV ; goto fail; } -if (r) { -if (r != -ENODEV ) +if (maxp0 <0 ) { +if (maxp0 != -ENODEV )dev_err (&udev->dev,"device descriptor read/64, error %d\n" , - r); - retval = -EMSGSIZE ; + maxp0); + retval = maxp0;continue ; } -#undef GET_DESCRIPTOR_BUFSIZE }/*
@@ -4981,19 +5000,17 @@ hub_port_init(struct usb_hub *hub, strucbreak ; } - retval =usb_get_device_descriptor (udev,8 ); -if (retval <8 ) { +/* !do_new_scheme || wusb */ + maxp0 =get_bMaxPacketSize0 (udev, buf,8 , retries ==0 ); +if (maxp0 <0 ) { + retval = maxp0;if (retval != -ENODEV )dev_err (&udev->dev,"device descriptor read/8, error %d\n" , retval); -if (retval >=0 ) - retval = -EMSGSIZE ; }else {u32 delay; - retval =0 ; - delay = udev->parent->hub_delay; udev->hub_delay =min_t (u32, delay,USB_TP_TRANSMISSION_DELAY_MAX );
@@ -5010,27 +5027,10 @@ hub_port_init(struct usb_hub *hub, strucif (retval) goto fail; -/* -* Some superspeed devices have finished the link training process -* and attached to a superspeed hub port, but the device descriptor -* got from those devices show they aren't superspeed devices. Warm -* reset the port attached by the devices can fix them. -*/ -if ((udev->speed >=USB_SPEED_SUPER ) && - (le16_to_cpu (udev->descriptor.bcdUSB) <0x0300 )) { -dev_err (&udev->dev,"got a wrong device descriptor, " -"warm reset device\n" ); -hub_port_reset (hub, port1, udev, -HUB_BH_RESET_TIME , true); - retval = -EINVAL ; - goto fail; - } - -if (udev->descriptor.bMaxPacketSize0 ==0xff || - udev->speed >=USB_SPEED_SUPER ) +if (maxp0 ==0xff || udev->speed >=USB_SPEED_SUPER ) i =512 ;else - i = udev->descriptor.bMaxPacketSize0; + i = maxp0;if (usb_endpoint_maxp (&udev->ep0.desc) != i) {if (udev->speed ==USB_SPEED_LOW || !(i ==8 || i ==16 || i ==32 || i ==64 )) {
@@ -5056,6 +5056,20 @@ hub_port_init(struct usb_hub *hub, struc goto fail; } +/* +* Some superspeed devices have finished the link training process +* and attached to a superspeed hub port, but the device descriptor +* got from those devices show they aren't superspeed devices. Warm +* reset the port attached by the devices can fix them. +*/ +if ((udev->speed >=USB_SPEED_SUPER ) && + (le16_to_cpu (udev->descriptor.bcdUSB) <0x0300 )) { +dev_err (&udev->dev,"got a wrong device descriptor, warm reset device\n" ); +hub_port_reset (hub, port1, udev,HUB_BH_RESET_TIME , true); + retval = -EINVAL ; + goto fail; + } +usb_detect_quirks (udev);if (udev->wusb ==0 &&le16_to_cpu (udev->descriptor.bcdUSB) >=0x0201 ) {
@@ -5078,6 +5092,7 @@ fail:hub_port_disable (hub, port1,0 );update_devnum (udev, devnum);/* for disconnect processing */ } +kfree (buf);return retval; }
Greg Kroah-Hartman
maintainerPATCH 148/739 USB: core: Change usb_get_device_descriptor() API
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit de28e469da75359a2bb8cd8778b78aa64b1be1f4 upstream.
The usb_get_device_descriptor() routine reads the device descriptor from the udev device and stores it directly in udev->descriptor. This interface is error prone, because the USB subsystem expects in-memory copies of a device's descriptors to be immutable once the device has been initialized.
The interface is changed so that the device descriptor is left in a kmalloc-ed buffer, not copied into the usb_device structure. A pointer to the buffer is returned to the caller, who is then responsible for kfree-ing it. The corresponding changes needed in the various callers are fairly small.
--- drivers/usb/core/hcd.c | 10 +++++++--- drivers/usb/core/hub.c | 44 +++++++++++++++++++++++--------------------- drivers/usb/core/message.c | 29 ++++++++++++----------------- drivers/usb/core/usb.h | 4 ++-- 4 files changed, 44 insertions(+), 43 deletions(-)
drivers/usb/core/hcd.c +7 -3
@@ -983,6 +983,7 @@ static int register_root_hub(struct usb_ {struct device *parent_dev = hcd->self.controller;struct usb_device *usb_dev = hcd->self.root_hub; +struct usb_device_descriptor *descr;const int devnum =1 ;int retval;
@@ -994,13 +995,16 @@ static int register_root_hub(struct usb_mutex_lock (&usb_bus_idr_lock); usb_dev->ep0.desc.wMaxPacketSize =cpu_to_le16 (64 ); - retval =usb_get_device_descriptor (usb_dev,USB_DT_DEVICE_SIZE ); -if (retval !=sizeof usb_dev->descriptor) { + descr =usb_get_device_descriptor (usb_dev); +if (IS_ERR (descr)) { + retval =PTR_ERR (descr);mutex_unlock (&usb_bus_idr_lock);dev_dbg (parent_dev,"can't read %s device descriptor %d\n" ,dev_name (&usb_dev->dev), retval); -return (retval <0 ) ? retval : -EMSGSIZE ; +return retval; } + usb_dev->descriptor = *descr; +kfree (descr);if (le16_to_cpu (usb_dev->descriptor.bcdUSB) >=0x0201 ) { retval =usb_get_bos_descriptor (usb_dev);
drivers/usb/core/hub.c +23 -21
104 lines not on this page · raw message
drivers/usb/core/message.c +12 -17
@@ -1040,40 +1040,35 @@ char *usb_cache_string(struct usb_deviceEXPORT_SYMBOL_GPL (usb_cache_string);/* -* usb_get_device_descriptor - (re)reads the device descriptor (usbcore) -* @dev: the device whose device descriptor is being updated -* @size: how much of the descriptor to read +* usb_get_device_descriptor - read the device descriptor +* @udev: the device whose device descriptor should be read * * Context: task context, might sleep. * -* Updates the copy of the device descriptor stored in the device structure, -* which dedicates space for this purpose. -* * Not exported, only for use by the core. If drivers really want to read * the device descriptor directly, they can call usb_get_descriptor() with * type = USB_DT_DEVICE and index = 0. * -* This call is synchronous, and may not be used in an interrupt context. -* -* Return: The number of bytes received on success, or else the status code -* returned by the underlying usb_control_msg() call. +* Returns: a pointer to a dynamically allocated usb_device_descriptor +* structure (which the caller must deallocate), or an ERR_PTR value. */ -int usb_get_device_descriptor (struct usb_device *dev,unsigned int size) +struct usb_device_descriptor *usb_get_device_descriptor (struct usb_device *udev) {struct usb_device_descriptor *desc;int ret; -if (size >sizeof (*desc)) -return -EINVAL ; desc =kmalloc (sizeof (*desc),GFP_NOIO );if (!desc) -return -ENOMEM ; +return ERR_PTR (-ENOMEM ); + + ret =usb_get_descriptor (udev,USB_DT_DEVICE ,0 , desc,sizeof (*desc)); +if (ret ==sizeof (*desc)) +return desc; - ret =usb_get_descriptor (dev,USB_DT_DEVICE ,0 , desc, size);if (ret >=0 ) -memcpy (&dev->descriptor, desc, size); + ret = -EMSGSIZE ;kfree (desc); -return ret; +return ERR_PTR (ret); }/*
drivers/usb/core/usb.h +2 -2
@@ -43,8 +43,8 @@ extern bool usb_endpoint_is_ignored(stru struct usb_endpoint_descriptor *epd);extern int usb_remove_device (struct usb_device *udev); -extern int usb_get_device_descriptor (struct usb_device *dev, -unsigned int size); +extern struct usb_device_descriptor *usb_get_device_descriptor ( +struct usb_device *udev);extern int usb_set_isoch_delay (struct usb_device *dev);extern int usb_get_bos_descriptor (struct usb_device *dev);extern void usb_release_bos_descriptor (struct usb_device *dev);
Greg Kroah-Hartman
maintainerPATCH 149/739 USB: core: Fix race by not overwriting udev->descriptor in hub_port_init()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit ff33299ec8bb80cdcc073ad9c506bd79bb2ed20b upstream.
Syzbot reported an out-of-bounds read in sysfs.c:read_descriptors():
BUG: KASAN: slab-out-of-bounds in read_descriptors+0x263/0x280 drivers/usb/core/sysfs.c:883 Read of size 8 at addr ffff88801e78b8c8 by task udevd/5011 CPU: 0 PID: 5011 Comm: udevd Not tainted 6.4.0-rc6-syzkaller-00195-g40f71e7cd3c6 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/27/2023 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xd9/0x150 lib/dump_stack.c:106 print_address_description.constprop.0+0x2c/0x3c0 mm/kasan/report.c:351 print_report mm/kasan/report.c:462 [inline] kasan_report+0x11c/0x130 mm/kasan/report.c:572 read_descriptors+0x263/0x280 drivers/usb/core/sysfs.c:883 ... Allocated by task 758: ... __do_kmalloc_node mm/slab_common.c:966 [inline] __kmalloc+0x5e/0x190 mm/slab_common.c:979 kmalloc include/linux/slab.h:563 [inline] kzalloc include/linux/slab.h:680 [inline] usb_get_configuration+0x1f7/0x5170 drivers/usb/core/config.c:887 usb_enumerate_device drivers/usb/core/hub.c:2407 [inline] usb_new_device+0x12b0/0x19d0 drivers/usb/core/hub.c:2545
As analyzed by Khazhy Kumykov, the cause of this bug is a race between read_descriptors() and hub_port_init(): The first routine uses a field in udev->descriptor, not expecting it to change, while the second overwrites it.
Prior to commit 45bf39f8df7f ("USB: core: Don't hold device lock while reading the "descriptors" sysfs file") this race couldn't occur, because the routines were mutually exclusive thanks to the device locking. Removing that locking from read_descriptors() exposed it to the race.
The best way to fix the bug is to keep hub_port_init() from changing udev->descriptor once udev has been initialized and registered. Drivers expect the descriptors stored in the kernel to be immutable; we should not undermine this expectation. In fact, this change should have been made long ago.
So now hub_port_init() will take an additional argument, specifying a buffer in which to store the device descriptor it reads. (If udev has not yet been initialized, the buffer pointer will be NULL and then hub_port_init() will store the device descriptor in udev as before.) This eliminates the data race responsible for the out-of-bounds read.
The changes to hub_port_init() appear more extensive than they really are, because of indentation changes resulting from an attempt to avoid writing to other parts of the usb_device structure after it has been initialized. Similar changes should be made to the code that reads the BOS descriptor, but that can be handled in a separate patch later on. This patch is sufficient to fix the bug found by syzbot.
--- drivers/usb/core/hub.c | 114 ++++++++++++++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 44 deletions(-)
drivers/usb/core/hub.c +70 -44
@@ -4793,10 +4793,17 @@ static int get_bMaxPacketSize0(struct us* the port lock. For a newly detected device that is not accessible * through any global pointers, it's not necessary to lock the device, * but it is still necessary to lock the port. +* +* For a newly detected device, @dev_descr must be NULL. The device +* descriptor retrieved from the device will then be stored in +* @udev->descriptor. For an already existing device, @dev_descr +* must be non-NULL. The device descriptor will be stored there, +* not in @udev->descriptor, because descriptors for registered +* devices are meant to be immutable. */ static int hub_port_init (struct usb_hub *hub,struct usb_device *udev,int port1, -int retry_counter) +int retry_counter,struct usb_device_descriptor *dev_descr) {struct usb_device *hdev = hub->hdev;struct usb_hcd *hcd =bus_to_hcd (hdev->bus);
@@ -4808,6 +4815,7 @@ hub_port_init(struct usb_hub *hub, strucint devnum = udev->devnum;const char *driver_name;bool do_new_scheme; +const bool initial = !dev_descr;int maxp0;struct usb_device_descriptor *buf, *descr;
@@ -4846,32 +4854,34 @@ hub_port_init(struct usb_hub *hub, struc } oldspeed = udev->speed; -/* USB 2.0 section 5.5.3 talks about ep0 maxpacket ... -* it's fixed size except for full speed devices. -* For Wireless USB devices, ep0 max packet is always 512 (tho -* reported as 0xff in the device descriptor). WUSB1.0[4.8.1]. -*/ -switch (udev->speed) { -case USB_SPEED_SUPER_PLUS : -case USB_SPEED_SUPER : -case USB_SPEED_WIRELESS :/* fixed at 512 */ - udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (512 ); -break ; -case USB_SPEED_HIGH :/* fixed at 64 */ - udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (64 ); -break ; -case USB_SPEED_FULL :/* 8, 16, 32, or 64 */ -/* to determine the ep0 maxpacket size, try to read -* the device descriptor to get bMaxPacketSize0 and -* then correct our initial guess. +if (initial) { +/* USB 2.0 section 5.5.3 talks about ep0 maxpacket ... +* it's fixed size except for full speed devices. +* For Wireless USB devices, ep0 max packet is always 512 (tho +* reported as 0xff in the device descriptor). WUSB1.0[4.8.1]. */ - udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (64 ); -break ; -case USB_SPEED_LOW :/* fixed at 8 */ - udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (8 ); -break ; -default : - goto fail; +switch (udev->speed) { +case USB_SPEED_SUPER_PLUS : +case USB_SPEED_SUPER : +case USB_SPEED_WIRELESS :/* fixed at 512 */ + udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (512 ); +break ; +case USB_SPEED_HIGH :/* fixed at 64 */ + udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (64 ); +break ; +case USB_SPEED_FULL :/* 8, 16, 32, or 64 */ +/* to determine the ep0 maxpacket size, try to read +* the device descriptor to get bMaxPacketSize0 and +* then correct our initial guess. +*/ + udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (64 ); +break ; +case USB_SPEED_LOW :/* fixed at 8 */ + udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (8 ); +break ; +default : + goto fail; + } }if (udev->speed ==USB_SPEED_WIRELESS )
@@ -4894,22 +4904,24 @@ hub_port_init(struct usb_hub *hub, strucif (udev->speed <USB_SPEED_SUPER )dev_info (&udev->dev,"%s %s USB device number %d using %s\n" , - (udev->config) ?"reset" :"new" , speed, + (initial ?"new" :"reset" ), speed, devnum, driver_name); -/* Set up TT records, if needed */ -if (hdev->tt) { - udev->tt = hdev->tt; - udev->ttport = hdev->ttport; - }else if (udev->speed !=USB_SPEED_HIGH - && hdev->speed ==USB_SPEED_HIGH ) { -if (!hub->tt.hub) { -dev_err (&udev->dev,"parent hub has no TT\n" ); - retval = -EINVAL ; - goto fail; +if (initial) { +/* Set up TT records, if needed */ +if (hdev->tt) { + udev->tt = hdev->tt; + udev->ttport = hdev->ttport; + }else if (udev->speed !=USB_SPEED_HIGH + && hdev->speed ==USB_SPEED_HIGH ) { +if (!hub->tt.hub) { +dev_err (&udev->dev,"parent hub has no TT\n" ); + retval = -EINVAL ; + goto fail; + } + udev->tt = &hub->tt; + udev->ttport = port1; } - udev->tt = &hub->tt; - udev->ttport = port1; }/* Why interleave GET_DESCRIPTOR and SET_ADDRESS this way?
@@ -4943,6 +4955,12 @@ hub_port_init(struct usb_hub *hub, struc maxp0 =get_bMaxPacketSize0 (udev, buf,GET_DESCRIPTOR_BUFSIZE , retries ==0 ); +if (maxp0 >0 && !initial && + maxp0 != udev->descriptor.bMaxPacketSize0) { +dev_err (&udev->dev,"device reset changed ep0 maxpacket size!\n" ); + retval = -ENODEV ; + goto fail; + } retval =hub_port_reset (hub, port1, udev, delay, false);if (retval <0 )/* error or disconnect */
@@ -5016,6 +5034,12 @@ hub_port_init(struct usb_hub *hub, struc }else {u32 delay; +if (!initial && maxp0 != udev->descriptor.bMaxPacketSize0) { +dev_err (&udev->dev,"device reset changed ep0 maxpacket size!\n" ); + retval = -ENODEV ; + goto fail; + } + delay = udev->parent->hub_delay; udev->hub_delay =min_t (u32, delay,USB_TP_TRANSMISSION_DELAY_MAX );
@@ -5059,7 +5083,10 @@ hub_port_init(struct usb_hub *hub, struc retval); goto fail; } - udev->descriptor = *descr; +if (initial) + udev->descriptor = *descr; +else + *dev_descr = *descr;kfree (descr);/*
@@ -5369,7 +5396,7 @@ static void hub_port_connect(struct usb_ }/* reset (non-USB 3.0 devices) and get descriptor */ - status =hub_port_init (hub, udev, port1, i); + status =hub_port_init (hub, udev, port1, i,NULL );if (status <0 ) goto loop;
@@ -5999,7 +6026,7 @@ static int usb_reset_and_verify_device(sstruct usb_device *parent_hdev = udev->parent;struct usb_hub *parent_hub;struct usb_hcd *hcd =bus_to_hcd (udev->bus); -struct usb_device_descriptor descriptor = udev->descriptor; +struct usb_device_descriptor descriptor;struct usb_host_bos *bos;int i, j, ret =0 ;int port1 = udev->portnum;
@@ -6035,7 +6062,7 @@ static int usb_reset_and_verify_device(s/* ep0 maxpacket size may change; let the HCD know about it. * Other endpoints will be handled by re-enumeration. */ usb_ep0_reinit (udev); - ret =hub_port_init (parent_hub, udev, port1, i); + ret =hub_port_init (parent_hub, udev, port1, i, &descriptor);if (ret >=0 || ret == -ENOTCONN || ret == -ENODEV )break ; }
@@ -6047,7 +6074,6 @@ static int usb_reset_and_verify_device(s/* Device might have changed firmware (DFU or similar) */ if (descriptors_changed (udev, &descriptor, bos)) {dev_info (&udev->dev,"device firmware changed\n" ); - udev->descriptor = descriptor;/* for disconnect() calls */ goto re_enumerate; }
Greg Kroah-Hartman
maintainerPATCH 150/739 scripts/gdb: fix lx-lsmod show the wrong size
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuan-Ying Lee <[email protected]>
[ Upstream commit fb40b0537342e1acd5c2daf2ff6780c1d0d2883c ]
'lsmod' shows total core layout size, so we need to sum up all the sections in core layout in gdb scripts.
/ # lsmodkasan_test 200704 0 - Live 0xffff80007f640000
Before patch:
(gdb) lx-lsmod
Address Module Size Used by0xffff80007f640000 kasan_test 36864 0
After patch:
(gdb) lx-lsmod
Address Module Size Used by0xffff80007f640000 kasan_test 200704 0
--- scripts/gdb/linux/constants.py.in | 3 +++ scripts/gdb/linux/modules.py | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-)
scripts/gdb/linux/constants.py.in +3 -0
@@ -64,6 +64,9 @@ LX_GDBPARSED(IRQ_HIDDEN) /* linux/module.h */ LX_GDBPARSED(MOD_TEXT) +LX_GDBPARSED(MOD_DATA) +LX_GDBPARSED(MOD_RODATA) +LX_GDBPARSED(MOD_RO_AFTER_INIT) /* linux/mount.h */ LX_VALUE(MNT_NOSUID)
scripts/gdb/linux/modules.py +9 -3
@@ -73,11 +73,17 @@ class LxLsmod(gdb.Command): " " if utils.get_long_type().sizeof == 8 else "")) for module in module_list(): - layout = module['mem'][constants.LX_MOD_TEXT] + text = module['mem'][constants.LX_MOD_TEXT] + text_addr = str(text['base']).split()[0] + total_size = 0 + + for i in range(constants.LX_MOD_TEXT, constants.LX_MOD_RO_AFTER_INIT + 1): + total_size += module['mem'][i]['size'] + gdb.write("{address} {name:<19} {size:>8} {ref}".format( - address=str(layout['base']).split()[0], + address=text_addr, name=module['name'].string(), - size=str(layout['size']), + size=str(total_size), ref=str(module['refcnt']['counter'] - 1))) t = self._module_use_type.get_type().pointer()
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 151/739 nmi_backtrace: allow excluding an arbitrary CPU
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 8d539b84f1e3478436f978ceaf55a0b6cab497b5 ]
The APIs that allow backtracing across CPUs have always had a way to exclude the current CPU. This convenience means callers didn't need to find a place to allocate a CPU mask just to handle the common case.
Let's extend the API to take a CPU ID to exclude instead of just a boolean. This isn't any more complex for the API to handle and allows the hardlockup detector to exclude a different CPU (the one it already did a trace for) without needing to find space for a CPU mask.
Arguably, this new API also encourages safer behavior. Specifically if the caller wants to avoid tracing the current CPU (maybe because they already traced the current CPU) this makes it more obvious to the caller that they need to make sure that the current CPU ID can't change.
Stable-dep-of: 1f38c86bb29f ("watchdog/hardlockup: avoid large stack frames in watchdog_hardlockup_check()")
--- arch/arm/include/asm/irq.h | 2 +- arch/arm/kernel/smp.c | 4 ++-- arch/loongarch/include/asm/irq.h | 2 +- arch/loongarch/kernel/process.c | 4 ++-- arch/mips/include/asm/irq.h | 2 +- arch/mips/kernel/process.c | 4 ++-- arch/powerpc/include/asm/irq.h | 2 +- arch/powerpc/kernel/stacktrace.c | 4 ++-- arch/powerpc/kernel/watchdog.c | 4 ++-- arch/sparc/include/asm/irq_64.h | 2 +- arch/sparc/kernel/process_64.c | 6 +++--- arch/x86/include/asm/irq.h | 2 +- arch/x86/kernel/apic/hw_nmi.c | 4 ++-- include/linux/nmi.h | 14 +++++++------- kernel/watchdog.c | 2 +- lib/nmi_backtrace.c | 6 +++--- 16 files changed, 32 insertions(+), 32 deletions(-)
arch/arm/include/asm/irq.h +1 -1
@@ -32,7 +32,7 @@ void handle_IRQ(unsigned int, struct pt_regs *);#include <linux/cpumask.h> extern void arch_trigger_cpumask_backtrace (const cpumask_t *mask, -bool exclude_self); +int exclude_cpu);#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace#endif
arch/arm/kernel/smp.c +2 -2
@@ -846,7 +846,7 @@ static void raise_nmi(cpumask_t *mask)__ipi_send_mask (ipi_desc[IPI_CPU_BACKTRACE ], mask); } -void arch_trigger_cpumask_backtrace (const cpumask_t *mask,bool exclude_self) +void arch_trigger_cpumask_backtrace (const cpumask_t *mask,int exclude_cpu) { -nmi_trigger_cpumask_backtrace (mask, exclude_self, raise_nmi); +nmi_trigger_cpumask_backtrace (mask, exclude_cpu, raise_nmi); }
arch/loongarch/include/asm/irq.h +1 -1
@@ -40,7 +40,7 @@ void spurious_interrupt(void);#define NR_IRQS_LEGACY 16#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace -void arch_trigger_cpumask_backtrace (const struct cpumask *mask,bool exclude_self); +void arch_trigger_cpumask_backtrace (const struct cpumask *mask,int exclude_cpu);#define MAX_IO_PICS 2#define NR_IRQS (64 + (256 * MAX_IO_PICS))
arch/loongarch/kernel/process.c +2 -2
@@ -338,9 +338,9 @@ static void raise_backtrace(cpumask_t *mask) } } -void arch_trigger_cpumask_backtrace (const cpumask_t *mask,bool exclude_self) +void arch_trigger_cpumask_backtrace (const cpumask_t *mask,int exclude_cpu) { -nmi_trigger_cpumask_backtrace (mask, exclude_self, raise_backtrace); +nmi_trigger_cpumask_backtrace (mask, exclude_cpu, raise_backtrace); }#ifdef CONFIG_64BIT
arch/mips/include/asm/irq.h +1 -1
@@ -77,7 +77,7 @@ extern int cp0_fdc_irq;extern int get_c0_fdc_int (void );void arch_trigger_cpumask_backtrace (const struct cpumask *mask, -bool exclude_self); +int exclude_cpu);#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace#endif /* _ASM_IRQ_H */
arch/mips/kernel/process.c +2 -2
@@ -750,9 +750,9 @@ static void raise_backtrace(cpumask_t *mask) } } -void arch_trigger_cpumask_backtrace (const cpumask_t *mask,bool exclude_self) +void arch_trigger_cpumask_backtrace (const cpumask_t *mask,int exclude_cpu) { -nmi_trigger_cpumask_backtrace (mask, exclude_self, raise_backtrace); +nmi_trigger_cpumask_backtrace (mask, exclude_cpu, raise_backtrace); }int mips_get_process_fp_mode (struct task_struct *task)
arch/powerpc/include/asm/irq.h +1 -1
@@ -55,7 +55,7 @@ int irq_choose_cpu(const struct cpumask *mask);#if defined(CONFIG_PPC_BOOK3S_64 ) && defined(CONFIG_NMI_IPI )extern void arch_trigger_cpumask_backtrace (const cpumask_t *mask, -bool exclude_self); +int exclude_cpu);#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace#endif
arch/powerpc/kernel/stacktrace.c +2 -2
@@ -221,8 +221,8 @@ static void raise_backtrace_ipi(cpumask_t *mask) } } -void arch_trigger_cpumask_backtrace (const cpumask_t *mask,bool exclude_self) +void arch_trigger_cpumask_backtrace (const cpumask_t *mask,int exclude_cpu) { -nmi_trigger_cpumask_backtrace (mask, exclude_self, raise_backtrace_ipi); +nmi_trigger_cpumask_backtrace (mask, exclude_cpu, raise_backtrace_ipi); }#endif /* defined(CONFIG_PPC_BOOK3S_64) && defined(CONFIG_NMI_IPI) */
arch/powerpc/kernel/watchdog.c +2 -2
@@ -245,7 +245,7 @@ static void watchdog_smp_panic(int cpu)__cpumask_clear_cpu (c, &wd_smp_cpus_ipi); } }else { -trigger_allbutself_cpu_backtrace (); +trigger_allbutcpu_cpu_backtrace (cpu);cpumask_clear (&wd_smp_cpus_ipi); }
@@ -416,7 +416,7 @@ DEFINE_INTERRUPT_HANDLER_NMI(soft_nmi_interrupt)xchg (&__wd_nmi_output,1 );// see wd_lockup_ipi if (sysctl_hardlockup_all_cpu_backtrace) -trigger_allbutself_cpu_backtrace (); +trigger_allbutcpu_cpu_backtrace (cpu);if (hardlockup_panic)nmi_panic (regs,"Hard LOCKUP" );
arch/sparc/include/asm/irq_64.h +1 -1
@@ -87,7 +87,7 @@ static inline unsigned long get_softint(void) }void arch_trigger_cpumask_backtrace (const struct cpumask *mask, -bool exclude_self); +int exclude_cpu);#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtraceextern void *hardirq_stack[NR_CPUS ];
arch/sparc/kernel/process_64.c +3 -3
@@ -236,7 +236,7 @@ static void __global_reg_poll(struct global_reg_snapshot *gp) } } -void arch_trigger_cpumask_backtrace (const cpumask_t *mask,bool exclude_self) +void arch_trigger_cpumask_backtrace (const cpumask_t *mask,int exclude_cpu) {struct thread_info *tp =current_thread_info ();struct pt_regs *regs =get_irq_regs ();
@@ -252,7 +252,7 @@ void arch_trigger_cpumask_backtrace(const cpumask_t *mask, bool exclude_self)memset (global_cpu_snapshot,0 ,sizeof (global_cpu_snapshot)); -if (cpumask_test_cpu (this_cpu, mask) && !exclude_self) +if (cpumask_test_cpu (this_cpu, mask) && this_cpu != exclude_cpu)__global_reg_self (tp, regs, this_cpu);smp_fetch_global_regs ();
@@ -260,7 +260,7 @@ void arch_trigger_cpumask_backtrace(const cpumask_t *mask, bool exclude_self)for_each_cpu (cpu, mask) {struct global_reg_snapshot *gp; -if (exclude_self && cpu == this_cpu) +if (cpu == exclude_cpu)continue ; gp = &global_cpu_snapshot[cpu].reg;
arch/x86/include/asm/irq.h +1 -1
@@ -42,7 +42,7 @@ extern void init_ISA_irqs(void);#ifdef CONFIG_X86_LOCAL_APIC void arch_trigger_cpumask_backtrace (const struct cpumask *mask, -bool exclude_self); +int exclude_cpu);#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace#endif
arch/x86/kernel/apic/hw_nmi.c +2 -2
@@ -34,9 +34,9 @@ static void nmi_raise_cpu_backtrace(cpumask_t *mask) apic->send_IPI_mask (mask,NMI_VECTOR ); } -void arch_trigger_cpumask_backtrace (const cpumask_t *mask,bool exclude_self) +void arch_trigger_cpumask_backtrace (const cpumask_t *mask,int exclude_cpu) { -nmi_trigger_cpumask_backtrace (mask, exclude_self, +nmi_trigger_cpumask_backtrace (mask, exclude_cpu, nmi_raise_cpu_backtrace); }
include/linux/nmi.h +7 -7
@@ -157,31 +157,31 @@ static inline void touch_nmi_watchdog(void)#ifdef arch_trigger_cpumask_backtracestatic inline bool trigger_all_cpu_backtrace (void ) { -arch_trigger_cpumask_backtrace (cpu_online_mask, false); +arch_trigger_cpumask_backtrace (cpu_online_mask,-1 );return true; } -static inline bool trigger_allbutself_cpu_backtrace (void ) +static inline bool trigger_allbutcpu_cpu_backtrace (int exclude_cpu) { -arch_trigger_cpumask_backtrace (cpu_online_mask, true); +arch_trigger_cpumask_backtrace (cpu_online_mask, exclude_cpu);return true; }static inline bool trigger_cpumask_backtrace (struct cpumask *mask) { -arch_trigger_cpumask_backtrace (mask, false); +arch_trigger_cpumask_backtrace (mask,-1 );return true; }static inline bool trigger_single_cpu_backtrace (int cpu) { -arch_trigger_cpumask_backtrace (cpumask_of (cpu), false); +arch_trigger_cpumask_backtrace (cpumask_of (cpu),-1 );return true; }/* generic implementation */ void nmi_trigger_cpumask_backtrace (const cpumask_t *mask, -bool exclude_self, +int exclude_cpu,void (*raise)(cpumask_t *mask));bool nmi_cpu_backtrace (struct pt_regs *regs);
@@ -190,7 +190,7 @@ static inline bool trigger_all_cpu_backtrace(void) {return false; } -static inline bool trigger_allbutself_cpu_backtrace (void ) +static inline bool trigger_allbutcpu_cpu_backtrace (int exclude_cpu) {return false; }
kernel/watchdog.c +1 -1
@@ -523,7 +523,7 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)dump_stack ();if (softlockup_all_cpu_backtrace) { -trigger_allbutself_cpu_backtrace (); +trigger_allbutcpu_cpu_backtrace (smp_processor_id ());clear_bit_unlock (0 , &soft_lockup_nmi_warn); }
lib/nmi_backtrace.c +3 -3
@@ -34,7 +34,7 @@ static unsigned long backtrace_flag;* they are passed being updated as a side effect of this call. */ void nmi_trigger_cpumask_backtrace (const cpumask_t *mask, -bool exclude_self, +int exclude_cpu,void (*raise)(cpumask_t *mask)) {int i, this_cpu =get_cpu ();
@@ -49,8 +49,8 @@ void nmi_trigger_cpumask_backtrace(const cpumask_t *mask, }cpumask_copy (to_cpumask (backtrace_mask), mask); -if (exclude_self) -cpumask_clear_cpu (this_cpu,to_cpumask (backtrace_mask)); +if (exclude_cpu !=-1 ) +cpumask_clear_cpu (exclude_cpu,to_cpumask (backtrace_mask));/* * Don't try to send an NMI to this cpu; it may work on some
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 152/739 watchdog/hardlockup: avoid large stack frames in watchdog_hardlockup_check()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 1f38c86bb29f4548b8df01b47a313518e6ed2dfe ]
After commit 77c12fc95980 ("watchdog/hardlockup: add a "cpu" param to watchdog_hardlockup_check()") we started storing a struct cpumask on the stack in watchdog_hardlockup_check(). On systems with CONFIG_NR_CPUS set to 8192 this takes up 1K on the stack. That triggers warnings with CONFIG_FRAME_WARN set to 1024.
We'll use the new trigger_allbutcpu_cpu_backtrace() to avoid needing to use a CPU mask at all.
--- kernel/watchdog.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
kernel/watchdog.c +2 -7
@@ -151,9 +151,6 @@ void watchdog_hardlockup_check(unsigned int cpu, struct pt_regs *regs)*/ if (is_hardlockup (cpu)) {unsigned int this_cpu =smp_processor_id (); -struct cpumask backtrace_mask; - -cpumask_copy (&backtrace_mask, cpu_online_mask);/* Only print hardlockups once. */ if (per_cpu (watchdog_hardlockup_warned, cpu))
@@ -167,10 +164,8 @@ void watchdog_hardlockup_check(unsigned int cpu, struct pt_regs *regs)show_regs (regs); elsedump_stack (); -cpumask_clear_cpu (cpu, &backtrace_mask); }else { -if (trigger_single_cpu_backtrace (cpu)) -cpumask_clear_cpu (cpu, &backtrace_mask); +trigger_single_cpu_backtrace (cpu); }/*
@@ -179,7 +174,7 @@ void watchdog_hardlockup_check(unsigned int cpu, struct pt_regs *regs)*/ if (sysctl_hardlockup_all_cpu_backtrace && !test_and_set_bit (0 , &watchdog_hardlockup_all_cpu_dumped)) -trigger_cpumask_backtrace (&backtrace_mask); +trigger_allbutcpu_cpu_backtrace (cpu);if (hardlockup_panic)nmi_panic (regs,"Hard LOCKUP" );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 153/739 fs: ocfs2: namei: check return value of ocfs2_add_entry()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Artem Chernyshev <[email protected]>
[ Upstream commit 6b72e5f9e79360fce4f2be7fe81159fbdf4256a5 ]
Process result of ocfs2_add_entry() in case we have an error value.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- fs/ocfs2/namei.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/ocfs2/namei.c +4 -0
@@ -1535,6 +1535,10 @@ static int ocfs2_rename(struct mnt_idmap *idmap, status =ocfs2_add_entry (handle, new_dentry, old_inode,OCFS2_I (old_inode)->ip_blkno, new_dir_bh, &target_insert); +if (status <0 ) { +mlog_errno (status); + goto bail; + } } old_inode->i_ctime =current_time (old_inode);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 154/739 net: lan966x: Fix return value check for vcap_get_rule()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ruan Jinjie <[email protected]>
[ Upstream commit ab104318f63997113b0ce7ac288e51359925ed79 ]
As Simon Horman suggests, update vcap_get_rule() to always return an ERR_PTR() and update the error detection conditions to use IS_ERR(), so use IS_ERR() to fix the return value issue.
--- drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c +2 -2
@@ -59,7 +59,7 @@ static int lan966x_ptp_add_trap(struct lan966x_port *port,int err; vrule =vcap_get_rule (lan966x->vcap_ctrl, rule_id); -if (vrule) { +if (!IS_ERR (vrule)) {u32 value, mask;/* Just modify the ingress port mask and exit */
@@ -106,7 +106,7 @@ static int lan966x_ptp_del_trap(struct lan966x_port *port,int err; vrule =vcap_get_rule (lan966x->vcap_ctrl, rule_id); -if (!vrule) +if (IS_ERR (vrule))return -EEXIST ;vcap_rule_get_key_u32 (vrule,VCAP_KF_IF_IGR_PORT_MASK , &value, &mask);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 155/739 net: annotate data-races around sk->sk_lingertime
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit bc1fb82ae11753c5dec53c667a055dc37796dbd2 ]
sk_getsockopt() runs locklessly. This means sk->sk_lingertime can be read while other threads are changing its value.
Other reads also happen without socket lock being held, and must be annotated.
Remove preprocessor logic using BITS_PER_LONG, compilers are smart enough to figure this by themselves.
v2: fixed a clang W=1 (-Wtautological-constant-out-of-range-compare) warning
(Jakub)
--- net/bluetooth/iso.c | 2 +- net/bluetooth/sco.c | 2 +- net/core/sock.c | 18 +++++++++--------- net/sched/em_meta.c | 2 +- net/smc/af_smc.c | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-)
net/bluetooth/iso.c +1 -1
@@ -1486,7 +1486,7 @@ static int iso_sock_release(struct socket *sock)iso_sock_close (sk); -if (sock_flag (sk,SOCK_LINGER ) && sk->sk_lingertime && +if (sock_flag (sk,SOCK_LINGER ) &&READ_ONCE (sk->sk_lingertime) && !(current->flags &PF_EXITING )) {lock_sock (sk); err =bt_sock_wait_state (sk,BT_CLOSED , sk->sk_lingertime);
net/bluetooth/sco.c +1 -1
@@ -1267,7 +1267,7 @@ static int sco_sock_release(struct socket *sock)sco_sock_close (sk); -if (sock_flag (sk,SOCK_LINGER ) && sk->sk_lingertime && +if (sock_flag (sk,SOCK_LINGER ) &&READ_ONCE (sk->sk_lingertime) && !(current->flags &PF_EXITING )) {lock_sock (sk); err =bt_sock_wait_state (sk,BT_CLOSED , sk->sk_lingertime);
net/core/sock.c +9 -9
@@ -797,7 +797,7 @@ EXPORT_SYMBOL(sock_set_reuseport);void sock_no_linger (struct sock *sk) {lock_sock (sk); - sk->sk_lingertime =0 ; +WRITE_ONCE (sk->sk_lingertime,0 );sock_set_flag (sk,SOCK_LINGER );release_sock (sk); }
@@ -1230,15 +1230,15 @@ int sk_setsockopt(struct sock *sk, int level, int optname, ret = -EFAULT ;break ; } -if (!ling.l_onoff) +if (!ling.l_onoff) {sock_reset_flag (sk,SOCK_LINGER ); -else { -#if (BITS_PER_LONG ==32 ) -if ((unsigned int )ling.l_linger >=MAX_SCHEDULE_TIMEOUT /HZ ) - sk->sk_lingertime =MAX_SCHEDULE_TIMEOUT ; + }else { +unsigned long t_sec = ling.l_linger; + +if (t_sec >=MAX_SCHEDULE_TIMEOUT /HZ ) +WRITE_ONCE (sk->sk_lingertime,MAX_SCHEDULE_TIMEOUT );else -#endif - sk->sk_lingertime = (unsigned int )ling.l_linger *HZ ; +WRITE_ONCE (sk->sk_lingertime, t_sec *HZ );sock_set_flag (sk,SOCK_LINGER ); }break ;
@@ -1691,7 +1691,7 @@ int sk_getsockopt(struct sock *sk, int level, int optname,case SO_LINGER : lv =sizeof (v.ling); v.ling.l_onoff =sock_flag (sk,SOCK_LINGER ); - v.ling.l_linger = sk->sk_lingertime /HZ ; + v.ling.l_linger =READ_ONCE (sk->sk_lingertime) /HZ ;break ;case SO_BSDCOMPAT :
net/sched/em_meta.c +1 -1
@@ -502,7 +502,7 @@ META_COLLECTOR(int_sk_lingertime) *err =-1 ;return ; } - dst->value = sk->sk_lingertime /HZ ; + dst->value =READ_ONCE (sk->sk_lingertime) /HZ ; }META_COLLECTOR (int_sk_err_qlen)
net/smc/af_smc.c +1 -1
@@ -1820,7 +1820,7 @@ void smc_close_non_accepted(struct sock *sk)lock_sock (sk);if (!sk->sk_lingertime)/* wait for peer closing */ - sk->sk_lingertime =SMC_MAX_STREAM_WAIT_TIMEOUT ; +WRITE_ONCE (sk->sk_lingertime,SMC_MAX_STREAM_WAIT_TIMEOUT );__smc_release (smc);release_sock (sk);sock_put (sk);/* sock_hold above */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 156/739 hwmon: (asus-ec-sensosrs) fix mutex path for X670E Hero
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eugene Shalygin <[email protected]>
[ Upstream commit 9c53fb0ad1acaf227718ccae16e8fb8e01c05918 ]
A user reported that they observe race condition warning [1] and after looking once again into the DSDT source it was found that wrong mutex was used.
[1] https://github.com/zeule/asus-ec-sensors/issues/43
--- drivers/hwmon/asus-ec-sensors.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/asus-ec-sensors.c +1 -1
@@ -340,7 +340,7 @@ static const struct ec_board_info board_info_crosshair_x670e_hero = { .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE | SENSOR_TEMP_MB | SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER, - .mutex_path = ASUS_HW_ACCESS_MUTEX_RMTW_ASMX, + .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH, .family = family_amd_600_series, };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 157/739 wifi: mwifiex: fix memory leak in mwifiex_histogram_read()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Antipov <[email protected]>
[ Upstream commit 9c8fd72a5c2a031cbc680a2990107ecd958ffcdb ]
Always free the zeroed page on return from 'mwifiex_histogram_read()'.
--- drivers/net/wireless/marvell/mwifiex/debugfs.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/wireless/marvell/mwifiex/debugfs.c +7 -2
@@ -253,8 +253,11 @@ mwifiex_histogram_read(struct file *file, char __user *ubuf,if (!p)return -ENOMEM ; -if (!priv || !priv->hist_data) -return -EFAULT ; +if (!priv || !priv->hist_data) { + ret = -EFAULT ; + goto free_and_exit; + } + phist_data = priv->hist_data; p += sprintf(p, "\n"
@@ -309,6 +312,8 @@ mwifiex_histogram_read(struct file *file, char __user *ubuf, ret =simple_read_from_buffer (ubuf, count, ppos, (char *)page, (unsigned long )p - page); +free_and_exit: +free_page (page);return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 158/739 wifi: mwifiex: Fix missed return in oob checks failed path
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Polaris Pi <[email protected]>
[ Upstream commit 2785851c627f2db05f9271f7f63661b5dbd95c4c ]
Add missed return in mwifiex_uap_queue_bridged_pkt() and mwifiex_process_rx_packet().
--- drivers/net/wireless/marvell/mwifiex/sta_rx.c | 1 + drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 1 + 2 files changed, 2 insertions(+)
drivers/net/wireless/marvell/mwifiex/sta_rx.c +1 -0
@@ -92,6 +92,7 @@ int mwifiex_process_rx_packet(struct mwifiex_private *priv, skb->len, rx_pkt_off); priv->stats.rx_dropped++;dev_kfree_skb_any (skb); +return -1 ; } if ((!memcmp(&rx_pkt_hdr->rfc1042_hdr, bridge_tunnel_header,
drivers/net/wireless/marvell/mwifiex/uap_txrx.c +1 -0
@@ -110,6 +110,7 @@ static void mwifiex_uap_queue_bridged_pkt(struct mwifiex_private *priv, skb->len, le16_to_cpu(uap_rx_pd->rx_pkt_offset)); priv->stats.rx_dropped++;dev_kfree_skb_any (skb); +return ; } if ((!memcmp(&rx_pkt_hdr->rfc1042_hdr, bridge_tunnel_header,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 159/739 wifi: rtw89: 8852b: rfk: fine tune IQK parameters to improve performance on 2GHz band
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ping-Ke Shih <[email protected]>
[ Upstream commit b3bfc4fb1edc8136396ece2d7204c2ee5cae188d ]
A few samples get bad performance on 2GHz band, so use proper IQK command code and select another group to have wider range of calibration value.
--- drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c +2 -2
@@ -846,7 +846,7 @@ static bool _iqk_one_shot(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx,case ID_NBTXK :rtw89_phy_write32_mask (rtwdev,R_P0_RFCTM ,B_P0_RFCTM_EN ,0x0 );rtw89_phy_write32_mask (rtwdev,R_IQK_DIF4 ,B_IQK_DIF4_TXT ,0x011 ); - iqk_cmd =0x308 | (1 << (4 + path)); + iqk_cmd =0x408 | (1 << (4 + path));break ;case ID_NBRXK :rtw89_phy_write32_mask (rtwdev,R_P0_RFCTM ,B_P0_RFCTM_EN ,0x1 );
@@ -1078,7 +1078,7 @@ static bool _iqk_nbtxk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx, u8 {struct rtw89_iqk_info *iqk_info = &rtwdev->iqk;bool kfail; -u8 gp =0x3 ; +u8 gp =0x2 ;switch (iqk_info->iqk_band[path]) {case RTW89_BAND_2G :
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 160/739 selftests: memfd: error out test process when child test fails
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksa Sarai <[email protected]>
[ Upstream commit 99f34659e78b9b781a3248e0b080b4dfca4957e2 ]
Patch series "memfd: cleanups for vm.memfd_noexec", v2.
The most critical issue with vm.memfd_noexec=2 (the fact that passing MFD_EXEC would bypass it entirely[1]) has been fixed in Andrew's tree[2], but there are still some outstanding issues that need to be addressed:
* vm.memfd_noexec=2 shouldn't reject old-style memfd_create(2) syscalls because it will make it far to difficult to ever migrate. Instead it should imply MFD_EXEC.
* The dmesg warnings are pr_warn_once(), which on most systems means that they will be used up by systemd or some other boot process and userspace developers will never see it.
- For the !(flags & (MFD_EXEC | MFD_NOEXEC_SEAL)) case, outputting a rate-limited message to the kernel log is necessary to tell userspace that they should add the new flags.
Arguably the most ideal way to deal with the spam concern[3,4] while still prompting userspace to switch to the new flags would be to only log the warning once per task or something similar. However, adding something to task_struct for tracking this would be needless bloat for a single pr_warn_ratelimited().
So just switch to pr_info_ratelimited() to avoid spamming the log with something that isn't a real warning. There's lots of info-level stuff in dmesg, it seems really unlikely that this should be an actual problem. Most programs are already switching to the new flags anyway.
- For the vm.memfd_noexec=2 case, we need to log a warning for every failure because otherwise userspace will have no idea why their previously working program started returning -EACCES (previously -EINVAL) from memfd_create(2). pr_warn_once() is simply wrong here.
* The racheting mechanism for vm.memfd_noexec makes it incredibly unappealing for most users to enable the sysctl because enabling it on &init_pid_ns means you need a system reboot to unset it. Given the actual security threat being protected against, CAP_SYS_ADMIN users being restricted in this way makes little sense.
The argument for this ratcheting by the original author was that it allows you to have a hierarchical setting that cannot be unset by child pidnses, but this is not accurate -- changing the parent pidns's vm.memfd_noexec setting to be more restrictive didn't affect children.
Instead, switch the vm.memfd_noexec sysctl to be properly hierarchical and allow CAP_SYS_ADMIN users (in the pidns's owning userns) to lower the setting as long as it is not lower than the parent's effective setting. This change also makes it so that changing a parent pidns's vm.memfd_noexec will affect all descendants, providing a properly hierarchical setting. The performance impact of this is incredibly minimal since the maximum depth of pidns is 32 and it is only checked during memfd_create(2) and unshare(CLONE_NEWPID).
* The memfd selftests would not exit with a non-zero error code when certain tests that ran in a forked process (specifically the ones related to MFD_EXEC and MFD_NOEXEC_SEAL) failed.
[1]: https://lore.kernel.org/all/[email protected]/
[2]: https://lore.kernel.org/all/[email protected]/
[3]: https://lore.kernel.org/Y5yS8wCnuYGLHMj4@x1n/
[4]: https://lore.kernel.org/[email protected]/
This patch (of 5):
Before this change, a test runner using this self test would see a return code of 0 when the tests using a child process (namely the MFD_NOEXEC_SEAL and MFD_EXEC tests) failed, masking test failures.
--- tools/testing/selftests/memfd/memfd_test.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
tools/testing/selftests/memfd/memfd_test.c +18 -1
@@ -1202,7 +1202,24 @@ static pid_t spawn_newpid_thread(unsigned int flags, int (*fn)(void *))static void join_newpid_thread (pid_t pid) { -waitpid (pid,NULL ,0 ); +int wstatus; + +if (waitpid (pid, &wstatus,0 ) <0 ) { +printf ("newpid thread: waitpid() failed: %m\n" ); +abort (); + } + +if (WIFEXITED (wstatus) &&WEXITSTATUS (wstatus) !=0 ) { +printf ("newpid thread: exited with non-zero error code %d\n" , +WEXITSTATUS (wstatus)); +abort (); + } + +if (WIFSIGNALED (wstatus)) { +printf ("newpid thread: killed by signal %d\n" , +WTERMSIG (wstatus)); +abort (); + } }/*
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 161/739 samples/bpf: fix bio latency check with tracepoint
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel T. Lee <[email protected]>
[ Upstream commit 92632115fb57ff9e368f256913e96d6fd5abf5ab ]
Recently, a new tracepoint for the block layer, specifically the block_io_start/done tracepoints, was introduced in commit 5a80bd075f3b ("block: introduce block_io_start/block_io_done tracepoints").
Previously, the kprobe entry used for this purpose was quite unstable and inherently broke relevant probes [1]. Now that a stable tracepoint is available, this commit replaces the bio latency check with it.
One of the changes made during this replacement is the key used for the hash table. Since 'struct request' cannot be used as a hash key, the approach taken follows that which was implemented in bcc/biolatency [2]. (uses dev:sector for the key)
[1]: https://github.com/iovisor/bcc/issues/4261
[2]: https://github.com/iovisor/bcc/pull/4691
--- samples/bpf/tracex3_kern.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-)
samples/bpf/tracex3_kern.c +24 -12
@@ -11,6 +11,12 @@#include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> +struct start_key { +dev_t dev; +u32 _pad; +sector_t sector; +}; +struct { __uint(type, BPF_MAP_TYPE_HASH); __type(key, long);
@@ -18,16 +24,17 @@ struct {__uint (max_entries,4096 ); } my_map SEC(".maps"); -/* kprobe is NOT a stable ABI. If kernel internals change this bpf+kprobe -* example will no longer be meaningful -*/ -SEC("kprobe/blk_mq_start_request") -int bpf_prog1 (struct pt_regs *ctx) +/* from /sys/kernel/tracing/events/block/block_io_start/format */ +SEC("tracepoint/block/block_io_start") +int bpf_prog1 (struct trace_event_raw_block_rq *ctx) { -long rq =PT_REGS_PARM1 (ctx);u64 val =bpf_ktime_get_ns (); +struct start_key key = { + .dev = ctx->dev, + .sector = ctx->sector + }; -bpf_map_update_elem (&my_map, &rq, &val,BPF_ANY ); +bpf_map_update_elem (&my_map, &key, &val,BPF_ANY );return 0 ; }
@@ -49,21 +56,26 @@ struct {__uint (max_entries,SLOTS ); } lat_map SEC(".maps"); -SEC("kprobe/__blk_account_io_done") -int bpf_prog2 (struct pt_regs *ctx) +/* from /sys/kernel/tracing/events/block/block_io_done/format */ +SEC("tracepoint/block/block_io_done") +int bpf_prog2 (struct trace_event_raw_block_rq *ctx) { -long rq =PT_REGS_PARM1 (ctx); +struct start_key key = { + .dev = ctx->dev, + .sector = ctx->sector + }; +u64 *value, l, base;u32 index; - value =bpf_map_lookup_elem (&my_map, &rq); + value =bpf_map_lookup_elem (&my_map, &key);if (!value)return 0 ;u64 cur_time =bpf_ktime_get_ns ();u64 delta = cur_time - *value; -bpf_map_delete_elem (&my_map, &rq); +bpf_map_delete_elem (&my_map, &key);/* the lines below are computing index = log10(delta)*10 * using integer arithmetic
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 162/739 samples/bpf: fix broken map lookup probe
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel T. Lee <[email protected]>
[ Upstream commit d93a7cf6ca2cfcd7de5d06f753ce8d5e863316ac ]
In the commit 7c4cd051add3 ("bpf: Fix syscall's stackmap lookup potential deadlock"), a potential deadlock issue was addressed, which resulted in *_map_lookup_elem not triggering BPF programs. (prior to lookup, bpf_disable_instrumentation() is used)
To resolve the broken map lookup probe using "htab_map_lookup_elem", this commit introduces an alternative approach. Instead, it utilize "bpf_map_copy_value" and apply a filter specifically for the hash table with map_type.
--- samples/bpf/tracex6_kern.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
samples/bpf/tracex6_kern.c +15 -2
@@ -2,6 +2,8 @@#include <linux/version.h> #include <uapi/linux/bpf.h> #include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> +#include <bpf/bpf_core_read.h> struct { __uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);
@@ -45,13 +47,24 @@ int bpf_prog1(struct pt_regs *ctx)return 0 ; } -SEC("kprobe/htab_map_lookup_elem") -int bpf_prog2 (struct pt_regs *ctx) +/* +* Since *_map_lookup_elem can't be expected to trigger bpf programs +* due to potential deadlocks (bpf_disable_instrumentation), this bpf +* program will be attached to bpf_map_copy_value (which is called +* from map_lookup_elem) and will only filter the hashtable type. +*/ +SEC("kprobe/bpf_map_copy_value") +int BPF_KPROBE (bpf_prog2 ,struct bpf_map *map) {u32 key =bpf_get_smp_processor_id ();struct bpf_perf_event_value *val, buf; +enum bpf_map_type type;int error; + type =BPF_CORE_READ (map, map_type); +if (type !=BPF_MAP_TYPE_HASH ) +return 0 ; + error =bpf_perf_event_read_value (&counters, key, &buf,sizeof (buf));if (error)return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 163/739 wifi: ath9k: fix races between ath9k_wmi_cmd and ath9k_wmi_ctrl_rx
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
[ Upstream commit b674fb513e2e7a514fcde287c0f73915d393fdb6 ]
Currently, the synchronization between ath9k_wmi_cmd() and ath9k_wmi_ctrl_rx() is exposed to a race condition which, although being rather unlikely, can lead to invalid behaviour of ath9k_wmi_cmd().
Consider the following scenario:
CPU0 CPU1
ath9k_wmi_cmd(...)
mutex_lock(&wmi->op_mutex)
ath9k_wmi_cmd_issue(...)
wait_for_completion_timeout(...)
---
timeout
---
/* the callback is being processed * before last_seq_id became zero */ ath9k_wmi_ctrl_rx(...) spin_lock_irqsave(...) /* wmi->last_seq_id check here * doesn't detect timeout yet */ spin_unlock_irqrestore(...)
/* last_seq_id is zeroed to
* indicate there was a timeout
*/
wmi->last_seq_id = 0
mutex_unlock(&wmi->op_mutex)
return -ETIMEDOUT
ath9k_wmi_cmd(...)
mutex_lock(&wmi->op_mutex)
/* the buffer is replaced with
* another one
*/
wmi->cmd_rsp_buf = rsp_buf
wmi->cmd_rsp_len = rsp_len
ath9k_wmi_cmd_issue(...)
spin_lock_irqsave(...)
spin_unlock_irqrestore(...)
wait_for_completion_timeout(...)
/* the continuation of the
* callback left after the first
* ath9k_wmi_cmd call
*/
ath9k_wmi_rsp_callback(...)
/* copying data designated
* to already timeouted
* WMI command into an
* inappropriate wmi_cmd_buf
*/
memcpy(...)
complete(&wmi->cmd_wait) /* awakened by the bogus callback
* => invalid return result
*/
mutex_unlock(&wmi->op_mutex)
return 0
To fix this, update last_seq_id on timeout path inside ath9k_wmi_cmd() under the wmi_lock. Move ath9k_wmi_rsp_callback() under wmi_lock inside ath9k_wmi_ctrl_rx() so that the wmi->cmd_wait can be completed only for initially designated wmi_cmd call, otherwise the path would be rejected with last_seq_id check.
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- drivers/net/wireless/ath/ath9k/wmi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/wmi.c +4 -2
@@ -242,10 +242,10 @@ static void ath9k_wmi_ctrl_rx(void *priv, struct sk_buff *skb,spin_unlock_irqrestore (&wmi->wmi_lock, flags); goto free_skb; } -spin_unlock_irqrestore (&wmi->wmi_lock, flags);/* WMI command response */ ath9k_wmi_rsp_callback (wmi, skb); +spin_unlock_irqrestore (&wmi->wmi_lock, flags); free_skb:kfree_skb (skb);
@@ -308,8 +308,8 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,struct ath_common *common =ath9k_hw_common (ah);u16 headroom =sizeof (struct htc_frame_hdr ) +sizeof (struct wmi_cmd_hdr ); +unsigned long time_left, flags;struct sk_buff *skb; -unsigned long time_left;int ret =0 ;if (ah->ah_flags &AH_UNPLUGGED )
@@ -345,7 +345,9 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,if (!time_left) {ath_dbg (common,WMI ,"Timeout waiting for WMI command: %s\n" ,wmi_cmd_to_name (cmd_id)); +spin_lock_irqsave (&wmi->wmi_lock, flags); wmi->last_seq_id =0 ; +spin_unlock_irqrestore (&wmi->wmi_lock, flags);mutex_unlock (&wmi->op_mutex);return -ETIMEDOUT ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 164/739 wifi: ath9k: protect WMI command response buffer replacement with a lock
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
[ Upstream commit 454994cfa9e4c18b6df9f78b60db8eadc20a6c25 ]
If ath9k_wmi_cmd() has exited with a timeout, it is possible that during next ath9k_wmi_cmd() call the wmi_rsp callback for previous wmi command writes to new wmi->cmd_rsp_buf and makes a completion. This results in an invalid ath9k_wmi_cmd() return value.
Move the replacement of WMI command response buffer and length under wmi_lock. Note that last_seq_id value is updated there, too.
Thus, the buffer cannot be written to by a belated wmi_rsp callback because that path is properly rejected by the last_seq_id check.
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- drivers/net/wireless/ath/ath9k/wmi.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath9k/wmi.c +8 -6
@@ -283,7 +283,8 @@ int ath9k_wmi_connect(struct htc_target *htc, struct wmi *wmi,static int ath9k_wmi_cmd_issue (struct wmi *wmi,struct sk_buff *skb, -enum wmi_cmd_id cmd,u16 len) +enum wmi_cmd_id cmd,u16 len, +u8 *rsp_buf,u32 rsp_len) {struct wmi_cmd_hdr *hdr;unsigned long flags;
@@ -293,6 +294,11 @@ static int ath9k_wmi_cmd_issue(struct wmi *wmi, hdr->seq_no =cpu_to_be16 (++wmi->tx_seq_id);spin_lock_irqsave (&wmi->wmi_lock, flags); + +/* record the rsp buffer and length */ + wmi->cmd_rsp_buf = rsp_buf; + wmi->cmd_rsp_len = rsp_len; + wmi->last_seq_id = wmi->tx_seq_id;spin_unlock_irqrestore (&wmi->wmi_lock, flags);
@@ -333,11 +339,7 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id, goto out; } -/* record the rsp buffer and length */ - wmi->cmd_rsp_buf = rsp_buf; - wmi->cmd_rsp_len = rsp_len; - - ret =ath9k_wmi_cmd_issue (wmi, skb, cmd_id, cmd_len); + ret =ath9k_wmi_cmd_issue (wmi, skb, cmd_id, cmd_len, rsp_buf, rsp_len);if (ret) goto out;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 165/739 bpf: Fix a bpf_kptr_xchg() issue with local kptr
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yonghong Song <[email protected]>
[ Upstream commit ab6c637ad0276e42f8acabcbc64932a6d346dab3 ]
When reviewing local percpu kptr support, Alexei discovered a bug wherea bpf_kptr_xchg() may succeed even if the map value kptr type and locally allocated obj type do not match ([1]). Missed struct btf_id comparison is the reason for the bug. This patch added such struct btf_id comparison and will flag verification failure if types do not match.
[1] https://lore.kernel.org/bpf/20230819002907.io3iphmnuk43xblu@macbook-pro-8.dhcp.thefacebook.com/#t
--- kernel/bpf/verifier.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
kernel/bpf/verifier.c +15 -10
@@ -4982,20 +4982,22 @@ static int map_kptr_match_type(struct bpf_verifier_env *env, struct bpf_reg_state *reg, u32 regno) {const char *targ_name =btf_type_name (kptr_field->kptr.btf, kptr_field->kptr.btf_id); -int perm_flags =PTR_MAYBE_NULL |PTR_TRUSTED |MEM_RCU ; +int perm_flags;const char *reg_name ="" ; -/* Only unreferenced case accepts untrusted pointers */ -if (kptr_field->type ==BPF_KPTR_UNREF ) - perm_flags |=PTR_UNTRUSTED ; +if (btf_is_kernel (reg->btf)) { + perm_flags =PTR_MAYBE_NULL |PTR_TRUSTED |MEM_RCU ; + +/* Only unreferenced case accepts untrusted pointers */ +if (kptr_field->type ==BPF_KPTR_UNREF ) + perm_flags |=PTR_UNTRUSTED ; + }else { + perm_flags =PTR_MAYBE_NULL |MEM_ALLOC ; + }if (base_type (reg->type) !=PTR_TO_BTF_ID || (type_flag (reg->type) & ~perm_flags)) goto bad_type; -if (!btf_is_kernel (reg->btf)) { -verbose (env,"R%d must point to kernel BTF\n" , regno); -return -EINVAL ; - }/* We need to verify reg->type and reg->btf, before accessing reg->btf */ reg_name =btf_type_name (reg->btf, reg->btf_id);
@@ -5008,7 +5010,7 @@ static int map_kptr_match_type(struct bpf_verifier_env *env,if (__check_ptr_off_reg (env, reg, regno, true))return -EACCES ; -/* A full type match is needed, as BTF can be vmlinux or module BTF, and +/* A full type match is needed, as BTF can be vmlinux, module or prog BTF, and * we also need to take into account the reg->off. * * We want to support cases like:
@@ -7750,7 +7752,10 @@ static int check_reg_type(struct bpf_verifier_env *env, u32 regno,verbose (env,"verifier internal error: unimplemented handling of MEM_ALLOC\n" );return -EFAULT ; } -/* Handled by helper specific checks */ +if (meta->func_id == BPF_FUNC_kptr_xchg) { +if (map_kptr_match_type (env, meta->kptr_field, reg, regno)) +return -EACCES ; + }break ;case PTR_TO_BTF_ID |MEM_PERCPU :case PTR_TO_BTF_ID |MEM_PERCPU |PTR_TRUSTED :
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 166/739 wifi: mac80211: fix puncturing bitmap handling in CSA
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 927521170c4a18c620f97865f7bad48f17c48967 ]
Code inspection reveals that we switch the puncturing bitmap before the real channel switch, since that happens only in the second round of the worker after the channel context is switched by ieee80211_link_use_reserved_context().
--- net/mac80211/cfg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/mac80211/cfg.c +6 -6
@@ -3648,12 +3648,6 @@ static int __ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata)lockdep_assert_held (&local->mtx);lockdep_assert_held (&local->chanctx_mtx); -if (sdata->vif.bss_conf.eht_puncturing != sdata->vif.bss_conf.csa_punct_bitmap) { - sdata->vif.bss_conf.eht_puncturing = - sdata->vif.bss_conf.csa_punct_bitmap; - changed |=BSS_CHANGED_EHT_PUNCTURING ; - } -/* * using reservation isn't immediate as it may be deferred until later * with multi-vif. once reservation is complete it will re-schedule the
@@ -3683,6 +3677,12 @@ static int __ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata)if (err)return err; +if (sdata->vif.bss_conf.eht_puncturing != sdata->vif.bss_conf.csa_punct_bitmap) { + sdata->vif.bss_conf.eht_puncturing = + sdata->vif.bss_conf.csa_punct_bitmap; + changed |=BSS_CHANGED_EHT_PUNCTURING ; + } +ieee80211_link_info_change_notify (sdata, &sdata->deflink, changed);if (sdata->deflink.csa_block_tx) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 167/739 wifi: nl80211/cfg80211: add forgotten nla_policy for BSS color attribute
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Ma <[email protected]>
[ Upstream commit 218d690c49b7e9c94ad0d317adbdd4af846ea0dc ]
The previous commit dd3e4fc75b4a ("nl80211/cfg80211: add BSS color to NDP ranging parameters") adds a parameter for NDP ranging by introducing a new attribute type named NL80211_PMSR_FTM_REQ_ATTR_BSS_COLOR.
However, the author forgot to also describe the nla_policy at nl80211_pmsr_ftm_req_attr_policy (net/wireless/nl80211.c). Just complement it to avoid malformed attribute that causes out-of-attribute access.
--- net/wireless/nl80211.c | 1 + 1 file changed, 1 insertion(+)
net/wireless/nl80211.c +1 -0
@@ -323,6 +323,7 @@ nl80211_pmsr_ftm_req_attr_policy[NL80211_PMSR_FTM_REQ_ATTR_MAX + 1] = { [NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED] = { .type = NLA_FLAG }, [NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED] = { .type = NLA_FLAG }, [NL80211_PMSR_FTM_REQ_ATTR_LMR_FEEDBACK] = { .type = NLA_FLAG }, + [NL80211_PMSR_FTM_REQ_ATTR_BSS_COLOR] = { .type = NLA_U8 }, }; static const struct nla_policy
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 168/739 mac80211: make ieee80211_tx_info padding explicit
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit a7a2ef0c4b3efbd7d6f3fabd87dbbc0b3f2de5af ]
While looking at a bug, I got rather confused by the layout of the 'status' field in ieee80211_tx_info. Apparently, the intention is that status_driver_data[] is used for driver specific data, and fills up the size of the union to 40 bytes, just like the other ones.
This is indeed what actually happens, but only because of the combination of two mistakes:
- "void *status_driver_data[18 / sizeof(void *)];" is intended to be 18 bytes long but is actually two bytes shorter because of rounding-down in the division, to a multiple of the pointer size (4 bytes or 8 bytes).
- The other fields combined are intended to be 22 bytes long, but are actually 24 bytes because of padding in front of the unaligned tx_time member, and in front of the pointer array.
The two mistakes cancel out. so the size ends up fine, but it seems more helpful to make this explicit, by having a multiple of 8 bytes in the size calculation and explicitly describing the padding.
--- include/net/mac80211.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
include/net/mac80211.h +3 -1
@@ -1192,9 +1192,11 @@ struct ieee80211_tx_info {u8 ampdu_ack_len;u8 ampdu_len;u8 antenna; +u8 pad;u16 tx_time;u8 flags; -void *status_driver_data[18 /sizeof (void *)]; +u8 pad2; +void *status_driver_data[16 /sizeof (void *)]; } status;struct { struct ieee80211_tx_rate driver_rates[
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 169/739 bpf: Fix check_func_arg_reg_off bug for graph root/node
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kumar Kartikeya Dwivedi <[email protected]>
[ Upstream commit 6785b2edf48c6b1c3ea61fe3b0d2e02b8fbf90c0 ]
The commit being fixed introduced a hunk into check_func_arg_reg_off that bypasses reg->off == 0 enforcement when offset points to a graph node or root. This might possibly be done for treating bpf_rbtree_remove and others as KF_RELEASE and then later check correct reg->off in helper argument checks.
But this is not the case, those helpers are already not KF_RELEASE and permit non-zero reg->off and verify it later to match the subobject in BTF type.
However, this logic leads to bpf_obj_drop permitting free of register arguments with non-zero offset when they point to a graph root or node within them, which is not ok.
For instance:
struct foo {
int i;
int j;
struct bpf_rb_node node;
};struct foo *f = bpf_obj_new(typeof(*f));
if (!f) ...bpf_obj_drop(f); // OKbpf_obj_drop(&f->i); // still ok from verifier PoV bpf_obj_drop(&f->node); // Not OK, but permitted right now
Fix this by dropping the whole part of code altogether.
--- kernel/bpf/verifier.c | 11 ----------- 1 file changed, 11 deletions(-)
kernel/bpf/verifier.c +0 -11
@@ -7807,17 +7807,6 @@ int check_func_arg_reg_off(struct bpf_verifier_env *env,if (arg_type_is_dynptr (arg_type) && type ==PTR_TO_STACK )return 0 ; -if ((type_is_ptr_alloc_obj (type) ||type_is_non_owning_ref (type)) && reg->off) { -if (reg_find_field_offset (reg, reg->off,BPF_GRAPH_NODE_OR_ROOT )) -return __check_ptr_off_reg (env, reg, regno, true); - -verbose (env,"R%d must have zero offset when passed to release func\n" , - regno); -verbose (env,"No graph node or root found at R%d type:%s off:%d\n" , regno, -btf_type_name (reg->btf, reg->btf_id), reg->off); -return -EINVAL ; - } -/* Doing check_ptr_off_reg check for the offset will catch this * because fixed_off_ok is false, but checking here allows us * to give the user a better error message.
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 170/739 wifi: mwifiex: avoid possible NULL skb pointer dereference
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Antipov <[email protected]>
[ Upstream commit 35a7a1ce7c7d61664ee54f5239a1f120ab95a87e ]
In 'mwifiex_handle_uap_rx_forward()', always check the value returned by 'skb_copy()' to avoid potential NULL pointer dereference in 'mwifiex_uap_queue_bridged_pkt()', and drop original skb in case of copying failure.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/wireless/marvell/mwifiex/uap_txrx.c +9 -1
@@ -253,7 +253,15 @@ int mwifiex_handle_uap_rx_forward(struct mwifiex_private *priv,if (is_multicast_ether_addr (ra)) { skb_uap =skb_copy (skb,GFP_ATOMIC ); -mwifiex_uap_queue_bridged_pkt (priv, skb_uap); +if (likely (skb_uap)) { +mwifiex_uap_queue_bridged_pkt (priv, skb_uap); + }else { +mwifiex_dbg (adapter,ERROR , +"failed to copy skb for uAP\n" ); + priv->stats.rx_dropped++; +dev_kfree_skb_any (skb); +return -1 ; + } }else {if (mwifiex_get_sta_entry (priv, ra)) {/* Requeue Intra-BSS packet */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 171/739 Bluetooth: hci_conn: Consolidate code for aborting connections
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit a13f316e90fdb1fb6df6582e845aa9b3270f3581 ]
This consolidates code for aborting connections using hci_cmd_sync_queue so it is synchronized with other threads, but because of the fact that some commands may block the cmd_sync_queue while waiting specific events this attempt to cancel those requests by using hci_cmd_sync_cancel.
Stable-dep-of: 94d9ba9f9888 ("Bluetooth: hci_sync: Fix UAF in hci_disconnect_all_sync")
--- include/net/bluetooth/hci_core.h | 2 +- net/bluetooth/hci_conn.c | 154 ++++++------------------------- net/bluetooth/hci_sync.c | 23 +++-- net/bluetooth/mgmt.c | 15 +-- 4 files changed, 47 insertions(+), 147 deletions(-)
include/net/bluetooth/hci_core.h +1 -1
@@ -739,6 +739,7 @@ struct hci_conn {unsigned long flags;enum conn_reasons conn_reason; +__u8 abort_reason;__u32 clock;__u16 clock_accuracy;
@@ -758,7 +759,6 @@ struct hci_conn {struct delayed_work auto_accept_work;struct delayed_work idle_work;struct delayed_work le_conn_timeout; -struct work_struct le_scan_cleanup;struct device dev;struct dentry *debugfs;
net/bluetooth/hci_conn.c +30 -124
188 lines not on this page · raw message
net/bluetooth/hci_sync.c +15 -8
@@ -5269,22 +5269,27 @@ static int hci_disconnect_sync(struct hci_dev *hdev, struct hci_conn *conn, }static int hci_le_connect_cancel_sync (struct hci_dev *hdev, -struct hci_conn *conn) +struct hci_conn *conn,u8 reason) { +/* Return reason if scanning since the connection shall probably be +* cleanup directly. +*/ if (test_bit (HCI_CONN_SCANNING , &conn->flags)) -return 0 ; +return reason; -if (test_and_set_bit (HCI_CONN_CANCEL , &conn->flags)) +if (conn->role ==HCI_ROLE_SLAVE || +test_and_set_bit (HCI_CONN_CANCEL , &conn->flags))return 0 ;return __hci_cmd_sync_status (hdev,HCI_OP_LE_CREATE_CONN_CANCEL ,0 ,NULL ,HCI_CMD_TIMEOUT ); } -static int hci_connect_cancel_sync (struct hci_dev *hdev,struct hci_conn *conn) +static int hci_connect_cancel_sync (struct hci_dev *hdev,struct hci_conn *conn, +u8 reason) {if (conn->type ==LE_LINK ) -return hci_le_connect_cancel_sync (hdev, conn); +return hci_le_connect_cancel_sync (hdev, conn, reason);if (hdev->hci_ver <BLUETOOTH_VER_1_2 )return 0 ;
@@ -5337,9 +5342,11 @@ int hci_abort_conn_sync(struct hci_dev *hdev, struct hci_conn *conn, u8 reason)case BT_CONFIG :return hci_disconnect_sync (hdev, conn, reason);case BT_CONNECT : - err =hci_connect_cancel_sync (hdev, conn); + err =hci_connect_cancel_sync (hdev, conn, reason);/* Cleanup hci_conn object if it cannot be cancelled as it -* likelly means the controller and host stack are out of sync. +* likelly means the controller and host stack are out of sync +* or in case of LE it was still scanning so it can be cleanup +* safely. */ if (err) {hci_dev_lock (hdev);
@@ -6253,7 +6260,7 @@ int hci_le_create_conn_sync(struct hci_dev *hdev, struct hci_conn *conn) done:if (err == -ETIMEDOUT ) -hci_le_connect_cancel_sync (hdev, conn); +hci_le_connect_cancel_sync (hdev, conn,0x00 );/* Re-enable advertising after the connection attempt is finished. */ hci_resume_advertising_sync (hdev);
net/bluetooth/mgmt.c +1 -14
@@ -3580,18 +3580,6 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,return err; } -static int abort_conn_sync (struct hci_dev *hdev,void *data) -{ -struct hci_conn *conn; -u16 handle =PTR_ERR (data); - - conn =hci_conn_hash_lookup_handle (hdev, handle); -if (!conn) -return 0 ; - -return hci_abort_conn_sync (hdev, conn,HCI_ERROR_REMOTE_USER_TERM ); -} -static int cancel_pair_device (struct sock *sk,struct hci_dev *hdev,void *data,u16 len) {
@@ -3642,8 +3630,7 @@ static int cancel_pair_device(struct sock *sk, struct hci_dev *hdev, void *data, le_addr_type(addr->type));if (conn->conn_reason ==CONN_REASON_PAIR_DEVICE ) -hci_cmd_sync_queue (hdev, abort_conn_sync,ERR_PTR (conn->handle), -NULL ); +hci_abort_conn (conn,HCI_ERROR_REMOTE_USER_TERM ); unlock:hci_dev_unlock (hdev);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 172/739 Bluetooth: ISO: Notify user space about failed bis connections
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Iulia Tanasescu <[email protected]>
[ Upstream commit f777d88278170410b06a1f6633f3b9375a4ddd6b ]
Some use cases require the user to be informed if BIG synchronization fails. This commit makes it so that even if the BIG sync established event arrives with error status, a new hconn is added for each BIS, and the iso layer is notified about the failed connections.
Unsuccesful bis connections will be marked using the HCI_CONN_BIG_SYNC_FAILED flag. From the iso layer, the POLLERR event is triggered on the newly allocated bis sockets, before adding them to the accept list of the parent socket.
Quoted 1 line
From user space, a new fd for each failed bis connection will be
obtained by calling accept. The user should check for the POLLERR event on the new socket, to determine if the connection was successful or not.
The HCI_CONN_BIG_SYNC flag has been added to mark whether the BIG sync has been successfully established. This flag is checked at bis cleanup, so the HCI LE BIG Terminate Sync command is only issued if needed.
The BT_SK_BIG_SYNC flag indicates if BIG create sync has been called for a listening socket, to avoid issuing the command everytime a BIGInfo advertising report is received.
Stable-dep-of: 94d9ba9f9888 ("Bluetooth: hci_sync: Fix UAF in hci_disconnect_all_sync")
--- include/net/bluetooth/hci_core.h | 25 ++++++++++++++++++++ net/bluetooth/hci_conn.c | 37 +++++++++++------------------ net/bluetooth/hci_event.c | 21 +++++++++++++---- net/bluetooth/hci_sync.c | 8 +++++++ net/bluetooth/iso.c | 40 +++++++++++++++++++++++--------- 5 files changed, 93 insertions(+), 38 deletions(-)
include/net/bluetooth/hci_core.h +25 -0
@@ -976,6 +976,8 @@ enum {HCI_CONN_PER_ADV ,HCI_CONN_BIG_CREATED ,HCI_CONN_CREATE_CIS , +HCI_CONN_BIG_SYNC , + HCI_CONN_BIG_SYNC_FAILED, };static inline bool hci_conn_ssp_enabled (struct hci_conn *conn)
@@ -1287,6 +1289,29 @@ static inline struct hci_conn *hci_conn_hash_lookup_big(struct hci_dev *hdev,return NULL ; } +static inline struct hci_conn *hci_conn_hash_lookup_big_any_dst (struct hci_dev *hdev, +__u8 handle) +{ +struct hci_conn_hash *h = &hdev->conn_hash; +struct hci_conn *c; + +rcu_read_lock (); + +list_for_each_entry_rcu (c, &h->list, list) { +if (c->type !=ISO_LINK ) +continue ; + +if (handle == c->iso_qos.bcast.big) { +rcu_read_unlock (); +return c; + } + } + +rcu_read_unlock (); + +return NULL ; +} +static inline struct hci_conn *hci_conn_hash_lookup_state (struct hci_dev *hdev,__u8 type,__u16 state) {
net/bluetooth/hci_conn.c +14 -23
@@ -734,6 +734,7 @@ struct iso_list_data { };int count;bool big_term; +bool big_sync_term; };static void bis_list (struct hci_conn *conn,void *data)
@@ -751,17 +752,6 @@ static void bis_list(struct hci_conn *conn, void *data) d->count++; } -static void find_bis (struct hci_conn *conn,void *data) -{ -struct iso_list_data *d = data; - -/* Ignore unicast */ -if (bacmp (&conn->dst,BDADDR_ANY )) -return ; - - d->count++; -} -static int terminate_big_sync (struct hci_dev *hdev,void *data) {struct iso_list_data *d = data;
@@ -814,31 +804,26 @@ static int big_terminate_sync(struct hci_dev *hdev, void *data)bt_dev_dbg (hdev,"big 0x%2.2x sync_handle 0x%4.4x" , d->big, d->sync_handle); -/* Check if ISO connection is a BIS and terminate BIG if there are -* no other connections using it. -*/ -hci_conn_hash_list_state (hdev, find_bis,ISO_LINK ,BT_CONNECTED , d); -if (d->count) -return 0 ; - -hci_le_big_terminate_sync (hdev, d->big); +if (d->big_sync_term) +hci_le_big_terminate_sync (hdev, d->big);return hci_le_pa_terminate_sync (hdev, d->sync_handle); } -static int hci_le_big_terminate (struct hci_dev *hdev,u8 big,u16 sync_handle) +static int hci_le_big_terminate (struct hci_dev *hdev,u8 big,struct hci_conn *conn) {struct iso_list_data *d;int ret; -bt_dev_dbg (hdev,"big 0x%2.2x sync_handle 0x%4.4x" , big, sync_handle); +bt_dev_dbg (hdev,"big 0x%2.2x sync_handle 0x%4.4x" , big, conn->sync_handle); d =kzalloc (sizeof (*d),GFP_KERNEL );if (!d)return -ENOMEM ; d->big = big; - d->sync_handle = sync_handle; + d->sync_handle = conn->sync_handle; + d->big_sync_term =test_and_clear_bit (HCI_CONN_BIG_SYNC , &conn->flags); ret =hci_cmd_sync_queue (hdev, big_terminate_sync, d, terminate_big_destroy);
@@ -876,8 +861,14 @@ static void bis_cleanup(struct hci_conn *conn)hci_le_terminate_big (hdev, conn); }else { + bis =hci_conn_hash_lookup_big_any_dst (hdev, + conn->iso_qos.bcast.big); + +if (bis) +return ; +hci_le_big_terminate (hdev, conn->iso_qos.bcast.big, - conn->sync_handle); + conn); } }
net/bluetooth/hci_event.c +17 -4
@@ -7035,9 +7035,6 @@ static void hci_le_big_sync_established_evt(struct hci_dev *hdev, void *data, flex_array_size(ev, bis, ev->num_bis)))return ; -if (ev->status) -return ; -hci_dev_lock (hdev);for (i =0 ; i < ev->num_bis; i++) {
@@ -7061,9 +7058,25 @@ static void hci_le_big_sync_established_evt(struct hci_dev *hdev, void *data, bis->iso_qos.bcast.in.latency =le16_to_cpu (ev->interval) *125 /100 ; bis->iso_qos.bcast.in.sdu =le16_to_cpu (ev->max_pdu); -hci_iso_setup_path (bis); +if (!ev->status) { +set_bit (HCI_CONN_BIG_SYNC , &bis->flags); +hci_iso_setup_path (bis); + } } +/* In case BIG sync failed, notify each failed connection to +* the user after all hci connections have been added +*/ +if (ev->status) +for (i =0 ; i < ev->num_bis; i++) { +u16 handle =le16_to_cpu (ev->bis[i]); + + bis =hci_conn_hash_lookup_handle (hdev, handle); + +set_bit (HCI_CONN_BIG_SYNC_FAILED , &bis->flags); +hci_connect_cfm (bis, ev->status); + } +hci_dev_unlock (hdev); }
net/bluetooth/hci_sync.c +8 -0
@@ -5356,6 +5356,14 @@ int hci_abort_conn_sync(struct hci_dev *hdev, struct hci_conn *conn, u8 reason)return err;case BT_CONNECT2 :return hci_reject_conn_sync (hdev, conn, reason); +case BT_OPEN : +/* Cleanup bises that failed to be established */ +if (test_and_clear_bit (HCI_CONN_BIG_SYNC_FAILED , &conn->flags)) { +hci_dev_lock (hdev); +hci_conn_failed (conn, reason); +hci_dev_unlock (hdev); + } +break ;default : conn->state =BT_CLOSED ;break ;
net/bluetooth/iso.c +29 -11
@@ -48,6 +48,11 @@ static void iso_sock_kill(struct sock *sk);#define EIR_SERVICE_DATA_LENGTH 4#define BASE_MAX_LENGTH (HCI_MAX_PER_AD_LENGTH - EIR_SERVICE_DATA_LENGTH) +/* iso_pinfo flags values */ +enum { +BT_SK_BIG_SYNC , +}; +struct iso_pinfo {struct bt_sock bt;bdaddr_t src;
@@ -58,7 +63,7 @@ struct iso_pinfo {__u8 bc_num_bis;__u8 bc_bis[ISO_MAX_NUM_BIS ];__u16 sync_handle; -__u32 flags; +unsigned long flags;struct bt_iso_qos qos;bool qos_user_set;__u8 base_len;
@@ -1583,6 +1588,12 @@ static void iso_conn_ready(struct iso_conn *conn)hci_conn_hold (hcon);iso_chan_add (conn, sk, parent); +if (ev && ((struct hci_evt_le_big_sync_estabilished *)ev)->status) { +/* Trigger error signal on child socket */ + sk->sk_err =ECONNREFUSED ; + sk->sk_error_report (sk); + } +if (test_bit (BT_SK_DEFER_SETUP , &bt_sk (parent)->flags)) sk->sk_state =BT_CONNECT2 ;else
@@ -1651,15 +1662,17 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags)if (ev2->num_bis <iso_pi (sk)->bc_num_bis)iso_pi (sk)->bc_num_bis = ev2->num_bis; - err =hci_le_big_create_sync (hdev, - &iso_pi (sk)->qos, -iso_pi (sk)->sync_handle, -iso_pi (sk)->bc_num_bis, -iso_pi (sk)->bc_bis); -if (err) { -bt_dev_err (hdev,"hci_le_big_create_sync: %d" , - err); - sk =NULL ; +if (!test_and_set_bit (BT_SK_BIG_SYNC , &iso_pi (sk)->flags)) { + err =hci_le_big_create_sync (hdev, + &iso_pi (sk)->qos, +iso_pi (sk)->sync_handle, +iso_pi (sk)->bc_num_bis, +iso_pi (sk)->bc_bis); +if (err) { +bt_dev_err (hdev,"hci_le_big_create_sync: %d" , + err); + sk =NULL ; + } } } }else {
@@ -1702,7 +1715,12 @@ static void iso_connect_cfm(struct hci_conn *hcon, __u8 status)BT_DBG ("hcon %p bdaddr %pMR status %d" , hcon, &hcon->dst, status); -if (!status) { +/* Similar to the success case, if HCI_CONN_BIG_SYNC_FAILED is set, +* queue the failed bis connection into the accept queue of the +* listening socket and wake up userspace, to inform the user about +* the BIG sync failed event. +*/ +if (!status ||test_bit (HCI_CONN_BIG_SYNC_FAILED , &hcon->flags)) {struct iso_conn *conn; conn =iso_conn_add (hcon);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 173/739 Bluetooth: hci_sync: Fix UAF on hci_abort_conn_sync
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 5af1f84ed13a416297ab9ced7537f4d5ae7f329a ]
Connections may be cleanup while waiting for the commands to complete so this attempts to check if the connection handle remains valid in case of errors that would lead to call hci_conn_failed:
BUG: KASAN: slab-use-after-free in hci_conn_failed+0x1f/0x160 Read of size 8 at addr ffff888001376958 by task kworker/u3:0/52 CPU: 0 PID: 52 Comm: kworker/u3:0 Not tainted 6.5.0-rc1-00527-g2dfe76d58d3a #5615 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-1.fc38 04/01/2014 Workqueue: hci0 hci_cmd_sync_work Call Trace: <TASK> dump_stack_lvl+0x1d/0x70 print_report+0xce/0x620 ? __virt_addr_valid+0xd4/0x150 ? hci_conn_failed+0x1f/0x160 kasan_report+0xd1/0x100 ? hci_conn_failed+0x1f/0x160 hci_conn_failed+0x1f/0x160 hci_abort_conn_sync+0x237/0x360
Stable-dep-of: 94d9ba9f9888 ("Bluetooth: hci_sync: Fix UAF in hci_disconnect_all_sync")
--- net/bluetooth/hci_sync.c | 45 ++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 16 deletions(-)
net/bluetooth/hci_sync.c +29 -16
@@ -5335,27 +5335,20 @@ static int hci_reject_conn_sync(struct hci_dev *hdev, struct hci_conn *conn,int hci_abort_conn_sync (struct hci_dev *hdev,struct hci_conn *conn,u8 reason) { -int err; +int err =0 ; +u16 handle = conn->handle;switch (conn->state) {case BT_CONNECTED :case BT_CONFIG : -return hci_disconnect_sync (hdev, conn, reason); + err =hci_disconnect_sync (hdev, conn, reason); +break ;case BT_CONNECT : err =hci_connect_cancel_sync (hdev, conn, reason); -/* Cleanup hci_conn object if it cannot be cancelled as it -* likelly means the controller and host stack are out of sync -* or in case of LE it was still scanning so it can be cleanup -* safely. -*/ -if (err) { -hci_dev_lock (hdev); -hci_conn_failed (conn, err); -hci_dev_unlock (hdev); - } -return err; +break ;case BT_CONNECT2 : -return hci_reject_conn_sync (hdev, conn, reason); + err =hci_reject_conn_sync (hdev, conn, reason); +break ;case BT_OPEN :/* Cleanup bises that failed to be established */ if (test_and_clear_bit (HCI_CONN_BIG_SYNC_FAILED , &conn->flags)) {
@@ -5366,10 +5359,30 @@ int hci_abort_conn_sync(struct hci_dev *hdev, struct hci_conn *conn, u8 reason)break ;default : conn->state =BT_CLOSED ; -break ; +return 0 ; } -return 0 ; +/* Cleanup hci_conn object if it cannot be cancelled as it +* likelly means the controller and host stack are out of sync +* or in case of LE it was still scanning so it can be cleanup +* safely. +*/ +if (err) { +struct hci_conn *c; + +/* Check if the connection hasn't been cleanup while waiting +* commands to complete. +*/ + c =hci_conn_hash_lookup_handle (hdev, handle); +if (!c || c != conn) +return 0 ; + +hci_dev_lock (hdev); +hci_conn_failed (conn, err); +hci_dev_unlock (hdev); + } + +return err; }static int hci_disconnect_all_sync (struct hci_dev *hdev,u8 reason)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 174/739 Bluetooth: hci_sync: Fix UAF in hci_disconnect_all_sync
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 94d9ba9f9888b748d4abd2aa1547af56ae85f772 ]
Use-after-free can occur in hci_disconnect_all_sync if a connection is deleted by concurrent processing of a controller event.
To prevent this the code now tries to iterate over the list backwards to ensure the links are cleanup before its parents, also it no longer relies on a cursor, instead it always uses the last element since hci_abort_conn_sync is guaranteed to call hci_conn_del.
UAF crash log:
==================================================================
BUG: KASAN: slab-use-after-free in hci_set_powered_sync (net/bluetooth/hci_sync.c:5424) [bluetooth] Read of size 8 at addr ffff888009d9c000 by task kworker/u9:0/124 CPU: 0 PID: 124 Comm: kworker/u9:0 Tainted: G W 6.5.0-rc1+ #10 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-1.fc38 04/01/2014 Workqueue: hci0 hci_cmd_sync_work [bluetooth] Call Trace: <TASK> dump_stack_lvl+0x5b/0x90 print_report+0xcf/0x670 ? __virt_addr_valid+0xdd/0x160 ? hci_set_powered_sync+0x2c9/0x4a0 [bluetooth] kasan_report+0xa6/0xe0 ? hci_set_powered_sync+0x2c9/0x4a0 [bluetooth] ? __pfx_set_powered_sync+0x10/0x10 [bluetooth] hci_set_powered_sync+0x2c9/0x4a0 [bluetooth] ? __pfx_hci_set_powered_sync+0x10/0x10 [bluetooth] ? __pfx_lock_release+0x10/0x10 ? __pfx_set_powered_sync+0x10/0x10 [bluetooth] hci_cmd_sync_work+0x137/0x220 [bluetooth] process_one_work+0x526/0x9d0 ? __pfx_process_one_work+0x10/0x10 ? __pfx_do_raw_spin_lock+0x10/0x10 ? mark_held_locks+0x1a/0x90 worker_thread+0x92/0x630 ? __pfx_worker_thread+0x10/0x10 kthread+0x196/0x1e0 ? __pfx_kthread+0x10/0x10 ret_from_fork+0x2c/0x50 </TASK> Allocated by task 1782: kasan_save_stack+0x33/0x60 kasan_set_track+0x25/0x30 __kasan_kmalloc+0x8f/0xa0 hci_conn_add+0xa5/0xa80 [bluetooth] hci_bind_cis+0x881/0x9b0 [bluetooth] iso_connect_cis+0x121/0x520 [bluetooth] iso_sock_connect+0x3f6/0x790 [bluetooth] __sys_connect+0x109/0x130 __x64_sys_connect+0x40/0x50 do_syscall_64+0x60/0x90 entry_SYSCALL_64_after_hwframe+0x6e/0xd8 Freed by task 695: kasan_save_stack+0x33/0x60 kasan_set_track+0x25/0x30 kasan_save_free_info+0x2b/0x50 __kasan_slab_free+0x10a/0x180 __kmem_cache_free+0x14d/0x2e0 device_release+0x5d/0xf0 kobject_put+0xdf/0x270 hci_disconn_complete_evt+0x274/0x3a0 [bluetooth] hci_event_packet+0x579/0x7e0 [bluetooth] hci_rx_work+0x287/0xaa0 [bluetooth] process_one_work+0x526/0x9d0 worker_thread+0x92/0x630 kthread+0x196/0x1e0 ret_from_fork+0x2c/0x50 ==================================================================
--- net/bluetooth/hci_sync.c | 55 +++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 20 deletions(-)
net/bluetooth/hci_sync.c +35 -20
@@ -5337,6 +5337,7 @@ int hci_abort_conn_sync(struct hci_dev *hdev, struct hci_conn *conn, u8 reason) {int err =0 ;u16 handle = conn->handle; +struct hci_conn *c;switch (conn->state) {case BT_CONNECTED :
@@ -5358,43 +5359,57 @@ int hci_abort_conn_sync(struct hci_dev *hdev, struct hci_conn *conn, u8 reason) }break ;default : +hci_dev_lock (hdev); conn->state =BT_CLOSED ; +hci_disconn_cfm (conn, reason); +hci_conn_del (conn); +hci_dev_unlock (hdev);return 0 ; } +hci_dev_lock (hdev); + +/* Check if the connection hasn't been cleanup while waiting +* commands to complete. +*/ + c =hci_conn_hash_lookup_handle (hdev, handle); +if (!c || c != conn) { + err =0 ; + goto unlock; + } +/* Cleanup hci_conn object if it cannot be cancelled as it * likelly means the controller and host stack are out of sync * or in case of LE it was still scanning so it can be cleanup * safely. */ -if (err) { -struct hci_conn *c; - -/* Check if the connection hasn't been cleanup while waiting -* commands to complete. -*/ - c =hci_conn_hash_lookup_handle (hdev, handle); -if (!c || c != conn) -return 0 ; - -hci_dev_lock (hdev); -hci_conn_failed (conn, err); -hci_dev_unlock (hdev); - } +hci_conn_failed (conn, reason); +unlock: +hci_dev_unlock (hdev);return err; }static int hci_disconnect_all_sync (struct hci_dev *hdev,u8 reason) { -struct hci_conn *conn, *tmp; -int err; +struct list_head *head = &hdev->conn_hash.list; +struct hci_conn *conn; -list_for_each_entry_safe (conn, tmp, &hdev->conn_hash.list, list) { - err =hci_abort_conn_sync (hdev, conn, reason); -if (err) -return err; +rcu_read_lock (); + while ((conn = list_first_or_null_rcu(head, struct hci_conn, list))) { +/* Make sure the connection is not freed while unlocking */ + conn =hci_conn_get (conn); +rcu_read_unlock (); +/* Disregard possible errors since hci_conn_del shall have been +* called even in case of errors had occurred since it would +* then cause hci_conn_failed to be called which calls +* hci_conn_del internally. +*/ +hci_abort_conn_sync (hdev, conn, reason); +hci_conn_put (conn); +rcu_read_lock (); } +rcu_read_unlock ();return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 175/739 Bluetooth: hci_conn: fail SCO/ISO via hci_conn_failed if ACL gone early
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pauli Virtanen <[email protected]>
[ Upstream commit 3344d318337d9dca928fd448e966557ec5063f85 ]
Not calling hci_(dis)connect_cfm before deleting conn referred to by a socket generally results to use-after-free.
When cleaning up SCO connections when the parent ACL is deleted too early, use hci_conn_failed to do the connection cleanup properly.
We also need to clean up ISO connections in a similar situation when connecting has started but LE Create CIS is not yet sent, so do it too here.
--- net/bluetooth/hci_conn.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-)
net/bluetooth/hci_conn.c +24 -8
@@ -1040,6 +1040,29 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst,return conn; } +static void hci_conn_cleanup_child (struct hci_conn *conn,u8 reason) +{ +if (!reason) + reason =HCI_ERROR_REMOTE_USER_TERM ; + +/* Due to race, SCO/ISO conn might be not established yet at this point, +* and nothing else will clean it up. In other cases it is done via HCI +* events. +*/ +switch (conn->type) { +case SCO_LINK : +case ESCO_LINK : +if (HCI_CONN_HANDLE_UNSET (conn->handle)) +hci_conn_failed (conn, reason); +break ; +case ISO_LINK : +if (conn->state !=BT_CONNECTED && + !test_bit (HCI_CONN_CREATE_CIS , &conn->flags)) +hci_conn_failed (conn, reason); +break ; + } +} +static void hci_conn_unlink (struct hci_conn *conn) {struct hci_dev *hdev = conn->hdev;
@@ -1062,14 +1085,7 @@ static void hci_conn_unlink(struct hci_conn *conn)if (!test_bit (HCI_UP , &hdev->flags))continue ; -/* Due to race, SCO connection might be not established -* yet at this point. Delete it now, otherwise it is -* possible for it to be stuck and can't be deleted. -*/ -if ((child->type ==SCO_LINK || - child->type ==ESCO_LINK ) && -HCI_CONN_HANDLE_UNSET (child->handle)) -hci_conn_del (child); +hci_conn_cleanup_child (child, conn->abort_reason); }return ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 176/739 Bluetooth: btusb: Do not call kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jinjie Ruan <[email protected]>
[ Upstream commit 2a05334d7f91ff189692089c05fc48cc1d8204de ]
It is not allowed to call kfree_skb() from hardware interrupt context or with hardware interrupts being disabled. So replace kfree_skb() with dev_kfree_skb_irq() under spin_lock_irqsave(). Compile tested only.
--- drivers/bluetooth/btusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/btusb.c +1 -1
@@ -2079,7 +2079,7 @@ static int btusb_switch_alt_setting(struct hci_dev *hdev, int new_alts)* alternate setting. */ spin_lock_irqsave (&data->rxlock, flags); -kfree_skb (data->sco_skb); +dev_kfree_skb_irq (data->sco_skb); data->sco_skb =NULL ;spin_unlock_irqrestore (&data->rxlock, flags);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 177/739 arm64: mm: use ptep_clear() instead of pte_clear() in clear_flush()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qi Zheng <[email protected]>
[ Upstream commit 00de2c9f26b15f1a6f2af516dd8ec5f8d28189b7 ]
In clear_flush(), the original pte may be a present entry, so we should use ptep_clear() to let page_table_check track the pte clearing operation, otherwise it may cause false positive in subsequent set_pte_at().
--- arch/arm64/mm/hugetlbpage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/mm/hugetlbpage.c +1 -1
@@ -236,7 +236,7 @@ static void clear_flush(struct mm_struct *mm,unsigned long i, saddr = addr;for (i =0 ; i < ncontig; i++, addr += pgsize, ptep++) -pte_clear (mm, addr, ptep); +ptep_clear (mm, addr, ptep);flush_tlb_range (&vma, saddr, addr); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 178/739 net/mlx5: Dynamic cyclecounter shift calculation for PTP free running clock
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rahul Rameshbabu <[email protected]>
[ Upstream commit 84a58e60038fa0366006977dba85eae16b2e3d78 ]
Use a dynamic calculation to determine the shift value for the internal timer cyclecounter that will lead to the highest precision frequency adjustments. Previously used a constant for the shift value assuming all devices supported by the driver had a nominal frequency of 1GHz. However, there are devices that operate at different frequencies. The previous shift value constant would break the PHC functionality for those devices.
--- .../ethernet/mellanox/mlx5/core/lib/clock.c | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c +27 -5
@@ -32,16 +32,13 @@#include <linux/clocksource.h> #include <linux/highmem.h> +#include <linux/log2.h> #include <linux/ptp_clock_kernel.h> #include <rdma/mlx5-abi.h> #include "lib/eq.h" #include "en.h" #include "clock.h" -enum { -MLX5_CYCLES_SHIFT =31 -}; -enum {MLX5_PIN_MODE_IN =0x0 ,MLX5_PIN_MODE_OUT =0x1 ,
@@ -93,6 +90,31 @@ static bool mlx5_modify_mtutc_allowed(struct mlx5_core_dev *mdev)return MLX5_CAP_MCAM_FEATURE (mdev, ptpcyc2realtime_modify); } +static u32 mlx5_ptp_shift_constant (u32 dev_freq_khz) +{ +/* Optimal shift constant leads to corrections above just 1 scaled ppm. +* +* Two sets of equations are needed to derive the optimal shift +* constant for the cyclecounter. +* +* dev_freq_khz * 1000 / 2^shift_constant = 1 scaled_ppm +* ppb = scaled_ppm * 1000 / 2^16 +* +* Using the two equations together +* +* dev_freq_khz * 1000 / 1 scaled_ppm = 2^shift_constant +* dev_freq_khz * 2^16 / 1 ppb = 2^shift_constant +* dev_freq_khz = 2^(shift_constant - 16) +* +* then yields +* +* shift_constant = ilog2(dev_freq_khz) + 16 +*/ + +return min (ilog2 (dev_freq_khz) +16 , +ilog2 ((U32_MAX /NSEC_PER_MSEC ) * dev_freq_khz)); +} +static s32 mlx5_ptp_getmaxphase (struct ptp_clock_info *ptp) { struct mlx5_clock *clock = container_of(ptp, struct mlx5_clock, ptp_info);
@@ -909,7 +931,7 @@ static void mlx5_timecounter_init(struct mlx5_core_dev *mdev) dev_freq =MLX5_CAP_GEN (mdev, device_frequency_khz); timer->cycles.read = read_internal_timer; - timer->cycles.shift =MLX5_CYCLES_SHIFT ; + timer->cycles.shift =mlx5_ptp_shift_constant (dev_freq); timer->cycles.mult =clocksource_khz2mult (dev_freq, timer->cycles.shift); timer->nominal_c_mult = timer->cycles.mult;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 179/739 wifi: ath9k: use IS_ERR() with debugfs_create_dir()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Ming <[email protected]>
[ Upstream commit 1e4134610d93271535ecf900a676e1f094e9944c ]
The debugfs_create_dir() function returns error pointers, it never returns NULL. Most incorrect error checks were fixed, but the one in ath9k_htc_init_debug() was forgotten.
Fix the remaining error check.
--- drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/htc_drv_debug.c +1 -1
@@ -491,7 +491,7 @@ int ath9k_htc_init_debug(struct ath_hw *ah) priv->debug.debugfs_phy =debugfs_create_dir (KBUILD_MODNAME , priv->hw->wiphy->debugfsdir); -if (!priv->debug.debugfs_phy) +if (IS_ERR (priv->debug.debugfs_phy))return -ENOMEM ;ath9k_cmn_spectral_init_debug (&priv->spec_priv, priv->debug.debugfs_phy);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 180/739 ice: avoid executing commands on other ports when driving sync
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacob Keller <[email protected]>
[ Upstream commit 0aacec49c29e7c5b1487e859b0c0a42388c34092 ]
The ice hardware has a synchronization mechanism used to drive the simultaneous application of commands on both PHY ports and the source timer in the MAC.
When issuing a sync via ice_ptp_exec_tmr_cmd(), the hardware will simultaneously apply the commands programmed for the main timer and each PHY port. Neither the main timer command register, nor the PHY port command registers auto clear on command execution.
During the execution of a timer command intended for a single port on E822 devices, such as those used to configure a PHY during link up, the driver is not correctly clearing the previous commands.
This results in unintentionally executing the last programmed command on the main timer and other PHY ports whenever performing reconfiguration on E822 ports after link up. This results in unintended side effects on other timers, depending on what command was previously programmed.
To fix this, the driver must ensure that the main timer and all other PHY ports are properly initialized to perform no action.
The enumeration for timer commands does not include an enumeration value for doing nothing. Introduce ICE_PTP_NOP for this purpose. When writing a timer command to hardware, leave the command bits set to zero which indicates that no operation should be performed on that port.
Modify ice_ptp_one_port_cmd() to always initialize all ports. For all ports other than the one being configured, write their timer command register to ICE_PTP_NOP. This ensures that no side effect happens on the timer command.
To fix this for the PHY ports, modify ice_ptp_one_port_cmd() to always initialize all other ports to ICE_PTP_NOP. This ensures that no side effects happen on the other ports.
Call ice_ptp_src_cmd() with a command value if ICE_PTP_NOP in ice_sync_phy_timer_e822() and ice_start_phy_timer_e822().
With both of these changes, the driver should no longer execute a stale command on the main timer or another PHY port when reconfiguring one of the PHY ports after link up.
--- drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 55 +++++++++++++++++++-- drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 3 +- 2 files changed, 52 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/ice/ice_ptp_hw.c +50 -5
@@ -131,6 +131,8 @@ static void ice_ptp_src_cmd(struct ice_hw *hw, enum ice_ptp_tmr_cmd cmd)case READ_TIME : cmd_val |=GLTSYN_CMD_READ_TIME ;break ; +case ICE_PTP_NOP : +break ; }wr32 (hw,GLTSYN_CMD , cmd_val);
@@ -1226,18 +1228,18 @@ ice_ptp_read_port_capture(struct ice_hw *hw, u8 port, u64 *tx_ts, u64 *rx_ts) }/** -* ice_ptp_one_port_cmd - Prepare a single PHY port for a timer command +* ice_ptp_write_port_cmd_e822 - Prepare a single PHY port for a timer command * @hw: pointer to HW struct * @port: Port to which cmd has to be sent * @cmd: Command to be sent to the port * * Prepare the requested port for an upcoming timer sync command. * -* Note there is no equivalent of this operation on E810, as that device -* always handles all external PHYs internally. +* Do not use this function directly. If you want to configure exactly one +* port, use ice_ptp_one_port_cmd() instead. */ static int -ice_ptp_one_port_cmd (struct ice_hw *hw,u8 port,enum ice_ptp_tmr_cmd cmd) +ice_ptp_write_port_cmd_e822 (struct ice_hw *hw,u8 port,enum ice_ptp_tmr_cmd cmd) {u32 cmd_val, val;u8 tmr_idx;
@@ -1261,6 +1263,8 @@ ice_ptp_one_port_cmd(struct ice_hw *hw, u8 port, enum ice_ptp_tmr_cmd cmd)case ADJ_TIME_AT_TIME : cmd_val |=PHY_CMD_ADJ_TIME_AT_TIME ;break ; +case ICE_PTP_NOP : +break ; }/* Tx case */
@@ -1306,6 +1310,39 @@ ice_ptp_one_port_cmd(struct ice_hw *hw, u8 port, enum ice_ptp_tmr_cmd cmd)return 0 ; } +/** +* ice_ptp_one_port_cmd - Prepare one port for a timer command +* @hw: pointer to the HW struct +* @configured_port: the port to configure with configured_cmd +* @configured_cmd: timer command to prepare on the configured_port +* +* Prepare the configured_port for the configured_cmd, and prepare all other +* ports for ICE_PTP_NOP. This causes the configured_port to execute the +* desired command while all other ports perform no operation. +*/ +static int +ice_ptp_one_port_cmd (struct ice_hw *hw,u8 configured_port, +enum ice_ptp_tmr_cmd configured_cmd) +{ +u8 port; + +for (port =0 ; port <ICE_NUM_EXTERNAL_PORTS ; port++) { +enum ice_ptp_tmr_cmd cmd; +int err; + +if (port == configured_port) + cmd = configured_cmd; +else + cmd =ICE_PTP_NOP ; + + err =ice_ptp_write_port_cmd_e822 (hw, port, cmd); +if (err) +return err; + } + +return 0 ; +} +/** * ice_ptp_port_cmd_e822 - Prepare all ports for a timer command * @hw: pointer to the HW struct
@@ -1322,7 +1359,7 @@ ice_ptp_port_cmd_e822(struct ice_hw *hw, enum ice_ptp_tmr_cmd cmd)for (port =0 ; port <ICE_NUM_EXTERNAL_PORTS ; port++) {int err; - err =ice_ptp_one_port_cmd (hw, port, cmd); + err =ice_ptp_write_port_cmd_e822 (hw, port, cmd);if (err)return err; }
@@ -2252,6 +2289,9 @@ static int ice_sync_phy_timer_e822(struct ice_hw *hw, u8 port)if (err) goto err_unlock; +/* Do not perform any action on the main timer */ +ice_ptp_src_cmd (hw,ICE_PTP_NOP ); +/* Issue the sync to activate the time adjustment */ ice_ptp_exec_tmr_cmd (hw);
@@ -2372,6 +2412,9 @@ int ice_start_phy_timer_e822(struct ice_hw *hw, u8 port)if (err)return err; +/* Do not perform any action on the main timer */ +ice_ptp_src_cmd (hw,ICE_PTP_NOP ); +ice_ptp_exec_tmr_cmd (hw); err =ice_read_phy_reg_e822 (hw, port,P_REG_PS , &val);
@@ -2847,6 +2890,8 @@ static int ice_ptp_port_cmd_e810(struct ice_hw *hw, enum ice_ptp_tmr_cmd cmd)case ADJ_TIME_AT_TIME : cmd_val =GLTSYN_CMD_ADJ_INIT_TIME ;break ; +case ICE_PTP_NOP : +return 0 ; }/* Read, modify, write */
drivers/net/ethernet/intel/ice/ice_ptp_hw.h +2 -1
@@ -9,7 +9,8 @@ enum ice_ptp_tmr_cmd {INIT_INCVAL ,ADJ_TIME ,ADJ_TIME_AT_TIME , -READ_TIME +READ_TIME , + ICE_PTP_NOP, }; enum ice_ptp_serdes {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 181/739 octeontx2-pf: fix page_pool creation fail for rings > 32k
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ratheesh Kannoth <[email protected]>
[ Upstream commit 49fa4b0d06705a24a81bb8be6eb175059b77f0a7 ]
octeontx2 driver calls page_pool_create() during driver probe() and fails if queue size > 32k. Page pool infra uses these buffers as shock absorbers for burst traffic. These pages are pinned down over time as working sets varies, due to the recycling nature of page pool, given page pool (currently) don't have a shrinker mechanism, the pages remain pinned down in ptr_ring. Instead of clamping page_pool size to 32k at
most, limit it even more to 2k to avoid wasting memory.
This have been tested on octeontx2 CN10KA hardware. TCP and UDP tests using iperf shows no performance regressions.
--- drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c | 2 +- drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +1 -1
@@ -1432,7 +1432,7 @@ int otx2_pool_init(struct otx2_nic *pfvf, u16 pool_id, } pp_params.flags =PP_FLAG_PAGE_FRAG |PP_FLAG_DMA_MAP ; - pp_params.pool_size = numptrs; + pp_params.pool_size =min (OTX2_PAGE_POOL_SZ , numptrs); pp_params.nid =NUMA_NO_NODE ; pp_params.dev = pfvf->dev; pp_params.dma_dir =DMA_FROM_DEVICE ;
drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.h +2 -0
@@ -23,6 +23,8 @@#define OTX2_ETH_HLEN (VLAN_ETH_HLEN + VLAN_HLEN)#define OTX2_MIN_MTU 60 +#define OTX2_PAGE_POOL_SZ 2048 +#define OTX2_MAX_GSO_SEGS 255#define OTX2_MAX_FRAGS_IN_SQE 9
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 182/739 net: arcnet: Do not call kfree_skb() under local_irq_disable()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jinjie Ruan <[email protected]>
[ Upstream commit 786c96e92fb9e854cb8b0cb7399bb2fb28e15c4b ]
It is not allowed to call kfree_skb() from hardware interrupt context or with hardware interrupts being disabled. So replace kfree_skb() with dev_kfree_skb_irq() under local_irq_disable(). Compile tested only.
--- drivers/net/arcnet/arcnet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/arcnet/arcnet.c +1 -1
@@ -464,7 +464,7 @@ static void arcnet_reply_tasklet(struct tasklet_struct *t) ret =sock_queue_err_skb (sk, ackskb);if (ret) -kfree_skb (ackskb); +dev_kfree_skb_irq (ackskb);local_irq_enable (); };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 183/739 kunit: Fix checksum tests on big endian CPUs
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
[ Upstream commit b38460bc463c54e0c15ff3b37e81f7e2059bb9bb ]
On powerpc64le checksum kunit tests work:
[ 2.011457][ T1] KTAP version 1 [ 2.011662][ T1] # Subtest: checksum [ 2.011848][ T1] 1..3 [ 2.034710][ T1] ok 1 test_csum_fixed_random_inputs [ 2.079325][ T1] ok 2 test_csum_all_carry_inputs [ 2.127102][ T1] ok 3 test_csum_no_carry_inputs [ 2.127202][ T1] # checksum: pass:3 fail:0 skip:0 total:3 [ 2.127533][ T1] # Totals: pass:3 fail:0 skip:0 total:3 [ 2.127956][ T1] ok 1 checksum
But on powerpc64 and powerpc32 they fail:
[ 1.859890][ T1] KTAP version 1 [ 1.860041][ T1] # Subtest: checksum [ 1.860201][ T1] 1..3 [ 1.861927][ T58] # test_csum_fixed_random_inputs: ASSERTION FAILED at lib/checksum_kunit.c:243 [ 1.861927][ T58] Expected result == expec, but [ 1.861927][ T58] result == 54991 (0xd6cf) [ 1.861927][ T58] expec == 33316 (0x8224) [ 1.863742][ T1] not ok 1 test_csum_fixed_random_inputs [ 1.864520][ T60] # test_csum_all_carry_inputs: ASSERTION FAILED at lib/checksum_kunit.c:267 [ 1.864520][ T60] Expected result == expec, but [ 1.864520][ T60] result == 255 (0xff) [ 1.864520][ T60] expec == 65280 (0xff00) [ 1.868820][ T1] not ok 2 test_csum_all_carry_inputs [ 1.869977][ T62] # test_csum_no_carry_inputs: ASSERTION FAILED at lib/checksum_kunit.c:306 [ 1.869977][ T62] Expected result == expec, but [ 1.869977][ T62] result == 64515 (0xfc03) [ 1.869977][ T62] expec == 0 (0x0) [ 1.872060][ T1] not ok 3 test_csum_no_carry_inputs [ 1.872102][ T1] # checksum: pass:0 fail:3 skip:0 total:3 [ 1.872458][ T1] # Totals: pass:0 fail:3 skip:0 total:3 [ 1.872791][ T1] not ok 3 checksum
This is because all expected values were calculated for X86 which is little endian. On big endian systems all precalculated 16 bits halves must be byte swapped.
And this is confirmed by a huge amount of sparse errors when building with C=2
So fix all sparse errors and it will naturally work on all endianness.
--- lib/checksum_kunit.c | 54 +++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 16 deletions(-)
lib/checksum_kunit.c +38 -16
@@ -10,7 +10,8 @@#define MAX_ALIGN 64#define TEST_BUFLEN (MAX_LEN + MAX_ALIGN) -static const __wsum random_init_sum =0x2847aab ; +/* Values for a little endian CPU. Byte swap each half on big endian CPU. */ +static const u32 random_init_sum =0x2847aab ;static const u8 random_buf[] = {0xac ,0xd7 ,0x76 ,0x69 ,0x6e ,0xf2 ,0x93 ,0x2c ,0x1f ,0xe0 ,0xde ,0x86 ,0x8f ,0x54 ,0x33 ,0x90 ,0x95 ,0xbf ,0xff ,0xb9 ,0xea ,0x62 ,0x6e ,0xb5 ,
@@ -56,7 +57,9 @@ static const u8 random_buf[] = {0xe1 ,0xdf ,0x4b ,0xe1 ,0x81 ,0xe2 ,0x17 ,0x02 ,0x7b ,0x58 ,0x8b ,0x92 ,0x1a ,0xac ,0x46 ,0xdd ,0x2e ,0xce ,0x40 ,0x09 }; -static const __sum16 expected_results[] = { + +/* Values for a little endian CPU. Byte swap on big endian CPU. */ +static const u16 expected_results[] = {0x82d0 ,0x8224 ,0xab23 ,0xaaad ,0x41ad ,0x413f ,0x4f3e ,0x4eab ,0x22ab ,0x228c ,0x428b ,0x41ad ,0xbbac ,0xbb1d ,0x671d ,0x66ea ,0xd6e9 ,0xd654 , 0x1754, 0x1655, 0x5d54, 0x5c6a, 0xfa69, 0xf9fb, 0x44fb, 0x4428, 0xf527,
@@ -115,7 +118,9 @@ static const __sum16 expected_results[] = {0x1d47 ,0x3c46 ,0x3bc5 ,0x59c4 ,0x59ad ,0x57ad ,0x5732 ,0xff31 ,0xfea6 , 0x6ca6, 0x6c8c, 0xc08b, 0xc045, 0xe344, 0xe316, 0x1516, 0x14d6, }; -static const __wsum init_sums_no_overflow[] = { + +/* Values for a little endian CPU. Byte swap each half on big endian CPU. */ +static const u32 init_sums_no_overflow[] = {0xffffffff ,0xfffffffb ,0xfffffbfb ,0xfffffbf7 ,0xfffff7f7 ,0xfffff7f3 ,0xfffff3f3 ,0xfffff3ef ,0xffffefef ,0xffffefeb ,0xffffebeb ,0xffffebe7 , 0xffffe7e7, 0xffffe7e3, 0xffffe3e3, 0xffffe3df, 0xffffdfdf, 0xffffdfdb,
@@ -208,7 +213,21 @@ static u8 tmp_buf[TEST_BUFLEN];#define full_csum (buff, len, sum) csum_fold(csum_partial(buff, len, sum)) -#define CHECK_EQ (lhs, rhs) KUNIT_ASSERT_EQ(test, lhs, rhs) +#define CHECK_EQ (lhs, rhs) KUNIT_ASSERT_EQ(test, (__force u64)lhs, (__force u64)rhs) + +static __sum16 to_sum16 (u16 x) +{ +return (__force __sum16 )le16_to_cpu ((__force __le16 )x); +} + +/* This function swaps the bytes inside each half of a __wsum */ +static __wsum to_wsum (u32 x) +{ +u16 hi =le16_to_cpu ((__force __le16)(x >>16 )); +u16 lo =le16_to_cpu ((__force __le16 )x); + +return (__force __wsum)((hi <<16 ) | lo); +}static void assert_setup_correct (struct kunit *test) {
@@ -226,7 +245,8 @@ static void assert_setup_correct(struct kunit *test)static void test_csum_fixed_random_inputs (struct kunit *test) {int len, align; -__wsum result, expec, sum; +__wsum sum; +__sum16 result, expec;assert_setup_correct (test);for (align =0 ; align <TEST_BUFLEN ; ++align) {
@@ -237,9 +257,9 @@ static void test_csum_fixed_random_inputs(struct kunit *test)/* * Test the precomputed random input. */ - sum = random_init_sum; + sum =to_wsum (random_init_sum); result =full_csum (&tmp_buf[align], len, sum); - expec = expected_results[len]; + expec =to_sum16 (expected_results[len]);CHECK_EQ (result, expec); } }
@@ -251,7 +271,8 @@ static void test_csum_fixed_random_inputs(struct kunit *test)static void test_csum_all_carry_inputs (struct kunit *test) {int len, align; -__wsum result, expec, sum; +__wsum sum; +__sum16 result, expec;assert_setup_correct (test);memset (tmp_buf,0xff ,TEST_BUFLEN );
@@ -261,9 +282,9 @@ static void test_csum_all_carry_inputs(struct kunit *test)/* * All carries from input and initial sum. */ - sum =0xffffffff ; + sum =to_wsum (0xffffffff ); result =full_csum (&tmp_buf[align], len, sum); - expec = (len &1 ) ?0xff00 :0 ; + expec =to_sum16 ((len &1 ) ?0xff00 :0 );CHECK_EQ (result, expec);/*
@@ -272,11 +293,11 @@ static void test_csum_all_carry_inputs(struct kunit *test) sum =0 ; result =full_csum (&tmp_buf[align], len, sum);if (len &1 ) - expec =0xff00 ; + expec =to_sum16 (0xff00 );else if (len) expec =0 ;else - expec =0xffff ; + expec =to_sum16 (0xffff );CHECK_EQ (result, expec); } }
@@ -290,7 +311,8 @@ static void test_csum_all_carry_inputs(struct kunit *test)static void test_csum_no_carry_inputs (struct kunit *test) {int len, align; -__wsum result, expec, sum; +__wsum sum; +__sum16 result, expec;assert_setup_correct (test);memset (tmp_buf,0x4 ,TEST_BUFLEN );
@@ -300,7 +322,7 @@ static void test_csum_no_carry_inputs(struct kunit *test)/* * Expect no carries. */ - sum = init_sums_no_overflow[len]; + sum =to_wsum (init_sums_no_overflow[len]); result =full_csum (&tmp_buf[align], len, sum); expec =0 ;CHECK_EQ (result, expec);
@@ -308,9 +330,9 @@ static void test_csum_no_carry_inputs(struct kunit *test)/* * Expect one carry. */ - sum = init_sums_no_overflow[len] +1 ; + sum =to_wsum (init_sums_no_overflow[len] +1 ); result =full_csum (&tmp_buf[align], len, sum); - expec = len ?0xfffe :0xffff ; + expec =to_sum16 (len ?0xfffe :0xffff );CHECK_EQ (result, expec); } }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 184/739 mlxsw: i2c: Fix chunk size setting in output mailbox buffer
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vadim Pasternak <[email protected]>
[ Upstream commit 146c7c330507c0384bf29d567186632bfe975927 ]
The driver reads commands output from the output mailbox. If the size of the output mailbox is not a multiple of the transaction / block size, then the driver will not issue enough read transactions to read the entire output, which can result in driver initialization errors.
Fix by determining the number of transactions using DIV_ROUND_UP().
--- drivers/net/ethernet/mellanox/mlxsw/i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/i2c.c +1 -1
@@ -444,7 +444,7 @@ mlxsw_i2c_cmd(struct device *dev, u16 opcode, u32 in_mod, size_t in_mbox_size, }else {/* No input mailbox is case of initialization query command. */ reg_size =MLXSW_I2C_MAX_DATA_SIZE ; - num = reg_size / mlxsw_i2c->block_size; + num =DIV_ROUND_UP (reg_size, mlxsw_i2c->block_size);if (mutex_lock_interruptible (&mlxsw_i2c->cmd.lock) <0 ) {dev_err (&client->dev,"Could not acquire lock" );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 185/739 mlxsw: i2c: Limit single transaction buffer size
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vadim Pasternak <[email protected]>
[ Upstream commit d7248f1cc835bd80e936dc5b2d94b149bdd0077d ]
Maximum size of buffer is obtained from underlying I2C adapter and in case adapter allows I2C transaction buffer size greater than 100 bytes, transaction will fail due to firmware limitation.
As a result driver will fail initialization.
Limit the maximum size of transaction buffer by 100 bytes to fit to firmware.
Remove unnecessary calculation:max_t(u16, MLXSW_I2C_BLK_DEF, quirk_size).
This condition can not happened.
--- drivers/net/ethernet/mellanox/mlxsw/i2c.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/i2c.c +2 -1
@@ -48,6 +48,7 @@#define MLXSW_I2C_MBOX_SIZE_BITS 12#define MLXSW_I2C_ADDR_BUF_SIZE 4#define MLXSW_I2C_BLK_DEF 32 +#define MLXSW_I2C_BLK_MAX 100#define MLXSW_I2C_RETRY 5#define MLXSW_I2C_TIMEOUT_MSECS 5000#define MLXSW_I2C_MAX_DATA_SIZE 256
@@ -653,7 +654,7 @@ static int mlxsw_i2c_probe(struct i2c_client *client)return -EOPNOTSUPP ; } - mlxsw_i2c->block_size =max_t (u16,MLXSW_I2C_BLK_DEF , + mlxsw_i2c->block_size =min_t (u16,MLXSW_I2C_BLK_MAX ,min_t (u16, quirks->max_read_len, quirks->max_write_len)); }else {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 186/739 mlxsw: core_hwmon: Adjust module label names based on MTCAP sensor counter
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vadim Pasternak <[email protected]>
[ Upstream commit 3fc134a07438055fc93ce1bbacf2702ddd09500c ]
Transceiver module temperature sensors are indexed after ASIC and platform sensors. The current label printing method does not take this into account and simply prints the index of the transceiver module sensor.
On new systems that have platform sensors this results in incorrect (shifted) transceiver module labels being printed:
$ sensors [...] front panel 002: +37.0°C (crit = +70.0°C, emerg = +75.0°C) front panel 003: +47.0°C (crit = +70.0°C, emerg = +75.0°C) [...]
Fix by taking the sensor count into account. After the fix:
$ sensors [...] front panel 001: +37.0°C (crit = +70.0°C, emerg = +75.0°C) front panel 002: +47.0°C (crit = +70.0°C, emerg = +75.0°C) [...]
--- drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c +2 -1
@@ -405,7 +405,8 @@ mlxsw_hwmon_module_temp_label_show(struct device *dev, container_of(attr, struct mlxsw_hwmon_attr, dev_attr);return sprintf (buf,"front panel %03u\n" , - mlxsw_hwmon_attr->type_index); + mlxsw_hwmon_attr->type_index +1 - + mlxsw_hwmon_attr->mlxsw_hwmon_dev->sensor_count); } static ssize_t
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 187/739 crypto: qat - fix crypto capability detection for 4xxx
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Guerin <[email protected]>
[ Upstream commit fab9516f02b418e37d3cde6c21c316085262aece ]
When extending the capability detection logic for 4xxx devices the SMx algorithms were accidentally missed.
Enable these SMx capabilities by default for QAT GEN4 devices.
Check for device variants where the SMx algorithms are explicitly disabled by the GEN4 hardware. This is indicated in fusectl1 register.
Mask out SM3 and SM4 based on a bit specific to those algorithms. Mask out SM2 if the PKE slice is not present.
--- drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c | 9 +++++++++ drivers/crypto/intel/qat/qat_common/icp_qat_hw.h | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-)
drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c +9 -0
@@ -223,6 +223,8 @@ static u32 get_accel_cap(struct adf_accel_dev *accel_dev)ICP_ACCEL_CAPABILITIES_HKDF |ICP_ACCEL_CAPABILITIES_CHACHA_POLY |ICP_ACCEL_CAPABILITIES_AESGCM_SPC | +ICP_ACCEL_CAPABILITIES_SM3 | +ICP_ACCEL_CAPABILITIES_SM4 |ICP_ACCEL_CAPABILITIES_AES_V2 ;/* A set bit in fusectl1 means the feature is OFF in this SKU */
@@ -246,12 +248,19 @@ static u32 get_accel_cap(struct adf_accel_dev *accel_dev) capabilities_sym &= ~ICP_ACCEL_CAPABILITIES_CIPHER ; } +if (fusectl1 &ICP_ACCEL_4XXX_MASK_SMX_SLICE ) { + capabilities_sym &= ~ICP_ACCEL_CAPABILITIES_SM3 ; + capabilities_sym &= ~ICP_ACCEL_CAPABILITIES_SM4 ; + } + capabilities_asym =ICP_ACCEL_CAPABILITIES_CRYPTO_ASYMMETRIC |ICP_ACCEL_CAPABILITIES_CIPHER | +ICP_ACCEL_CAPABILITIES_SM2 |ICP_ACCEL_CAPABILITIES_ECEDMONT ;if (fusectl1 &ICP_ACCEL_4XXX_MASK_PKE_SLICE ) { capabilities_asym &= ~ICP_ACCEL_CAPABILITIES_CRYPTO_ASYMMETRIC ; + capabilities_asym &= ~ICP_ACCEL_CAPABILITIES_SM2 ; capabilities_asym &= ~ICP_ACCEL_CAPABILITIES_ECEDMONT ; }
drivers/crypto/intel/qat/qat_common/icp_qat_hw.h +4 -1
@@ -97,7 +97,10 @@ enum icp_qat_capabilities_mask {ICP_ACCEL_CAPABILITIES_SHA3_EXT =BIT (15 ),ICP_ACCEL_CAPABILITIES_AESGCM_SPC =BIT (16 ),ICP_ACCEL_CAPABILITIES_CHACHA_POLY =BIT (17 ), -/* Bits 18-21 are currently reserved */ +ICP_ACCEL_CAPABILITIES_SM2 =BIT (18 ), +ICP_ACCEL_CAPABILITIES_SM3 =BIT (19 ), +ICP_ACCEL_CAPABILITIES_SM4 =BIT (20 ), +/* Bit 21 is currently reserved */ ICP_ACCEL_CAPABILITIES_CNV_INTEGRITY =BIT (22 ),ICP_ACCEL_CAPABILITIES_CNV_INTEGRITY64 =BIT (23 ), ICP_ACCEL_CAPABILITIES_LZ4_COMPRESSION = BIT(24),
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 188/739 hwmon: (tmp513) Fix the channel number in tmp51x_is_visible()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Biju Das <[email protected]>
[ Upstream commit d103337e38e7e64c3d915029e947b1cb0b512737 ]
The supported channels for this driver are {0..3}. Fix the incorrect channel in tmp51x_is_visible().
--- drivers/hwmon/tmp513.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/tmp513.c +1 -1
@@ -434,7 +434,7 @@ static umode_t tmp51x_is_visible(const void *_data,switch (type) {case hwmon_temp: -if (data->id == tmp512 && channel ==4 ) +if (data->id == tmp512 && channel ==3 )return 0 ;switch (attr) {case hwmon_temp_input:
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 189/739 octeontx2-pf: Fix PFC TX scheduler free
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suman Ghosh <[email protected]>
[ Upstream commit a9ac2e18779597f280d68a5b5f5bdd51a34080fa ]
During PFC TX schedulers free, flag TXSCHQ_FREE_ALL was being set which caused free up all schedulers other than the PFC schedulers. This patch fixes that to free only the PFC Tx schedulers.
--- .../ethernet/marvell/octeontx2/nic/otx2_common.c | 1 + .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 15 ++++----------- 2 files changed, 5 insertions(+), 11 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +1 -0
@@ -804,6 +804,7 @@ void otx2_txschq_free_one(struct otx2_nic *pfvf, u16 lvl, u16 schq)mutex_unlock (&pfvf->mbox.lock); } +EXPORT_SYMBOL (otx2_txschq_free_one);void otx2_txschq_stop (struct otx2_nic *pfvf) {
drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c +4 -11
@@ -125,19 +125,12 @@ int otx2_pfc_txschq_alloc(struct otx2_nic *pfvf)static int otx2_pfc_txschq_stop_one (struct otx2_nic *pfvf,u8 prio) { -struct nix_txsch_free_req *free_req; +int lvl; -mutex_lock (&pfvf->mbox.lock);/* free PFC TLx nodes */ - free_req =otx2_mbox_alloc_msg_nix_txsch_free (&pfvf->mbox); -if (!free_req) { -mutex_unlock (&pfvf->mbox.lock); -return -ENOMEM ; - } - - free_req->flags =TXSCHQ_FREE_ALL ; -otx2_sync_mbox_msg (&pfvf->mbox); -mutex_unlock (&pfvf->mbox.lock); +for (lvl =0 ; lvl < pfvf->hw.txschq_link_cfg_lvl; lvl++) +otx2_txschq_free_one (pfvf, lvl, + pfvf->pfc_schq_list[lvl][prio]); pfvf->pfc_alloc_status[prio] = false;return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 190/739 octeontx2-af: CN10KB: fix PFC configuration
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hariprasad Kelam <[email protected]>
[ Upstream commit 47bcc9c1cf6aa60156c7532983090e86d9d171b6 ]
Suppose user has enabled pfc with prio 0,1 on a PF netdev(eth0)
dcb pfc set dev eth0 prio-pfc o:on 1:on
later user enabled pfc priorities 2 and 3 on the VF interface(eth1)
dcb pfc set dev eth1 prio-pfc 2:on 3:on
Instead of enabling pfc on all priorities (0..3), the driver only enables on priorities 2,3. This patch corrects the issue by using the proper CSR address.
--- drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rpm.c +9 -8
@@ -355,8 +355,8 @@ int rpm_lmac_enadis_pause_frm(void *rpmd, int lmac_id, u8 tx_pause,void rpm_lmac_pause_frm_config (void *rpmd,int lmac_id,bool enable) { +u64 cfg, pfc_class_mask_cfg;rpm_t *rpm = rpmd; -u64 cfg;/* ALL pause frames received are completely ignored */ cfg =rpm_read (rpm, lmac_id,RPMX_MTI_MAC100X_COMMAND_CONFIG );
@@ -380,9 +380,11 @@ void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool enable)rpm_write (rpm,0 ,RPMX_CMR_CHAN_MSK_OR , ~0ULL );/* Disable all PFC classes */ - cfg =rpm_read (rpm, lmac_id,RPMX_CMRX_PRT_CBFC_CTL ); + pfc_class_mask_cfg =is_dev_rpm2 (rpm) ?RPM2_CMRX_PRT_CBFC_CTL : +RPMX_CMRX_PRT_CBFC_CTL ; + cfg =rpm_read (rpm, lmac_id, pfc_class_mask_cfg); cfg =FIELD_SET (RPM_PFC_CLASS_MASK ,0 , cfg); -rpm_write (rpm, lmac_id,RPMX_CMRX_PRT_CBFC_CTL , cfg); +rpm_write (rpm, lmac_id, pfc_class_mask_cfg, cfg); }int rpm_get_rx_stats (void *rpmd,int lmac_id,int idx,u64 *rx_stat)
@@ -605,8 +607,11 @@ int rpm_lmac_pfc_config(void *rpmd, int lmac_id, u8 tx_pause, u8 rx_pause, u16 pif (!is_lmac_valid (rpm, lmac_id))return -ENODEV ; + pfc_class_mask_cfg =is_dev_rpm2 (rpm) ?RPM2_CMRX_PRT_CBFC_CTL : +RPMX_CMRX_PRT_CBFC_CTL ; + cfg =rpm_read (rpm, lmac_id,RPMX_MTI_MAC100X_COMMAND_CONFIG ); - class_en =rpm_read (rpm, lmac_id,RPMX_CMRX_PRT_CBFC_CTL ); + class_en =rpm_read (rpm, lmac_id, pfc_class_mask_cfg); pfc_en |=FIELD_GET (RPM_PFC_CLASS_MASK , class_en);if (rx_pause) {
@@ -635,10 +640,6 @@ int rpm_lmac_pfc_config(void *rpmd, int lmac_id, u8 tx_pause, u8 rx_pause, u16 p cfg |=RPMX_MTI_MAC100X_COMMAND_CONFIG_PFC_MODE ;rpm_write (rpm, lmac_id,RPMX_MTI_MAC100X_COMMAND_CONFIG , cfg); - - pfc_class_mask_cfg =is_dev_rpm2 (rpm) ?RPM2_CMRX_PRT_CBFC_CTL : -RPMX_CMRX_PRT_CBFC_CTL ; -rpm_write (rpm, lmac_id, pfc_class_mask_cfg, class_en);return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 191/739 cteonxt2-pf: Fix backpressure config for multiple PFC priorities to work simultaneously
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suman Ghosh <[email protected]>
[ Upstream commit 597d0ec0e4ca6a912affea4cc94df08959e9ec74 ]
MAC (CGX or RPM) asserts backpressure at TL3 or TL2 node of the egress hierarchical scheduler tree depending on link level config done. If there are multiple PFC priorities enabled at a time and for all such flows to backoff, each priority will have to assert backpressure at different TL3/TL2 scheduler nodes and these flows will need to submit egress pkts to these nodes.
Current PFC configuration has an issue where in only one backpressure scheduler node is being allocated which is resulting in only one PFC priority to work. This patch fixes this issue.
--- drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c +3 -3
@@ -70,7 +70,7 @@ static int otx2_pfc_txschq_alloc_one(struct otx2_nic *pfvf, u8 prio)* link config level. These rest of the scheduler can be * same as hw.txschq_list. */ -for (lvl =0 ; lvl < pfvf->hw.txschq_link_cfg_lvl; lvl++) +for (lvl =0 ; lvl <= pfvf->hw.txschq_link_cfg_lvl; lvl++) req->schq[lvl] =1 ; rc =otx2_sync_mbox_msg (&pfvf->mbox);
@@ -83,7 +83,7 @@ static int otx2_pfc_txschq_alloc_one(struct otx2_nic *pfvf, u8 prio)return PTR_ERR (rsp);/* Setup transmit scheduler list */ -for (lvl =0 ; lvl < pfvf->hw.txschq_link_cfg_lvl; lvl++) { +for (lvl =0 ; lvl <= pfvf->hw.txschq_link_cfg_lvl; lvl++) {if (!rsp->schq[lvl])return -ENOSPC ;
@@ -128,7 +128,7 @@ static int otx2_pfc_txschq_stop_one(struct otx2_nic *pfvf, u8 prio)int lvl;/* free PFC TLx nodes */ -for (lvl =0 ; lvl < pfvf->hw.txschq_link_cfg_lvl; lvl++) +for (lvl =0 ; lvl <= pfvf->hw.txschq_link_cfg_lvl; lvl++)otx2_txschq_free_one (pfvf, lvl, pfvf->pfc_schq_list[lvl][prio]);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 192/739 sfc: Check firmware supports Ethernet PTP filter
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Austin <[email protected]>
[ Upstream commit c4413a20fa6d7c4888009fb7dd391685f196cd36 ]
Not all firmware variants support RSS filters. Do not fail all PTP functionality when raw ethernet PTP filters fail to insert.
--- drivers/net/ethernet/sfc/ptp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/sfc/ptp.c +3 -1
@@ -1485,7 +1485,9 @@ static int efx_ptp_insert_multicast_filters(struct efx_nic *efx) goto fail; rc =efx_ptp_insert_eth_multicast_filter (efx); -if (rc <0 ) + +/* Not all firmware variants support this filter */ +if (rc <0 && rc != -EPROTONOSUPPORT ) goto fail; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 193/739 net/sched: sch_hfsc: Ensure inner classes have fsc curve
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Budimir Markovic <[email protected]>
[ Upstream commit b3d26c5702c7d6c45456326e56d2ccf3f103e60f ]
HFSC assumes that inner classes have an fsc curve, but it is currently possible for classes without an fsc curve to become parents. This leads to bugs including a use-after-free.
Don't allow non-root classes without HFSC_FSC to become parents.
--- net/sched/sch_hfsc.c | 4 ++++ 1 file changed, 4 insertions(+)
net/sched/sch_hfsc.c +4 -0
@@ -1012,6 +1012,10 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,if (parent ==NULL )return -ENOENT ; } +if (!(parent->cl_flags &HFSC_FSC ) && parent != &q->root) { +NL_SET_ERR_MSG (extack,"Invalid parent - parent class must have FSC" ); +return -EINVAL ; + }if (classid ==0 ||TC_H_MAJ (classid ^ sch->handle) !=0 )return -EINVAL ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 194/739 pds_core: protect devlink callbacks from fw_down state
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shannon Nelson <[email protected]>
[ Upstream commit 91202ce78fcd070982a115f0bf6f328af619aa00 ]
Don't access structs that have been cleared when in the fw_down state and the various structs have been cleaned and are waiting to recover. This caused a panic on rmmod when already in fw_down and devlink_param_unregister() tried to check the parameters.
--- drivers/net/ethernet/amd/pds_core/devlink.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/amd/pds_core/devlink.c +3 -0
@@ -10,6 +10,9 @@ pdsc_viftype *pdsc_dl_find_viftype_by_id(struct pdsc *pdsc, {int vt; +if (!pdsc->viftype_status) +return NULL ; +for (vt =0 ; vt <PDS_DEV_TYPE_MAX ; vt++) {if (pdsc->viftype_status[vt].dl_id == dl_id)return &pdsc->viftype_status[vt];
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 195/739 pds_core: no health reporter in VF
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shannon Nelson <[email protected]>
[ Upstream commit e48b894a1db7f6ce66bff0402ab21ff9f0e56034 ]
Make sure the health reporter is set up before we use it in our devlink health updates, especially since the VF doesn't set up the health reporter.
--- drivers/net/ethernet/amd/pds_core/core.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/amd/pds_core/core.c +5 -3
@@ -524,7 +524,8 @@ static void pdsc_fw_down(struct pdsc *pdsc) }/* Notify clients of fw_down */ -devlink_health_report (pdsc->fw_reporter,"FW down reported" , pdsc); +if (pdsc->fw_reporter) +devlink_health_report (pdsc->fw_reporter,"FW down reported" , pdsc);pdsc_notify (PDS_EVENT_RESET , &reset_event);pdsc_stop (pdsc);
@@ -554,8 +555,9 @@ static void pdsc_fw_up(struct pdsc *pdsc)/* Notify clients of fw_up */ pdsc->fw_recoveries++; -devlink_health_reporter_state_update (pdsc->fw_reporter, -DEVLINK_HEALTH_REPORTER_STATE_HEALTHY ); +if (pdsc->fw_reporter) +devlink_health_reporter_state_update (pdsc->fw_reporter, +DEVLINK_HEALTH_REPORTER_STATE_HEALTHY );pdsc_notify (PDS_EVENT_RESET , &reset_event);return ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 196/739 pds_core: no reset command for VF
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shannon Nelson <[email protected]>
[ Upstream commit 95e383226d6fcda6c217912f11edf8d74de9cc85 ]
The VF doesn't need to send a reset command, and in a PCI reset scenario it might not have a valid IO space to write to anyway.
--- drivers/net/ethernet/amd/pds_core/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/amd/pds_core/core.c +2 -1
@@ -464,7 +464,8 @@ void pdsc_teardown(struct pdsc *pdsc, bool removing) {int i; -pdsc_devcmd_reset (pdsc); +if (!pdsc->pdev->is_virtfn) +pdsc_devcmd_reset (pdsc);pdsc_qcq_free (pdsc, &pdsc->notifyqcq);pdsc_qcq_free (pdsc, &pdsc->adminqcq);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 197/739 pds_core: check for work queue before use
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shannon Nelson <[email protected]>
[ Upstream commit 969cfd4c8ca50c32901342cdd3d677c3ffe61371 ]
Add a check that the wq exists before queuing up work for a failed devcmd, as the PF is responsible for health and the VF doesn't have a wq.
--- drivers/net/ethernet/amd/pds_core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/amd/pds_core/dev.c +1 -1
@@ -183,7 +183,7 @@ int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, err =pdsc_devcmd_wait (pdsc, max_seconds);memcpy_fromio (comp, &pdsc->cmd_regs->comp,sizeof (*comp)); -if (err == -ENXIO || err == -ETIMEDOUT ) +if ((err == -ENXIO || err == -ETIMEDOUT ) && pdsc->wq)queue_work (pdsc->wq, &pdsc->health_work);return err;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 198/739 pds_core: pass opcode to devcmd_wait
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shannon Nelson <[email protected]>
[ Upstream commit 0ea064e74bc8f915aba3f2d0fb3418247a09b73d ]
Don't rely on the PCI memory for the devcmd opcode because we read a 0xff value if the PCI bus is broken, which can cause us to report a bogus dev_cmd opcode later.
--- drivers/net/ethernet/amd/pds_core/dev.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/net/ethernet/amd/pds_core/dev.c +2 -5
@@ -121,7 +121,7 @@ static const char *pdsc_devcmd_str(int opcode) } } -static int pdsc_devcmd_wait (struct pdsc *pdsc,int max_seconds) +static int pdsc_devcmd_wait (struct pdsc *pdsc,u8 opcode,int max_seconds) {struct device *dev = pdsc->dev;unsigned long start_time;
@@ -131,9 +131,6 @@ static int pdsc_devcmd_wait(struct pdsc *pdsc, int max_seconds)int done =0 ;int err =0 ;int status; -int opcode; - - opcode =ioread8 (&pdsc->cmd_regs->cmd.opcode); start_time = jiffies; max_wait = start_time + (max_seconds *HZ );
@@ -180,7 +177,7 @@ int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd,memcpy_toio (&pdsc->cmd_regs->cmd, cmd,sizeof (*cmd));pdsc_devcmd_dbell (pdsc); - err =pdsc_devcmd_wait (pdsc, max_seconds); + err =pdsc_devcmd_wait (pdsc, cmd->opcode, max_seconds);memcpy_fromio (comp, &pdsc->cmd_regs->comp,sizeof (*comp));if ((err == -ENXIO || err == -ETIMEDOUT ) && pdsc->wq)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 199/739 netrom: Deny concurrent connect().
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit c2f8fd7949603efb03908e05abbf7726748c8de3 ]
syzkaller reported null-ptr-deref [0] related to AF_NETROM. This is another self-accept issue from the strace log. [1]
syz-executor creates an AF_NETROM socket and calls connect(), which is blocked at that time. Then, sk->sk_state is TCP_SYN_SENT and sock->state is SS_CONNECTING.
[pid 5059] socket(AF_NETROM, SOCK_SEQPACKET, 0) = 4
[pid 5059] connect(4, {sa_family=AF_NETROM, sa_data="..." <unfinished ...>
Another thread calls connect() concurrently, which finally fails with -EINVAL. However, the problem here is the socket state is reset even while the first connect() is blocked.
[pid 5060] connect(4, NULL, 0 <unfinished ...>
[pid 5060] <... connect resumed>) = -1 EINVAL (Invalid argument)
As sk->state is TCP_CLOSE and sock->state is SS_UNCONNECTED, the following listen() succeeds. Then, the first connect() looks up itself as a listener and puts skb into the queue with skb->sk itself. As a result, the next accept() gets another FD of itself as 3, and the first connect() finishes.
[pid 5060] listen(4, 0 <unfinished ...> [pid 5060] <... listen resumed>) = 0 [pid 5060] accept(4, NULL, NULL <unfinished ...> [pid 5060] <... accept resumed>) = 3 [pid 5059] <... connect resumed>) = 0
Then, accept4() is called but blocked, which causes the general protection fault later.
[pid 5059] accept4(4, NULL, 0x20000400, SOCK_NONBLOCK <unfinished ...>
After that, another self-accept occurs by accept() and writev().
[pid 5060] accept(4, NULL, NULL <unfinished ...>
[pid 5061] writev(3, [{iov_base=...}] <unfinished ...>
[pid 5061] <... writev resumed>) = 99
[pid 5060] <... accept resumed>) = 6Finally, the leader thread close()s all FDs. Since the three FDs reference the same socket, nr_release() does the cleanup for it three times, and the remaining accept4() causes the following fault.
[pid 5058] close(3) = 0 [pid 5058] close(4) = 0 [pid 5058] close(5) = -1 EBADF (Bad file descriptor) [pid 5058] close(6) = 0 [pid 5058] <... exit_group resumed>) = ? [ 83.456055][ T5059] general protection fault, probably for non-canonical address 0xdffffc0000000003: 0000 [#1] PREEMPT SMP KASAN
To avoid the issue, we need to return an error for connect() if another connect() is in progress, as done in __inet_stream_connect().
[0]:
general protection fault, probably for non-canonical address 0xdffffc0000000003: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x0000000000000018-0x000000000000001f] CPU: 0 PID: 5059 Comm: syz-executor.0 Not tainted 6.5.0-rc5-syzkaller-00194-gace0ab3a4b54 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 07/26/2023 RIP: 0010:__lock_acquire+0x109/0x5de0 kernel/locking/lockdep.c:5012 Code: 45 85 c9 0f 84 cc 0e 00 00 44 8b 05 11 6e 23 0b 45 85 c0 0f 84 be 0d 00 00 48 ba 00 00 00 00 00 fc ff df 4c 89 d1 48 c1 e9 03 <80> 3c 11 00 0f 85 e8 40 00 00 49 81 3a a0 69 48 90 0f 84 96 0d 00 RSP: 0018:ffffc90003d6f9e0 EFLAGS: 00010006 RAX: ffff8880244c8000 RBX: 1ffff920007adf6c RCX: 0000000000000003 RDX: dffffc0000000000 RSI: 0000000000000000 RDI: 0000000000000018 RBP: 0000000000000001 R08: 0000000000000001 R09: 0000000000000001 R10: 0000000000000018 R11: 0000000000000000 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 FS: 00007f51d519a6c0(0000) GS:ffff8880b9800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f51d5158d58 CR3: 000000002943f000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> lock_acquire kernel/locking/lockdep.c:5761 [inline] lock_acquire+0x1ae/0x510 kernel/locking/lockdep.c:5726 __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline] _raw_spin_lock_irqsave+0x3a/0x50 kernel/locking/spinlock.c:162 prepare_to_wait+0x47/0x380 kernel/sched/wait.c:269 nr_accept+0x20d/0x650 net/netrom/af_netrom.c:798 do_accept+0x3a6/0x570 net/socket.c:1872 __sys_accept4_file net/socket.c:1913 [inline] __sys_accept4+0x99/0x120 net/socket.c:1943 __do_sys_accept4 net/socket.c:1954 [inline] __se_sys_accept4 net/socket.c:1951 [inline] __x64_sys_accept4+0x96/0x100 net/socket.c:1951 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x38/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f51d447cae9 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 e1 20 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f51d519a0c8 EFLAGS: 00000246 ORIG_RAX: 0000000000000120 RAX: ffffffffffffffda RBX: 00007f51d459bf80 RCX: 00007f51d447cae9 RDX: 0000000020000400 RSI: 0000000000000000 RDI: 0000000000000004 RBP: 00007f51d44c847a R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000800 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000000000b R14: 00007f51d459bf80 R15: 00007ffc25c34e48 </TASK>
--- net/netrom/af_netrom.c | 5 +++++ 1 file changed, 5 insertions(+)
net/netrom/af_netrom.c +5 -0
@@ -660,6 +660,11 @@ static int nr_connect(struct socket *sock, struct sockaddr *uaddr, goto out_release; } +if (sock->state ==SS_CONNECTING ) { + err = -EALREADY ; + goto out_release; + } + sk->sk_state =TCP_CLOSE ; sock->state =SS_UNCONNECTED ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 200/739 drm/bridge: tc358764: Fix debug print parameter order
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Vasut <[email protected]>
[ Upstream commit 7f947be02aab5b154427cb5b0fffe858fc387b02 ]
The debug print parameters were swapped in the output and they were printed as decimal values, both the hardware address and the value. Update the debug print to print the parameters in correct order, and use hexadecimal print for both address and value.
--- drivers/gpu/drm/bridge/tc358764.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/tc358764.c +1 -1
@@ -176,7 +176,7 @@ static void tc358764_read(struct tc358764 *ctx, u16 addr, u32 *val)if (ret >=0 )le32_to_cpus (val); -dev_dbg (ctx->dev,"read: %d, addr: %d\n" , addr, *val); +dev_dbg (ctx->dev,"read: addr=0x%04x data=0x%08x\n" , addr, *val); }static void tc358764_write (struct tc358764 *ctx,u16 addr,u32 val)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 201/739 ASoC: soc-compress: Fix deadlock in soc_compr_open_fe
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: yixuanjiang <[email protected]>
[ Upstream commit 2222214749a9969e09454b9ba7febfdfb09c1c8d ]
Modify the error handling flow by release lock.
The require mutex will keep holding if open fail.
--- sound/soc/soc-compress.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/soc-compress.c +1 -0
@@ -193,6 +193,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)snd_soc_dai_compr_shutdown (cpu_dai, cstream,1 ); out:dpcm_path_put (&list); +snd_soc_dpcm_mutex_unlock (fe); be_err: fe->dpcm[stream].runtime_update =SND_SOC_DPCM_UPDATE_NO ;snd_soc_card_mutex_unlock (fe->card);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 202/739 ASoC: cs43130: Fix numerator/denominator mixup
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Phil Elwell <[email protected]>
[ Upstream commit a9e7c964cea4fb1541cc81a11d1b2fd135f4cf38 ]
In converting to using the standard u16_fract type, commit [1] made the obvious mistake and failed to take account of the difference in numerator and denominator ordering, breaking all uses of the cs43130 codec.
Fix it.
[1] commit e14bd35ef446 ("ASoC: cs43130: Re-use generic struct u16_fract")
--- sound/soc/codecs/cs43130.h | 138 ++++++++++++++++++------------------- 1 file changed, 69 insertions(+), 69 deletions(-)
sound/soc/codecs/cs43130.h +69 -69
@@ -381,88 +381,88 @@ struct cs43130_clk_gen {/* frm_size = 16 */ static const struct cs43130_clk_gen cs43130_16_clk_gen[] = { - {22579200 ,32000 , .v = {441 ,10 , }, }, - {22579200 ,44100 , .v = {32 ,1 , }, }, - {22579200 ,48000 , .v = {147 ,5 , }, }, - {22579200 ,88200 , .v = {16 ,1 , }, }, - {22579200 ,96000 , .v = {147 ,10 , }, }, - {22579200 ,176400 , .v = {8 ,1 , }, }, - {22579200 ,192000 , .v = {147 ,20 , }, }, - {22579200 ,352800 , .v = {4 ,1 , }, }, - {22579200 ,384000 , .v = {147 ,40 , }, }, - {24576000 ,32000 , .v = {48 ,1 , }, }, - {24576000 ,44100 , .v = {5120 ,147 , }, }, - {24576000 ,48000 , .v = {32 ,1 , }, }, - {24576000 ,88200 , .v = {2560 ,147 , }, }, - {24576000 ,96000 , .v = {16 ,1 , }, }, - {24576000 ,176400 , .v = {1280 ,147 , }, }, - {24576000 ,192000 , .v = {8 ,1 , }, }, - {24576000 ,352800 , .v = {640 ,147 , }, }, - {24576000 ,384000 , .v = {4 ,1 , }, }, + {22579200 ,32000 , .v = {10 ,441 , }, }, + {22579200 ,44100 , .v = {1 ,32 , }, }, + {22579200 ,48000 , .v = {5 ,147 , }, }, + {22579200 ,88200 , .v = {1 ,16 , }, }, + {22579200 ,96000 , .v = {10 ,147 , }, }, + {22579200 ,176400 , .v = {1 ,8 , }, }, + {22579200 ,192000 , .v = {20 ,147 , }, }, + {22579200 ,352800 , .v = {1 ,4 , }, }, + {22579200 ,384000 , .v = {40 ,147 , }, }, + {24576000 ,32000 , .v = {1 ,48 , }, }, + {24576000 ,44100 , .v = {147 ,5120 , }, }, + {24576000 ,48000 , .v = {1 ,32 , }, }, + {24576000 ,88200 , .v = {147 ,2560 , }, }, + {24576000 ,96000 , .v = {1 ,16 , }, }, + {24576000 ,176400 , .v = {147 ,1280 , }, }, + {24576000 ,192000 , .v = {1 ,8 , }, }, + {24576000 ,352800 , .v = {147 ,640 , }, }, + {24576000 ,384000 , .v = {1 ,4 , }, }, };/* frm_size = 32 */ static const struct cs43130_clk_gen cs43130_32_clk_gen[] = { - {22579200 ,32000 , .v = {441 ,20 , }, }, - {22579200 ,44100 , .v = {16 ,1 , }, }, - {22579200 ,48000 , .v = {147 ,10 , }, }, - {22579200 ,88200 , .v = {8 ,1 , }, }, - {22579200 ,96000 , .v = {147 ,20 , }, }, - {22579200 ,176400 , .v = {4 ,1 , }, }, - {22579200 ,192000 , .v = {147 ,40 , }, }, - {22579200 ,352800 , .v = {2 ,1 , }, }, - {22579200 ,384000 , .v = {147 ,80 , }, }, - {24576000 ,32000 , .v = {24 ,1 , }, }, - {24576000 ,44100 , .v = {2560 ,147 , }, }, - {24576000 ,48000 , .v = {16 ,1 , }, }, - {24576000 ,88200 , .v = {1280 ,147 , }, }, - {24576000 ,96000 , .v = {8 ,1 , }, }, - {24576000 ,176400 , .v = {640 ,147 , }, }, - {24576000 ,192000 , .v = {4 ,1 , }, }, - {24576000 ,352800 , .v = {320 ,147 , }, }, - {24576000 ,384000 , .v = {2 ,1 , }, }, + {22579200 ,32000 , .v = {20 ,441 , }, }, + {22579200 ,44100 , .v = {1 ,16 , }, }, + {22579200 ,48000 , .v = {10 ,147 , }, }, + {22579200 ,88200 , .v = {1 ,8 , }, }, + {22579200 ,96000 , .v = {20 ,147 , }, }, + {22579200 ,176400 , .v = {1 ,4 , }, }, + {22579200 ,192000 , .v = {40 ,147 , }, }, + {22579200 ,352800 , .v = {1 ,2 , }, }, + {22579200 ,384000 , .v = {80 ,147 , }, }, + {24576000 ,32000 , .v = {1 ,24 , }, }, + {24576000 ,44100 , .v = {147 ,2560 , }, }, + {24576000 ,48000 , .v = {1 ,16 , }, }, + {24576000 ,88200 , .v = {147 ,1280 , }, }, + {24576000 ,96000 , .v = {1 ,8 , }, }, + {24576000 ,176400 , .v = {147 ,640 , }, }, + {24576000 ,192000 , .v = {1 ,4 , }, }, + {24576000 ,352800 , .v = {147 ,320 , }, }, + {24576000 ,384000 , .v = {1 ,2 , }, }, };/* frm_size = 48 */ static const struct cs43130_clk_gen cs43130_48_clk_gen[] = { - {22579200 ,32000 , .v = {147 ,100 , }, }, - {22579200 ,44100 , .v = {32 ,3 , }, }, - {22579200 ,48000 , .v = {49 ,5 , }, }, - {22579200 ,88200 , .v = {16 ,3 , }, }, - {22579200 ,96000 , .v = {49 ,10 , }, }, - {22579200 ,176400 , .v = {8 ,3 , }, }, - {22579200 ,192000 , .v = {49 ,20 , }, }, - {22579200 ,352800 , .v = {4 ,3 , }, }, - {22579200 ,384000 , .v = {49 ,40 , }, }, - {24576000 ,32000 , .v = {16 ,1 , }, }, - {24576000 ,44100 , .v = {5120 ,441 , }, }, - {24576000 ,48000 , .v = {32 ,3 , }, }, - {24576000 ,88200 , .v = {2560 ,441 , }, }, - {24576000 ,96000 , .v = {16 ,3 , }, }, - {24576000 ,176400 , .v = {1280 ,441 , }, }, - {24576000 ,192000 , .v = {8 ,3 , }, }, - {24576000 ,352800 , .v = {640 ,441 , }, }, - {24576000 ,384000 , .v = {4 ,3 , }, }, + {22579200 ,32000 , .v = {100 ,147 , }, }, + {22579200 ,44100 , .v = {3 ,32 , }, }, + {22579200 ,48000 , .v = {5 ,49 , }, }, + {22579200 ,88200 , .v = {3 ,16 , }, }, + {22579200 ,96000 , .v = {10 ,49 , }, }, + {22579200 ,176400 , .v = {3 ,8 , }, }, + {22579200 ,192000 , .v = {20 ,49 , }, }, + {22579200 ,352800 , .v = {3 ,4 , }, }, + {22579200 ,384000 , .v = {40 ,49 , }, }, + {24576000 ,32000 , .v = {1 ,16 , }, }, + {24576000 ,44100 , .v = {441 ,5120 , }, }, + {24576000 ,48000 , .v = {3 ,32 , }, }, + {24576000 ,88200 , .v = {441 ,2560 , }, }, + {24576000 ,96000 , .v = {3 ,16 , }, }, + {24576000 ,176400 , .v = {441 ,1280 , }, }, + {24576000 ,192000 , .v = {3 ,8 , }, }, + {24576000 ,352800 , .v = {441 ,640 , }, }, + {24576000 ,384000 , .v = {3 ,4 , }, }, };/* frm_size = 64 */ static const struct cs43130_clk_gen cs43130_64_clk_gen[] = { - {22579200 ,32000 , .v = {441 ,40 , }, }, - {22579200 ,44100 , .v = {8 ,1 , }, }, - {22579200 ,48000 , .v = {147 ,20 , }, }, - {22579200 ,88200 , .v = {4 ,1 , }, }, - {22579200 ,96000 , .v = {147 ,40 , }, }, - {22579200 ,176400 , .v = {2 ,1 , }, }, - {22579200 ,192000 , .v = {147 ,80 , }, }, + {22579200 ,32000 , .v = {40 ,441 , }, }, + {22579200 ,44100 , .v = {1 ,8 , }, }, + {22579200 ,48000 , .v = {20 ,147 , }, }, + {22579200 ,88200 , .v = {1 ,4 , }, }, + {22579200 ,96000 , .v = {40 ,147 , }, }, + {22579200 ,176400 , .v = {1 ,2 , }, }, + {22579200 ,192000 , .v = {80 ,147 , }, }, {22579200 ,352800 , .v = {1 ,1 , }, }, - {24576000 ,32000 , .v = {12 ,1 , }, }, - {24576000 ,44100 , .v = {1280 ,147 , }, }, - {24576000 ,48000 , .v = {8 ,1 , }, }, - {24576000 ,88200 , .v = {640 ,147 , }, }, - {24576000 ,96000 , .v = {4 ,1 , }, }, - {24576000 ,176400 , .v = {320 ,147 , }, }, - {24576000 ,192000 , .v = {2 ,1 , }, }, - {24576000 ,352800 , .v = {160 ,147 , }, }, + {24576000 ,32000 , .v = {1 ,12 , }, }, + {24576000 ,44100 , .v = {147 ,1280 , }, }, + {24576000 ,48000 , .v = {1 ,8 , }, }, + {24576000 ,88200 , .v = {147 ,640 , }, }, + {24576000 ,96000 , .v = {1 ,4 , }, }, + {24576000 ,176400 , .v = {147 ,320 , }, }, + {24576000 ,192000 , .v = {1 ,2 , }, }, + {24576000 ,352800 , .v = {147 ,160 , }, }, {24576000 ,384000 , .v = {1 ,1 , }, }, };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 203/739 drm: bridge: dw-mipi-dsi: Fix enable/disable of DSI controller
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ondrej Jirman <[email protected]>
[ Upstream commit 05aa61334592adb230749ff465b103ee10e63936 ]
Before this patch, booting to Linux VT and doing a simple:
echo 2 > /sys/class/graphics/fb0/blank
echo 0 > /sys/class/graphics/fb0/blank
would result in failures to re-enable the panel. Mode set callback is called only once during boot in this scenario, while calls to enable/disable callbacks are balanced afterwards. The driver doesn't work unless userspace calls modeset before enabling the CRTC/connector.
This patch moves enabling of the DSI host from mode_set into pre_enable callback, and removes some old hacks where this bridge driver is directly calling into other bridge driver's callbacks.
pre_enable_prev_first flag is set on the panel's bridge so that panel drivers will get their prepare function called between DSI host's pre_enable and enable callbacks, so that they get a chance to perform panel setup while DSI host is already enabled in command mode. Otherwise panel's prepare would be called before DSI host is enabled, and any DSI communication used in prepare callback would fail.
With all these changes, the enable/disable sequence is now well balanced, and host's and panel's callbacks are called in proper order documented in the drm_panel API documentation without needing the old hacks. (Mainly that panel->prepare is called when DSI host is ready to allow the panel driver to send DSI commands and vice versa during disable.)
Tested on Pinephone Pro. Trace of the callbacks follows.
Before:
[ 1.253882] dw-mipi-dsi-rockchip ff960000.dsi: mode_set [ 1.290732] panel-himax-hx8394 ff960000.dsi.0: prepare [ 1.475576] dw-mipi-dsi-rockchip ff960000.dsi: enable [ 1.475593] panel-himax-hx8394 ff960000.dsi.0: enable
echo 2 > /sys/class/graphics/fb0/blank
[ 13.722799] panel-himax-hx8394 ff960000.dsi.0: disable [ 13.774502] dw-mipi-dsi-rockchip ff960000.dsi: post_disable [ 13.774526] panel-himax-hx8394 ff960000.dsi.0: unprepare
echo 0 > /sys/class/graphics/fb0/blank
[ 17.735796] panel-himax-hx8394 ff960000.dsi.0: prepare [ 17.923522] dw-mipi-dsi-rockchip ff960000.dsi: enable [ 17.923540] panel-himax-hx8394 ff960000.dsi.0: enable [ 17.944330] dw-mipi-dsi-rockchip ff960000.dsi: failed to write command FIFO [ 17.944335] panel-himax-hx8394 ff960000.dsi.0: sending command 0xb9 failed: -110 [ 17.944340] panel-himax-hx8394 ff960000.dsi.0: Panel init sequence failed: -110
echo 2 > /sys/class/graphics/fb0/blank
[ 431.148583] panel-himax-hx8394 ff960000.dsi.0: disable [ 431.169259] dw-mipi-dsi-rockchip ff960000.dsi: failed to write command FIFO [ 431.169268] panel-himax-hx8394 ff960000.dsi.0: Failed to enter sleep mode: -110 [ 431.169282] dw-mipi-dsi-rockchip ff960000.dsi: post_disable [ 431.169316] panel-himax-hx8394 ff960000.dsi.0: unprepare [ 431.169357] pclk_mipi_dsi0 already disabled
echo 0 > /sys/class/graphics/fb0/blank
[ 432.796851] panel-himax-hx8394 ff960000.dsi.0: prepare [ 432.981537] dw-mipi-dsi-rockchip ff960000.dsi: enable [ 432.981568] panel-himax-hx8394 ff960000.dsi.0: enable [ 433.002290] dw-mipi-dsi-rockchip ff960000.dsi: failed to write command FIFO [ 433.002299] panel-himax-hx8394 ff960000.dsi.0: sending command 0xb9 failed: -110 [ 433.002312] panel-himax-hx8394 ff960000.dsi.0: Panel init sequence failed: -110
-----------------------------------------------------------------------
After:
[ 1.248372] dw-mipi-dsi-rockchip ff960000.dsi: mode_set [ 1.248704] dw-mipi-dsi-rockchip ff960000.dsi: pre_enable [ 1.285377] panel-himax-hx8394 ff960000.dsi.0: prepare [ 1.468392] dw-mipi-dsi-rockchip ff960000.dsi: enable [ 1.468421] panel-himax-hx8394 ff960000.dsi.0: enable
echo 2 > /sys/class/graphics/fb0/blank
[ 16.210357] panel-himax-hx8394 ff960000.dsi.0: disable [ 16.261315] dw-mipi-dsi-rockchip ff960000.dsi: post_disable [ 16.261339] panel-himax-hx8394 ff960000.dsi.0: unprepare
echo 0 > /sys/class/graphics/fb0/blank
[ 19.161453] dw-mipi-dsi-rockchip ff960000.dsi: pre_enable [ 19.197869] panel-himax-hx8394 ff960000.dsi.0: prepare [ 19.382141] dw-mipi-dsi-rockchip ff960000.dsi: enable [ 19.382158] panel-himax-hx8394 ff960000.dsi.0: enable
(But depends on functionality intorduced in Linux 6.3, so this patch will
not build on older kernels when applied to older stable branches.)
--- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +16 -12
@@ -265,6 +265,7 @@ struct dw_mipi_dsi {struct dw_mipi_dsi *master;/* dual-dsi master ptr */ struct dw_mipi_dsi *slave;/* dual-dsi slave ptr */ +struct drm_display_mode mode;const struct dw_mipi_dsi_plat_data *plat_data; };
@@ -332,6 +333,7 @@ static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host,if (IS_ERR (bridge))return PTR_ERR (bridge); + bridge->pre_enable_prev_first = true; dsi->panel_bridge = bridge;drm_bridge_add (&dsi->bridge);
@@ -859,15 +861,6 @@ static void dw_mipi_dsi_bridge_post_atomic_disable(struct drm_bridge *bridge,*/ dw_mipi_dsi_set_mode (dsi,0 ); -/* -* TODO Only way found to call panel-bridge post_disable & -* panel unprepare before the dsi "final" disable... -* This needs to be fixed in the drm_bridge framework and the API -* needs to be updated to manage our own call chains... -*/ -if (dsi->panel_bridge->funcs->post_disable) - dsi->panel_bridge->funcs->post_disable (dsi->panel_bridge); -if (phy_ops->power_off) phy_ops->power_off (dsi->plat_data->priv_data);
@@ -942,15 +935,25 @@ static void dw_mipi_dsi_mode_set(struct dw_mipi_dsi *dsi, phy_ops->power_on (dsi->plat_data->priv_data); } +static void dw_mipi_dsi_bridge_atomic_pre_enable (struct drm_bridge *bridge, +struct drm_bridge_state *old_bridge_state) +{ +struct dw_mipi_dsi *dsi =bridge_to_dsi (bridge); + +/* Power up the dsi ctl into a command mode */ +dw_mipi_dsi_mode_set (dsi, &dsi->mode); +if (dsi->slave) +dw_mipi_dsi_mode_set (dsi->slave, &dsi->mode); +} +static void dw_mipi_dsi_bridge_mode_set (struct drm_bridge *bridge,const struct drm_display_mode *mode,const struct drm_display_mode *adjusted_mode) {struct dw_mipi_dsi *dsi =bridge_to_dsi (bridge); -dw_mipi_dsi_mode_set (dsi, adjusted_mode); -if (dsi->slave) -dw_mipi_dsi_mode_set (dsi->slave, adjusted_mode); +/* Store the display mode for later use in pre_enable callback */ +drm_mode_copy (&dsi->mode, adjusted_mode); } static void dw_mipi_dsi_bridge_atomic_enable(struct drm_bridge *bridge,
@@ -1004,6 +1007,7 @@ static const struct drm_bridge_funcs dw_mipi_dsi_bridge_funcs = { .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, .atomic_reset = drm_atomic_helper_bridge_reset, + .atomic_pre_enable = dw_mipi_dsi_bridge_atomic_pre_enable, .atomic_enable = dw_mipi_dsi_bridge_atomic_enable, .atomic_post_disable = dw_mipi_dsi_bridge_post_atomic_disable, .mode_set = dw_mipi_dsi_bridge_mode_set,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 204/739 quota: factor out dquot_write_dquot()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit 024128477809f8073d870307c8157b8826ebfd08 ]
Refactor out dquot_write_dquot() to reduce duplicate code.
Message-Id: <[email protected]>
Stable-dep-of: dabc8b207566 ("quota: fix dqput() to follow the guarantees dquot_srcu should provide")
--- fs/quota/dquot.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-)
fs/quota/dquot.c +16 -23
@@ -628,6 +628,18 @@ int dquot_scan_active(struct super_block *sb, }EXPORT_SYMBOL (dquot_scan_active); +static inline int dquot_write_dquot (struct dquot *dquot) +{ +int ret = dquot->dq_sb->dq_op->write_dquot (dquot); +if (ret <0 ) { +quota_error (dquot->dq_sb,"Can't write quota structure " +"(error %d). Quota may get out of sync!" , ret); +/* Clear dirty bit anyway to avoid infinite loop. */ +clear_dquot_dirty (dquot); + } +return ret; +} +/* Write all dquot structures to quota files */ int dquot_writeback_dquots (struct super_block *sb,int type) {
@@ -658,16 +670,9 @@ int dquot_writeback_dquots(struct super_block *sb, int type)* use count */ dqgrab (dquot);spin_unlock (&dq_list_lock); - err = sb->dq_op->write_dquot (dquot); -if (err) { -/* -* Clear dirty bit anyway to avoid infinite -* loop here. -*/ -clear_dquot_dirty (dquot); -if (!ret) - ret = err; - } + err =dquot_write_dquot (dquot); +if (err && !ret) + ret = err;dqput (dquot);spin_lock (&dq_list_lock); }
@@ -765,8 +770,6 @@ static struct shrinker dqcache_shrinker = {*/ void dqput (struct dquot *dquot) { -int ret; -if (!dquot)return ;#ifdef CONFIG_QUOTA_DEBUG
@@ -794,17 +797,7 @@ void dqput(struct dquot *dquot)if (dquot_dirty (dquot)) {spin_unlock (&dq_list_lock);/* Commit dquot before releasing */ - ret = dquot->dq_sb->dq_op->write_dquot (dquot); -if (ret <0 ) { -quota_error (dquot->dq_sb,"Can't write quota structure" -" (error %d). Quota may get out of sync!" , - ret); -/* -* We clear dirty bit anyway, so that we avoid -* infinite loop here -*/ -clear_dquot_dirty (dquot); - } +dquot_write_dquot (dquot); goto we_slept; }if (test_bit (DQ_ACTIVE_B , &dquot->dq_flags)) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 205/739 quota: rename dquot_active() to inode_quota_active()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit 4b9bdfa16535de8f49bf954aeed0f525ee2fc322 ]
Now we have a helper function dquot_dirty() to determine if dquot has DQ_MOD_B bit. dquot_active() can easily be misunderstood as a helper function to determine if dquot has DQ_ACTIVE_B bit. So we avoid this by renaming it to inode_quota_active() and later on we will add the helper function dquot_active() to determine if dquot has DQ_ACTIVE_B bit.
Message-Id: <[email protected]>
Stable-dep-of: dabc8b207566 ("quota: fix dqput() to follow the guarantees dquot_srcu should provide")
--- fs/quota/dquot.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
fs/quota/dquot.c +10 -10
@@ -1418,7 +1418,7 @@ static int info_bdq_free(struct dquot *dquot, qsize_t space)return QUOTA_NL_NOWARN ; } -static int dquot_active (const struct inode *inode) +static int inode_quota_active (const struct inode *inode) {struct super_block *sb = inode->i_sb;
@@ -1441,7 +1441,7 @@ static int __dquot_initialize(struct inode *inode, int type)qsize_t rsv;int ret =0 ; -if (!dquot_active (inode)) +if (!inode_quota_active (inode))return 0 ; dquots =i_dquot (inode);
@@ -1549,7 +1549,7 @@ bool dquot_initialize_needed(struct inode *inode)struct dquot **dquots;int i; -if (!dquot_active (inode)) +if (!inode_quota_active (inode))return false; dquots =i_dquot (inode);
@@ -1660,7 +1660,7 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)int reserve = flags &DQUOT_SPACE_RESERVE ;struct dquot **dquots; -if (!dquot_active (inode)) { +if (!inode_quota_active (inode)) {if (reserve) {spin_lock (&inode->i_lock); *inode_reserved_space (inode) += number;
@@ -1730,7 +1730,7 @@ int dquot_alloc_inode(struct inode *inode)struct dquot_warn warn[MAXQUOTAS ];struct dquot *const *dquots; -if (!dquot_active (inode)) +if (!inode_quota_active (inode))return 0 ;for (cnt =0 ; cnt <MAXQUOTAS ; cnt++) warn[cnt].w_type =QUOTA_NL_NOWARN ;
@@ -1773,7 +1773,7 @@ int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)struct dquot **dquots;int cnt, index; -if (!dquot_active (inode)) { +if (!inode_quota_active (inode)) {spin_lock (&inode->i_lock); *inode_reserved_space (inode) -= number;__inode_add_bytes (inode, number);
@@ -1815,7 +1815,7 @@ void dquot_reclaim_space_nodirty(struct inode *inode, qsize_t number)struct dquot **dquots;int cnt, index; -if (!dquot_active (inode)) { +if (!inode_quota_active (inode)) {spin_lock (&inode->i_lock); *inode_reserved_space (inode) += number;__inode_sub_bytes (inode, number);
@@ -1859,7 +1859,7 @@ void __dquot_free_space(struct inode *inode, qsize_t number, int flags)struct dquot **dquots;int reserve = flags &DQUOT_SPACE_RESERVE , index; -if (!dquot_active (inode)) { +if (!inode_quota_active (inode)) {if (reserve) {spin_lock (&inode->i_lock); *inode_reserved_space (inode) -= number;
@@ -1914,7 +1914,7 @@ void dquot_free_inode(struct inode *inode)struct dquot *const *dquots;int index; -if (!dquot_active (inode)) +if (!inode_quota_active (inode))return ; dquots =i_dquot (inode);
@@ -2086,7 +2086,7 @@ int dquot_transfer(struct mnt_idmap *idmap, struct inode *inode,struct super_block *sb = inode->i_sb;int ret; -if (!dquot_active (inode)) +if (!inode_quota_active (inode))return 0 ;if (i_uid_needs_update (idmap, iattr, inode)) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 206/739 quota: add new helper dquot_active()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit 33bcfafc48cb186bc4bbcea247feaa396594229e ]
Add new helper function dquot_active() to make the code more concise.
Message-Id: <[email protected]>
Stable-dep-of: dabc8b207566 ("quota: fix dqput() to follow the guarantees dquot_srcu should provide")
--- fs/quota/dquot.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
fs/quota/dquot.c +14 -9
@@ -336,6 +336,11 @@ static void wait_on_dquot(struct dquot *dquot)mutex_unlock (&dquot->dq_lock); } +static inline int dquot_active (struct dquot *dquot) +{ +return test_bit (DQ_ACTIVE_B , &dquot->dq_flags); +} +static inline int dquot_dirty (struct dquot *dquot) {return test_bit (DQ_MOD_B , &dquot->dq_flags);
@@ -351,14 +356,14 @@ int dquot_mark_dquot_dirty(struct dquot *dquot) {int ret =1 ; -if (!test_bit (DQ_ACTIVE_B , &dquot->dq_flags)) +if (!dquot_active (dquot))return 0 ;if (sb_dqopt (dquot->dq_sb)->flags &DQUOT_NOLIST_DIRTY )return test_and_set_bit (DQ_MOD_B , &dquot->dq_flags);/* If quota is dirty already, we don't have to acquire dq_list_lock */ -if (test_bit (DQ_MOD_B , &dquot->dq_flags)) +if (dquot_dirty (dquot))return 1 ;spin_lock (&dq_list_lock);
@@ -440,7 +445,7 @@ int dquot_acquire(struct dquot *dquot)smp_mb__before_atomic ();set_bit (DQ_READ_B , &dquot->dq_flags);/* Instantiate dquot if needed */ -if (!test_bit (DQ_ACTIVE_B , &dquot->dq_flags) && !dquot->dq_off) { +if (!dquot_active (dquot) && !dquot->dq_off) { ret = dqopt->ops[dquot->dq_id.type]->commit_dqblk (dquot);/* Write the info if needed */ if (info_dirty (&dqopt->info[dquot->dq_id.type])) {
@@ -482,7 +487,7 @@ int dquot_commit(struct dquot *dquot) goto out_lock;/* Inactive dquot can be only if there was error during read/init * => we have better not writing it */ -if (test_bit (DQ_ACTIVE_B , &dquot->dq_flags)) +if (dquot_active (dquot)) ret = dqopt->ops[dquot->dq_id.type]->commit_dqblk (dquot);else ret = -EIO ;
@@ -597,7 +602,7 @@ int dquot_scan_active(struct super_block *sb,spin_lock (&dq_list_lock);list_for_each_entry (dquot, &inuse_list, dq_inuse) { -if (!test_bit (DQ_ACTIVE_B , &dquot->dq_flags)) +if (!dquot_active (dquot))continue ;if (dquot->dq_sb != sb)continue ;
@@ -612,7 +617,7 @@ int dquot_scan_active(struct super_block *sb,* outstanding call and recheck the DQ_ACTIVE_B after that. */ wait_on_dquot (dquot); -if (test_bit (DQ_ACTIVE_B , &dquot->dq_flags)) { +if (dquot_active (dquot)) { ret =fn (dquot, priv);if (ret <0 ) goto out;
@@ -663,7 +668,7 @@ int dquot_writeback_dquots(struct super_block *sb, int type) dquot = list_first_entry(&dirty, struct dquot, dq_dirty); -WARN_ON (!test_bit (DQ_ACTIVE_B , &dquot->dq_flags)); +WARN_ON (!dquot_active (dquot));/* Now we have active dquot from which someone is * holding reference so we can safely just increase
@@ -800,7 +805,7 @@ void dqput(struct dquot *dquot)dquot_write_dquot (dquot); goto we_slept; } -if (test_bit (DQ_ACTIVE_B , &dquot->dq_flags)) { +if (dquot_active (dquot)) {spin_unlock (&dq_list_lock); dquot->dq_sb->dq_op->release_dquot (dquot); goto we_slept;
@@ -901,7 +906,7 @@ struct dquot *dqget(struct super_block *sb, struct kqid qid)* already finished or it will be canceled due to dq_count > 1 test */ wait_on_dquot (dquot);/* Read the dquot / allocate space in quota file */ -if (!test_bit (DQ_ACTIVE_B , &dquot->dq_flags)) { +if (!dquot_active (dquot)) {int err; err = sb->dq_op->acquire_dquot (dquot);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 207/739 quota: fix dqput() to follow the guarantees dquot_srcu should provide
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit dabc8b20756601b9e1cc85a81d47d3f98ed4d13a ]
The dquot_mark_dquot_dirty() using dquot references from the inode should be protected by dquot_srcu. quota_off code takes care to call synchronize_srcu(&dquot_srcu) to not drop dquot references while they are used by other users. But dquot_transfer() breaks this assumption. We call dquot_transfer() to drop the last reference of dquot and add it to free_dquots, but there may still be other users using the dquot at this time, as shown in the function graph below:
cpu1 cpu2
_________________|_________________wb_do_writeback CHOWN(1)
...
ext4_da_update_reserve_space
dquot_claim_block
...
dquot_mark_dquot_dirty // try to dirty old quota
test_bit(DQ_ACTIVE_B, &dquot->dq_flags) // still ACTIVE
if (test_bit(DQ_MOD_B, &dquot->dq_flags))
// test no dirty, wait dq_list_lock
...
dquot_transfer
__dquot_transfer
dqput_all(transfer_from) // rls old dquot
dqput // last dqput
dquot_release
clear_bit(DQ_ACTIVE_B, &dquot->dq_flags)
atomic_dec(&dquot->dq_count)
put_dquot_last(dquot)
list_add_tail(&dquot->dq_free, &free_dquots)
// add the dquot to free_dquots
if (!test_and_set_bit(DQ_MOD_B, &dquot->dq_flags))
add dqi_dirty_list // add released dquot to dirty_listThis can cause various issues, such as dquot being destroyed by dqcache_shrink_scan() after being added to free_dquots, which can trigger a UAF in dquot_mark_dquot_dirty(); or after dquot is added to free_dquots and then to dirty_list, it is added to free_dquots again after dquot_writeback_dquots() is executed, which causes the free_dquots list to be corrupted and triggers a UAF when dqcache_shrink_scan() is called for freeing dquot twice.
As Honza said, we need to fix dquot_transfer() to follow the guarantees dquot_srcu should provide. But calling synchronize_srcu() directly from dquot_transfer() is too expensive (and mostly unnecessary). So we add dquot whose last reference should be dropped to the new global dquot list releasing_dquots, and then queue work item which would call synchronize_srcu() and after that perform the final cleanup of all the dquots on releasing_dquots.
Message-Id: <[email protected]>
--- fs/quota/dquot.c | 96 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 78 insertions(+), 18 deletions(-)
fs/quota/dquot.c +78 -18
@@ -225,13 +225,22 @@ static void put_quota_format(struct quota_format_type *fmt)/* * Dquot List Management: -* The quota code uses four lists for dquot management: the inuse_list, -* free_dquots, dqi_dirty_list, and dquot_hash[] array. A single dquot -* structure may be on some of those lists, depending on its current state. +* The quota code uses five lists for dquot management: the inuse_list, +* releasing_dquots, free_dquots, dqi_dirty_list, and dquot_hash[] array. +* A single dquot structure may be on some of those lists, depending on +* its current state. * * All dquots are placed to the end of inuse_list when first created, and this * list is used for invalidate operation, which must look at every dquot. * +* When the last reference of a dquot will be dropped, the dquot will be +* added to releasing_dquots. We'd then queue work item which would call +* synchronize_srcu() and after that perform the final cleanup of all the +* dquots on the list. Both releasing_dquots and free_dquots use the +* dq_free list_head in the dquot struct. When a dquot is removed from +* releasing_dquots, a reference count is always subtracted, and if +* dq_count == 0 at that point, the dquot will be added to the free_dquots. +* * Unused dquots (dq_count == 0) are added to the free_dquots list when freed, * and this list is searched whenever we need an available dquot. Dquots are * removed from the list as soon as they are used again, and
@@ -250,6 +259,7 @@ static void put_quota_format(struct quota_format_type *fmt)static LIST_HEAD (inuse_list);static LIST_HEAD (free_dquots); +static LIST_HEAD (releasing_dquots);static unsigned int dq_hash_bits, dq_hash_mask;static struct hlist_head *dquot_hash;
@@ -260,6 +270,9 @@ static qsize_t inode_get_rsv_space(struct inode *inode);static qsize_t __inode_get_rsv_space (struct inode *inode);static int __dquot_initialize (struct inode *inode,int type); +static void quota_release_workfn (struct work_struct *work); +static DECLARE_DELAYED_WORK(quota_release_work, quota_release_workfn); +static inline unsigned int hashfn (const struct super_block *sb,struct kqid qid) {
@@ -305,12 +318,18 @@ static inline void put_dquot_last(struct dquot *dquot)dqstats_inc (DQST_FREE_DQUOTS ); } +static inline void put_releasing_dquots (struct dquot *dquot) +{ +list_add_tail (&dquot->dq_free, &releasing_dquots); +} +static inline void remove_free_dquot (struct dquot *dquot) {if (list_empty (&dquot->dq_free))return ;list_del_init (&dquot->dq_free); -dqstats_dec (DQST_FREE_DQUOTS ); +if (!atomic_read (&dquot->dq_count)) +dqstats_dec (DQST_FREE_DQUOTS ); }static inline void put_inuse (struct dquot *dquot)
@@ -552,6 +571,8 @@ static void invalidate_dquots(struct super_block *sb, int type)struct dquot *dquot, *tmp; restart: +flush_delayed_work ("a_release_work); +spin_lock (&dq_list_lock);list_for_each_entry_safe (dquot, tmp, &inuse_list, dq_inuse) {if (dquot->dq_sb != sb)
@@ -560,6 +581,12 @@ static void invalidate_dquots(struct super_block *sb, int type)continue ;/* Wait for dquot users */ if (atomic_read (&dquot->dq_count)) { +/* dquot in releasing_dquots, flush and retry */ +if (!list_empty (&dquot->dq_free)) { +spin_unlock (&dq_list_lock); + goto restart; + } +atomic_inc (&dquot->dq_count);spin_unlock (&dq_list_lock);/*
@@ -770,6 +797,49 @@ static struct shrinker dqcache_shrinker = { .seeks = DEFAULT_SEEKS, }; +/* +* Safely release dquot and put reference to dquot. +*/ +static void quota_release_workfn (struct work_struct *work) +{ +struct dquot *dquot; +struct list_head rls_head; + +spin_lock (&dq_list_lock); +/* Exchange the list head to avoid livelock. */ +list_replace_init (&releasing_dquots, &rls_head); +spin_unlock (&dq_list_lock); + +restart: +synchronize_srcu (&dquot_srcu); +spin_lock (&dq_list_lock); +while (!list_empty (&rls_head)) { + dquot = list_first_entry(&rls_head, struct dquot, dq_free); +/* Dquot got used again? */ +if (atomic_read (&dquot->dq_count) >1 ) { +remove_free_dquot (dquot); +atomic_dec (&dquot->dq_count); +continue ; + } +if (dquot_dirty (dquot)) { +spin_unlock (&dq_list_lock); +/* Commit dquot before releasing */ +dquot_write_dquot (dquot); + goto restart; + } +if (dquot_active (dquot)) { +spin_unlock (&dq_list_lock); + dquot->dq_sb->dq_op->release_dquot (dquot); + goto restart; + } +/* Dquot is inactive and clean, now move it to free list */ +remove_free_dquot (dquot); +atomic_dec (&dquot->dq_count); +put_dquot_last (dquot); + } +spin_unlock (&dq_list_lock); +} +/* * Put reference to dquot */
@@ -786,7 +856,7 @@ void dqput(struct dquot *dquot) }#endif dqstats_inc (DQST_DROPS ); -we_slept: +spin_lock (&dq_list_lock);if (atomic_read (&dquot->dq_count) >1 ) {/* We have more than one user... nothing to do */
@@ -798,25 +868,15 @@ void dqput(struct dquot *dquot)spin_unlock (&dq_list_lock);return ; } +/* Need to release dquot? */ -if (dquot_dirty (dquot)) { -spin_unlock (&dq_list_lock); -/* Commit dquot before releasing */ -dquot_write_dquot (dquot); - goto we_slept; - } -if (dquot_active (dquot)) { -spin_unlock (&dq_list_lock); - dquot->dq_sb->dq_op->release_dquot (dquot); - goto we_slept; - } -atomic_dec (&dquot->dq_count);#ifdef CONFIG_QUOTA_DEBUG /* sanity check */ BUG_ON (!list_empty (&dquot->dq_free));#endif -put_dquot_last (dquot); +put_releasing_dquots (dquot);spin_unlock (&dq_list_lock); +queue_delayed_work (system_unbound_wq, "a_release_work,1 ); }EXPORT_SYMBOL (dqput);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 208/739 drm/amd/display: Do not set drr on pipe commit
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wesley Chalmers <[email protected]>
[ Upstream commit 09c8cbedba5fa85f15ac91ed74848aceff69f8e5 ]
[WHY]
Writing to DRR registers such as OTG_V_TOTAL_MIN on the same frame as a pipe commit can cause underflow.
[HOW]
Move DMUB p-state delegate into optimze_bandwidth; enabling FAMS sets optimized_required.
This change expects that Freesync requests are blocked when optimized_required is true.
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 6 ++++++ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 7 +++++++ 2 files changed, 13 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +6 -0
@@ -2123,6 +2123,12 @@ void dcn20_optimize_bandwidth(if (hubbub->funcs->program_compbuf_size) hubbub->funcs->program_compbuf_size (hubbub, context->bw_ctx.bw.dcn.compbuf_size_kb, true); +if (context->bw_ctx.bw.dcn.clk.fw_based_mclk_switching) { +dc_dmub_srv_p_state_delegate (dc, + true, context); + context->bw_ctx.bw.dcn.clk.p_state_change_support = true; + } + dc->clk_mgr->funcs->update_clocks( dc->clk_mgr, context,
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +7 -0
@@ -951,11 +951,18 @@ void dcn30_set_disp_pattern_generator(const struct dc *dc,void dcn30_prepare_bandwidth (struct dc *dc,struct dc_state *context) { +if (context->bw_ctx.bw.dcn.clk.fw_based_mclk_switching) { + dc->optimized_required = true; + context->bw_ctx.bw.dcn.clk.p_state_change_support = false; + } +if (dc->clk_mgr->dc_mode_softmax_enabled)if (dc->clk_mgr->clks.dramclk_khz <= dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 && context->bw_ctx.bw.dcn.clk.dramclk_khz > dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 ) dc->clk_mgr->funcs->set_max_memclk (dc->clk_mgr, dc->clk_mgr->bw_params->clk_table.entries[dc->clk_mgr->bw_params->clk_table.num_entries -1 ].memclk_mhz);dcn20_prepare_bandwidth (dc, context); + +dc_dmub_srv_p_state_delegate (dc, false, context); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 209/739 drm/hyperv: Fix a compilation issue because of not including screen_info.h
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sui Jingfeng <[email protected]>
[ Upstream commit 8d1077cf2e43b15fefd76ebec2b71541eb27ef2c ]
Fixes the following build errors on arm64:
drivers/video/fbdev/hyperv_fb.c: In function 'hvfb_getmem':
Quoted 1 line
Quoted 1 line
drivers/video/fbdev/hyperv_fb.c:1033:24: error: 'screen_info' undeclared (first use in this function)
1033 | base = screen_info.lfb_base;
| ^~~~~~~~~~~drivers/video/fbdev/hyperv_fb.c:1033:24: note: each undeclared identifier is reported only once for each function it appears in
Quoted 1 line
Quoted 1 line
drivers/gpu/drm/hyperv/hyperv_drm_drv.c:75:54: error: 'screen_info' undeclared (first use in this function)
75 | drm_aperture_remove_conflicting_framebuffers(screen_info.lfb_base,
| ^~~~~~~~~~~drivers/gpu/drm/hyperv/hyperv_drm_drv.c:75:54: note: each undeclared identifier is reported only once for each function it appears in
--- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/hyperv/hyperv_drm_drv.c +1 -0
@@ -7,6 +7,7 @@#include <linux/hyperv.h> #include <linux/module.h> #include <linux/pci.h> +#include <linux/screen_info.h> #include <drm/drm_aperture.h> #include <drm/drm_atomic_helper.h>
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 210/739 ASoC: stac9766: fix build errors with REGMAP_AC97
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit c70064b96f509daa78f57992aeabcf274fb2fed4 ]
Select REGMAP_AC97 to fix these build errors:
ERROR: modpost: "regmap_ac97_default_volatile" [sound/soc/codecs/snd-soc-stac9766.ko] undefined!
ERROR: modpost: "__regmap_init_ac97" [sound/soc/codecs/snd-soc-stac9766.ko] undefined!
--- sound/soc/codecs/Kconfig | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/Kconfig +1 -0
@@ -1708,6 +1708,7 @@ config SND_SOC_STA529 config SND_SOC_STAC9766 tristate depends on SND_SOC_AC97_BUS + select REGMAP_AC97 config SND_SOC_STI_SAS tristate "codec Audio support for STI SAS codec"
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 211/739 soc: qcom: ocmem: Fix NUM_PORTS & NUM_MACROS macros
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Weiss <[email protected]>
[ Upstream commit a7b484b1c9332a1ee12e8799d62a11ee3f8e0801 ]
Since we're using these two macros to read a value from a register, we need to use the FIELD_GET instead of the FIELD_PREP macro, otherwise we're getting wrong values.
So instead of:
[ 3.111779] ocmem fdd00000.sram: 2 ports, 1 regions, 512 macros, not interleaved
we now get the correct value of:
[ 3.129672] ocmem fdd00000.sram: 2 ports, 1 regions, 2 macros, not interleaved
--- drivers/soc/qcom/ocmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/qcom/ocmem.c +2 -2
@@ -80,8 +80,8 @@ struct ocmem {#define OCMEM_HW_VERSION_MINOR (val) FIELD_GET(GENMASK(27, 16), val)#define OCMEM_HW_VERSION_STEP (val) FIELD_GET(GENMASK(15, 0), val) -#define OCMEM_HW_PROFILE_NUM_PORTS (val) FIELD_PREP(0x0000000f, (val)) -#define OCMEM_HW_PROFILE_NUM_MACROS (val) FIELD_PREP(0x00003f00, (val)) +#define OCMEM_HW_PROFILE_NUM_PORTS (val) FIELD_GET(0x0000000f, (val)) +#define OCMEM_HW_PROFILE_NUM_MACROS (val) FIELD_GET(0x00003f00, (val))#define OCMEM_HW_PROFILE_LAST_REGN_HALFSIZE 0x00010000#define OCMEM_HW_PROFILE_INTERLEAVING 0x00020000
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 212/739 arm64: defconfig: enable Qualcomm MSM8996 Global Clock Controller as built-in
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit dc015a3a6d6986c41a7bd12fb205a282f685e328 ]
The commit 8f680c287445 ("arm64: defconfig: Switch msm8996 clk drivers to module") switched CONFIG_MSM_MMCC_8996 to module, which also resulted in CONFIG_MSM_GCC_8996 being switched to module. This breaks useful bootflow for Qualcomm MSM8996 / APQ8096 platforms, because the serial is not enabled anymore until the GCC module is loaded.
--- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm64/configs/defconfig +1 -0
@@ -1182,6 +1182,7 @@ CONFIG_IPQ_GCC_8074=y CONFIG_IPQ_GCC_9574=y CONFIG_MSM_GCC_8916=y CONFIG_MSM_GCC_8994=y +CONFIG_MSM_GCC_8996=y CONFIG_MSM_MMCC_8994=m CONFIG_MSM_MMCC_8996=m CONFIG_MSM_MMCC_8998=m
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 213/739 arm64: dts: qcom: sm8150: use proper DSI PHY compatible
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 3091e5820a367f3368132f57e0a9ba6d545da15d ]
The DSI PHY on the Qualcomm SM8150 platform requires platform-specific handling. Use the proper SoC-specific compatible string for the DSI PHYs.
--- arch/arm64/boot/dts/qcom/sm8150.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sm8150.dtsi +2 -2
@@ -3840,7 +3840,7 @@ opp-358000000 { }; mdss_dsi0_phy: phy@ae94400 { - compatible = "qcom,dsi-phy-7nm"; + compatible = "qcom,dsi-phy-7nm-8150"; reg = <0 0x0ae94400 0 0x200>, <0 0x0ae94600 0 0x280>, <0 0x0ae94900 0 0x260>;
@@ -3914,7 +3914,7 @@ mdss_dsi1_out: endpoint { }; mdss_dsi1_phy: phy@ae96400 { - compatible = "qcom,dsi-phy-7nm"; + compatible = "qcom,dsi-phy-7nm-8150"; reg = <0 0x0ae96400 0 0x200>, <0 0x0ae96600 0 0x280>, <0 0x0ae96900 0 0x260>;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 214/739 arm64: dts: qcom: sm6350: Fix ZAP region
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 44bcded2be4fe9b9d0b6e48075c9947b75c0af63 ]
The previous ZAP region definition was wrong. Fix it. Note this is not a device-specific fixup, but a fixup to the generic PIL load address.
--- arch/arm64/boot/dts/qcom/sm6350.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/qcom/sm6350.dtsi +5 -5
@@ -633,11 +633,6 @@ pil_ipa_gsi_mem: memory@8b710000 { no-map; }; - pil_gpu_mem: memory@8b715400 { - reg = <0 0x8b715400 0 0x2000>; - no-map; - }; - pil_modem_mem: memory@8b800000 { reg = <0 0x8b800000 0 0xf800000>; no-map;
@@ -658,6 +653,11 @@ removed_region: memory@c0000000 { no-map; }; + pil_gpu_mem: memory@f0d00000 { + reg = <0 0xf0d00000 0 0x1000>; + no-map; + }; + debug_region: memory@ffb00000 { reg = <0 0xffb00000 0 0xc0000>; no-map;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 215/739 Revert "arm64: dts: qcom: msm8996: rename labels for HDMI nodes"
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 2b812caf5f64df959555e48dfc7bf8f061d9fe8f ]
The commit f43b6dc7d56e ("arm64: dts: qcom: msm8996: rename labels for HDMI nodes") is broken, it changes all the HDMI node names, compatible strings instead of changing just node aliases. Revert the commit in order to land a proper clean version.
--- arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 50 ++++++++++---------- arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 6 +-- arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 4 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 16 +++---- 4 files changed, 38 insertions(+), 38 deletions(-)
arch/arm64/boot/dts/qcom/apq8096-db820c.dts +25 -25
@@ -208,6 +208,25 @@ &gpu { status = "okay"; }; +&hdmi { + status = "okay"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>; + pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>; + + core-vdda-supply = <&vreg_l12a_1p8>; + core-vcc-supply = <&vreg_s4a_1p8>; +}; + +&hdmi_phy { + status = "okay"; + + vddio-supply = <&vreg_l12a_1p8>; + vcca-supply = <&vreg_l28a_0p925>; + #phy-cells = <0>; +}; + &hsusb_phy1 { status = "okay";
@@ -232,25 +251,6 @@ &mdss { status = "okay"; }; -&mdss_hdmi { - status = "okay"; - - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&mdss_hdmi_hpd_active &mdss_hdmi_ddc_active>; - pinctrl-1 = <&mdss_hdmi_hpd_suspend &mdss_hdmi_ddc_suspend>; - - core-vdda-supply = <&vreg_l12a_1p8>; - core-vcc-supply = <&vreg_s4a_1p8>; -}; - -&mdss_hdmi_phy { - status = "okay"; - - vddio-supply = <&vreg_l12a_1p8>; - vcca-supply = <&vreg_l28a_0p925>; - #phy-cells = <0>; -}; - &mmcc { vdd-gfx-supply = <&vdd_gfx>; };
@@ -433,28 +433,28 @@ sdc2_cd_off: sdc2-cd-off-state { drive-strength = <2>; }; - mdss_hdmi_hpd_active: mdss_hdmi-hpd-active-state { + hdmi_hpd_active: hdmi-hpd-active-state { pins = "gpio34"; function = "hdmi_hot"; bias-pull-down; drive-strength = <16>; }; - mdss_hdmi_hpd_suspend: mdss_hdmi-hpd-suspend-state { + hdmi_hpd_suspend: hdmi-hpd-suspend-state { pins = "gpio34"; function = "hdmi_hot"; bias-pull-down; drive-strength = <2>; }; - mdss_hdmi_ddc_active: mdss_hdmi-ddc-active-state { + hdmi_ddc_active: hdmi-ddc-active-state { pins = "gpio32", "gpio33"; function = "hdmi_ddc"; drive-strength = <2>; bias-pull-up; }; - mdss_hdmi_ddc_suspend: mdss_hdmi-ddc-suspend-state { + hdmi_ddc_suspend: hdmi-ddc-suspend-state { pins = "gpio32", "gpio33"; function = "hdmi_ddc"; drive-strength = <2>;
@@ -1043,7 +1043,7 @@ cpu { }; }; - mdss_hdmi-dai-link { + hdmi-dai-link { link-name = "HDMI"; cpu { sound-dai = <&q6afedai HDMI_RX>;
@@ -1054,7 +1054,7 @@ platform { }; codec { - sound-dai = <&mdss_hdmi 0>; + sound-dai = <&hdmi 0>; }; };
arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts +3 -3
@@ -92,15 +92,15 @@ &gpu { status = "okay"; }; -&mdss { +&hdmi { status = "okay"; }; -&mdss_hdmi { +&hdmi_phy { status = "okay"; }; -&mdss_hdmi_phy { +&mdss { status = "okay"; };
arch/arm64/boot/dts/qcom/msm8996-mtp.dts +2 -2
@@ -24,10 +24,10 @@ &blsp2_uart2 { status = "okay"; }; -&mdss_hdmi { +&hdmi { status = "okay"; }; -&mdss_hdmi_phy { +&hdmi_phy { status = "okay"; };
arch/arm64/boot/dts/qcom/msm8996.dtsi +8 -8
@@ -895,7 +895,7 @@ mmcc: clock-controller@8c0000 { <&mdss_dsi0_phy 0>, <&mdss_dsi1_phy 1>, <&mdss_dsi1_phy 0>, - <&mdss_hdmi_phy>; + <&hdmi_phy>; clock-names = "xo", "gpll0", "gcc_mmss_noc_cfg_ahb_clk",
@@ -980,7 +980,7 @@ ports { port@0 { reg = <0>; mdp5_intf3_out: endpoint { - remote-endpoint = <&mdss_hdmi_in>; + remote-endpoint = <&hdmi_in>; }; };
@@ -1136,8 +1136,8 @@ mdss_dsi1_phy: phy@996400 { status = "disabled"; }; - mdss_hdmi: mdss_hdmi-tx@9a0000 { - compatible = "qcom,mdss_hdmi-tx-8996"; + hdmi: hdmi-tx@9a0000 { + compatible = "qcom,hdmi-tx-8996"; reg = <0x009a0000 0x50c>, <0x00070000 0x6158>, <0x009e0000 0xfff>;
@@ -1160,7 +1160,7 @@ mdss_hdmi: mdss_hdmi-tx@9a0000 { "alt_iface", "extp"; - phys = <&mdss_hdmi_phy>; + phys = <&hdmi_phy>; #sound-dai-cells = <1>; status = "disabled";
@@ -1171,16 +1171,16 @@ ports { port@0 { reg = <0>; - mdss_hdmi_in: endpoint { + hdmi_in: endpoint { remote-endpoint = <&mdp5_intf3_out>; }; }; }; }; - mdss_hdmi_phy: phy@9a0600 { + hdmi_phy: phy@9a0600 { #phy-cells = <0>; - compatible = "qcom,mdss_hdmi-phy-8996"; + compatible = "qcom,hdmi-phy-8996"; reg = <0x009a0600 0x1c4>, <0x009a0a00 0x124>, <0x009a0c00 0x124>,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 216/739 arm64: dts: qcom: sm8250: correct dynamic power coefficients
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vincent Guittot <[email protected]>
[ Upstream commit 775a5283c25d160b2a1359018c447bc518096547 ]
sm8250 faces the same problem with its Energy Model as sdm845. The energy cost of LITTLE cores is reported to be higher than medium or big cores
EM computes the energy with formula:
energy = OPP's cost / maximum cpu capacity * utilization
On v6.4-rc6 we have:
max capacity of CPU0 = 284
capacity of CPU0's OPP(1612800 Hz) = 253
cost of CPU0's OPP(1612800 Hz) = 191704
max capacity of CPU4 = 871
capacity of CPU4's OPP(710400 Hz) = 255
cost of CPU4's OPP(710400 Hz) = 343217
Both OPPs have almost the same compute capacity but the estimated energy per unit of utilization will be estimated to:
energy CPU0 = 191704 / 284 * 1 = 675
energy CPU4 = 343217 / 871 * 1 = 394
EM estimates that little CPU0 will consume 71% more than medium CPU4 for the same compute capacity. According to [1], little consumes 25% less than medium core for Coremark benchmark at those OPPs for the same duration.
Set the dynamic-power-coefficient of CPU0-3 to 105 to fix the energy model for little CPUs.
[1] https://github.com/kdrag0n/freqbench/tree/master/results/sm8250/k30s
--- arch/arm64/boot/dts/qcom/sm8250.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/qcom/sm8250.dtsi +4 -4
@@ -100,7 +100,7 @@ CPU0: cpu@0 { clocks = <&cpufreq_hw 0>; enable-method = "psci"; capacity-dmips-mhz = <448>; - dynamic-power-coefficient = <205>; + dynamic-power-coefficient = <105>; next-level-cache = <&L2_0>; power-domains = <&CPU_PD0>; power-domain-names = "psci";
@@ -131,7 +131,7 @@ CPU1: cpu@100 { clocks = <&cpufreq_hw 0>; enable-method = "psci"; capacity-dmips-mhz = <448>; - dynamic-power-coefficient = <205>; + dynamic-power-coefficient = <105>; next-level-cache = <&L2_100>; power-domains = <&CPU_PD1>; power-domain-names = "psci";
@@ -156,7 +156,7 @@ CPU2: cpu@200 { clocks = <&cpufreq_hw 0>; enable-method = "psci"; capacity-dmips-mhz = <448>; - dynamic-power-coefficient = <205>; + dynamic-power-coefficient = <105>; next-level-cache = <&L2_200>; power-domains = <&CPU_PD2>; power-domain-names = "psci";
@@ -181,7 +181,7 @@ CPU3: cpu@300 { clocks = <&cpufreq_hw 0>; enable-method = "psci"; capacity-dmips-mhz = <448>; - dynamic-power-coefficient = <205>; + dynamic-power-coefficient = <105>; next-level-cache = <&L2_300>; power-domains = <&CPU_PD3>; power-domain-names = "psci";
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 217/739 arm64: dts: qcom: sm8450: correct crypto unit address
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit b02966f8689795406ac210189924a8cb02a71bbe ]
Crypto node unit address should match reg.
--- arch/arm64/boot/dts/qcom/sm8450.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8450.dtsi +1 -1
@@ -4212,7 +4212,7 @@ cryptobam: dma-controller@1dc4000 { <&apps_smmu 0x59f 0x0>; }; - crypto: crypto@1de0000 { + crypto: crypto@1dfa000 { compatible = "qcom,sm8450-qce", "qcom,sm8150-qce", "qcom,qce"; reg = <0 0x01dfa000 0 0x6000>; dmas = <&cryptobam 4>, <&cryptobam 5>;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 218/739 arm64: dts: qcom: msm8916-l8150: correct light sensor VDDIO supply
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 6a541eaa6e8e5283efb993ae7a947bede8d01fa5 ]
liteon,ltr559 light sensor takes VDDIO, not VIO, supply:
msm8916-longcheer-l8150.dtb: light-sensor@23: 'vio-supply' does not match any of the regexes: 'pinctrl-[0-9]+'
--- arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts +1 -1
@@ -165,7 +165,7 @@ light-sensor@23 { pinctrl-0 = <&light_int_default>; vdd-supply = <&pm8916_l17>; - vio-supply = <&pm8916_l6>; + vddio-supply = <&pm8916_l6>; }; gyroscope@68 {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 219/739 arm64: dts: qcom: sm8250-edo: Add gpio line names for TLMM
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 40b398beabdfe0e9088b13976e56b1dc706fe851 ]
Sony ever so graciously provides GPIO line names in their downstream kernel (though sometimes they are not 100% accurate and you can judge that by simply looking at them and with what drivers they are used).
Add these to the PDX203&206 DTSIs to better document the hardware.
Diff between 203 and 206:
< "CAM_PWR_A_CS", > "FRONTC_PWR_EN", < "CAM4_MCLK", < "TOF_RST_N", > "NC", > "NC", < "WLC_I2C_SDA", < "WLC_I2C_SCL", /* GPIO_120 */ > "NC", > "NC", < "WLC_INT_N", > "NC",
Which makes sense, as 203 has a 3D iToF, slightly different camera power wiring and WLC (WireLess Charging).
Stable-dep-of: a422c6a91a66 ("arm64: dts: qcom: sm8250-edo: Rectify gpio-keys")
--- .../qcom/sm8250-sony-xperia-edo-pdx203.dts | 183 ++++++++++++++++++ .../qcom/sm8250-sony-xperia-edo-pdx206.dts | 183 ++++++++++++++++++ 2 files changed, 366 insertions(+)
arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts +183 -0
@@ -14,3 +14,186 @@ / { }; /delete-node/ &vreg_l7f_1p8; + +&tlmm { + gpio-line-names = "AP_CTI_IN", /* GPIO_0 */ + "MDM2AP_ERR_FATAL", + "AP_CTI_OUT", + "MDM2AP_STATUS", + "NFC_I2C_SDA", + "NFC_I2C_SCL", + "NFC_EN", + "NFC_CLK_REQ", + "NFC_ESE_PWR_REQ", + "DVDT_WRT_DET_AND", + "SPK_AMP_RESET_N", /* GPIO_10 */ + "SPK_AMP_INT_N", + "APPS_I2C_1_SDA", + "APPS_I2C_1_SCL", + "NC", + "TX_GTR_THRES_IN", + "HST_BT_UART_CTS", + "HST_BT_UART_RFR", + "HST_BT_UART_TX", + "HST_BT_UART_RX", + "HST_WLAN_EN", /* GPIO_20 */ + "HST_BT_EN", + "RGBC_IR_PWR_EN", + "FP_INT_N", + "NC", + "NC", + "NC", + "NC", + "NFC_ESE_SPI_MISO", + "NFC_ESE_SPI_MOSI", + "NFC_ESE_SPI_SCLK", /* GPIO_30 */ + "NFC_ESE_SPI_CS_N", + "WCD_RST_N", + "NC", + "SDM_DEBUG_UART_TX", + "SDM_DEBUG_UART_RX", + "TS_I2C_SDA", + "TS_I2C_SCL", + "TS_INT_N", + "FP_SPI_MISO", /* GPIO_40 */ + "FP_SPI_MOSI", + "FP_SPI_SCLK", + "FP_SPI_CS_N", + "APPS_I2C_0_SDA", + "APPS_I2C_0_SCL", + "DISP_ERR_FG", + "UIM2_DETECT_EN", + "NC", + "NC", + "NC", /* GPIO_50 */ + "NC", + "MDM_UART_CTS", + "MDM_UART_RFR", + "MDM_UART_TX", + "MDM_UART_RX", + "AP2MDM_STATUS", + "AP2MDM_ERR_FATAL", + "MDM_IPC_HS_UART_TX", + "MDM_IPC_HS_UART_RX", + "NC", /* GPIO_60 */ + "NC", + "NC", + "NC", + "NC", + "USB_CC_DIR", + "DISP_VSYNC", + "NC", + "NC", + "CAM_PWR_B_CS", + "NC", /* GPIO_70 */ + "CAM_PWR_A_CS", + "SBU_SW_SEL", + "SBU_SW_OE", + "FP_RESET_N", + "FP_RESET_N", + "DISP_RESET_N", + "DEBUG_GPIO0", + "TRAY_DET", + "CAM2_RST_N", + "PCIE0_RST_N", + "PCIE0_CLK_REQ_N", /* GPIO_80 */ + "PCIE0_WAKE_N", + "DVDT_ENABLE", + "DVDT_WRT_DET_OR", + "NC", + "PCIE2_RST_N", + "PCIE2_CLK_REQ_N", + "PCIE2_WAKE_N", + "MDM_VFR_IRQ0", + "MDM_VFR_IRQ1", + "SW_SERVICE", /* GPIO_90 */ + "CAM_SOF", + "CAM1_RST_N", + "CAM0_RST_N", + "CAM0_MCLK", + "CAM1_MCLK", + "CAM2_MCLK", + "CAM3_MCLK", + "CAM4_MCLK", + "TOF_RST_N", + "NC", /* GPIO_100 */ + "CCI0_I2C_SDA", + "CCI0_I2C_SCL", + "CCI1_I2C_SDA", + "CCI1_I2C_SCL_", + "CCI2_I2C_SDA", + "CCI2_I2C_SCL", + "CCI3_I2C_SDA", + "CCI3_I2C_SCL", + "CAM3_RST_N", + "NFC_DWL_REQ", /* GPIO_110 */ + "NFC_IRQ", + "XVS", + "NC", + "RF_ID_EXTENSION", + "SPK_AMP_I2C_SDA", + "SPK_AMP_I2C_SCL", + "NC", + "NC", + "WLC_I2C_SDA", + "WLC_I2C_SCL", /* GPIO_120 */ + "ACC_COVER_OPEN", + "ALS_PROX_INT_N", + "ACCEL_INT", + "WLAN_SW_CTRL", + "CAMSENSOR_I2C_SDA", + "CAMSENSOR_I2C_SCL", + "UDON_SWITCH_SEL", + "WDOG_DISABLE", + "BAROMETER_INT", + "NC", /* GPIO_130 */ + "NC", + "FORCED_USB_BOOT", + "NC", + "NC", + "WLC_INT_N", + "NC", + "NC", + "RGBC_IR_INT", + "NC", + "NC", /* GPIO_140 */ + "NC", + "BT_SLIMBUS_CLK", + "BT_SLIMBUS_DATA", + "HW_ID_0", + "HW_ID_1", + "WCD_SWR_TX_CLK", + "WCD_SWR_TX_DATA0", + "WCD_SWR_TX_DATA1", + "WCD_SWR_RX_CLK", + "WCD_SWR_RX_DATA0", /* GPIO_150 */ + "WCD_SWR_RX_DATA1", + "SDM_DMIC_CLK1", + "SDM_DMIC_DATA1", + "SDM_DMIC_CLK2", + "SDM_DMIC_DATA2", + "SPK_AMP_I2S_CLK", + "SPK_AMP_I2S_WS", + "SPK_AMP_I2S_ASP_DIN", + "SPK_AMP_I2S_ASP_DOUT", + "COMPASS_I2C_SDA", /* GPIO_160 */ + "COMPASS_I2C_SCL", + "NC", + "NC", + "SSC_SPI_1_MISO", + "SSC_SPI_1_MOSI", + "SSC_SPI_1_CLK", + "SSC_SPI_1_CS_N", + "NC", + "NC", + "SSC_SENSOR_I2C_SDA", /* GPIO_170 */ + "SSC_SENSOR_I2C_SCL", + "NC", + "NC", + "NC", + "NC", + "HST_BLE_SNS_UART6_TX", + "HST_BLE_SNS_UART6_RX", + "HST_WLAN_UART_TX", + "HST_WLAN_UART_RX"; +};
arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts +183 -0
189 lines not on this page · raw message
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 220/739 arm64: dts: qcom: sm8250-edo: Add GPIO line names for PMIC GPIOs
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 6b8a63350752c6a5e4b54f2de6174084652cd3cd ]
Sony ever so graciously provides GPIO line names in their downstream kernel (though sometimes they are not 100% accurate and you can judge that by simply looking at them and with what drivers they are used).
Add these to the PDX203&206 DTSIs to better document the hardware.
Diff between 203 and 206:pm8009_gpios
< "CAM_PWR_LD_EN",
Quoted 1 line
"NC",
pm8150_gpios
< "NC", > "G_ASSIST_N", < "WLC_EN_N", /* GPIO_10 */ > "NC", /* GPIO_10 */
Which is due to 5 II having an additional Google Assistant hardware button and 1 II having a wireless charger & different camera wiring to accommodate the additional 3D iToF sensor.
Stable-dep-of: a422c6a91a66 ("arm64: dts: qcom: sm8250-edo: Rectify gpio-keys")
--- .../qcom/sm8250-sony-xperia-edo-pdx203.dts | 50 +++++++++++++++++++ .../qcom/sm8250-sony-xperia-edo-pdx206.dts | 50 +++++++++++++++++++ 2 files changed, 100 insertions(+)
arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts +50 -0
@@ -15,6 +15,56 @@ / { /delete-node/ &vreg_l7f_1p8; +&pm8009_gpios { + gpio-line-names = "NC", /* GPIO_1 */ + "CAM_PWR_LD_EN", + "WIDEC_PWR_EN", + "NC"; +}; + +&pm8150_gpios { + gpio-line-names = "VOL_DOWN_N", /* GPIO_1 */ + "OPTION_2", + "NC", + "PM_SLP_CLK_IN", + "OPTION_1", + "NC", + "NC", + "SP_ARI_PWR_ALARM", + "NC", + "NC"; /* GPIO_10 */ +}; + +&pm8150b_gpios { + gpio-line-names = "SNAPSHOT_N", /* GPIO_1 */ + "FOCUS_N", + "NC", + "NC", + "RF_LCD_ID_EN", + "NC", + "NC", + "LCD_ID", + "NC", + "WLC_EN_N", /* GPIO_10 */ + "NC", + "RF_ID"; +}; + +&pm8150l_gpios { + gpio-line-names = "NC", /* GPIO_1 */ + "PM3003A_EN", + "NC", + "NC", + "NC", + "AUX2_THERM", + "BB_HP_EN", + "FP_LDO_EN", + "PMX_RESET_N", + "AUX3_THERM", /* GPIO_10 */ + "DTV_PWR_EN", + "PM3003A_MODE"; +}; + &tlmm { gpio-line-names = "AP_CTI_IN", /* GPIO_0 */ "MDM2AP_ERR_FATAL",
arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts +50 -0
56 lines not on this page · raw message
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 221/739 arm64: dts: qcom: sm8250-edo: Rectify gpio-keys
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit a422c6a91a667b309ca1a6c08b30dbfcf7d4e866 ]
Set up the corresponding GPIOs properly and add the leftover hardware buttons to mark this piece of the puzzle complete.
--- .../qcom/sm8250-sony-xperia-edo-pdx206.dts | 10 ++++ .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 54 ++++++++++++++++--- 2 files changed, 58 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts +10 -0
@@ -20,6 +20,8 @@ &framebuffer { }; &gpio_keys { + pinctrl-0 = <&focus_n &snapshot_n &vol_down_n &g_assist_n>; + g-assist-key { label = "Google Assistant Key"; linux,code = <KEY_LEFTMETA>;
@@ -48,6 +50,14 @@ &pm8150_gpios { "SP_ARI_PWR_ALARM", "NC", "NC"; /* GPIO_10 */ + + g_assist_n: g-assist-n-state { + pins = "gpio6"; + function = "normal"; + power-source = <1>; + bias-pull-up; + input-enable; + }; }; &pm8150b_gpios {
arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi +48 -6
66 lines not on this page · raw message
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 222/739 arm64: dts: qcom: sc8280xp-crd: Correct vreg_misc_3p3 GPIO
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Andersson <[email protected]>
[ Upstream commit 9566b5271f68bdf6e69b7c511850e3fb75cd18be ]
The vreg_misc_3p3 regulator is controlled by PMC8280_1 GPIO 2, not 1, on the CRD.
--- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +2 -2
@@ -167,7 +167,7 @@ vreg_misc_3p3: regulator-misc-3p3 { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&pmc8280_1_gpios 1 GPIO_ACTIVE_HIGH>; + gpio = <&pmc8280_1_gpios 2 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-names = "default";
@@ -757,7 +757,7 @@ edp_bl_reg_en: edp-bl-reg-en-state { }; misc_3p3_reg_en: misc-3p3-reg-en-state { - pins = "gpio1"; + pins = "gpio2"; function = "normal"; }; };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 223/739 arm64: dts: qcom: sc8280xp: Add missing SCM interconnect
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 0a69ccf20b0837db857abfc94d7e3bacf1cb771b ]
The SCM interconnect path was missing. Add it.
--- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/sc8280xp.dtsi +1 -0
@@ -298,6 +298,7 @@ CLUSTER_SLEEP_0: cluster-sleep-0 { firmware { scm: scm { compatible = "qcom,scm-sc8280xp", "qcom,scm"; + interconnects = <&aggre2_noc MASTER_CRYPTO 0 &mc_virt SLAVE_EBI1 0>; }; };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 224/739 arm64: dts: qcom: msm8939: Drop "qcom,idle-state-spc" compatible
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 982f810fc196002808b6d4230ba8f431c993d264 ]
As of today, the only cool and legal way to get ARM64 SMP going is via PSCI (or spin tables). Sadly, not all chip and device vendors were considerate of this in the early days of arm64. Qualcomm, for example reused their tried-and-true spin-up method from MSM8974 and their Krait/ arm32 Cortex designs.
MSM8916 supports SMP with its arm32 dt overlay, as probably could 8939. But the arm64 DT should not define non-PSCI SMP or CPUidle stuff.
Drop the qcom,idle-state-spc compatible (associated with Qualcomm-specific CPUIdle) to make the dt checker happy:
apq8039-t2.dtb: idle-states: cpu-sleep-0:compatible:
['qcom,idle-state-spc', 'arm,idle-state'] is too long
--- arch/arm64/boot/dts/qcom/msm8939.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8939.dtsi +1 -1
@@ -155,7 +155,7 @@ CPU7: cpu@3 { idle-states { CPU_SLEEP_0: cpu-sleep-0 { - compatible ="qcom,idle-state-spc", "arm,idle-state"; + compatible = "arm,idle-state"; entry-latency-us = <130>; exit-latency-us = <150>; min-residency-us = <2000>;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 225/739 arm64: dts: qcom: msm8939: Add missing cache-unified to L2
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 68a59251f1c590ad567ff7fd799f6634fbab6e16 ]
Add the missing property to fix the dt checker warning:
qcom/apq8039-t2.dtb: l2-cache: 'cache-unified' is a required property
--- arch/arm64/boot/dts/qcom/msm8939.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/msm8939.dtsi +2 -0
@@ -55,6 +55,7 @@ CPU0: cpu@100 { L2_1: l2-cache { compatible = "cache"; cache-level = <2>; + cache-unified; }; };
@@ -111,6 +112,7 @@ CPU4: cpu@0 { L2_0: l2-cache { compatible = "cache"; cache-level = <2>; + cache-unified; }; };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 226/739 arm64: dts: qcom: msm8996: Add missing interrupt to the USB2 controller
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 36541089c4733355ed844c67eebd0c3936953454 ]
The interrupt line was previously not described. Take care of that.
--- arch/arm64/boot/dts/qcom/msm8996.dtsi | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/qcom/msm8996.dtsi +3 -0
@@ -3336,6 +3336,9 @@ usb2: usb@76f8800 { #size-cells = <1>; ranges; + interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "hs_phy_irq"; + clocks = <&gcc GCC_PERIPH_NOC_USB20_AHB_CLK>, <&gcc GCC_USB20_MASTER_CLK>, <&gcc GCC_USB20_MOCK_UTMI_CLK>,
Signature · 1 line
2.40.1