[Xenomai-core] [pull request] rtdm: Add padding to rtser_config

[Xenomai-core] [pull request] rtdm: Add padding to rtser_config

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 1887 bytes --]

The following changes since commit 6b1a185b460765c933b17932d77be6967d2e42dc:
  Philippe Gerum (1):
        nucleus: fix locking in shared heap deletion

are available in the git repository at:

  git://git.xenomai.org/xenomai-jki.git for-upstream

Jan Kiszka (1):
      rtdm: Add padding to rtser_config

 include/rtdm/rtserial.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

---

rtdm: Add padding to rtser_config

The current layout of rtser_config is unfortunate as it may result in
different layout depending on the compiler alignment setting. Namely,
rx_timeout may be aligned on 8-byte boundaries in user land while it may
not be aligned in the kernel, or vice versa.

Avoid this ambiguity by adding a reserved padding field. Bump profile
revision number due to ABI breakage.

Signed-off-by: Jan Kiszka <jan.kiszka@domain.hid>
---
 include/rtdm/rtserial.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/rtdm/rtserial.h b/include/rtdm/rtserial.h
index 30bb564..48712b2 100644
--- a/include/rtdm/rtserial.h
+++ b/include/rtdm/rtserial.h
@@ -29,7 +29,7 @@
  * Feel free to comment on this profile via the Xenomai mailing list
  * (Xenomai-core@domain.hid) or directly to the author (jan.kiszka@domain.hid).
  *
- * @b Profile @b Revision: 2
+ * @b Profile @b Revision: 3
  * @n
  * @n
  * @par Device Characteristics
@@ -79,7 +79,7 @@
 
 #include <rtdm/rtdm.h>
 
-#define RTSER_PROFILE_VER		2
+#define RTSER_PROFILE_VER		3
 
 /*!
  * @anchor RTSER_DEF_BAUD   @name RTSER_DEF_BAUD
@@ -263,6 +263,8 @@ typedef struct rtser_config {
 	/** reception FIFO interrupt threshold, see @ref RTSER_FIFO_xxx */
 	int		fifo_depth;
 
+	int		reserved;
+
 	/** reception timeout, see @ref RTSER_TIMEOUT_xxx for special
 	 *  values */
 	nanosecs_rel_t	rx_timeout;
-- 
1.6.0.2


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]

Re: [Xenomai-core] [pull request] rtdm: Add padding to rtser_config

[Jan Kiszka]

Jan Kiszka wrote:
> The following changes since commit 6b1a185b460765c933b17932d77be6967d2e42dc:
>   Philippe Gerum (1):
>         nucleus: fix locking in shared heap deletion
> 
> are available in the git repository at:
> 
>   git://git.xenomai.org/xenomai-jki.git for-upstream
> 
> Jan Kiszka (1):
>       rtdm: Add padding to rtser_config
> 
>  include/rtdm/rtserial.h |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> ---
> 
> rtdm: Add padding to rtser_config
> 
> The current layout of rtser_config is unfortunate as it may result in
> different layout depending on the compiler alignment setting. Namely,
> rx_timeout may be aligned on 8-byte boundaries in user land while it may
> not be aligned in the kernel, or vice versa.
> 
> Avoid this ambiguity by adding a reserved padding field. Bump profile
> revision number due to ABI breakage.

Sorry, forgot to state explicitly: This is obviously no material for 2.4
as it breaks the ABI also for those users that didn't suffer from it so
far (mostly x86). So please revert the corresponding commit.

Thanks,
Jan

-- 
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux