| Message ID | 20220111151215.22955-5-jgross@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mini-os: remove device specific struct file members | expand |
Juergen Gross, le mar. 11 janv. 2022 16:12:07 +0100, a ecrit: > Allocate a file type dynamically via alloc_file_type(). > > Instead of directly accessing the files[] array use get_file_from_fd(). > > Make some now local functions static and modify their prototypes to > match the file_ops requirements. > > Signed-off-by: Juergen Gross <jgross@suse.com> modulo the int fd / file * thing, Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > --- > include/lib.h | 3 +- > include/tpm_tis.h | 6 --- > lib/sys.c | 23 --------- > tpm_tis.c | 120 ++++++++++++++++++++++++++++++---------------- > 4 files changed, 80 insertions(+), 72 deletions(-) > > diff --git a/include/lib.h b/include/lib.h > index 05c7de5..d94d142 100644 > --- a/include/lib.h > +++ b/include/lib.h > @@ -166,8 +166,7 @@ void sanity_check(void); > #define FTYPE_TAP 8 > #define FTYPE_BLK 9 > #define FTYPE_TPMFRONT 10 > -#define FTYPE_TPM_TIS 11 > -#define FTYPE_N 12 > +#define FTYPE_N 11 > #define FTYPE_SPARE 16 > > typedef int file_read_func(int fd, void *buf, size_t nbytes); > diff --git a/include/tpm_tis.h b/include/tpm_tis.h > index 86e83f1..2af974d 100644 > --- a/include/tpm_tis.h > +++ b/include/tpm_tis.h > @@ -37,14 +37,11 @@ struct tpm_chip; > > struct tpm_chip* init_tpm_tis(unsigned long baseaddr, int localities, unsigned int irq); > struct tpm_chip* init_tpm2_tis(unsigned long baseaddr, int localities, unsigned int irq); > -void shutdown_tpm_tis(struct tpm_chip* tpm); > > int tpm_tis_request_locality(struct tpm_chip* tpm, int locality); > int tpm_tis_cmd(struct tpm_chip* tpm, uint8_t* req, size_t reqlen, uint8_t** resp, size_t* resplen); > > #ifdef HAVE_LIBC > -#include <sys/stat.h> > -#include <fcntl.h> > /* POSIX IO functions: > * use tpm_tis_open() to get a file descriptor to the tpm device > * use write() on the fd to send a command to the backend. You must > @@ -53,9 +50,6 @@ int tpm_tis_cmd(struct tpm_chip* tpm, uint8_t* req, size_t reqlen, uint8_t** res > * fstat() to get the size of the response and lseek() to seek on it. > */ > int tpm_tis_open(struct tpm_chip* tpm); > -int tpm_tis_posix_read(int fd, uint8_t* buf, size_t count); > -int tpm_tis_posix_write(int fd, const uint8_t* buf, size_t count); > -int tpm_tis_posix_fstat(int fd, struct stat* buf); > #endif > > #endif > diff --git a/lib/sys.c b/lib/sys.c > index d213ae5..4060b42 100644 > --- a/lib/sys.c > +++ b/lib/sys.c > @@ -29,7 +29,6 @@ > #include <blkfront.h> > #include <fbfront.h> > #include <tpmfront.h> > -#include <tpm_tis.h> > #include <xenbus.h> > #include <xenstore.h> > #include <poll.h> > @@ -349,11 +348,6 @@ int read(int fd, void *buf, size_t nbytes) > case FTYPE_TPMFRONT: { > return tpmfront_posix_read(fd, buf, nbytes); > } > -#endif > -#ifdef CONFIG_TPM_TIS > - case FTYPE_TPM_TIS: { > - return tpm_tis_posix_read(fd, buf, nbytes); > - } > #endif > default: > break; > @@ -399,10 +393,6 @@ int write(int fd, const void *buf, size_t nbytes) > #ifdef CONFIG_TPMFRONT > case FTYPE_TPMFRONT: > return tpmfront_posix_write(fd, buf, nbytes); > -#endif > -#ifdef CONFIG_TPM_TIS > - case FTYPE_TPM_TIS: > - return tpm_tis_posix_write(fd, buf, nbytes); > #endif > default: > break; > @@ -459,10 +449,6 @@ off_t lseek(int fd, off_t offset, int whence) > #ifdef CONFIG_TPMFRONT > case FTYPE_TPMFRONT: > break; > -#endif > -#ifdef CONFIG_TPM_TIS > - case FTYPE_TPM_TIS: > - break; > #endif > case FTYPE_FILE: > break; > @@ -515,11 +501,6 @@ int close(int fd) > shutdown_tpmfront(files[fd].dev); > break; > #endif > -#ifdef CONFIG_TPM_TIS > - case FTYPE_TPM_TIS: > - shutdown_tpm_tis(files[fd].dev); > - break; > -#endif > #ifdef CONFIG_KBDFRONT > case FTYPE_KBD: > shutdown_kbdfront(files[fd].dev); > @@ -599,10 +580,6 @@ int fstat(int fd, struct stat *buf) > #ifdef CONFIG_TPMFRONT > case FTYPE_TPMFRONT: > return tpmfront_posix_fstat(fd, buf); > -#endif > -#ifdef CONFIG_TPM_TIS > - case FTYPE_TPM_TIS: > - return tpm_tis_posix_fstat(fd, buf); > #endif > default: > break; > diff --git a/tpm_tis.c b/tpm_tis.c > index 477f555..abea7a1 100644 > --- a/tpm_tis.c > +++ b/tpm_tis.c > @@ -792,6 +792,9 @@ int tpm_tis_send(struct tpm_chip* tpm, uint8_t* buf, size_t len) { > int status, burstcnt = 0; > int count = 0; > uint32_t ordinal; > +#ifdef HAVE_LIBC > + struct file *file = get_file_from_fd(tpm->fd); > +#endif > > if(tpm_tis_request_locality(tpm, tpm->locality) < 0) { > return -EBUSY; > @@ -844,9 +847,10 @@ int tpm_tis_send(struct tpm_chip* tpm, uint8_t* buf, size_t len) { > } > } > #ifdef HAVE_LIBC > - if(tpm->fd >= 0) { > - files[tpm->fd].read = false; > - files[tpm->fd].offset = 0; > + if ( file ) > + { > + file->read = false; > + file->offset = 0; > } > #endif > return len; > @@ -1093,6 +1097,23 @@ ssize_t tpm_getcap(struct tpm_chip *chip, uint32_t subcap_id, cap_t *cap, > return rc; > } > > +static void shutdown_tpm_tis(struct tpm_chip* tpm){ > + int i; > + > + printk("Shutting down tpm_tis device\n"); > + > + iowrite32(TPM_INT_ENABLE(tpm, tpm->locality), ~TPM_GLOBAL_INT_ENABLE); > + > + /*Unmap all of the mmio pages */ > + for(i = 0; i < 5; ++i) { > + if(tpm->pages[i] != NULL) { > + iounmap(tpm->pages[i], PAGE_SIZE); > + tpm->pages[i] = NULL; > + } > + } > + free(tpm); > + return; > +} > > struct tpm_chip* init_tpm_tis(unsigned long baseaddr, int localities, unsigned int irq) > { > @@ -1242,25 +1263,6 @@ abort_egress: > return NULL; > } > > -void shutdown_tpm_tis(struct tpm_chip* tpm){ > - int i; > - > - printk("Shutting down tpm_tis device\n"); > - > - iowrite32(TPM_INT_ENABLE(tpm, tpm->locality), ~TPM_GLOBAL_INT_ENABLE); > - > - /*Unmap all of the mmio pages */ > - for(i = 0; i < 5; ++i) { > - if(tpm->pages[i] != NULL) { > - iounmap(tpm->pages[i], PAGE_SIZE); > - tpm->pages[i] = NULL; > - } > - } > - free(tpm); > - return; > -} > - > - > int tpm_tis_cmd(struct tpm_chip* tpm, uint8_t* req, size_t reqlen, uint8_t** resp, size_t* resplen) > { > if(tpm->locality < 0) { > @@ -1279,23 +1281,24 @@ int tpm_tis_cmd(struct tpm_chip* tpm, uint8_t* req, size_t reqlen, uint8_t** res > } > > #ifdef HAVE_LIBC > -int tpm_tis_open(struct tpm_chip* tpm) > +#include <sys/stat.h> > +#include <fcntl.h> > + > +static int tpm_tis_close(int fd) > { > - /* Silently prevent multiple opens */ > - if(tpm->fd != -1) { > - return tpm->fd; > - } > + struct file *file = get_file_from_fd(fd); > > - tpm->fd = alloc_fd(FTYPE_TPM_TIS); > - printk("tpm_tis_open() -> %d\n", tpm->fd); > - files[tpm->fd].dev = tpm; > - return tpm->fd; > + shutdown_tpm_tis(file->dev); > + > + return 0; > } > > -int tpm_tis_posix_write(int fd, const uint8_t* buf, size_t count) > +static int tpm_tis_posix_write(int fd, const void *buf, size_t count) > { > struct tpm_chip* tpm; > - tpm = files[fd].dev; > + struct file *file = get_file_from_fd(fd); > + > + tpm = file->dev; > > if(tpm->locality < 0) { > printk("tpm_tis_posix_write() failed! locality not set!\n"); > @@ -1319,11 +1322,13 @@ int tpm_tis_posix_write(int fd, const uint8_t* buf, size_t count) > return count; > } > > -int tpm_tis_posix_read(int fd, uint8_t* buf, size_t count) > +static int tpm_tis_posix_read(int fd, void *buf, size_t count) > { > int rc; > struct tpm_chip* tpm; > - tpm = files[fd].dev; > + struct file *file = get_file_from_fd(fd); > + > + tpm = file->dev; > > if(count == 0) { > return 0; > @@ -1337,20 +1342,24 @@ int tpm_tis_posix_read(int fd, uint8_t* buf, size_t count) > > > /* Handle EOF case */ > - if(files[fd].offset >= tpm->data_len) { > + if ( file->offset >= tpm->data_len ) > + { > rc = 0; > } else { > - rc = min(tpm->data_len - files[fd].offset, count); > - memcpy(buf, tpm->data_buffer + files[fd].offset, rc); > + rc = min(tpm->data_len - file->offset, count); > + memcpy(buf, tpm->data_buffer + file->offset, rc); > } > - files[fd].offset += rc; > + file->offset += rc; > /* Reset the data pending flag */ > return rc; > } > -int tpm_tis_posix_fstat(int fd, struct stat* buf) > + > +static int tpm_tis_posix_fstat(int fd, struct stat *buf) > { > struct tpm_chip* tpm; > - tpm = files[fd].dev; > + struct file *file = get_file_from_fd(fd); > + > + tpm = file->dev; > > buf->st_mode = O_RDWR; > buf->st_uid = 0; > @@ -1360,6 +1369,35 @@ int tpm_tis_posix_fstat(int fd, struct stat* buf) > return 0; > } > > +static struct file_ops tpm_tis_ops = { > + .name = "tpm_tis", > + .read = tpm_tis_posix_read, > + .write = tpm_tis_posix_write, > + .lseek = lseek_default, > + .close = tpm_tis_close, > + .fstat = tpm_tis_posix_fstat, > +}; > + > +int tpm_tis_open(struct tpm_chip* tpm) > +{ > + struct file *file; > + static unsigned int ftype_tis; > + > + /* Silently prevent multiple opens */ > + if(tpm->fd != -1) { > + return tpm->fd; > + } > + > + if ( !ftype_tis ) > + ftype_tis = alloc_file_type(&tpm_tis_ops); > + > + tpm->fd = alloc_fd(ftype_tis); > + printk("tpm_tis_open() -> %d\n", tpm->fd); > + file = get_file_from_fd(tpm->fd); > + file->dev = tpm; > + return tpm->fd; > +} > + > /* TPM 2.0 */ > > /*TPM2.0 Selftest*/ > -- > 2.26.2 >
On 11/01/2022 15:12, Juergen Gross wrote: > diff --git a/tpm_tis.c b/tpm_tis.c > index 477f555..abea7a1 100644 > --- a/tpm_tis.c > +++ b/tpm_tis.c > @@ -1093,6 +1097,23 @@ ssize_t tpm_getcap(struct tpm_chip *chip, uint32_t subcap_id, cap_t *cap, > return rc; > } > > +static void shutdown_tpm_tis(struct tpm_chip* tpm){ Style, as you're moving it. Also in the function. > @@ -1360,6 +1369,35 @@ int tpm_tis_posix_fstat(int fd, struct stat* buf) > return 0; > } > > +static struct file_ops tpm_tis_ops = { > + .name = "tpm_tis", > + .read = tpm_tis_posix_read, > + .write = tpm_tis_posix_write, > + .lseek = lseek_default, > + .close = tpm_tis_close, > + .fstat = tpm_tis_posix_fstat, > +}; > + > +int tpm_tis_open(struct tpm_chip* tpm) Style. > +{ > + struct file *file; > + static unsigned int ftype_tis; > + > + /* Silently prevent multiple opens */ > + if(tpm->fd != -1) { > + return tpm->fd; > + } Another WTF moment. We silently swallow multiple open()s, but don't refcout close()s ? This cannot be correct, or sensible, behaviour. Jason/Daniel - thoughts? ~Andrew
On Tue, Jan 11, 2022 at 3:29 PM Andrew Cooper <amc96@srcf.net> wrote: > > On 11/01/2022 15:12, Juergen Gross wrote: > > diff --git a/tpm_tis.c b/tpm_tis.c > > index 477f555..abea7a1 100644 > > --- a/tpm_tis.c > > +++ b/tpm_tis.c > > @@ -1093,6 +1097,23 @@ ssize_t tpm_getcap(struct tpm_chip *chip, uint32_t subcap_id, cap_t *cap, > > return rc; > > } > > > > +static void shutdown_tpm_tis(struct tpm_chip* tpm){ > > Style, as you're moving it. Also in the function. > > > @@ -1360,6 +1369,35 @@ int tpm_tis_posix_fstat(int fd, struct stat* buf) > > return 0; > > } > > > > +static struct file_ops tpm_tis_ops = { > > + .name = "tpm_tis", > > + .read = tpm_tis_posix_read, > > + .write = tpm_tis_posix_write, > > + .lseek = lseek_default, > > + .close = tpm_tis_close, > > + .fstat = tpm_tis_posix_fstat, > > +}; > > + > > +int tpm_tis_open(struct tpm_chip* tpm) > > Style. > > > +{ > > + struct file *file; > > + static unsigned int ftype_tis; > > + > > + /* Silently prevent multiple opens */ > > + if(tpm->fd != -1) { > > + return tpm->fd; > > + } > > Another WTF moment. We silently swallow multiple open()s, but don't > refcout close()s ? > > This cannot be correct, or sensible, behaviour. > > Jason/Daniel - thoughts? Looks like vtpmmgr only opens a single global fd, so it has not been a problem in practice. You need some sort of synchronization to let multiple entities access the TPM. So limiting to only a single entity/single FD is a reasonable restriction. Regards, Jason
On 11.01.22 21:29, Andrew Cooper wrote: > On 11/01/2022 15:12, Juergen Gross wrote: >> diff --git a/tpm_tis.c b/tpm_tis.c >> index 477f555..abea7a1 100644 >> --- a/tpm_tis.c >> +++ b/tpm_tis.c >> @@ -1093,6 +1097,23 @@ ssize_t tpm_getcap(struct tpm_chip *chip, uint32_t subcap_id, cap_t *cap, >> return rc; >> } >> >> +static void shutdown_tpm_tis(struct tpm_chip* tpm){ > > Style, as you're moving it. Also in the function. > >> @@ -1360,6 +1369,35 @@ int tpm_tis_posix_fstat(int fd, struct stat* buf) >> return 0; >> } >> >> +static struct file_ops tpm_tis_ops = { >> + .name = "tpm_tis", >> + .read = tpm_tis_posix_read, >> + .write = tpm_tis_posix_write, >> + .lseek = lseek_default, >> + .close = tpm_tis_close, >> + .fstat = tpm_tis_posix_fstat, >> +}; >> + >> +int tpm_tis_open(struct tpm_chip* tpm) > > Style. Ah, yes I should have corrected this while moving the function. > >> +{ >> + struct file *file; >> + static unsigned int ftype_tis; >> + >> + /* Silently prevent multiple opens */ >> + if(tpm->fd != -1) { >> + return tpm->fd; >> + } > > Another WTF moment. We silently swallow multiple open()s, but don't > refcout close()s ? > > This cannot be correct, or sensible, behaviour. > > Jason/Daniel - thoughts? I just moved the function, but I can change this, of course. Juergen
On 12/01/2022 07:54, Juergen Gross wrote: > On 11.01.22 21:29, Andrew Cooper wrote: >> On 11/01/2022 15:12, Juergen Gross wrote: >>> diff --git a/tpm_tis.c b/tpm_tis.c >>> index 477f555..abea7a1 100644 >>> --- a/tpm_tis.c >>> +++ b/tpm_tis.c >>> @@ -1093,6 +1097,23 @@ ssize_t tpm_getcap(struct tpm_chip *chip, >>> uint32_t subcap_id, cap_t *cap, >>> return rc; >>> } >>> +static void shutdown_tpm_tis(struct tpm_chip* tpm){ >> >> Style, as you're moving it. Also in the function. >> >>> @@ -1360,6 +1369,35 @@ int tpm_tis_posix_fstat(int fd, struct stat* >>> buf) >>> return 0; >>> } >>> +static struct file_ops tpm_tis_ops = { >>> + .name = "tpm_tis", >>> + .read = tpm_tis_posix_read, >>> + .write = tpm_tis_posix_write, >>> + .lseek = lseek_default, >>> + .close = tpm_tis_close, >>> + .fstat = tpm_tis_posix_fstat, >>> +}; >>> + >>> +int tpm_tis_open(struct tpm_chip* tpm) >> >> Style. > > Ah, yes I should have corrected this while moving the function. > >> >>> +{ >>> + struct file *file; >>> + static unsigned int ftype_tis; >>> + >>> + /* Silently prevent multiple opens */ >>> + if(tpm->fd != -1) { >>> + return tpm->fd; >>> + } >> >> Another WTF moment. We silently swallow multiple open()s, but don't >> refcout close()s ? >> >> This cannot be correct, or sensible, behaviour. >> >> Jason/Daniel - thoughts? > > I just moved the function, but I can change this, of course. It's a pattern elsewhere too. Much as it's horrible logic, it probably doesn't want reworking in a patch like this, and the series as a whole is big enough so I'm not going to suggest you tackle it too. ~Andrew
diff --git a/include/lib.h b/include/lib.h index 05c7de5..d94d142 100644 --- a/include/lib.h +++ b/include/lib.h @@ -166,8 +166,7 @@ void sanity_check(void); #define FTYPE_TAP 8 #define FTYPE_BLK 9 #define FTYPE_TPMFRONT 10 -#define FTYPE_TPM_TIS 11 -#define FTYPE_N 12 +#define FTYPE_N 11 #define FTYPE_SPARE 16 typedef int file_read_func(int fd, void *buf, size_t nbytes); diff --git a/include/tpm_tis.h b/include/tpm_tis.h index 86e83f1..2af974d 100644 --- a/include/tpm_tis.h +++ b/include/tpm_tis.h @@ -37,14 +37,11 @@ struct tpm_chip; struct tpm_chip* init_tpm_tis(unsigned long baseaddr, int localities, unsigned int irq); struct tpm_chip* init_tpm2_tis(unsigned long baseaddr, int localities, unsigned int irq); -void shutdown_tpm_tis(struct tpm_chip* tpm); int tpm_tis_request_locality(struct tpm_chip* tpm, int locality); int tpm_tis_cmd(struct tpm_chip* tpm, uint8_t* req, size_t reqlen, uint8_t** resp, size_t* resplen); #ifdef HAVE_LIBC -#include <sys/stat.h> -#include <fcntl.h> /* POSIX IO functions: * use tpm_tis_open() to get a file descriptor to the tpm device * use write() on the fd to send a command to the backend. You must @@ -53,9 +50,6 @@ int tpm_tis_cmd(struct tpm_chip* tpm, uint8_t* req, size_t reqlen, uint8_t** res * fstat() to get the size of the response and lseek() to seek on it. */ int tpm_tis_open(struct tpm_chip* tpm); -int tpm_tis_posix_read(int fd, uint8_t* buf, size_t count); -int tpm_tis_posix_write(int fd, const uint8_t* buf, size_t count); -int tpm_tis_posix_fstat(int fd, struct stat* buf); #endif #endif diff --git a/lib/sys.c b/lib/sys.c index d213ae5..4060b42 100644 --- a/lib/sys.c +++ b/lib/sys.c @@ -29,7 +29,6 @@ #include <blkfront.h> #include <fbfront.h> #include <tpmfront.h> -#include <tpm_tis.h> #include <xenbus.h> #include <xenstore.h> #include <poll.h> @@ -349,11 +348,6 @@ int read(int fd, void *buf, size_t nbytes) case FTYPE_TPMFRONT: { return tpmfront_posix_read(fd, buf, nbytes); } -#endif -#ifdef CONFIG_TPM_TIS - case FTYPE_TPM_TIS: { - return tpm_tis_posix_read(fd, buf, nbytes); - } #endif default: break; @@ -399,10 +393,6 @@ int write(int fd, const void *buf, size_t nbytes) #ifdef CONFIG_TPMFRONT case FTYPE_TPMFRONT: return tpmfront_posix_write(fd, buf, nbytes); -#endif -#ifdef CONFIG_TPM_TIS - case FTYPE_TPM_TIS: - return tpm_tis_posix_write(fd, buf, nbytes); #endif default: break; @@ -459,10 +449,6 @@ off_t lseek(int fd, off_t offset, int whence) #ifdef CONFIG_TPMFRONT case FTYPE_TPMFRONT: break; -#endif -#ifdef CONFIG_TPM_TIS - case FTYPE_TPM_TIS: - break; #endif case FTYPE_FILE: break; @@ -515,11 +501,6 @@ int close(int fd) shutdown_tpmfront(files[fd].dev); break; #endif -#ifdef CONFIG_TPM_TIS - case FTYPE_TPM_TIS: - shutdown_tpm_tis(files[fd].dev); - break; -#endif #ifdef CONFIG_KBDFRONT case FTYPE_KBD: shutdown_kbdfront(files[fd].dev); @@ -599,10 +580,6 @@ int fstat(int fd, struct stat *buf) #ifdef CONFIG_TPMFRONT case FTYPE_TPMFRONT: return tpmfront_posix_fstat(fd, buf); -#endif -#ifdef CONFIG_TPM_TIS - case FTYPE_TPM_TIS: - return tpm_tis_posix_fstat(fd, buf); #endif default: break; diff --git a/tpm_tis.c b/tpm_tis.c index 477f555..abea7a1 100644 --- a/tpm_tis.c +++ b/tpm_tis.c @@ -792,6 +792,9 @@ int tpm_tis_send(struct tpm_chip* tpm, uint8_t* buf, size_t len) { int status, burstcnt = 0; int count = 0; uint32_t ordinal; +#ifdef HAVE_LIBC + struct file *file = get_file_from_fd(tpm->fd); +#endif if(tpm_tis_request_locality(tpm, tpm->locality) < 0) { return -EBUSY; @@ -844,9 +847,10 @@ int tpm_tis_send(struct tpm_chip* tpm, uint8_t* buf, size_t len) { } } #ifdef HAVE_LIBC - if(tpm->fd >= 0) { - files[tpm->fd].read = false; - files[tpm->fd].offset = 0; + if ( file ) + { + file->read = false; + file->offset = 0; } #endif return len; @@ -1093,6 +1097,23 @@ ssize_t tpm_getcap(struct tpm_chip *chip, uint32_t subcap_id, cap_t *cap, return rc; } +static void shutdown_tpm_tis(struct tpm_chip* tpm){ + int i; + + printk("Shutting down tpm_tis device\n"); + + iowrite32(TPM_INT_ENABLE(tpm, tpm->locality), ~TPM_GLOBAL_INT_ENABLE); + + /*Unmap all of the mmio pages */ + for(i = 0; i < 5; ++i) { + if(tpm->pages[i] != NULL) { + iounmap(tpm->pages[i], PAGE_SIZE); + tpm->pages[i] = NULL; + } + } + free(tpm); + return; +} struct tpm_chip* init_tpm_tis(unsigned long baseaddr, int localities, unsigned int irq) { @@ -1242,25 +1263,6 @@ abort_egress: return NULL; } -void shutdown_tpm_tis(struct tpm_chip* tpm){ - int i; - - printk("Shutting down tpm_tis device\n"); - - iowrite32(TPM_INT_ENABLE(tpm, tpm->locality), ~TPM_GLOBAL_INT_ENABLE); - - /*Unmap all of the mmio pages */ - for(i = 0; i < 5; ++i) { - if(tpm->pages[i] != NULL) { - iounmap(tpm->pages[i], PAGE_SIZE); - tpm->pages[i] = NULL; - } - } - free(tpm); - return; -} - - int tpm_tis_cmd(struct tpm_chip* tpm, uint8_t* req, size_t reqlen, uint8_t** resp, size_t* resplen) { if(tpm->locality < 0) { @@ -1279,23 +1281,24 @@ int tpm_tis_cmd(struct tpm_chip* tpm, uint8_t* req, size_t reqlen, uint8_t** res } #ifdef HAVE_LIBC -int tpm_tis_open(struct tpm_chip* tpm) +#include <sys/stat.h> +#include <fcntl.h> + +static int tpm_tis_close(int fd) { - /* Silently prevent multiple opens */ - if(tpm->fd != -1) { - return tpm->fd; - } + struct file *file = get_file_from_fd(fd); - tpm->fd = alloc_fd(FTYPE_TPM_TIS); - printk("tpm_tis_open() -> %d\n", tpm->fd); - files[tpm->fd].dev = tpm; - return tpm->fd; + shutdown_tpm_tis(file->dev); + + return 0; } -int tpm_tis_posix_write(int fd, const uint8_t* buf, size_t count) +static int tpm_tis_posix_write(int fd, const void *buf, size_t count) { struct tpm_chip* tpm; - tpm = files[fd].dev; + struct file *file = get_file_from_fd(fd); + + tpm = file->dev; if(tpm->locality < 0) { printk("tpm_tis_posix_write() failed! locality not set!\n"); @@ -1319,11 +1322,13 @@ int tpm_tis_posix_write(int fd, const uint8_t* buf, size_t count) return count; } -int tpm_tis_posix_read(int fd, uint8_t* buf, size_t count) +static int tpm_tis_posix_read(int fd, void *buf, size_t count) { int rc; struct tpm_chip* tpm; - tpm = files[fd].dev; + struct file *file = get_file_from_fd(fd); + + tpm = file->dev; if(count == 0) { return 0; @@ -1337,20 +1342,24 @@ int tpm_tis_posix_read(int fd, uint8_t* buf, size_t count) /* Handle EOF case */ - if(files[fd].offset >= tpm->data_len) { + if ( file->offset >= tpm->data_len ) + { rc = 0; } else { - rc = min(tpm->data_len - files[fd].offset, count); - memcpy(buf, tpm->data_buffer + files[fd].offset, rc); + rc = min(tpm->data_len - file->offset, count); + memcpy(buf, tpm->data_buffer + file->offset, rc); } - files[fd].offset += rc; + file->offset += rc; /* Reset the data pending flag */ return rc; } -int tpm_tis_posix_fstat(int fd, struct stat* buf) + +static int tpm_tis_posix_fstat(int fd, struct stat *buf) { struct tpm_chip* tpm; - tpm = files[fd].dev; + struct file *file = get_file_from_fd(fd); + + tpm = file->dev; buf->st_mode = O_RDWR; buf->st_uid = 0; @@ -1360,6 +1369,35 @@ int tpm_tis_posix_fstat(int fd, struct stat* buf) return 0; } +static struct file_ops tpm_tis_ops = { + .name = "tpm_tis", + .read = tpm_tis_posix_read, + .write = tpm_tis_posix_write, + .lseek = lseek_default, + .close = tpm_tis_close, + .fstat = tpm_tis_posix_fstat, +}; + +int tpm_tis_open(struct tpm_chip* tpm) +{ + struct file *file; + static unsigned int ftype_tis; + + /* Silently prevent multiple opens */ + if(tpm->fd != -1) { + return tpm->fd; + } + + if ( !ftype_tis ) + ftype_tis = alloc_file_type(&tpm_tis_ops); + + tpm->fd = alloc_fd(ftype_tis); + printk("tpm_tis_open() -> %d\n", tpm->fd); + file = get_file_from_fd(tpm->fd); + file->dev = tpm; + return tpm->fd; +} + /* TPM 2.0 */ /*TPM2.0 Selftest*/
Allocate a file type dynamically via alloc_file_type(). Instead of directly accessing the files[] array use get_file_from_fd(). Make some now local functions static and modify their prototypes to match the file_ops requirements. Signed-off-by: Juergen Gross <jgross@suse.com> --- include/lib.h | 3 +- include/tpm_tis.h | 6 --- lib/sys.c | 23 --------- tpm_tis.c | 120 ++++++++++++++++++++++++++++++---------------- 4 files changed, 80 insertions(+), 72 deletions(-)