plugins ext BUGFIX printed context align all sizes and mem

Refs #2455

Author: michalvasko

src/plugins_exts.h

@@ -953,13 +953,26 @@ LIBYANG_API_DECL void lyplg_ext_cfree_instance_substatements(const struct ly_ctx
  * compiled size
  */
 
+/**
+ * @brief Alignment of all the printed data, ensures all memory access is aligned to this number (B)
+ */
+#define LY_CTXP_MEM_ALIGN 8
+
+/**
+ * @brief Adjust data size to an aligned size to make sure the following data is aligned.
+ *
+ * @param[in,out] SIZE Data size that is adjusted.
+ */
+#define LY_CTXP_MEM_SIZE(SIZE) ((SIZE) + ((~(SIZE) + 1) & (LY_CTXP_MEM_ALIGN - 1)))
+
 /**
  * @brief Callback to return the size of the custom compiled structure and substmts array. If there are none, do not
  * define this callback.
  *
  * @param[in] ext Compiled extension structure.
  * @param[in,out] addr_ht Hash table with addresses of shared structures that were already accounted for, can be added to.
- * @return Total size of the custom compiled structures and the substmts array;
+ * @return Total size of the custom compiled structures and the substmts array. Always use ::LY_CTXP_MEM_SIZE when
+ * adding to the size for correct alignment.
  * @return -1 on error.
  */
 typedef int (*lyplg_ext_compiled_size_clb)(const struct lysc_ext_instance *ext, struct ly_ht *addr_ht);
@@ -984,7 +997,7 @@ LIBYANG_API_DECL int lyplg_ext_compiled_stmts_storage_size(const struct lysc_ext
  * @param[in] orig_ext Compiled extension structure to print.
  * @param[in,out] ext Printed extension structure to modify.
  * @param[in,out] mem Memory chunk of the size returned by ::lyplg_ext_compiled_size_clb() to print into, is moved
- * after all the printed data.
+ * after all the printed data. Always use ::LY_CTXP_MEM_SIZE when moving @p mem for correct alignment.
  * @param[in,out] ptr_set Set with pointers to set to printed addresses.
  * @param[in,out] addr_ht Hash table with pairs of addresses of shared structures to be printed and their printed
  * addresses, can be added to.

src/plugins_exts/metadata.c

@@ -220,7 +220,7 @@ annotation_compiled_size(const struct lysc_ext_instance *ext, struct ly_ht *addr
 {
     int size = 0;
 
-    size += sizeof(struct lysc_ext_metadata);
+    size += LY_CTXP_MEM_SIZE(sizeof(struct lysc_ext_metadata));
     size += lyplg_ext_compiled_stmts_storage_size(ext->substmts, addr_ht);
 
     return size;
@@ -233,7 +233,7 @@ annotation_compiled_print(const struct lysc_ext_instance *orig_ext, struct lysc_
     struct lysc_ext_metadata *ann_cdata;
 
     ann_cdata = ext->compiled = *mem;
-    *mem = (char *)*mem + sizeof *ann_cdata;
+    *mem = (char *)*mem + LY_CTXP_MEM_SIZE(sizeof *ann_cdata);
     memset(ann_cdata, 0, sizeof *ann_cdata);
 
     ext->substmts[1].storage_p = (void **)&ann_cdata->units;

src/plugins_exts/schema_mount.c

@@ -79,8 +79,6 @@ struct sprinter_tree_priv {
         lyplg_ext_compile_log(cctx, ext, LY_LLERR, LY_EINT, "Internal error (%s:%d).", __FILE__, __LINE__); \
         return LY_EINT
 
-#define CTXP_MEM_SIZE(SIZE) ((SIZE) + ((~(SIZE) + 1) & (8 - 1)))
-
 /**
  * @brief Check if given mount point is unique among its siblings
  *
@@ -1468,20 +1466,20 @@ schema_mount_compiled_size(const struct lysc_ext_instance *ext, struct ly_ht *ad
         return 0;
     }
 
-    size += CTXP_MEM_SIZE(sizeof *sm_data);
+    size += LY_CTXP_MEM_SIZE(sizeof *sm_data);
 
     /* ht addr check, make sure the shared context is stored only once */
     hash = lyht_hash((const char *)&sm_data->shared, sizeof sm_data->shared);
     if (lyht_insert(addr_ht, &sm_data->shared, hash, NULL) == LY_EEXIST) {
         return size;
     }
 
-    size += CTXP_MEM_SIZE(sizeof *sm_data->shared);
-    size += CTXP_MEM_SIZE(sm_data->shared->schema_count * sizeof *sm_data->shared->schemas);
+    size += LY_CTXP_MEM_SIZE(sizeof *sm_data->shared);
+    size += LY_CTXP_MEM_SIZE(sm_data->shared->schema_count * sizeof *sm_data->shared->schemas);
     for (i = 0; i < sm_data->shared->schema_count; ++i) {
-        size += CTXP_MEM_SIZE(ly_ctx_compiled_size(sm_data->shared->schemas[i].ctx));
-        size += CTXP_MEM_SIZE(strlen(sm_data->shared->schemas[i].mount_point) + 1);
-        size += CTXP_MEM_SIZE(strlen(sm_data->shared->schemas[i].content_id) + 1);
+        size += LY_CTXP_MEM_SIZE(ly_ctx_compiled_size(sm_data->shared->schemas[i].ctx));
+        size += LY_CTXP_MEM_SIZE(strlen(sm_data->shared->schemas[i].mount_point) + 1);
+        size += LY_CTXP_MEM_SIZE(strlen(sm_data->shared->schemas[i].content_id) + 1);
     }
 
     /* inlined contexts cannot be reused and will not be printed */
@@ -1501,7 +1499,7 @@ schema_mount_compiled_print(const struct lysc_ext_instance *orig_ext, struct lys
 
     /* sm_data */
     ext->compiled = sm_data = *mem;
-    *mem = (char *)*mem + CTXP_MEM_SIZE(sizeof *sm_data);
+    *mem = (char *)*mem + LY_CTXP_MEM_SIZE(sizeof *sm_data);
 
     pthread_mutexattr_init(&attr);
     pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
@@ -1517,15 +1515,15 @@ schema_mount_compiled_print(const struct lysc_ext_instance *orig_ext, struct lys
 
     /* sm_data->shared */
     sm_data->shared = *mem;
-    *mem = (char *)*mem + CTXP_MEM_SIZE(sizeof *sm_data->shared);
+    *mem = (char *)*mem + LY_CTXP_MEM_SIZE(sizeof *sm_data->shared);
 
     sm_data->shared->schema_count = orig_sm_data->shared->schema_count;
     sm_data->shared->ref_count = orig_sm_data->shared->ref_count;
 
     /* sm_data->shared->schemas */
     if (orig_sm_data->shared->schemas) {
         sm_data->shared->schemas = *mem;
-        *mem = (char *)*mem + CTXP_MEM_SIZE(sm_data->shared->schema_count * sizeof *sm_data->shared->schemas);
+        *mem = (char *)*mem + LY_CTXP_MEM_SIZE(sm_data->shared->schema_count * sizeof *sm_data->shared->schemas);
 
         for (i = 0; i < sm_data->shared->schema_count; ++i) {
             /* ctx */
@@ -1538,12 +1536,12 @@ schema_mount_compiled_print(const struct lysc_ext_instance *orig_ext, struct lys
             /* mount_point */
             strcpy(*mem, orig_sm_data->shared->schemas[i].mount_point);
             sm_data->shared->schemas[i].mount_point = *mem;
-            *mem = (char *)*mem + CTXP_MEM_SIZE(strlen(sm_data->shared->schemas[i].mount_point) + 1);
+            *mem = (char *)*mem + LY_CTXP_MEM_SIZE(strlen(sm_data->shared->schemas[i].mount_point) + 1);
 
             /* content_id */
             strcpy(*mem, orig_sm_data->shared->schemas[i].content_id);
             sm_data->shared->schemas[i].content_id = *mem;
-            *mem = (char *)*mem + CTXP_MEM_SIZE(strlen(sm_data->shared->schemas[i].content_id) + 1);
+            *mem = (char *)*mem + LY_CTXP_MEM_SIZE(strlen(sm_data->shared->schemas[i].content_id) + 1);
         }
     }
 

src/plugins_exts/structure.c

@@ -329,9 +329,9 @@ structure_compiled_size(const struct lysc_ext_instance *ext, struct ly_ht *addr_
 
     struct_cdata = ext->compiled;
 
-    size += sizeof *struct_cdata;
+    size += LY_CTXP_MEM_SIZE(sizeof *struct_cdata);
     size += lyplg_ext_compiled_stmts_storage_size(ext->substmts, addr_ht);
-    size += sizeof *struct_cdata->top_cont;
+    size += LY_CTXP_MEM_SIZE(sizeof *struct_cdata->top_cont);
 
     return size;
 }
@@ -347,12 +347,12 @@ structure_compiled_print(const struct lysc_ext_instance *orig_ext, struct lysc_e
 
     /* ext structure */
     struct_cdata = ext->compiled = *mem;
-    *mem = (char *)*mem + sizeof *struct_cdata;
+    *mem = (char *)*mem + LY_CTXP_MEM_SIZE(sizeof *struct_cdata);
     memset(struct_cdata, 0, sizeof *struct_cdata);
 
     /* top_cont */
     struct_cdata->top_cont = *mem;
-    *mem = (char *)*mem + sizeof *struct_cdata->top_cont;
+    *mem = (char *)*mem + LY_CTXP_MEM_SIZE(sizeof *struct_cdata->top_cont);
     lyplg_ext_compiled_print_add_addr(addr_ht, orig_cdata->top_cont, struct_cdata->top_cont);
     memset(struct_cdata->top_cont, 0, sizeof *struct_cdata->top_cont);