* [failures] container_ofh-make-container_of-const-aware.patch removed from -mm tree
@ 2022-02-11 22:05 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2022-02-11 22:05 UTC (permalink / raw)
To: mm-commits, dmitry.baryshkov, akpm
The patch titled
Subject: container_of.h: make container_of const-aware
has been removed from the -mm tree. Its filename was
container_ofh-make-container_of-const-aware.patch
This patch was dropped because it had testing failures
------------------------------------------------------
From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Subject: container_of.h: make container_of const-aware
container_of() macro has one major drawback. It does not check whether
the passed ptr has a const pointer, the result will always be a non-const
pointer. Use a _Generic() construct (supported since gcc 4.9 and Clang
3.0) to teach container_of that if converting a const pointer, the
returned pointer should also have the const modifier.
Link: https://lkml.kernel.org/r/20220210170434.3924169-1-dmitry.baryshkov@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
--- a/include/linux/container_of.h~container_ofh-make-container_of-const-aware
+++ a/include/linux/container_of.h
@@ -19,7 +19,11 @@
static_assert(__same_type(*(ptr), ((type *)0)->member) || \
__same_type(*(ptr), void), \
"pointer type mismatch in container_of()"); \
- ((type *)(__mptr - offsetof(type, member))); })
+ _Generic((ptr), \
+ const typeof(((type *)0)->member)*: \
+ ((const type *)(__mptr - offsetof(type, member))), \
+ default: ((type *)(__mptr - offsetof(type, member))) \
+ ); })
/**
* container_of_safe - cast a member of a structure out to the containing structure
@@ -35,6 +39,10 @@
__same_type(*(ptr), void), \
"pointer type mismatch in container_of_safe()"); \
IS_ERR_OR_NULL(__mptr) ? ERR_CAST(__mptr) : \
- ((type *)(__mptr - offsetof(type, member))); })
+ _Generic((ptr), \
+ const typeof(((type *)0)->member)*: \
+ ((const type *)(__mptr - offsetof(type, member))), \
+ default: ((type *)(__mptr - offsetof(type, member))) \
+ ); })
#endif /* _LINUX_CONTAINER_OF_H */
_
Patches currently in -mm which might be from dmitry.baryshkov@linaro.org are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-02-11 22:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-11 22:05 [failures] container_ofh-make-container_of-const-aware.patch removed from -mm tree Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.