Compare commits

..

No commits in common. "master" and "v1.13.1" have entirely different histories.

27 changed files with 2376 additions and 2655 deletions

2
.gitignore vendored
View File

@ -21,5 +21,3 @@ examples/ioctl
examples/logring
examples/pager
examples/uid-filter
examples/mmap-read
examples/mmap-test

View File

@ -1,142 +0,0 @@
language: c
os: linux
dist: trusty
compiler: gcc
env:
global:
- KERNEL_GIT="https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git"
matrix:
include:
# Older version of the kernel
# - name: "Kernel 2.6.13"
# env: KERNEL_BRANCH="v2.6.13" GCC_VER="gcc-4.9"
# addons:
# apt:
# packages:
# - gcc-4.9
# sources:
# - ubuntu-toolchain-r-test
- name: "Kernel 2.6.32"
env: KERNEL_BRANCH="v2.6.32" GCC_VER="gcc-4.9"
addons:
apt:
packages:
- gcc-4.9
sources:
- ubuntu-toolchain-r-test
- name: "Kernel 3.10.0"
env: KERNEL_BRANCH="v3.10" GCC_VER="gcc-4.9"
addons:
apt:
packages:
- gcc-4.9
sources:
- ubuntu-toolchain-r-test
# Here are actively supported kernel
- name: "Kernel 3.16.y LTS"
env: KERNEL_BRANCH="linux-3.16.y" GCC_VER="gcc-5"
addons:
apt:
packages:
- gcc-5
sources:
- ubuntu-toolchain-r-test
- name: "Kernel 4.4.y LTS"
env: KERNEL_BRANCH="linux-4.4.y" GCC_VER="gcc-5"
addons:
apt:
packages:
- gcc-5
sources:
- ubuntu-toolchain-r-test
- name: "Kernel 4.9.y LTS"
env: KERNEL_BRANCH="linux-4.9.y" GCC_VER="gcc-6"
addons:
apt:
packages:
- gcc-6
sources:
- ubuntu-toolchain-r-test
- name: "Kernel 4.14.y LTS"
env: KERNEL_BRANCH="linux-4.14.y" GCC_VER="gcc-7"
addons:
apt:
packages:
- libelf-dev
- gcc-7
sources:
- ubuntu-toolchain-r-test
- name: "Kernel 4.19.y LTS"
env: KERNEL_BRANCH="linux-4.19.y" GCC_VER="gcc-7"
addons:
apt:
packages:
- libelf-dev
- gcc-7
sources:
- ubuntu-toolchain-r-test
- name: "Kernel 5.4.y LTS"
env: KERNEL_BRANCH="linux-5.4.y" GCC_VER="gcc-8"
addons:
apt:
packages:
- libelf-dev
- gcc-8
sources:
- ubuntu-toolchain-r-test
# Stable versions
- name: "Kernel 5.7.y STABLE"
env: KERNEL_BRANCH="linux-5.7.y" GCC_VER="gcc-8"
addons:
apt:
packages:
- libelf-dev
- gcc-8
sources:
- ubuntu-toolchain-r-test
- name: "Kernel 5.8.y STABLE"
env: KERNEL_BRANCH="linux-5.8.y" GCC_VER="gcc-8"
addons:
apt:
packages:
- libelf-dev
- gcc-8
sources:
- ubuntu-toolchain-r-test
allow_failures:
- name: "Kernel 5.8.y STABLE"
# Here checkout kernels
before_script:
- eval "export CC=${GCC_VER}"
- eval "${CC} --version"
- git clone ${KERNEL_GIT} --depth=1 --branch=${KERNEL_BRANCH} ${KERNEL_BRANCH}
- pushd .
- cd $KERNEL_BRANCH
- yes "" | make oldconfig CC=${GCC_VER}
- make prepare CC=${GCC_VER}
- make scripts CC=${GCC_VER}
- popd
# Now build with kernel sources
script:
- make KDIR=${PWD}/${KERNEL_BRANCH} CC=${GCC_VER}
# Not sure if I should cache the kernel source tree...
#cache:
# directories:
# - '$HOME/.sonar/cache'

View File

@ -23,6 +23,8 @@ export
####################################################
SUBDIRS = kfusd libfusd examples
default:
$(MAKE) -C libfusd
$(MAKE) -C kfusd

View File

@ -2,22 +2,16 @@
FUSD: A Linux Framework for User-Space Devices
----------------------------------------------
[![Build Status](https://travis-ci.org/Godzil/fusd.svg?branch=master)](https://travis-ci.org/Godzil/fusd)
**Welcome to FUSD!**
This is FUSD snapshot 20110401, released 18 January 2012. This fork is based
on the found on the xiph.org SVN tracker. ( http://svn.xiph.org/trunk/fusd )
They seems to no longer update this tool (since 11 January 2007) and since it
longer compile with recent Linux kernel (at around 2.6.21) and since I need
it in personal project, I ported it to newer version (current version is 2.6.32).
It is currently no officialy supporting newer kernel, but changes are currently
going on to support newer kernel up to 4.15. It is currently building under this
line, but don't expect it to work.
They seems to no longuer update this tool (since 11 January 2007) and since it
longuer compile with recent Linux kernel (at around 2.6.21) and since I need
it in personal project, I ported it to newer version (current version is 2.6.32)
Some feature are still missing missing or buggy form the Xiph version (due to
changes on the kernel source tree), but it is still usable.
changes on the kernel source tree), but it's completly useable.
The official URL for this fork is:
@ -59,7 +53,7 @@ include the following rule:
5. Verify the fusd devices /dev/fusd/status and /dev/fusd/control
exist. If the modprobe succeeds but no fusd devices appear,
double-check the udev rule config change and make sure udevd restarted
doublecheck the udev rule config change and make sure udevd restarted
successfully. The kfusd kernel module must be inserted after udev has
been correctly configured and restarted.

View File

@ -7,6 +7,7 @@
% Released under open-source, BSD license
% See LICENSE file for full license
%
% $Id: fusd.tex,v 1.63 2003/08/20 22:00:55 jelson Exp $
\documentclass{article}
\addtolength{\topmargin}{-.5in} % repairing LaTeX's huge margins...

View File

@ -1,4 +1,5 @@
%
% $Id: html.sty,v 1.1 2001/05/12 00:38:48 cvs Exp $
% LaTeX2HTML Version 99.2 : html.sty
%
% This file contains definitions of LaTeX commands which are

View File

@ -1,27 +1,23 @@
SRC = console-read.c drums3.c echo.c helloworld.c logring.c pager.c\
drums2.c drums.c ioctl.c uid-filter.c
OBJ = console-read.o drums3.o echo.o helloworld.o logring.o pager.o\
drums2.o drums.o ioctl.o uid-filter.o mmap-test.o
drums2.o drums.o ioctl.o uid-filter.o
TARGETS = console-read drums3 echo helloworld logring pager\
drums2 drums ioctl uid-filter mmap-test
drums2 drums ioctl uid-filter
default: $(TARGETS) mmap-read
default: $(TARGETS)
install: $(TARGETS)
clean:
rm -f *.o *.d $(TARGETS) gmon.out *~
mmap-read: mmap-read.c
$(CC) $< -o $@
$(TARGETS): %: %.c ../libfusd/libfusd.a
$(TARGETS): %: %.c
$(CC) $(GCF) $< -o $@ ../libfusd/libfusd.a
%.d: %.c
$(CC) -M $(CFLAGS) $< > $@.$$$$; sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; rm -f $@.$$$$
ifeq ($(MAKECMDGOALS),target)
include $(SRC:.c=.d)
endif

View File

@ -40,6 +40,7 @@
* need a template from which to start on a real driver, use pager.c
* instead.
*
* $Id: console-read.c 12351 2007-01-19 07:22:54Z xiphmont $
*/
#include <stdio.h>

View File

@ -42,6 +42,7 @@
* directory: /dev/drums/bam, /dev/drums/bum, etc. If you cat one of
* these devices, it returns a string that's the same as its name.
*
* $Id: drums.c 12355 2007-01-19 17:44:17Z xiphmont $
*/
#include <stdio.h>

View File

@ -47,10 +47,10 @@
* to remember if this user has read before; cat /dev/drums/X will
* read infinitely
*
* $Id: drums2.c 12355 2007-01-19 17:44:17Z xiphmont $
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>

View File

@ -43,6 +43,7 @@
* However, it also prints a prompt to the console, asking the user if
* how loud the drums should be.
*
* $Id: drums3.c 12351 2007-01-19 07:22:54Z xiphmont $
*/
#include <stdio.h>

View File

@ -41,6 +41,7 @@
* stored. Then, when you read (e.g. "cat /dev/echo"), you get back
* whatever you wrote most recently.
*
* $Id: echo.c 12351 2007-01-19 07:22:54Z xiphmont $
*/
#include <stdio.h>

View File

@ -1,2 +0,0 @@
SUBSYSTEM=="fusd", NAME="fusd/%k"

View File

@ -37,6 +37,7 @@
* hello-world: Simply creates a device called /dev/hello-world, which
* greets you when you try to get it.
*
* $Id: helloworld.c 12351 2007-01-19 07:22:54Z xiphmont $
*/
/* EXAMPLE START helloworld.c */

View File

@ -41,6 +41,7 @@
* the other examples, anyway), because this program is both an
* example and part of the regression test suite.
*
* $Id: ioctl.c 12351 2007-01-19 07:22:54Z xiphmont $
*/
#include <stdio.h>

View File

@ -71,6 +71,7 @@
* but want to use it on a system that does not have FUSD, check out
* emlog at http://www.circlemud.org/~jelson/software/emlog.
*
* $Id: logring.c 12351 2007-01-19 07:22:54Z xiphmont $
*/
#include <stdio.h>

View File

@ -1,110 +0,0 @@
/*
*
* Copyright (c) 2003 The Regents of the University of California. All
* rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Neither the name of the University nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
/*
* FUSD - The Framework for UserSpace Devices - Example program
*
* This mmap a file/device and change it a bit.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <errno.h>
#include <ctype.h>
#include <unistd.h>
#include <sys/mman.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
static void hexdump(void *ptr_r, int size)
{
int J, I;
unsigned char *ptr = ptr_r;
unsigned long Addr = 0;
if (ptr == NULL) {
puts("NULL POINTER");
puts("-------------------------------------------------------------------------------------");
return;
}
while (Addr <= size) {
for (J = 0; J < 2; J++) {
printf("%08p: ", Addr + ptr);
for (I = 0; I < 16; I++, Addr++) { if (Addr <= size) { printf("%02lX ", (unsigned char) ptr[Addr]); } else { printf(" "); } }
printf(" | "); Addr -= 16;
for (I = 0; I < 16; I++, Addr++) { if (Addr <= size) { putchar(isprint(ptr[Addr]) ? ptr[Addr] : '.'); } else { putchar(' '); } }
puts("");
}
}
puts("-------------------------------------------------------------------------------------");
}
int main(int argc, char *argv[])
{
int fd, i;
char *ptr;
int size = 0;
struct stat FileStat;
srand((unsigned int) time(NULL));
if (argc != 3) {
printf("Usage: %s file size");
}
fd = open(argv[1], O_RDWR);
size = atoi(argv[2]);
ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
printf("ptr = %p\n", ptr);
if ((ptr != NULL) && (ptr != MAP_FAILED)) {
hexdump(ptr, size);
/* Let's do some changes */
for (i = 0; i < 128; i++) {
ptr[i] ^= rand() % 0x100;
}
msync(ptr, size, MS_SYNC|MS_INVALIDATE);
hexdump(ptr, size);
}
close(fd);
return 0;
}

View File

@ -1,146 +0,0 @@
/*
*
* Copyright (c) 2003 The Regents of the University of California. All
* rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Neither the name of the University nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
/*
* FUSD - The Framework for UserSpace Devices - Example program
*
* This example creates a a mmap-able buffer.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <ctype.h>
#include <unistd.h>
#include <sys/mman.h>
#include "fusd.h"
#define MIN(x, y) ((x) < (y) ? (x) : (y))
#define BUFFER_SIZE 4096
static char *mmap_buffer;
static void hexdump(void *ptr_r, int size)
{
int J, I;
unsigned char *ptr = ptr_r;
unsigned long Addr = 0;
if (ptr == NULL) {
puts("NULL POINTER");
puts("-------------------------------------------------------------------------------------");
return;
}
while (Addr <= size) {
for (J = 0; J < 2; J++) {
printf("%08p: ", Addr + ptr);
for (I = 0; I < 16; I++, Addr++) { if (Addr <= size) { printf("%02lX ", (unsigned char) ptr[Addr]); } else { printf(" "); } }
printf(" | "); Addr -= 16;
for (I = 0; I < 16; I++, Addr++) { if (Addr <= size) { putchar(isprint(ptr[Addr]) ? ptr[Addr] : '.'); } else { putchar(' '); } }
puts("");
}
}
puts("-------------------------------------------------------------------------------------");
}
ssize_t mmaptest_read(struct fusd_file_info *file, char *user_buffer,
size_t user_length, loff_t *offset)
{
int len;
if (*offset > BUFFER_SIZE) {
return 0;
}
len = MIN(user_length + (*offset), BUFFER_SIZE);
memcpy(user_buffer, mmap_buffer + (*offset), len);
*offset += len;
return len;
}
int tester_mmap(struct fusd_file_info *file, int offset, size_t length, int prot, int flags,
void **addr, size_t *out_length)
{
printf("Got a mmap request from PID:%d [offset=%d, size=%d, prot=%X, flags=%X, addr=%p]\n",
file->pid, offset, length, prot, flags, *addr);
if (length <= BUFFER_SIZE) {
*addr = mmap_buffer;
*out_length = BUFFER_SIZE;
return 0;
}
return -1;
}
int do_open(struct fusd_file_info *file)
{
/* opens and closes always succeed */
return 0;
}
int do_close(struct fusd_file_info *file)
{
/* Show content of the buffer */
hexdump(mmap_buffer, 512);
return 0;
}
struct fusd_file_operations drums_fops = {
open: do_open,
read: mmaptest_read,
mmap: tester_mmap,
close: do_close
};
int main(int argc, char *argv[])
{
int i;
mmap_buffer = (char *)mmap(NULL, BUFFER_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANONYMOUS, -1, 0);
if (fusd_register("mmap-tester", "mmaptest", "mmap-tester", 0666, NULL, &drums_fops) < 0) {
fprintf(stderr, "mmap-tester register failed: %m\n");
return -1;
}
memset(mmap_buffer, 0xAA, BUFFER_SIZE);
fprintf(stderr, "calling fusd_run...\n");
fusd_run();
return 0;
}

View File

@ -60,6 +60,7 @@
* If you close the FD and then reopen it, there will be a race (pages
* that arrive between the close and open will not be delivered).
*
* $Id: pager.c 12355 2007-01-19 17:44:17Z xiphmont $
*/
#include <stdio.h>
@ -365,12 +366,12 @@ static int fusd_success(struct fusd_file_info *file)
int main(int argc, char *argv[])
{
/* register the input device */
fusd_simple_register("/dev/pager/input", "pager", "pager!input", 0666, NULL,
fusd_simple_register("/dev/pager/input", "pager", "input", 0666, NULL,
open: fusd_success, close: fusd_success,
write: pager_input_write);
/* register the notification device */
fusd_simple_register("/dev/pager/notify", "pager", "pager!notify", 0666, NULL,
fusd_simple_register("/dev/pager/notify", "pager", "notify", 0666, NULL,
open: pager_notify_open,
close: pager_notify_close,
read: pager_notify_read,

View File

@ -42,6 +42,7 @@
* not be read by anyone other than the driver owner (not even root!).
* When you read from the device, it returns your PID to you.
*
* $Id: uid-filter.c 12351 2007-01-19 07:22:54Z xiphmont $
*/
#include <stdio.h>

View File

@ -66,8 +66,6 @@ __BEGIN_DECLS
#define FUSD_KOR_HACKED_VERSION
#ifndef __KERNEL__
struct fusd_file_info; /* forward decl */
typedef
@ -81,7 +79,7 @@ struct fusd_file_operations {
int (*ioctl) (struct fusd_file_info *file, int request, void *data);
int (*poll_diff) (struct fusd_file_info *file, unsigned int cached_state);
int (*unblock) (struct fusd_file_info *file);
int (*mmap) (struct fusd_file_info *file, int offset, size_t length, int prot, int flags, void** addr, size_t* out_length);
int (*mmap) (struct fusd_file_info *file, int offset, size_t length, int flags, void** addr, size_t* out_length);
} fusd_file_operations_t;
@ -107,7 +105,6 @@ struct fusd_file_info {
/* other info might be added later, e.g. state needed to complete
operations... */
pthread_mutex_t lock;
/* request message associated with this call */
int fd;
@ -115,8 +112,8 @@ struct fusd_file_info {
} fusd_file_info_t;
#define FILE_LOCK(__f) pthread_mutex_lock(&__f->lock)
#define FILE_UNLOCK(__f) pthread_mutex_unlock(&__f->lock)
/*************************** Library Functions ****************************/
@ -281,8 +278,6 @@ static inline int fusd_get_poll_diff_cached_state(struct fusd_file_info *file)
/* returns static string representing the flagset (e.g. RWE) */
char *fusd_unparse_flags(int flags);
#endif /* !__KERNEL__ */
#ifndef __KERNEL__
__END_DECLS
#endif

View File

@ -81,8 +81,6 @@
/* other constants */
#define FUSD_MSG_MAGIC 0x7a6b93cd
#pragma pack(1)
/* user->kernel: register a device */
typedef struct {
char name[FUSD_MAX_NAME_LENGTH+1];
@ -98,7 +96,7 @@ typedef struct {
pid_t pid;
uid_t uid;
gid_t gid;
unsigned long flags; /* flags from file struct */
unsigned int flags; /* flags from file struct */
void *device_info; /* device info */
void *private_info; /* file info */
@ -106,15 +104,10 @@ typedef struct {
* union but it just makes things too complex and doesn't save all
* that much memory anyway */
ssize_t retval;
unsigned long length;
unsigned long offset;
size_t length;
loff_t offset;
unsigned int cmd; /* ioctl cmd, poll_diff cached_state */
/* mmap parameters */
unsigned long mmprot;
unsigned long mmflags;
unsigned long mmoffset;
union {
unsigned long arg; /* ioctl */
void *ptr_arg;
@ -155,6 +148,4 @@ typedef struct {
int num_open;
} fusd_status_t;
#pragma pack()
#endif /* __FUSD_MSG_H__ */

View File

@ -37,6 +37,7 @@
*
* Private header file used by the Linux Kernel Module
*
* $Id: kfusd.h 12351 2007-01-19 07:22:54Z xiphmont $
*/
#ifndef __KFUSD_H__
@ -151,6 +152,30 @@ struct fusd_dev_t_s {
struct list_head devlist;
};
/**** Function Prototypes ****/
STATIC int maybe_free_fusd_dev(fusd_dev_t *fusd_dev);
STATIC int find_fusd_file(fusd_dev_t *fusd_dev, fusd_file_t *fusd_file);
STATIC int free_fusd_file(fusd_dev_t *fusd_dev, fusd_file_t *fusd_file);
STATIC int fusd_fops_call_send(fusd_file_t *fusd_file_arg,
fusd_msg_t *fusd_msg, struct fusd_transaction** transaction);
STATIC int fusd_fops_call_wait(fusd_file_t *fusd_file_arg,
fusd_msg_t **fusd_msg_reply, struct fusd_transaction* transaction);
STATIC void fusd_fops_call_done(fusd_file_t *fusd_file);
STATIC void fusd_forge_close(fusd_msg_t *msg, fusd_dev_t *fusd_dev);
STATIC int fusd_add_transaction(fusd_file_t *fusd_file, int transid, int subcmd, int size, struct fusd_transaction** out_transaction);
STATIC void fusd_cleanup_transaction(fusd_file_t *fusd_file, struct fusd_transaction* transaction);
STATIC void fusd_remove_transaction(fusd_file_t *fusd_file, struct fusd_transaction* transaction);
STATIC struct fusd_transaction* fusd_find_transaction(fusd_file_t *fusd_file, int transid);
STATIC struct fusd_transaction* fusd_find_transaction_by_pid(fusd_file_t *fusd_file, int pid);
/**** Utility functions & macros ****/
# ifdef CONFIG_FUSD_USE_WAKEUPSYNC
@ -248,7 +273,7 @@ static void fusd_vfree(void *ptr);
/* Functions like this should be in the kernel, but they are not. Sigh. */
# ifdef CONFIG_SMP
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
DECLARE_MUTEX(atomic_ops);
#else
DEFINE_SEMAPHORE(atomic_ops);

View File

@ -5,11 +5,11 @@ else
KDIR ?= /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
ROOTFS ?=
GIT_DESCRIBE = $(shell git describe --dirty --tags)
KERNEL_VER ?= 2.6.32.7
default:
$(MAKE) -C $(KDIR) M=$(PWD) EXTRA_CFLAGS="-I$(PWD)/../include -DGIT_DESCRIBE='\"${GIT_DESCRIBE}\"'" V=1 modules
$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) EXTRA_CFLAGS=-I$(PWD)/../include modules
install:
install -d -m 0755 $(ROOTFS)/lib/modules/$(KERNEL_VER)/kernel/drivers/misc

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,6 @@
SRC = libfusd.c
OBJ = libfusd.o
TARGETS = libfusd.a libfusd.so.0.0
GIT_DESCRIBE = $(shell git describe --dirty --tags)
default: $(TARGETS)
@ -16,7 +15,7 @@ clean:
rm -f *.o *.so *.so.* *.a *.d *.d.* gmon.out *~
$(TARGETS):
$(MAKE) target CFLAGS='-g -O2 $(SCF) $(GCF) -DGIT_DESCRIBE=\"${GIT_DESCRIBE}\"'
$(MAKE) target CFLAGS='-g -O2 $(SCF) $(GCF)'
target: $(OBJ)
$(LD) $(OBJ) $(SOLDFLAGS) -o libfusd.so.0.0 $(SLF)

View File

@ -35,9 +35,10 @@
*
* authors: jelson and girod
*
* $Id: libfusd.c 12351 2007-01-19 07:22:54Z xiphmont $
*/
char libfusd_c_id[] = "libfusd.c - FUSD " GIT_DESCRIBE;
char libfusd_c_id[] = "$Id: libfusd.c 12351 2007-01-19 07:22:54Z xiphmont $";
#include <stdio.h>
#include <stdlib.h>
@ -52,11 +53,6 @@ char libfusd_c_id[] = "libfusd.c - FUSD " GIT_DESCRIBE;
#include <string.h>
#include <time.h>
#include <pthread.h>
#include <unistd.h>
#include <sys/syscall.h>
#include "fusd.h"
#include "fusd_msg.h"
@ -76,7 +72,7 @@ char *dev_root = NULL;
* struct for each fusd fd.
*/
static fusd_file_operations_t fusd_fops_set[FD_SETSIZE];
fusd_file_operations_t null_fops = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
fusd_file_operations_t null_fops = { NULL };
/*
* accessor macros
@ -103,8 +99,7 @@ void fusd_init()
{
static int fusd_init_needed = 1;
if (fusd_init_needed)
{
if (fusd_init_needed) {
int i;
fusd_init_needed = 0;
@ -128,8 +123,7 @@ int fusd_register(const char *name, const char* clazz, const char* devname, mode
fusd_init();
/* make sure the name is valid and we have a valid set of fops... */
if (name == NULL || fops == NULL)
{
if (name == NULL || fops == NULL) {
fprintf(stderr, "fusd_register: invalid name or fops argument\n");
retval = -EINVAL;
goto done;
@ -140,33 +134,27 @@ int fusd_register(const char *name, const char* clazz, const char* devname, mode
* to register are SKIP_PREFIX (usually "/dev/"), skip over them.
*/
if (dev_root != NULL && strlen(name) > strlen(dev_root) &&
!strncmp(name, dev_root, strlen(dev_root)))
{
!strncmp(name, dev_root, strlen(dev_root))) {
name += strlen(dev_root);
}
if (strlen(name) > FUSD_MAX_NAME_LENGTH)
{
fprintf(stderr, "libfusd: name '%s' too long, sorry :(\n", name);
if (strlen(name) > FUSD_MAX_NAME_LENGTH) {
fprintf(stderr, "name '%s' too long, sorry :(", name);
retval = -EINVAL;
goto done;
}
/* open the fusd control channel */
if ((fd = open(FUSD_CONTROL_DEVNAME, O_RDWR | O_NONBLOCK)) < 0)
{
if ((fd = open(FUSD_CONTROL_DEVNAME, O_RDWR | O_NONBLOCK)) < 0) {
/* if the problem is that /dev/fusd does not exist, return the
* message "Package not installed", which is hopefully more
* illuminating than "no such file or directory" */
if (errno == ENOENT)
{
if (errno == ENOENT) {
fprintf(stderr, "libfusd: %s does not exist; ensure FUSD's kernel module is installed\n",
FUSD_CONTROL_DEVNAME);
retval = -ENOPKG;
}
else
{
} else {
perror("libfusd: trying to open FUSD control channel");
retval = -errno;
}
@ -174,8 +162,7 @@ int fusd_register(const char *name, const char* clazz, const char* devname, mode
}
/* fd in use? */
if (FUSD_FD_VALID(fd))
{
if (FUSD_FD_VALID(fd)) {
retval = -EBADF;
goto done;
}
@ -192,8 +179,7 @@ int fusd_register(const char *name, const char* clazz, const char* devname, mode
message.parm.register_msg.device_info = device_info;
/* make the request */
if (write(fd, &message, sizeof(fusd_msg_t)) < 0)
{
if (write(fd, &message, sizeof(fusd_msg_t)) < 0) {
retval = -errno;
goto done;
}
@ -204,38 +190,34 @@ int fusd_register(const char *name, const char* clazz, const char* devname, mode
/* success! */
done:
if (retval < 0)
{
if (retval < 0) {
if (fd >= 0)
close(fd);
errno = -retval;
retval = -1;
}
else
{
} else {
errno = 0;
retval = fd;
}
return retval;
}
int fusd_unregister(int fd)
{
int ret = -1;
if (FUSD_FD_VALID(fd))
{
if (FUSD_FD_VALID(fd)) {
/* clear fd location */
FUSD_SET_FOPS(fd, &null_fops);
FD_CLR(fd, &fusd_fds);
/* close */
ret = close(fd);
}
else
{
errno = EBADF;
return close(fd);
}
return ret;
else {
errno = EBADF;
return -1;
}
}
@ -254,25 +236,21 @@ void fusd_run(void)
int i;
/* locate maxmimum fd in use */
for (maxfd=0, i=0; i < FD_SETSIZE; i++)
{
if (FD_ISSET(i, &fusd_fds))
{
for (maxfd=0, i=0; i < FD_SETSIZE; i++) {
if (FD_ISSET(i, &fusd_fds)) {
maxfd = i;
}
}
maxfd++;
while (1)
{
while (1) {
/* select */
memmove(&tfds, &fusd_fds, sizeof(fd_set));
status = select(maxfd, &tfds, NULL, NULL, NULL);
/* error? */
if (status < 0)
{
if (status < 0) {
perror("libfusd: fusd_run: error on select");
continue;
}
@ -280,13 +258,14 @@ void fusd_run(void)
/* readable? */
for (i = 0; i < maxfd; i++)
if (FD_ISSET(i, &tfds))
fusd_dispatch(i);
fusd_dispatch(i);
}
}
/************************************************************************/
/* reads a fusd kernel-to-userspace message from fd, and puts a
* fusd_msg into the memory pointed to by msg (we assume we are passed
* a buffer managed by the caller). if there is a data portion to the
@ -295,51 +274,39 @@ void fusd_run(void)
* managed by the caller. */
static int fusd_get_message(int fd, fusd_msg_t *msg)
{
int ret;
/* read the header part into the kernel */
if (read(fd, msg, sizeof(fusd_msg_t)) < 0)
{
if (read(fd, msg, sizeof(fusd_msg_t)) < 0) {
if (errno != EAGAIN)
perror("error talking to FUSD control channel on header read");
ret = -errno;
goto exit;
return -errno;
}
msg->data = NULL; /* pointers in kernelspace have no meaning */
if (msg->magic != FUSD_MSG_MAGIC)
{
fprintf(stderr, "libfusd: magic number failure\n");
ret = -EINVAL;
goto exit;
if (msg->magic != FUSD_MSG_MAGIC) {
fprintf(stderr, "libfusd magic number failure\n");
return -EINVAL;
}
/* if there's a data part to the message, read it from the kernel. */
if (msg->datalen)
{
if ((msg->data = malloc(msg->datalen + 1)) == NULL)
{
if (msg->datalen) {
if ((msg->data = malloc(msg->datalen + 1)) == NULL) {
fprintf(stderr, "libfusd: can't allocate memory\n");
ret = -ENOMEM; /* this is bad, we are now unsynced */
goto exit;
return -ENOMEM; /* this is bad, we are now unsynced */
}
if (read(fd, msg->data, msg->datalen) < 0)
{
if (read(fd, msg->data, msg->datalen) < 0) {
perror("error talking to FUSD control channel on data read");
free(msg->data);
msg->data = NULL;
ret = -EIO;
goto exit;
return -EIO;
}
/* For convenience, we now ensure that the byte *after* the buffer
* is set to 0. (Note we malloc'd one extra byte above.) */
msg->data[msg->datalen] = '\0';
}
ret = 0;
exit:
return ret;
return 0;
}
@ -351,14 +318,11 @@ void fusd_fdset_add(fd_set *set, int *max)
{
int i;
for (i = 0; i < FD_SETSIZE; i++)
{
if (FD_ISSET(i, &fusd_fds))
{
for (i = 0; i < FD_SETSIZE; i++) {
if (FD_ISSET(i, &fusd_fds)) {
FD_SET(i, set);
if (i > *max)
{
*max = i;
if (i > *max) {
*max = i;
}
}
}
@ -376,7 +340,6 @@ void fusd_dispatch_fdset(fd_set *set)
for (i = 0; i < FD_SETSIZE; i++)
if (FD_ISSET(i, set) && FD_ISSET(i, &fusd_fds))
fusd_dispatch(i);
}
@ -398,16 +361,14 @@ static int fusd_dispatch_one(int fd, fusd_file_operations_t *fops)
int user_retval = 0; /* returned to the user who made the syscall */
/* check for valid, look up ops */
if (fops == NULL)
{
if (fops == NULL) {
fprintf(stderr, "fusd_dispatch: no fops provided!\n");
driver_retval = -EBADF;
goto out_noreply;
}
/* allocate memory for fusd_msg_t */
if ((msg = malloc(sizeof(fusd_msg_t))) == NULL)
{
if ((msg = malloc(sizeof(fusd_msg_t))) == NULL) {
driver_retval = -ENOMEM;
fprintf(stderr, "libfusd: can't allocate memory\n");
goto out_noreply;
@ -420,8 +381,7 @@ static int fusd_dispatch_one(int fd, fusd_file_operations_t *fops)
/* allocate file info struct */
file = malloc(sizeof(fusd_file_info_t));
if (NULL == file)
{
if (NULL == file) {
fprintf(stderr, "libfusd: can't allocate memory\n");
driver_retval = -ENOMEM;
goto out_noreply;
@ -429,11 +389,6 @@ static int fusd_dispatch_one(int fd, fusd_file_operations_t *fops)
/* fill the file info struct */
memset(file, '\0', sizeof(fusd_file_info_t));
pthread_mutex_init(&file->lock, NULL);
FILE_LOCK(file);
file->fd = fd;
file->device_info = msg->parm.fops_msg.device_info;
file->private_data = msg->parm.fops_msg.private_info;
@ -443,12 +398,9 @@ static int fusd_dispatch_one(int fd, fusd_file_operations_t *fops)
file->gid = msg->parm.fops_msg.gid;
file->fusd_msg = msg;
FILE_UNLOCK(file);
/* right now we only handle fops requests */
if (msg->cmd != FUSD_FOPS_CALL && msg->cmd != FUSD_FOPS_NONBLOCK &&
msg->cmd != FUSD_FOPS_CALL_DROPREPLY)
{
msg->cmd != FUSD_FOPS_CALL_DROPREPLY) {
fprintf(stderr, "libfusd: got unknown msg->cmd from kernel\n");
user_retval = -EINVAL;
goto send_reply;
@ -458,78 +410,64 @@ static int fusd_dispatch_one(int fd, fusd_file_operations_t *fops)
user_retval = -ENOSYS;
//printf("dispatch_one: subcmd: %d - ", msg->subcmd);
switch (msg->subcmd)
{
switch (msg->subcmd) {
case FUSD_OPEN:
//printf("FUSD_OPEN\n");
if (fops && fops->open)
user_retval = fops->open(file);
break;
case FUSD_CLOSE:
//printf("FUSD_CLOSE\n");
if (fops && fops->close)
user_retval = fops->close(file);
break;
case FUSD_READ:
//printf("FUSD_READ\n");
/* allocate a buffer and make the call */
if (fops && fops->read)
{
if ((msg->data = malloc(msg->parm.fops_msg.length)) == NULL)
{
user_retval = -ENOMEM;
fprintf(stderr, "libfusd: can't allocate memory\n");
}
else
{
msg->datalen = msg->parm.fops_msg.length;
user_retval = fops->read(file, msg->data, msg->datalen,
&msg->parm.fops_msg.offset);
if (fops && fops->read) {
if ((msg->data = malloc(msg->parm.fops_msg.length)) == NULL) {
user_retval = -ENOMEM;
fprintf(stderr, "libfusd: can't allocate memory\n");
} else {
msg->datalen = msg->parm.fops_msg.length;
user_retval = fops->read(file, msg->data, msg->datalen,
&msg->parm.fops_msg.offset);
}
}
break;
case FUSD_WRITE:
//printf("FUSD_WRITE\n");
if (fops && fops->write)
user_retval = fops->write(file, msg->data, msg->datalen,
&msg->parm.fops_msg.offset);
break;
case FUSD_MMAP:
//printf("FUSD_MMAP\n");
if (fops && fops->mmap)
{
user_retval = fops->mmap(file, msg->parm.fops_msg.mmoffset, msg->parm.fops_msg.length, msg->parm.fops_msg.mmprot,
msg->parm.fops_msg.mmflags, &msg->parm.fops_msg.arg.ptr_arg, &msg->parm.fops_msg.length);
user_retval = fops->mmap(file, msg->parm.fops_msg.offset, msg->parm.fops_msg.length, msg->parm.fops_msg.flags,
&msg->parm.fops_msg.arg.ptr_arg, &msg->parm.fops_msg.length);
}
break;
case FUSD_IOCTL:
//printf("FUSD_IOCTL\n");
if (fops && fops->ioctl)
{
if (fops && fops->ioctl) {
/* in the case of an ioctl read, allocate a buffer for the
* driver to write to, IF there isn't already a buffer. (there
* might already be a buffer if this is a read+write) */
if ((_IOC_DIR(msg->parm.fops_msg.cmd) & _IOC_READ) &&
msg->data == NULL)
{
msg->datalen = _IOC_SIZE(msg->parm.fops_msg.cmd);
if ((msg->data = malloc(msg->datalen)) == NULL)
{
user_retval = -ENOMEM;
break;
}
msg->data == NULL) {
msg->datalen = _IOC_SIZE(msg->parm.fops_msg.cmd);
if ((msg->data = malloc(msg->datalen)) == NULL) {
user_retval = -ENOMEM;
break;
}
}
if (msg->data != NULL)
user_retval = fops->ioctl(file, msg->parm.fops_msg.cmd, msg->data);
user_retval = fops->ioctl(file, msg->parm.fops_msg.cmd, msg->data);
else
user_retval = fops->ioctl(file, msg->parm.fops_msg.cmd,
(void *) msg->parm.fops_msg.arg.ptr_arg);
user_retval = fops->ioctl(file, msg->parm.fops_msg.cmd,
(void *) msg->parm.fops_msg.arg.ptr_arg);
}
break;
@ -558,7 +496,7 @@ static int fusd_dispatch_one(int fd, fusd_file_operations_t *fops)
/* out_noreply is only used for handling errors */
out_noreply:
out_noreply:
if (msg->data != NULL)
free(msg->data);
if (msg != NULL)
@ -566,26 +504,21 @@ out_noreply:
goto done;
/* send_reply is only used for success */
send_reply:
if (-user_retval <= 0xff)
{
send_reply:
if (-user_retval <= 0xff) {
/* 0xff is the maximum legal return value (?) - return val to user */
driver_retval = fusd_return(file, user_retval);
}
else
{
} else {
/* if we got a FUSD_NOREPLY, don't free the msg structure */
driver_retval = 0;
}
/* this is common to both errors and success */
done:
if (driver_retval < 0)
{
done:
if (driver_retval < 0) {
errno = -driver_retval;
driver_retval = -1;
}
return driver_retval;
}
@ -605,8 +538,7 @@ void fusd_dispatch(int fd)
fusd_file_operations_t *fops = NULL;
/* make sure we have a valid FD, and get its fops structure */
if (!FUSD_FD_VALID(fd))
{
if (!FUSD_FD_VALID(fd)) {
errno = EBADF;
retval = -1;
fprintf(stderr, "libfusd: not a valid FUSD FD\n");
@ -615,8 +547,7 @@ void fusd_dispatch(int fd)
fops = FUSD_GET_FOPS(fd);
/* now keep dispatching until a dispatch returns an error */
do
{
do {
retval = fusd_dispatch_one(fd, fops);
if (retval >= 0)
@ -626,16 +557,14 @@ void fusd_dispatch(int fd)
/* if we've dispatched at least one message successfully, and then
* stopped because of EAGAIN - do not report an error. this is the
* common case. */
if (num_dispatches > 0 && errno == EAGAIN)
{
if (num_dispatches > 0 && errno == EAGAIN) {
retval = 0;
errno = 0;
}
out:
if (retval < 0 && errno != EPIPE)
fprintf(stderr, "libfusd: fusd_dispatch error on fd %d: [%d] %m\n", fd, retval);
fprintf(stderr, "libfusd: fusd_dispatch error on fd %d: [%d] %m \n", fd, retval);
}
@ -649,26 +578,13 @@ void fusd_dispatch(int fd)
*/
void fusd_destroy(struct fusd_file_info *file)
{
if (file == NULL)
return;
if (file == NULL)
return;
FILE_LOCK(file);
if (file->fusd_msg != NULL)
{
if (file->fusd_msg->data != NULL)
{
free(file->fusd_msg->data);
file->fusd_msg->data = NULL;
}
free(file->fusd_msg);
file->fusd_msg = NULL;
}
FILE_UNLOCK(file);
pthread_mutex_destroy(&file->lock);
free(file);
if (file->fusd_msg->data != NULL)
free(file->fusd_msg->data);
free(file->fusd_msg);
free(file);
}
@ -684,31 +600,22 @@ int fusd_return(fusd_file_info_t *file, ssize_t retval)
fusd_msg_t *msg = NULL;
int fd;
int driver_retval = 0;
int ret;
struct iovec iov[2];
if (file == NULL)
{
if (file == NULL) {
fprintf(stderr, "fusd_return: NULL file\n");
ret = -EINVAL;
goto exit;
return -EINVAL;
}
FILE_LOCK(file);
fd = file->fd;
if (!FUSD_FD_VALID(fd))
{
if (!FUSD_FD_VALID(fd)) {
fprintf(stderr, "fusd_return: badfd (fd %d)\n", fd);
ret = -EBADF;
goto exit_unlock;
return -EBADF;
}
if ((msg = file->fusd_msg) == NULL)
{
if ((msg = file->fusd_msg) == NULL) {
fprintf(stderr, "fusd_return: fusd_msg is gone\n");
ret = -EINVAL;
goto exit_unlock;
return -EINVAL;
}
/* if this was a "DONTREPLY" message, just free the struct */
@ -716,29 +623,24 @@ int fusd_return(fusd_file_info_t *file, ssize_t retval)
goto free_memory;
/* do we copy data back to kernel? how much? */
switch(msg->subcmd)
{
switch(msg->subcmd) {
case FUSD_READ:
/* these operations can return data to userspace */
if (retval > 0)
{
msg->datalen = MIN((int)retval, (int)msg->parm.fops_msg.length);
if (retval > 0) {
msg->datalen = MIN(retval, msg->parm.fops_msg.length);
retval = msg->datalen;
}
else
{
} else {
msg->datalen = 0;
}
break;
case FUSD_IOCTL:
/* ioctl CAN (in read mode) return data to userspace */
if (/*(retval == 0) && */ (_IOC_DIR(msg->parm.fops_msg.cmd) & _IOC_READ) )
if ((retval == 0) &&
(_IOC_DIR(msg->parm.fops_msg.cmd) & _IOC_READ))
msg->datalen = _IOC_SIZE(msg->parm.fops_msg.cmd);
else
msg->datalen = 0;
break;
default:
/* open, close, write, etc. do not return data */
msg->datalen = 0;
@ -754,35 +656,29 @@ int fusd_return(fusd_file_info_t *file, ssize_t retval)
/* pid is NOT copied back. */
/* send message to kernel */
if (msg->datalen && msg->data != NULL)
{
if (msg->datalen && msg->data != NULL) {
//printf("(msg->datalen [%d] && msg->data != NULL [%p]", msg->datalen, msg->data);
iov[0].iov_base = msg;
iov[0].iov_len = sizeof(fusd_msg_t);
iov[1].iov_base = msg->data;
iov[1].iov_len = msg->datalen;
#if 0
driver_retval = writev(fd, iov, 2);
#else
driver_retval = ioctl(fd, 0xb16b00b5, iov);
#endif
}
else
{
else {
driver_retval = write(fd, msg, sizeof(fusd_msg_t));
}
free_memory:
FILE_UNLOCK(file);
free_memory:
fusd_destroy(file);
ret = 0;
if (driver_retval < 0)
ret = -errno;
goto exit;
exit_unlock:
FILE_UNLOCK(file);
exit:
return ret;
return -errno;
else
return 0;
}