[BlueZ,v1] Revert "adapter: add support for setting POLL_ERRQUEUE experimental feature"

Commit Message

Luiz Augusto von Dentz June 5, 2024, 2:39 p.m. UTC

From: Luiz Augusto von Dentz <[e-mail]>

This reverts commit e1c178f96a07fc43ad7523fdd4c93967843e4f60 as the
changes required in the kernel were reverted as well.
---
 src/adapter.c | 72 +++------------------------------------------------
 src/adapter.h |  1 -
 src/main.c    |  1 -
 src/main.conf |  1 -
 4 files changed, 3 insertions(+), 72 deletions(-)

Comments

[e-mail] June 5, 2024, 4:40 p.m. UTC | #1

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=859116

---Test result---

Test Summary:
CheckPatch                    FAIL      0.59 seconds
GitLint                       FAIL      0.54 seconds
BuildEll                      PASS      24.78 seconds
BluezMake                     PASS      1693.15 seconds
MakeCheck                     PASS      13.09 seconds
MakeDistcheck                 PASS      177.19 seconds
CheckValgrind                 PASS      251.24 seconds
CheckSmatch                   PASS      352.67 seconds
bluezmakeextell               PASS      119.47 seconds
IncrementalBuild              PASS      1472.06 seconds
ScanBuild                     PASS      999.34 seconds

Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,v1] Revert "adapter: add support for setting POLL_ERRQUEUE experimental feature"
WARNING:UNKNOWN_COMMIT_ID: Unknown commit id 'e1c178f96a07fc43ad7523fdd4c93967843e4f60', maybe rebased or not pulled?
#92: 
This reverts commit e1c178f96a07fc43ad7523fdd4c93967843e4f60 as the

/github/workspace/src/src/13687020.patch total: 0 errors, 1 warnings, 126 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

/github/workspace/src/src/13687020.patch has style problems, please review.

NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO

NOTE: If any of the errors are false positives, please report
      them to the maintainer, see CHECKPATCH in MAINTAINERS.


##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
[BlueZ,v1] Revert "adapter: add support for setting POLL_ERRQUEUE experimental feature"

WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search
1: T1 Title exceeds max length (87>80): "[BlueZ,v1] Revert "adapter: add support for setting POLL_ERRQUEUE experimental feature""


---
Regards,
Linux Bluetooth

[e-mail] June 5, 2024, 6:50 p.m. UTC | #2

Hello:

This patch was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <[e-mail]>:

On Wed,  5 Jun 2024 10:39:20 -0400 you wrote:
> From: Luiz Augusto von Dentz <[e-mail]>
> 
> This reverts commit e1c178f96a07fc43ad7523fdd4c93967843e4f60 as the
> changes required in the kernel were reverted as well.
> ---
>  src/adapter.c | 72 +++------------------------------------------------
>  src/adapter.h |  1 -
>  src/main.c    |  1 -
>  src/main.conf |  1 -
>  4 files changed, 3 insertions(+), 72 deletions(-)

Here is the summary with links:
  - [BlueZ,v1] Revert "adapter: add support for setting POLL_ERRQUEUE experimental feature"
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=f63c6e9fa069

You are awesome, thank you!

Patch

diff --git a/src/adapter.c b/src/adapter.c
index 017ad891f9ee..821d94592451 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -148,13 +148,6 @@  static const struct mgmt_exp_uuid iso_socket_uuid = {
 	.str = "6fbaf188-05e0-496a-9885-d6ddfdb4e03e"
 };
 
-/* 69518c4c-b69f-4679-8bc1-c021b47b5733 */
-static const struct mgmt_exp_uuid poll_errqueue_uuid = {
-	.val = { 0x33, 0x57, 0x7b, 0xb4, 0x21, 0xc0, 0xc1, 0x8b,
-		0x79, 0x46, 0x9f, 0xb6, 0x4c, 0x8c, 0x51, 0x69 },
-	.str = "69518c4c-b69f-4679-8bc1-c021b47b5733"
-};
-
 static DBusConnection *dbus_conn = NULL;
 
 static uint32_t kernel_features = 0;
@@ -10058,44 +10051,6 @@  static void iso_socket_func(struct btd_adapter *adapter, uint8_t action)
 	btd_error(adapter->dev_id, "Failed to set ISO Socket");
 }
 
-static void poll_errqueue_complete(uint8_t status, uint16_t len,
-				const void *param, void *user_data)
-{
-	struct exp_pending *pending = user_data;
-	struct btd_adapter *adapter = pending->adapter;
-	uint8_t action;
-
-	if (status != 0) {
-		error("Set Poll Errqueue failed with status 0x%02x (%s)",
-						status, mgmt_errstr(status));
-		return;
-	}
-
-	action = btd_kernel_experimental_enabled(poll_errqueue_uuid.str);
-
-	DBG("Poll Errqueue successfully %s", action ? "set" : "reset");
-
-	if (action)
-		queue_push_tail(adapter->exps,
-					(void *)poll_errqueue_uuid.val);
-}
-
-static void poll_errqueue_func(struct btd_adapter *adapter, uint8_t action)
-{
-	struct mgmt_cp_set_exp_feature cp;
-
-	memset(&cp, 0, sizeof(cp));
-	memcpy(cp.uuid, poll_errqueue_uuid.val, 16);
-	cp.action = action;
-
-	if (exp_mgmt_send(adapter, MGMT_OP_SET_EXP_FEATURE,
-			MGMT_INDEX_NONE, sizeof(cp), &cp,
-			poll_errqueue_complete))
-		return;
-
-	btd_error(adapter->dev_id, "Failed to set Poll Errqueue");
-}
-
 static const struct exp_feat {
 	uint32_t flag;
 	const struct mgmt_exp_uuid *uuid;
@@ -10110,8 +10065,6 @@  static const struct exp_feat {
 	EXP_FEAT(EXP_FEAT_CODEC_OFFLOAD, &codec_offload_uuid,
 		codec_offload_func),
 	EXP_FEAT(EXP_FEAT_ISO_SOCKET, &iso_socket_uuid, iso_socket_func),
-	EXP_FEAT(EXP_FEAT_POLL_ERRQUEUE, &poll_errqueue_uuid,
-							poll_errqueue_func),
 };
 
 static void read_exp_features_complete(uint8_t status, uint16_t length,
@@ -10123,6 +10076,8 @@  static void read_exp_features_complete(uint8_t status, uint16_t length,
 	size_t feature_count = 0;
 	size_t i = 0;
 
+	DBG("index %u status 0x%02x", adapter->dev_id, status);
+
 	if (status != MGMT_STATUS_SUCCESS) {
 		btd_error(adapter->dev_id,
 				"Failed to read exp features info: %s (0x%02x)",
@@ -10174,31 +10129,10 @@  static void read_exp_features_complete(uint8_t status, uint16_t length,
 	}
 }
 
-static void read_exp_features_adapter_complete(uint8_t status, uint16_t length,
-					const void *param, void *user_data)
-{
-	struct exp_pending *pending = user_data;
-	struct btd_adapter *adapter = pending->adapter;
-
-	DBG("index %u status 0x%02x", adapter->dev_id, status);
-	return read_exp_features_complete(status, length, param, user_data);
-}
-
-static void read_exp_features_none_complete(uint8_t status, uint16_t length,
-					const void *param, void *user_data)
-{
-	DBG("index NONE status 0x%02x", status);
-	return read_exp_features_complete(status, length, param, user_data);
-}
-
 static void read_exp_features(struct btd_adapter *adapter)
 {
 	if (exp_mgmt_send(adapter, MGMT_OP_READ_EXP_FEATURES_INFO,
-			adapter->dev_id, 0, NULL,
-			read_exp_features_adapter_complete) &&
-	    exp_mgmt_send(adapter, MGMT_OP_READ_EXP_FEATURES_INFO,
-			MGMT_INDEX_NONE, 0, NULL,
-			read_exp_features_none_complete))
+			adapter->dev_id, 0, NULL, read_exp_features_complete))
 		return;
 
 	btd_error(adapter->dev_id, "Failed to read exp features info");
diff --git a/src/adapter.h b/src/adapter.h
index 3534986f5a72..e3695b21b7c9 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -268,7 +268,6 @@  enum experimental_features {
 	EXP_FEAT_RPA_RESOLUTION		= 1 << 3,
 	EXP_FEAT_CODEC_OFFLOAD		= 1 << 4,
 	EXP_FEAT_ISO_SOCKET		= 1 << 5,
-	EXP_FEAT_POLL_ERRQUEUE		= 1 << 6,
 };
 
 bool btd_adapter_has_exp_feature(struct btd_adapter *adapter, uint32_t feature);
diff --git a/src/main.c b/src/main.c
index ac840d684f6d..62453bffaf57 100644
--- a/src/main.c
+++ b/src/main.c
@@ -712,7 +712,6 @@  static const char *valid_uuids[] = {
 	"330859bc-7506-492d-9370-9a6f0614037f",
 	"a6695ace-ee7f-4fb9-881a-5fac66c629af",
 	"6fbaf188-05e0-496a-9885-d6ddfdb4e03e",
-	"69518c4c-b69f-4679-8bc1-c021b47b5733",
 	"*"
 };
 
diff --git a/src/main.conf b/src/main.conf
index bea94640e627..82040b3fa33f 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -140,7 +140,6 @@ 
 # 330859bc-7506-492d-9370-9a6f0614037f (BlueZ Experimental Bluetooth Quality Report)
 # a6695ace-ee7f-4fb9-881a-5fac66c629af (BlueZ Experimental Offload Codecs)
 # 6fbaf188-05e0-496a-9885-d6ddfdb4e03e (BlueZ Experimental ISO socket)
-# 69518c4c-b69f-4679-8bc1-c021b47b5733 (BlueZ Experimental Poll Errqueue)
 # Defaults to false.
 #KernelExperimental = false