| Message ID | 20210513122220.313465-1-szymon.janc@codecoup.pl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] Bluetooth: Remove spurious error message | expand |
This is automated email and please do not reply to this email! Dear submitter, Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series: PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=481867 ---Test result--- Test Summary: CheckPatch PASS 0.69 seconds GitLint PASS 0.12 seconds BuildKernel PASS 531.09 seconds TestRunner: Setup PASS 351.44 seconds TestRunner: l2cap-tester PASS 2.53 seconds TestRunner: bnep-tester PASS 1.87 seconds TestRunner: mgmt-tester PASS 25.80 seconds TestRunner: rfcomm-tester PASS 2.12 seconds TestRunner: sco-tester PASS 2.11 seconds TestRunner: smp-tester PASS 2.24 seconds TestRunner: userchan-tester PASS 1.92 seconds Details ############################## Test: CheckPatch - PASS - 0.69 seconds Run checkpatch.pl script with rule in .checkpatch.conf ############################## Test: GitLint - PASS - 0.12 seconds Run gitlint with rule in .gitlint ############################## Test: BuildKernel - PASS - 531.09 seconds Build Kernel with minimal configuration supports Bluetooth ############################## Test: TestRunner: Setup - PASS - 351.44 seconds Setup environment for running Test Runner ############################## Test: TestRunner: l2cap-tester - PASS - 2.53 seconds Run test-runner with l2cap-tester Total: 40, Passed: 40 (100.0%), Failed: 0, Not Run: 0 ############################## Test: TestRunner: bnep-tester - PASS - 1.87 seconds Run test-runner with bnep-tester Total: 1, Passed: 1 (100.0%), Failed: 0, Not Run: 0 ############################## Test: TestRunner: mgmt-tester - PASS - 25.80 seconds Run test-runner with mgmt-tester Total: 416, Passed: 403 (96.9%), Failed: 0, Not Run: 13 ############################## Test: TestRunner: rfcomm-tester - PASS - 2.12 seconds Run test-runner with rfcomm-tester Total: 9, Passed: 9 (100.0%), Failed: 0, Not Run: 0 ############################## Test: TestRunner: sco-tester - PASS - 2.11 seconds Run test-runner with sco-tester Total: 8, Passed: 8 (100.0%), Failed: 0, Not Run: 0 ############################## Test: TestRunner: smp-tester - PASS - 2.24 seconds Run test-runner with smp-tester Total: 8, Passed: 8 (100.0%), Failed: 0, Not Run: 0 ############################## Test: TestRunner: userchan-tester - PASS - 1.92 seconds Run test-runner with userchan-tester Total: 3, Passed: 3 (100.0%), Failed: 0, Not Run: 0 --- Regards, Linux Bluetooth
Hi Szymon, > Even with rate limited reporting this is very spammy and since > it is remote device that is providing bogus data there is no > need to report this as error. > > Since real_len variable was used only to allow conditional error > message it is now also removed. > > [72454.143336] bt_err_ratelimited: 10 callbacks suppressed > [72454.143337] Bluetooth: hci0: advertising data len corrected > [72454.296314] Bluetooth: hci0: advertising data len corrected > [72454.892329] Bluetooth: hci0: advertising data len corrected > [72455.051319] Bluetooth: hci0: advertising data len corrected > [72455.357326] Bluetooth: hci0: advertising data len corrected > [72455.663295] Bluetooth: hci0: advertising data len corrected > [72455.787278] Bluetooth: hci0: advertising data len corrected > [72455.942278] Bluetooth: hci0: advertising data len corrected > [72456.094276] Bluetooth: hci0: advertising data len corrected > [72456.249137] Bluetooth: hci0: advertising data len corrected > [72459.416333] bt_err_ratelimited: 13 callbacks suppressed > [72459.416334] Bluetooth: hci0: advertising data len corrected > [72459.721334] Bluetooth: hci0: advertising data len corrected > [72460.011317] Bluetooth: hci0: advertising data len corrected > [72460.327171] Bluetooth: hci0: advertising data len corrected > [72460.638294] Bluetooth: hci0: advertising data len corrected > [72460.946350] Bluetooth: hci0: advertising data len corrected > [72461.225320] Bluetooth: hci0: advertising data len corrected > [72461.690322] Bluetooth: hci0: advertising data len corrected > [72462.118318] Bluetooth: hci0: advertising data len corrected > [72462.427319] Bluetooth: hci0: advertising data len corrected > [72464.546319] bt_err_ratelimited: 7 callbacks suppressed > [72464.546319] Bluetooth: hci0: advertising data len corrected > [72464.857318] Bluetooth: hci0: advertising data len corrected > [72465.163332] Bluetooth: hci0: advertising data len corrected > [72465.278331] Bluetooth: hci0: advertising data len corrected > [72465.432323] Bluetooth: hci0: advertising data len corrected > [72465.891334] Bluetooth: hci0: advertising data len corrected > [72466.045334] Bluetooth: hci0: advertising data len corrected > [72466.197321] Bluetooth: hci0: advertising data len corrected > [72466.340318] Bluetooth: hci0: advertising data len corrected > [72466.498335] Bluetooth: hci0: advertising data len corrected > [72469.803299] bt_err_ratelimited: 10 callbacks suppressed > > Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl> > Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=203753 > Cc: stable@vger.kernel.org > --- > net/bluetooth/hci_event.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > index 5e99968939ce..26846d338fa7 100644 > --- a/net/bluetooth/hci_event.c > +++ b/net/bluetooth/hci_event.c > @@ -5441,7 +5441,7 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr, > struct hci_conn *conn; > bool match; > u32 flags; > - u8 *ptr, real_len; > + u8 *ptr; > > switch (type) { > case LE_ADV_IND: > @@ -5472,14 +5472,8 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr, > break; > } > > - real_len = ptr - data; > - > /* Adjust for actual length */ > - if (len != real_len) { > - bt_dev_err_ratelimited(hdev, "advertising data len corrected %u -> %u", > - len, real_len); > - len = real_len; > - } > + len = ptr - data; please put a comment above the statement that this handles the case of incorrect advertising data len. Regards Marcel
Hi Szymon, On Thu, May 13, 2021 at 1:23 PM Szymon Janc <szymon.janc@codecoup.pl> wrote: > > Even with rate limited reporting this is very spammy and since > it is remote device that is providing bogus data there is no > need to report this as error. > > Since real_len variable was used only to allow conditional error > message it is now also removed. > > [72454.143336] bt_err_ratelimited: 10 callbacks suppressed > [72454.143337] Bluetooth: hci0: advertising data len corrected > [72454.296314] Bluetooth: hci0: advertising data len corrected > [72454.892329] Bluetooth: hci0: advertising data len corrected > [72455.051319] Bluetooth: hci0: advertising data len corrected > [72455.357326] Bluetooth: hci0: advertising data len corrected > [72455.663295] Bluetooth: hci0: advertising data len corrected > [72455.787278] Bluetooth: hci0: advertising data len corrected > [72455.942278] Bluetooth: hci0: advertising data len corrected > [72456.094276] Bluetooth: hci0: advertising data len corrected > [72456.249137] Bluetooth: hci0: advertising data len corrected > [72459.416333] bt_err_ratelimited: 13 callbacks suppressed > [72459.416334] Bluetooth: hci0: advertising data len corrected > [72459.721334] Bluetooth: hci0: advertising data len corrected > [72460.011317] Bluetooth: hci0: advertising data len corrected > [72460.327171] Bluetooth: hci0: advertising data len corrected > [72460.638294] Bluetooth: hci0: advertising data len corrected > [72460.946350] Bluetooth: hci0: advertising data len corrected > [72461.225320] Bluetooth: hci0: advertising data len corrected > [72461.690322] Bluetooth: hci0: advertising data len corrected > [72462.118318] Bluetooth: hci0: advertising data len corrected > [72462.427319] Bluetooth: hci0: advertising data len corrected > [72464.546319] bt_err_ratelimited: 7 callbacks suppressed > [72464.546319] Bluetooth: hci0: advertising data len corrected > [72464.857318] Bluetooth: hci0: advertising data len corrected > [72465.163332] Bluetooth: hci0: advertising data len corrected > [72465.278331] Bluetooth: hci0: advertising data len corrected > [72465.432323] Bluetooth: hci0: advertising data len corrected > [72465.891334] Bluetooth: hci0: advertising data len corrected > [72466.045334] Bluetooth: hci0: advertising data len corrected > [72466.197321] Bluetooth: hci0: advertising data len corrected > [72466.340318] Bluetooth: hci0: advertising data len corrected > [72466.498335] Bluetooth: hci0: advertising data len corrected > [72469.803299] bt_err_ratelimited: 10 callbacks suppressed > > Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl> Reviewed-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=203753 > Cc: stable@vger.kernel.org > --- > net/bluetooth/hci_event.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > index 5e99968939ce..26846d338fa7 100644 > --- a/net/bluetooth/hci_event.c > +++ b/net/bluetooth/hci_event.c > @@ -5441,7 +5441,7 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr, > struct hci_conn *conn; > bool match; > u32 flags; > - u8 *ptr, real_len; > + u8 *ptr; > > switch (type) { > case LE_ADV_IND: > @@ -5472,14 +5472,8 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr, > break; > } > > - real_len = ptr - data; > - > /* Adjust for actual length */ > - if (len != real_len) { > - bt_dev_err_ratelimited(hdev, "advertising data len corrected %u -> %u", > - len, real_len); > - len = real_len; > - } > + len = ptr - data; > > /* If the direct address is present, then this report is from > * a LE Direct Advertising Report event. In that case it is > -- > 2.31.1 >
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 5e99968939ce..26846d338fa7 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -5441,7 +5441,7 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr, struct hci_conn *conn; bool match; u32 flags; - u8 *ptr, real_len; + u8 *ptr; switch (type) { case LE_ADV_IND: @@ -5472,14 +5472,8 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr, break; } - real_len = ptr - data; - /* Adjust for actual length */ - if (len != real_len) { - bt_dev_err_ratelimited(hdev, "advertising data len corrected %u -> %u", - len, real_len); - len = real_len; - } + len = ptr - data; /* If the direct address is present, then this report is from * a LE Direct Advertising Report event. In that case it is
Even with rate limited reporting this is very spammy and since it is remote device that is providing bogus data there is no need to report this as error. Since real_len variable was used only to allow conditional error message it is now also removed. [72454.143336] bt_err_ratelimited: 10 callbacks suppressed [72454.143337] Bluetooth: hci0: advertising data len corrected [72454.296314] Bluetooth: hci0: advertising data len corrected [72454.892329] Bluetooth: hci0: advertising data len corrected [72455.051319] Bluetooth: hci0: advertising data len corrected [72455.357326] Bluetooth: hci0: advertising data len corrected [72455.663295] Bluetooth: hci0: advertising data len corrected [72455.787278] Bluetooth: hci0: advertising data len corrected [72455.942278] Bluetooth: hci0: advertising data len corrected [72456.094276] Bluetooth: hci0: advertising data len corrected [72456.249137] Bluetooth: hci0: advertising data len corrected [72459.416333] bt_err_ratelimited: 13 callbacks suppressed [72459.416334] Bluetooth: hci0: advertising data len corrected [72459.721334] Bluetooth: hci0: advertising data len corrected [72460.011317] Bluetooth: hci0: advertising data len corrected [72460.327171] Bluetooth: hci0: advertising data len corrected [72460.638294] Bluetooth: hci0: advertising data len corrected [72460.946350] Bluetooth: hci0: advertising data len corrected [72461.225320] Bluetooth: hci0: advertising data len corrected [72461.690322] Bluetooth: hci0: advertising data len corrected [72462.118318] Bluetooth: hci0: advertising data len corrected [72462.427319] Bluetooth: hci0: advertising data len corrected [72464.546319] bt_err_ratelimited: 7 callbacks suppressed [72464.546319] Bluetooth: hci0: advertising data len corrected [72464.857318] Bluetooth: hci0: advertising data len corrected [72465.163332] Bluetooth: hci0: advertising data len corrected [72465.278331] Bluetooth: hci0: advertising data len corrected [72465.432323] Bluetooth: hci0: advertising data len corrected [72465.891334] Bluetooth: hci0: advertising data len corrected [72466.045334] Bluetooth: hci0: advertising data len corrected [72466.197321] Bluetooth: hci0: advertising data len corrected [72466.340318] Bluetooth: hci0: advertising data len corrected [72466.498335] Bluetooth: hci0: advertising data len corrected [72469.803299] bt_err_ratelimited: 10 callbacks suppressed Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl> Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=203753 Cc: stable@vger.kernel.org --- net/bluetooth/hci_event.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)