sparc64-linux24-support-20010629

support for sparc64 linux2.4 tested with 2.4.5

diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c
index 760e8a5..3cc273a 100644 (file)
--- a/src/afs/LINUX/osi_groups.c
+++ b/src/afs/LINUX/osi_groups.c
@@ -159,7 +159,7 @@ asmlinkage int afs_xsetgroups32(int gidsetsize, gid_t *grouplist)
 }
 #endif
 #if defined(AFS_SPARC64_LINUX20_ENV)
-asmlinkage int afs_xsetgroups32(int gidsetsize, __kernel_gid_t32 *grouplist)
+asmlinkage int afs32_xsetgroups(int gidsetsize, __kernel_gid_t32 *grouplist)
 {
     gid_t gl[NGROUPS];
     int ret, i;
@@ -175,6 +175,24 @@ asmlinkage int afs_xsetgroups32(int gidsetsize, __kernel_gid_t32 *grouplist)
     set_fs (old_fs);
     return ret;
 }
+#ifdef AFS_LINUX24_ENV
+asmlinkage int afs32_xsetgroups32(int gidsetsize, __kernel_gid_t32 *grouplist)
+{
+    gid_t gl[NGROUPS];
+    int ret, i;
+    mm_segment_t old_fs = get_fs ();
+
+    if ((unsigned) gidsetsize > NGROUPS)
+       return -EINVAL;
+    for (i = 0; i < gidsetsize; i++, grouplist++)
+       if (__get_user (gl[i], grouplist))
+           return -EFAULT;
+    set_fs (KERNEL_DS);
+    ret = afs_xsetgroups32(gidsetsize, gl);
+    set_fs (old_fs);
+    return ret;
+}
+#endif
 #endif
 
 static int afs_setgroups(cred_t **cr, int ngroups, gid_t *gidset, int change_parent)

diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index 6080127..7947b5a 100644 (file)
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -20,6 +20,9 @@
 #include <linux/module.h>
 
 
+#ifdef AFS_SPARC64_LINUX24_ENV
+#define __NR_setgroups32      82 /* This number is not exported for some bizarre reason. */
+#endif
 
 asmlinkage int (*sys_settimeofdayp)(struct timeval *tv, struct timezone *tz);
 #if !defined(AFS_ALPHA_LINUX20_ENV)
@@ -56,7 +59,10 @@ static void* afs_ni_syscall = 0;
  
 #ifdef AFS_SPARC64_LINUX20_ENV
 static unsigned int afs_ni_syscall32 = 0;
-asmlinkage int (*sys_setgroupsp32)(int gidsetsize, __kernel_gid_t32 *grouplist);
+asmlinkage int (*sys32_setgroupsp)(int gidsetsize, __kernel_gid_t32 *grouplist);
+#if defined(__NR_setgroups32)
+asmlinkage int (*sys32_setgroups32p)(int gidsetsize, __kernel_gid_t32 *grouplist);
+#endif
 extern unsigned int sys_call_table32[];
 
 asmlinkage int afs_syscall32(long syscall, long parm1, long parm2, long parm3,
@@ -73,7 +79,7 @@ __asm__ __volatile__ ("
 }
 #endif
 
-#if defined(AFS_LINUX24_ENV)
+#ifdef AFS_LINUX24_ENV
 asmlinkage int (*sys_setgroups32p)(int gidsetsize, __kernel_gid32_t *grouplist);
 #endif 
 
@@ -89,9 +95,15 @@ int init_module(void)
 {
     extern int afs_syscall();
     extern int afs_xsetgroups();
-#if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_LINUX24_ENV)
+#if defined(__NR_setgroups32)
     extern int afs_xsetgroups32();
 #endif
+#ifdef AFS_SPARC64_LINUX20_ENV
+    extern int afs32_xsetgroups();
+#if defined(__NR_setgroups32)
+    extern int afs32_xsetgroups32();
+#endif
+#endif
 
     /* obtain PAGE_OFFSET value */
     afs_linux_page_offset = get_page_offset();
@@ -132,12 +144,16 @@ int init_module(void)
     sys_setgroupsp = SYSCALL2POINTER sys_call_table[__NR_setgroups];
     sys_call_table[__NR_setgroups] = POINTER2SYSCALL afs_xsetgroups;
 #ifdef AFS_SPARC64_LINUX20_ENV
-    sys_setgroupsp32 = SYSCALL2POINTER sys_call_table32[__NR_setgroups];
-    sys_call_table32[__NR_setgroups] = POINTER2SYSCALL afs_xsetgroups32;
+    sys32_setgroupsp = SYSCALL2POINTER sys_call_table32[__NR_setgroups];
+    sys_call_table32[__NR_setgroups] = POINTER2SYSCALL afs32_xsetgroups;
 #endif
 #if defined(__NR_setgroups32)
     sys_setgroups32p = SYSCALL2POINTER sys_call_table[__NR_setgroups32];
     sys_call_table[__NR_setgroups32] = POINTER2SYSCALL afs_xsetgroups32;
+#ifdef AFS_SPARC64_LINUX20_ENV
+    sys32_setgroups32p = SYSCALL2POINTER sys_call_table32[__NR_setgroups32];
+    sys_call_table32[__NR_setgroups32] = POINTER2SYSCALL afs32_xsetgroups32;
+#endif
 #endif
 
     return 0;
@@ -150,11 +166,14 @@ void cleanup_module(void)
     sys_call_table[__NR_setgroups] = POINTER2SYSCALL sys_setgroupsp;
     sys_call_table[__NR_afs_syscall] = afs_ni_syscall;
 #ifdef AFS_SPARC64_LINUX20_ENV
-    sys_call_table32[__NR_setgroups] = POINTER2SYSCALL sys_setgroupsp32;
+    sys_call_table32[__NR_setgroups] = POINTER2SYSCALL sys32_setgroupsp;
     sys_call_table32[__NR_afs_syscall] = afs_ni_syscall32;
 #endif
 #if defined(__NR_setgroups32)
     sys_call_table[__NR_setgroups32] = POINTER2SYSCALL sys_setgroups32p;
+#ifdef AFS_SPARC64_LINUX20_ENV
+    sys_call_table32[__NR_setgroups32] = POINTER2SYSCALL sys32_setgroups32p;
+#endif
 #endif
     unregister_filesystem(&afs_file_system);
 

diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index 0b70b19..073b8f6 100644 (file)
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -841,7 +841,9 @@ copyin_iparam(caddr_t cmarg, struct iparam *dst)
 #if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV)
        struct iparam32 dst32;
 
-#ifdef AFS_SPARC64_LINUX20_ENV
+#ifdef AFS_SPARC64_LINUX24_ENV
+       if (current->thread.flags & SPARC_FLAG_32BIT) 
+#elif AFS_SPARC64_LINUX20_ENV
        if (current->tss.flags & SPARC_FLAG_32BIT) 
 #else
 #error Not done for this linux version

diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index 82c33ad..1baf5f8 100644 (file)
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -199,7 +199,9 @@ copyin_afs_ioctl(caddr_t cmarg, struct afs_ioctl *dst)
 #if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV)
        struct afs_ioctl32 dst32;
 
-#ifdef AFS_SPARC64_LINUX20_ENV
+#ifdef AFS_SPARC64_LINUX24_ENV
+        if (current->thread.flags & SPARC_FLAG_32BIT)
+#elif AFS_SPARC64_LINUX20_ENV
        if (current->tss.flags & SPARC_FLAG_32BIT) 
 #else
 #error Not done for this linux type

diff --git a/src/config/Makefile.sparc64_linux24.in b/src/config/Makefile.sparc64_linux24.in
new file mode 100644 (file)
index 0000000..a8d184f
--- /dev/null
+++ b/src/config/Makefile.sparc64_linux24.in
@@ -0,0 +1,50 @@
+# Copyright 1998 Transarc Corporation 
+#
+# Keep macros within each section in sorted order for clean diff displays.
+#
+# AFS_OSTYPE used to indicate suffixes and os specific subdirectories.
+AFS_OSTYPE = LINUX
+
+# Base directory for linux kernel source. Actually a prefix which is complete
+# when LINUX_VERS is appended to it.
+LINUX_SRCDIR = /usr/src/linux-
+# Default list of Linux kernels to build. Build will run only if all
+# can be built. To build a different set, specify LINUX_VERS to make.
+LINUX_VERS = 2.2.14
+
+#
+# compilation and link editor flags
+DBG=-g
+OPTMZ=-O2
+PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC
+# Put -O2 here to _ensure_ all Makefiles pick it up.
+XCFLAGS= -O2
+MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}
+XLDFLAGS=
+SHARE_LDFLAGS = -shared -Xlinker -x
+SHLIB_SUFFIX=so
+SHLIB_CFLAGS=
+#
+# libraries
+MTLIBS=-lpthread
+TXLIBS= /usr/lib/libncurses.so
+XLIBS=@LIB_AFSDB@
+#
+# programs
+AR=ar
+AS=as
+CP=cp
+LD=ld   
+MT_CC=cc
+MV=mv
+RANLIB=ranlib
+RM=rm
+WASHTOOL=${DESTDIR}bin/washtool
+INSTALL=${DESTDIR}bin/install
+#
+# Other OS specific requirements
+#
+YACC = bison -y
+LEX = flex -l
+# Used in des library.
+CRYPT_OBJ = crypt.o

diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h
index b0dcd97..84e3ef7 100644 (file)
--- a/src/config/afs_sysnames.h
+++ b/src/config/afs_sysnames.h
@@ -123,6 +123,7 @@
 
 #define SYS_NAME_ID_sparc64_linux2     1800
 #define SYS_NAME_ID_sparc64_linux22    1801
+#define SYS_NAME_ID_sparc64_linux24    1802
 
 #define SYS_NAME_ID_s390_linux2         1900
 #define SYS_NAME_ID_s390_linux22        1901

diff --git a/src/config/param.sparc64_linux24.h b/src/config/param.sparc64_linux24.h
new file mode 100644 (file)
index 0000000..e63497d
--- /dev/null
+++ b/src/config/param.sparc64_linux24.h
@@ -0,0 +1,85 @@
+/* Copyright (C) 1998 by Transarc Corporation */
+
+
+#ifndef _PARAM_SPARC64_LINUX24_H_
+#define _PARAM_SPARC64_LINUX24_H_
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously sparc64 specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define AFS_LINUX20_ENV        1
+#define AFS_LINUX22_ENV        1
+#define AFS_LINUX24_ENV        1
+#define AFS_SPARC64_LINUX20_ENV        1
+#define AFS_SPARC64_LINUX22_ENV        1
+#define AFS_SPARC64_LINUX24_ENV        1
+#define AFS_LINUX_64BIT_KERNEL 1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 227
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+
+#define AFS_64BIT_ENV          1       /* Defines afs_int32 as int, not long. */
+#define AFS_32BIT_USR_ENV       1
+#define AFS_64BITPOINTER_ENV   1       /* pointers are 64 bits. */
+
+#if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
+#include <linux/config.h>
+#if defined(MODULE) && defined(CONFIG_MODVERSIONS)
+#define MODVERSIONS
+#include <linux/modversions.h>
+#endif
+#ifdef CONFIG_SMP
+#undef CONFIG_SMP
+#endif
+/* Using "AFS_SMP" to map to however many #define's are required to get
+ * MP to compile for Linux
+ */
+#ifdef AFS_SMP
+#define CONFIG_SMP
+#define __SMP__
+#define AFS_GLOBAL_SUNLOCK
+#endif
+
+#endif /* __KERNEL__  && !DUMP_KERNEL*/
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+/* Machine / Operating system information */
+#define SYS_NAME       "sparc64_linux24"
+#define SYS_NAME_ID    SYS_NAME_ID_sparc64_linux24
+#define AFSBIG_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+
+#ifdef KERNEL
+#ifndef MIN
+#define MIN(A,B) ((A) < (B) ? (A) : (B))
+#endif
+#ifndef MAX
+#define MAX(A,B) ((A) > (B) ? (A) : (B))
+#endif
+#endif /* KERNEL */
+
+/* on sparclinux is O_LARGEFILE defined but there is not off64_t,
+   so small hack to get usd_file.c work */
+#ifndef KERNEL
+#define __USE_FILE_OFFSET64 1
+#define __USE_LARGEFILE64 1
+#if !defined off64_t
+#define off64_t __off64_t
+#endif
+#endif
+
+#endif /* _PARAM_SPARC64_LINUX24_H_ */

diff --git a/src/config/param.sparc64_linux24_usr.h b/src/config/param.sparc64_linux24_usr.h
new file mode 100644 (file)
index 0000000..4512950
--- /dev/null
+++ b/src/config/param.sparc64_linux24_usr.h
@@ -0,0 +1,57 @@
+/* Copyright (C) 1998 by Transarc Corporation */
+
+
+#ifndef _PARAM_USR_SPARC64_LINUX24_H_
+#define _PARAM_USR_SPARC64_LINUX24_H_
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously sparc64 specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_LINUX20_ENV    1
+#define AFS_USR_LINUX22_ENV    1
+#define AFS_USR_LINUX24_ENV    1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 227
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME       "sparc64_linux24"
+#define SYS_NAME_ID    SYS_NAME_ID_sparc64_linux24
+#define AFSBIG_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* _PARAM_USR_SPARC64_LINUX24_H_ */