From 6c0420aa1c9360b2b8bdb19b26e10d768aeae949 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Thu, 15 May 2003 17:13:34 +0000 Subject: [PATCH] STABLE12-amd64-linux-port-20030428 first cut at an opteron port (cherry picked from commit 509c965d0aef031293edc0fcf3e97587d1deac73) --- Makefile.in | 2 + acinclude.m4 | 3 + src/afs/LINUX/osi_module.c | 2 +- src/afs/afs_call.c | 2 +- src/afs/afs_pioctl.c | 2 +- src/config/Makefile.amd64_linux24.in | 44 +++++++ src/config/afs_sysnames.h | 3 + src/config/param.amd64_linux24.h | 165 +++++++++++++++++++++++++++ src/config/param.amd64_linux24_usr.h | 165 +++++++++++++++++++++++++++ src/des/andrew-conf.h | 4 + src/des/conf-amd64-linux.h | 13 +++ src/des/crypt.c | 4 +- src/libafs/MakefileProto.LINUX.in | 5 + src/lwp/process.c | 2 + 14 files changed, 412 insertions(+), 4 deletions(-) create mode 100644 src/config/Makefile.amd64_linux24.in create mode 100644 src/config/param.amd64_linux24.h create mode 100644 src/config/param.amd64_linux24_usr.h create mode 100644 src/des/conf-amd64-linux.h diff --git a/Makefile.in b/Makefile.in index 84700b62a..ecc7b0623 100644 --- a/Makefile.in +++ b/Makefile.in @@ -314,6 +314,8 @@ login: project kauth rxkad ${COMPILE_PART1} login ${COMPILE_PART2} ;; \ parisc_linux24) \ echo Skipping pam/login for parisc_linux24 ;; \ + amd64_linux24) \ + echo Skipping pam/login for amd64_linux24 ;; \ sun*_* | hp_ux11* | *linux* | *fbsd* ) \ ${COMPILE_PART1} pam ${COMPILE_PART2} ;; \ ppc_darwin* | *_obsd* ) \ diff --git a/acinclude.m4 b/acinclude.m4 index 41d69d75a..d0ce5f17d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -452,6 +452,9 @@ else power*-ibm-aix4.3*) AFS_SYSNAME="rs_aix42" ;; + x86_64-*-linux-gnu) + AFS_SYSNAME="amd64_linuxXX" + ;; *) AC_MSG_ERROR(An AFS sysname is required) exit 1 diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c index 211ba33b5..92047b029 100644 --- a/src/afs/LINUX/osi_module.c +++ b/src/afs/LINUX/osi_module.c @@ -434,7 +434,7 @@ module_exit(afs_cleanup); static long get_page_offset(void) { -#if defined(AFS_PPC_LINUX22_ENV) || defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_SPARC_LINUX20_ENV) || defined(AFS_ALPHA_LINUX20_ENV) || defined(AFS_S390_LINUX22_ENV) || defined(AFS_IA64_LINUX20_ENV) || defined(AFS_PARISC_LINUX24_ENV) +#if defined(AFS_PPC_LINUX22_ENV) || defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_SPARC_LINUX20_ENV) || defined(AFS_ALPHA_LINUX20_ENV) || defined(AFS_S390_LINUX22_ENV) || defined(AFS_IA64_LINUX20_ENV) || defined(AFS_PARISC_LINUX24_ENV) || defined(AFS_AMD64_LINUX20_ENV) return PAGE_OFFSET; #else struct task_struct *p, *q; diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c index 272e00499..b2d8a9c2b 100644 --- a/src/afs/afs_call.c +++ b/src/afs/afs_call.c @@ -1087,7 +1087,7 @@ copyin_iparam(caddr_t cmarg, struct iparam *dst) } #endif /* AFS_SUN57_64BIT_ENV */ -#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV) +#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV) && !defined(AFS_AMD64_LINUX20_ENV) struct iparam32 dst32; #ifdef AFS_SPARC64_LINUX24_ENV diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c index 36e5a172d..d154e88ec 100644 --- a/src/afs/afs_pioctl.c +++ b/src/afs/afs_pioctl.c @@ -208,7 +208,7 @@ copyin_afs_ioctl(caddr_t cmarg, struct afs_ioctl *dst) } #endif /* defined(AFS_SGI_ENV) && (_MIPS_SZLONG==64) */ -#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV) +#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV) && !defined(AFS_AMD64_LINUX20_ENV) struct afs_ioctl32 dst32; #ifdef AFS_SPARC64_LINUX24_ENV diff --git a/src/config/Makefile.amd64_linux24.in b/src/config/Makefile.amd64_linux24.in new file mode 100644 index 000000000..13f666e45 --- /dev/null +++ b/src/config/Makefile.amd64_linux24.in @@ -0,0 +1,44 @@ +# 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 = @LINUX_VERSION@ + +# +# 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= +SHLIB_LDFLAGS = -shared -Xlinker -x +SHLIB_SUFFIX=so +SHLIB_CFLAGS= +SHLIB_LINKER=${MT_CC} -shared +# +# libraries +MTLIBS=-lpthread +TXLIBS=-lncurses +XLIBS= @LIB_AFSDB@ +# +# programs +AR=ar +AS=as +CP=cp +LD=ld +MT_CC=cc +MV=mv +RANLIB=ranlib +RM=rm +INSTALL=${TOP_SRCDIR}/pinstall/pinstall +# +# Other OS specific requirements +# +YACC = bison -y +LEX = flex -l diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h index 576c8de48..9131d030b 100644 --- a/src/config/afs_sysnames.h +++ b/src/config/afs_sysnames.h @@ -159,6 +159,9 @@ #define SYS_NAME_ID_parisc_linux22 2401 #define SYS_NAME_ID_parisc_linux24 2402 +#define SYS_NAME_ID_amd64_linux2 2700 +#define SYS_NAME_ID_amd64_linux22 2701 +#define SYS_NAME_ID_amd64_linux24 2702 /* * Placeholder to keep system-wide standard flags since this file is included by all * files (i.e in afs/param.h) diff --git a/src/config/param.amd64_linux24.h b/src/config/param.amd64_linux24.h new file mode 100644 index 000000000..1d6ebaf32 --- /dev/null +++ b/src/config/param.amd64_linux24.h @@ -0,0 +1,165 @@ +#ifndef UKERNEL +/* This section for kernel libafs compiles only */ + +/* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + +#ifndef AFS_PARAM_H +#define AFS_PARAM_H + +/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, + * it's a judgment call. If something is obviously amd64 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_AMD64_LINUX20_ENV 1 +#define AFS_AMD64_LINUX22_ENV 1 +#define AFS_AMD64_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 183 +#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_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ + +#if defined(__KERNEL__) && !defined(KDUMP_KERNEL) +#include + +#include +#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 1 +#ifndef __SMP__ +#define __SMP__ +#endif +#define AFS_GLOBAL_SUNLOCK +#endif + +#if defined(MODULE) && defined(CONFIG_MODVERSIONS) +#define MODVERSIONS +#include +#endif + +#endif /* __KERNEL__ && !DUMP_KERNEL*/ + +#include + +#define AFS_USERSPACE_IP_ADDR 1 +#define RXK_LISTENER_ENV 1 +#define AFS_GCPAGS 2 /* Set to Userdisabled, allow sysctl to override */ + +/* Machine / Operating system information */ +#define SYS_NAME "amd64_linux24" +#define SYS_NAME_ID SYS_NAME_ID_amd64_linux24 +#define AFSLITTLE_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 */ + +#define USE_UCONTEXT /* should be in afsconfig.h */ + +#endif /* _PARAM_AMD64_LINUX20_H_ */ + +#else /* !defined(UKERNEL) */ + +/* This section for user space compiles only */ + +/* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + +#ifndef AFS_PARAM_H +#define AFS_PARAM_H + +/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, + * it's a judgment call. If something is obviously amd64 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 183 +#define AFS_64BIT_IOPS_ENV 1 +#define AFS_NAMEI_ENV 1 /* User space interface to file system */ +#include + +#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 "amd64_linux24" +#define SYS_NAME_ID SYS_NAME_ID_amd64_linux24 +#define AFSLITTLE_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 + +#define USE_UCONTEXT /* should be in afsconfig.h */ + +#endif /* AFS_PARAM_H */ + +#endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_linux24_usr.h b/src/config/param.amd64_linux24_usr.h new file mode 100644 index 000000000..1d6ebaf32 --- /dev/null +++ b/src/config/param.amd64_linux24_usr.h @@ -0,0 +1,165 @@ +#ifndef UKERNEL +/* This section for kernel libafs compiles only */ + +/* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + +#ifndef AFS_PARAM_H +#define AFS_PARAM_H + +/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, + * it's a judgment call. If something is obviously amd64 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_AMD64_LINUX20_ENV 1 +#define AFS_AMD64_LINUX22_ENV 1 +#define AFS_AMD64_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 183 +#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_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ + +#if defined(__KERNEL__) && !defined(KDUMP_KERNEL) +#include + +#include +#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 1 +#ifndef __SMP__ +#define __SMP__ +#endif +#define AFS_GLOBAL_SUNLOCK +#endif + +#if defined(MODULE) && defined(CONFIG_MODVERSIONS) +#define MODVERSIONS +#include +#endif + +#endif /* __KERNEL__ && !DUMP_KERNEL*/ + +#include + +#define AFS_USERSPACE_IP_ADDR 1 +#define RXK_LISTENER_ENV 1 +#define AFS_GCPAGS 2 /* Set to Userdisabled, allow sysctl to override */ + +/* Machine / Operating system information */ +#define SYS_NAME "amd64_linux24" +#define SYS_NAME_ID SYS_NAME_ID_amd64_linux24 +#define AFSLITTLE_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 */ + +#define USE_UCONTEXT /* should be in afsconfig.h */ + +#endif /* _PARAM_AMD64_LINUX20_H_ */ + +#else /* !defined(UKERNEL) */ + +/* This section for user space compiles only */ + +/* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + +#ifndef AFS_PARAM_H +#define AFS_PARAM_H + +/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, + * it's a judgment call. If something is obviously amd64 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 183 +#define AFS_64BIT_IOPS_ENV 1 +#define AFS_NAMEI_ENV 1 /* User space interface to file system */ +#include + +#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 "amd64_linux24" +#define SYS_NAME_ID SYS_NAME_ID_amd64_linux24 +#define AFSLITTLE_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 + +#define USE_UCONTEXT /* should be in afsconfig.h */ + +#endif /* AFS_PARAM_H */ + +#endif /* !defined(UKERNEL) */ diff --git a/src/des/andrew-conf.h b/src/des/andrew-conf.h index f1be8c1a5..8d34bbf5d 100644 --- a/src/des/andrew-conf.h +++ b/src/des/andrew-conf.h @@ -64,7 +64,11 @@ #ifdef AFS_IA64_LINUX20_ENV #include "conf-ia64-linux.h" #else +#ifdef AFS_AMD64_LINUX20_ENV +#include "conf-amd64-linux.h" +#else #include "conf-i386-linux.h" +#endif /* AFS_AMD64_LINUX20_ENV */ #endif /* AFS_IA64_LINUX20_ENV */ #endif /* AFS_ALPHA_LINUX20_ENV */ #endif /* AFS_S390_LINUX20_ENV */ diff --git a/src/des/conf-amd64-linux.h b/src/des/conf-amd64-linux.h new file mode 100644 index 000000000..8118f4cf1 --- /dev/null +++ b/src/des/conf-amd64-linux.h @@ -0,0 +1,13 @@ +/* + * Copyright 1988 by the Massachusetts Institute of Technology. + * + * For copying and distribution information, please see the file + * . + * + */ + +#include + +#define BITS32 +#define BIG +#define LSBFIRST diff --git a/src/des/crypt.c b/src/des/crypt.c index db60d199e..9152e7428 100644 --- a/src/des/crypt.c +++ b/src/des/crypt.c @@ -88,7 +88,9 @@ RCSID("$Header$"); * define "LONG_IS_32_BITS" only if sizeof(long)==4. * This avoids use of bit fields (your compiler may be sloppy with them). */ -#if !defined(cray) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV) + +/* XXX shouldn't this be !AFS_64BIT_ENV ? */ +#if !defined(cray) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV) && !defined(AFS_AMD64_LINUX20_ENV) #define LONG_IS_32_BITS #endif diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in index 3fca3d3f9..dbd2e2326 100644 --- a/src/libafs/MakefileProto.LINUX.in +++ b/src/libafs/MakefileProto.LINUX.in @@ -58,6 +58,9 @@ GCC_KOPTS=@LINUX_GCC_KOPTS@ P5PLUS=@P5PLUS_KOPTS@ CCFLAGS = $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) -pipe $(P5PLUS) DEFINES = -D__KERNEL__ -DCPU=586 -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} ${KDEFINES} + +CCFLAGS = $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) -pipe -mcmodel=kernel +DEFINES = -D__KERNEL__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} CCFLAGS = $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) -pipe -mno-fp-regs -ffixed-8 DEFINES = -D__KERNEL__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} @@ -140,6 +143,8 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: ln -s ${LINUX_KERNEL_PATH}/include/asm-alpha asm ln -s ${LINUX_KERNEL_PATH}/include/asm-i386 asm + + ln -fs ${LINUX_KERNEL_PATH}/include/asm-x86_64 asm ln -s ${LINUX_KERNEL_PATH}/include/asm-s390 asm diff --git a/src/lwp/process.c b/src/lwp/process.c index 5335e0e7c..f95fa61cd 100644 --- a/src/lwp/process.c +++ b/src/lwp/process.c @@ -37,6 +37,8 @@ char* newsp; { #if defined(AFS_IA64_LINUX20_ENV) register unsigned long sp __asm__("r12"); +#elif defined(AFS_AMD64_LINUX24_ENV) + register unsigned long sp __asm__("sp"); #else #error "You need to update stack pointer register for this platform" #endif -- 2.39.5