Skip to content

[Backport v4.0-branch] logging: Ensure atomic update of log filter slot in LOG_FILTER_SLOT_SET #87301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 9, 2025
Merged

[Backport v4.0-branch] logging: Ensure atomic update of log filter slot in LOG_FILTER_SLOT_SET #87301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions include/zephyr/logging/log_core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,13 +400,13 @@
#define LOG_FILTER_SLOT_GET(_filters, _id) \
((*(_filters) >> LOG_FILTER_SLOT_SHIFT(_id)) & LOG_FILTER_SLOT_MASK)

#define LOG_FILTER_SLOT_SET(_filters, _id, _filter) \
do { \
*(_filters) &= ~(LOG_FILTER_SLOT_MASK << \
LOG_FILTER_SLOT_SHIFT(_id)); \
*(_filters) |= ((_filter) & LOG_FILTER_SLOT_MASK) << \
LOG_FILTER_SLOT_SHIFT(_id); \
#define LOG_FILTER_SLOT_SET(_filters, _id, _filter) \
do { \
uint32_t others = *(_filters) & ~(LOG_FILTER_SLOT_MASK << \
LOG_FILTER_SLOT_SHIFT(_id)); \
*(_filters) = others | (((_filter) & LOG_FILTER_SLOT_MASK) << \
LOG_FILTER_SLOT_SHIFT(_id)); \
} while (false)

Check notice on line 409 in include/zephyr/logging/log_core.h

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

include/zephyr/logging/log_core.h:409 
-#define LOG_FILTER_SLOT_SET(_filters, _id, _filter)			      \
-	do {								      \
-		uint32_t others = *(_filters) & ~(LOG_FILTER_SLOT_MASK <<     \
-				 LOG_FILTER_SLOT_SHIFT(_id));		      \
-		*(_filters) = others | (((_filter) & LOG_FILTER_SLOT_MASK) << \
-			       LOG_FILTER_SLOT_SHIFT(_id));		      \
+#define LOG_FILTER_SLOT_SET(_filters, _id, _filter)                                                \
+	do {                                                                                       \
+		uint32_t others =                                                                  \
+			*(_filters) & ~(LOG_FILTER_SLOT_MASK << LOG_FILTER_SLOT_SHIFT(_id));       \
+		*(_filters) = others |                                                             \
+			      (((_filter) & LOG_FILTER_SLOT_MASK) << LOG_FILTER_SLOT_SHIFT(_id));  \

Check notice on line 409 in include/zephyr/logging/log_core.h

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

include/zephyr/logging/log_core.h:409 
-#define LOG_FILTER_SLOT_SET(_filters, _id, _filter)			      \
-	do {								      \
-		uint32_t others = *(_filters) & ~(LOG_FILTER_SLOT_MASK <<     \
-				 LOG_FILTER_SLOT_SHIFT(_id));		      \
-		*(_filters) = others | (((_filter) & LOG_FILTER_SLOT_MASK) << \
-			       LOG_FILTER_SLOT_SHIFT(_id));		      \
+#define LOG_FILTER_SLOT_SET(_filters, _id, _filter)                                                \
+	do {                                                                                       \
+		uint32_t others =                                                                  \
+			*(_filters) & ~(LOG_FILTER_SLOT_MASK << LOG_FILTER_SLOT_SHIFT(_id));       \
+		*(_filters) = others |                                                             \
+			      (((_filter) & LOG_FILTER_SLOT_MASK) << LOG_FILTER_SLOT_SHIFT(_id));  \

Check notice on line 409 in include/zephyr/logging/log_core.h

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

include/zephyr/logging/log_core.h:409 
-#define LOG_FILTER_SLOT_SET(_filters, _id, _filter)			      \
-	do {								      \
-		uint32_t others = *(_filters) & ~(LOG_FILTER_SLOT_MASK <<     \
-				 LOG_FILTER_SLOT_SHIFT(_id));		      \
-		*(_filters) = others | (((_filter) & LOG_FILTER_SLOT_MASK) << \
-			       LOG_FILTER_SLOT_SHIFT(_id));		      \
+#define LOG_FILTER_SLOT_SET(_filters, _id, _filter)                                                \
+	do {                                                                                       \
+		uint32_t others =                                                                  \
+			*(_filters) & ~(LOG_FILTER_SLOT_MASK << LOG_FILTER_SLOT_SHIFT(_id));       \
+		*(_filters) = others |                                                             \
+			      (((_filter) & LOG_FILTER_SLOT_MASK) << LOG_FILTER_SLOT_SHIFT(_id));  \

Check notice on line 409 in include/zephyr/logging/log_core.h

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

include/zephyr/logging/log_core.h:409 
-#define LOG_FILTER_SLOT_SET(_filters, _id, _filter)			      \
-	do {								      \
-		uint32_t others = *(_filters) & ~(LOG_FILTER_SLOT_MASK <<     \
-				 LOG_FILTER_SLOT_SHIFT(_id));		      \
-		*(_filters) = others | (((_filter) & LOG_FILTER_SLOT_MASK) << \
-			       LOG_FILTER_SLOT_SHIFT(_id));		      \
+#define LOG_FILTER_SLOT_SET(_filters, _id, _filter)                                                \
+	do {                                                                                       \
+		uint32_t others =                                                                  \
+			*(_filters) & ~(LOG_FILTER_SLOT_MASK << LOG_FILTER_SLOT_SHIFT(_id));       \
+		*(_filters) = others |                                                             \
+			      (((_filter) & LOG_FILTER_SLOT_MASK) << LOG_FILTER_SLOT_SHIFT(_id));  \

#define LOG_FILTER_AGGR_SLOT_IDX 0

Expand Down
Loading