[Patch] modified shm.h is needed for SH-Linux

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[Patch] modified shm.h is needed for SH-Linux

SUGIOKA Toshinobu
Hi,

On sh3/4 linux kernel, SHMLBA is defined as 0x4000 in order to avoid cache alias problem.
So, it seems that modified shm.h is needed for sh3/4.

I'm not sure which real application depends on this macro, but at least, LTP's 'shmctl'
syscall test fails because of this mismatch.

2006-12-20  SUGIOKA Toshinobu  <[hidden email]>

        * sysdeps/unix/sysv/linux/sh/bits/shm.h: New file.

--- /dev/null 2006-11-02 11:51:22.852433000 +0900
+++ glibc-2.5/sysdeps/unix/sysv/linux/sh/bits/shm.h 2006-12-19 22:48:10.000000000 +0900
@@ -0,0 +1,101 @@
+/* Copyright (C) 1995,1996,1997,2000,2002,2004,2006 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _SYS_SHM_H
+# error "Never include <bits/shm.h> directly; use <sys/shm.h> instead."
+#endif
+
+#include <bits/types.h>
+
+/* Permission flag for shmget.  */
+#define SHM_R 0400 /* or S_IRUGO from <linux/stat.h> */
+#define SHM_W 0200 /* or S_IWUGO from <linux/stat.h> */
+
+/* Flags for `shmat'.  */
+#define SHM_RDONLY 010000 /* attach read-only else read-write */
+#define SHM_RND 020000 /* round attach address to SHMLBA */
+#define SHM_REMAP 040000 /* take-over region on attach */
+
+/* Commands for `shmctl'.  */
+#define SHM_LOCK 11 /* lock segment (root only) */
+#define SHM_UNLOCK 12 /* unlock segment (root only) */
+
+__BEGIN_DECLS
+
+/* Segment low boundary address multiple.  */
+#define SHMLBA 0x4000
+
+/* Type to count number of attaches.  */
+typedef unsigned long int shmatt_t;
+
+/* Data structure describing a set of semaphores.  */
+struct shmid_ds
+  {
+    struct ipc_perm shm_perm; /* operation permission struct */
+    size_t shm_segsz; /* size of segment in bytes */
+    __time_t shm_atime; /* time of last shmat() */
+    unsigned long int __unused1;
+    __time_t shm_dtime; /* time of last shmdt() */
+    unsigned long int __unused2;
+    __time_t shm_ctime; /* time of last change by shmctl() */
+    unsigned long int __unused3;
+    __pid_t shm_cpid; /* pid of creator */
+    __pid_t shm_lpid; /* pid of last shmop */
+    shmatt_t shm_nattch; /* number of current attaches */
+    unsigned long int __unused4;
+    unsigned long int __unused5;
+  };
+
+#ifdef __USE_MISC
+
+/* ipcs ctl commands */
+# define SHM_STAT 13
+# define SHM_INFO 14
+
+/* shm_mode upper byte flags */
+# define SHM_DEST 01000 /* segment will be destroyed on last detach */
+# define SHM_LOCKED 02000   /* segment will not be swapped */
+# define SHM_HUGETLB 04000 /* segment is mapped via hugetlb */
+# define SHM_NORESERVE 010000 /* don't check for reservations */
+
+struct shminfo
+  {
+    unsigned long int shmmax;
+    unsigned long int shmmin;
+    unsigned long int shmmni;
+    unsigned long int shmseg;
+    unsigned long int shmall;
+    unsigned long int __unused1;
+    unsigned long int __unused2;
+    unsigned long int __unused3;
+    unsigned long int __unused4;
+  };
+
+struct shm_info
+  {
+    int used_ids;
+    unsigned long int shm_tot; /* total allocated shm */
+    unsigned long int shm_rss; /* total resident shm */
+    unsigned long int shm_swp; /* total swapped shm */
+    unsigned long int swap_attempts;
+    unsigned long int swap_successes;
+  };
+
+#endif /* __USE_MISC */
+
+__END_DECLS

SUGIOKA Toshinobu

Reply | Threaded
Open this post in threaded view
|

Re: [Patch] modified shm.h is needed for SH-Linux

Kaz Kojima
SUGIOKA Toshinobu <[hidden email]> wrote:
> On sh3/4 linux kernel, SHMLBA is defined as 0x4000 in order to avoid cache alias problem.
> So, it seems that modified shm.h is needed for sh3/4.
>
> I'm not sure which real application depends on this macro, but at least, LTP's 'shmctl'
> syscall test fails because of this mismatch.
>
> 2006-12-20  SUGIOKA Toshinobu  <[hidden email]>
>
> * sysdeps/unix/sysv/linux/sh/bits/shm.h: New file.

This patch is fine by me.  Thanks for catching this.
Uli, could you please approve it?

Regards,
        kaz
Reply | Threaded
Open this post in threaded view
|

Re: [Patch] modified shm.h is needed for SH-Linux

Ulrich Drepper
In reply to this post by SUGIOKA Toshinobu
Applied.

--
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖