summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-05-01 16:35:29 +0200
committerThomas Haller <thaller@redhat.com>2019-05-07 21:05:12 +0200
commitf2ae994b2359aa690183a268c5b4cc8fb1a6012e (patch)
treee80cd0e303dbb601f5fa7cd5b70a90e50b86e6c8
parent9eefe27a1c7879e6f94bbb7dec5c9efe722888fa (diff)
downloadNetworkManager-th/various-cleanup-platform-libnm.tar.gz
device/trivial: add comment about lifetime of "kind" in tc_commit()th/various-cleanup-platform-libnm
In general, all fields of public NMPlatform* structs must be plain/simple. Meaning: copying the struct must be possible without caring about cloning/duplicating memory. In other words, if there are fields which lifetime is limited, then these fields cannot be inside the public part NMPlatform*. That is why - "NMPlatformLink.kind", "NMPlatformQdisc.kind", "NMPlatformTfilter.kind" are set by platform code to an interned string (g_intern_string()) that has a static lifetime. - the "ingress_qos_map" field is inside the ref-counted struct NMPObjectLnkVlan and not NMPlatformLnkVlan. This field requires managing the lifetime of the array and NMPlatformLnkVlan cannot provide that. See also for example NMPClass.cmd_obj_copy() which can deep-copy an object. But this is only suitable for fields in NMPObject*. The purpose of this rule is that you always can safely copy a NMPlatform* struct without worrying about the ownership and lifetime of the fields (the field's lifetime is unlimited). This rule and managing of resource lifetime is the main reason for the NMPlatform*/NMPObject* split. NMPlatform* structs simply have no mechanism for copying/releasing fields, that is why the NMPObject* counterpart exists (which is ref-counted and has a copy and destructor function). This is violated in tc_commit() for the "kind" strings. The lifetime of these strings is tied to the setting instance. We cannot intern the strings (because these are arbitrary strings and interned strings are leaked indefinitely). We also cannot g_strdup() the strings, because NMPlatform* is not supposed to own strings. So, just add comments that warn about this ugliness. The more correct solution would be to move the "kind" fields inside NMPObjectQdisc and NMPObjectTfilter, but that is a lot of extra effort.
-rw-r--r--src/devices/nm-device.c14
-rw-r--r--src/platform/nm-linux-platform.c6
-rw-r--r--src/platform/nm-platform.c34
-rw-r--r--src/platform/nm-platform.h12
4 files changed, 66 insertions, 0 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 33b85f5f14..99e84974fd 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -6520,7 +6520,12 @@ tc_commit (NMDevice *self)
NMPlatformQdisc *qdisc = NMP_OBJECT_CAST_QDISC (q);
qdisc->ifindex = ip_ifindex;
+
+ /* Note: kind string is still owned by NMTCTfilter.
+ * This qdisc instance must not be kept alive beyond this function.
+ * nm_platform_qdisc_sync() promises to do that. */
qdisc->kind = nm_tc_qdisc_get_kind (s_qdisc);
+
qdisc->addr_family = AF_UNSPEC;
qdisc->handle = nm_tc_qdisc_get_handle (s_qdisc);
qdisc->parent = nm_tc_qdisc_get_parent (s_qdisc);
@@ -6562,7 +6567,12 @@ tc_commit (NMDevice *self)
NMPlatformTfilter *tfilter = NMP_OBJECT_CAST_TFILTER (q);
tfilter->ifindex = ip_ifindex;
+
+ /* Note: kind string is still owned by NMTCTfilter.
+ * This tfilter instance must not be kept alive beyond this function.
+ * nm_platform_tfilter_sync() promises to do that. */
tfilter->kind = nm_tc_tfilter_get_kind (s_tfilter);
+
tfilter->addr_family = AF_UNSPEC;
tfilter->handle = nm_tc_tfilter_get_handle (s_tfilter);
tfilter->parent = nm_tc_tfilter_get_parent (s_tfilter);
@@ -6572,7 +6582,11 @@ tc_commit (NMDevice *self)
if (action) {
GVariant *var;
+ /* Note: kind string is still owned by NMTCAction.
+ * This tfilter instance must not be kept alive beyond this function.
+ * nm_platform_tfilter_sync() promises to do that. */
tfilter->action.kind = nm_tc_action_get_kind (action);
+
if (strcmp (tfilter->action.kind, "simple") == 0) {
var = nm_tc_action_get_attribute (action, "sdata");
if (var && g_variant_is_of_type (var, G_VARIANT_TYPE_BYTESTRING)) {
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index 6c1dbd0bed..13eda83109 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -8245,6 +8245,9 @@ qdisc_add (NMPlatform *platform,
char s_buf[256];
nm_auto_nlmsg struct nl_msg *msg = NULL;
+ /* Note: @qdisc must not be copied or kept alive because the lifetime of qdisc.kind
+ * is undefined. */
+
msg = _nl_msg_new_qdisc (RTM_NEWQDISC, flags, qdisc);
event_handler_read_netlink (platform, FALSE);
@@ -8286,6 +8289,9 @@ tfilter_add (NMPlatform *platform,
char s_buf[256];
nm_auto_nlmsg struct nl_msg *msg = NULL;
+ /* Note: @tfilter must not be copied or kept alive because the lifetime of tfilter.kind
+ * and tfilter.action.kind is undefined. */
+
msg = _nl_msg_new_tfilter (RTM_NEWTFILTER, flags, tfilter);
event_handler_read_netlink (platform, FALSE);
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index ee71319dd6..7add7dcdbe 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -5077,10 +5077,27 @@ nm_platform_qdisc_add (NMPlatform *self,
int ifindex = qdisc->ifindex;
_CHECK_SELF (self, klass, -NME_BUG);
+ /* Note: @qdisc must not be copied or kept alive because the lifetime of qdisc.kind
+ * is undefined. */
+
_LOG3D ("adding or updating a qdisc: %s", nm_platform_qdisc_to_string (qdisc, NULL, 0));
return klass->qdisc_add (self, flags, qdisc);
}
+/**
+ * nm_platform_qdisc_sync:
+ * @self: the #NMPlatform instance
+ * @ifindex: the ifindex where to configure the qdiscs.
+ * @known_qdiscs: the list of qdiscs (#NMPObject).
+ *
+ * The function promises not to take any reference to the qdisc
+ * instances from @known_qdiscs, nor to keep them around after
+ * the function returns. This is important, because it allows the
+ * caller to pass NMPlatformQdisc instances which "kind" string
+ * have a limited lifetime.
+ *
+ * Returns: %TRUE on success.
+ */
gboolean
nm_platform_qdisc_sync (NMPlatform *self,
int ifindex,
@@ -5143,10 +5160,27 @@ nm_platform_tfilter_add (NMPlatform *self,
int ifindex = tfilter->ifindex;
_CHECK_SELF (self, klass, -NME_BUG);
+ /* Note: @tfilter must not be copied or kept alive because the lifetime of tfilter.kind
+ * and tfilter.action.kind is undefined. */
+
_LOG3D ("adding or updating a tfilter: %s", nm_platform_tfilter_to_string (tfilter, NULL, 0));
return klass->tfilter_add (self, flags, tfilter);
}
+/**
+ * nm_platform_qdisc_sync:
+ * @self: the #NMPlatform instance
+ * @ifindex: the ifindex where to configure the qdiscs.
+ * @known_tfilters: the list of tfilters (#NMPObject).
+ *
+ * The function promises not to take any reference to the tfilter
+ * instances from @known_tfilters, nor to keep them around after
+ * the function returns. This is important, because it allows the
+ * caller to pass NMPlatformTfilter instances which "kind" string
+ * have a limited lifetime.
+ *
+ * Returns: %TRUE on success.
+ */
gboolean
nm_platform_tfilter_sync (NMPlatform *self,
int ifindex,
diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
index 9b6848d977..a2d8e57ff6 100644
--- a/src/platform/nm-platform.h
+++ b/src/platform/nm-platform.h
@@ -626,7 +626,11 @@ typedef struct {
typedef struct {
__NMPlatformObjWithIfindex_COMMON;
+
+ /* beware, kind is embedded in an NMPObject, hence you must
+ * take care of the lifetime of the string. */
const char *kind;
+
int addr_family;
guint32 handle;
guint32 parent;
@@ -649,7 +653,11 @@ typedef struct {
} NMPlatformActionMirred;
typedef struct {
+
+ /* beware, kind is embedded in an NMPObject, hence you must
+ * take care of the lifetime of the string. */
const char *kind;
+
union {
NMPlatformActionSimple simple;
NMPlatformActionMirred mirred;
@@ -661,7 +669,11 @@ typedef struct {
typedef struct {
__NMPlatformObjWithIfindex_COMMON;
+
+ /* beware, kind is embedded in an NMPObject, hence you must
+ * take care of the lifetime of the string. */
const char *kind;
+
int addr_family;
guint32 handle;
guint32 parent;