Date: Wed, 12 Oct 2016 21:22:08 -0600 From: Warner Losh <imp@bsdimp.com> To: Konstantin Belousov <kostikbel@gmail.com>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org> Cc: Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r307070 - in head/sys: amd64/amd64 conf dev/efidev i386/include modules/efirt sys Message-ID: <CANCZdfoCKCj2yLSeJfnB=3V02gwn8SJvFW8BGr8-pkmHMfn03Q@mail.gmail.com> In-Reply-To: <20161012114920.GU68202@kib.kiev.ua> References: <201610112224.u9BMOUlp053188@repo.freebsd.org> <20161012114920.GU68202@kib.kiev.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
Yea, I'd made most of those changes in git and lost them :(
Warner
On Wed, Oct 12, 2016 at 5:49 AM, Konstantin Belousov
<kostikbel@gmail.com> wrote:
> On Tue, Oct 11, 2016 at 10:24:30PM +0000, Warner Losh wrote:
>
>> Added: head/sys/dev/efidev/efidev.c
>> ==============================================================================
>> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
>> +++ head/sys/dev/efidev/efidev.c Tue Oct 11 22:24:30 2016 (r307070)
>> @@ -0,0 +1,199 @@
>> +/*-
>> + * Copyright (c) 2016 Netflix, Inc.
>> + * All rights reserved.
>> + *
>> + * Redistribution and use in source and binary forms, with or without
>> + * modification, are permitted provided that the following conditions
>> + * are met:
>> + * 1. Redistributions of source code must retain the above copyright
>> + * notice, this list of conditions and the following disclaimer
>> + * in this position and unchanged.
>> + * 2. Redistributions in binary form must reproduce the above copyright
>> + * notice, this list of conditions and the following disclaimer in the
>> + * documentation and/or other materials provided with the distribution.
>> + *
>> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
>> + */
>> +
>> +#include <sys/cdefs.h>
>> +__FBSDID("$FreeBSD$");
>> +
>> +#include <sys/param.h>
>> +#include <sys/systm.h>
>> +#include <sys/kernel.h>
>> +#include <sys/bus.h>
>> +#include <sys/conf.h>
>> +#include <sys/lock.h>
>> +#include <sys/malloc.h>
>> +#include <sys/module.h>
>> +
>> +#include <machine/efi.h>
> As I asked in review, please use <sys/efi.h>, not <machine/efi.h>
>
>> +#include <sys/efiio.h>
>> +
>> +static d_ioctl_t efidev_ioctl;
>> +
>> +static struct cdevsw efi_cdevsw = {
>> + .d_name = "efi",
>> + .d_version = D_VERSION,
>> + .d_ioctl = efidev_ioctl,
>> +};
>> +
>> +/* ARGSUSED */
>> +static int
>> +efidev_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t addr,
>> + int flags __unused, struct thread *td __unused)
>> +{
>> + int error;
>> +
>> + switch (cmd) {
>> + case EFIIOC_GET_TABLE:
>> + {
>> + struct efi_get_table_ioc *egtioc =
>> + (struct efi_get_table_ioc *)addr;
>> +
>> + error = efi_get_table(&egtioc->uuid, &egtioc->ptr);
>> + break;
>> + }
>> + case EFIIOC_GET_TIME:
>> + {
>> + struct efi_tm *tm = (struct efi_tm *)addr;
>> +
>> + error = efi_get_time(tm);
>> + break;
>> + }
>> + case EFIIOC_SET_TIME:
>> + {
>> + struct efi_tm *tm = (struct efi_tm *)addr;
>> +
>> + error = efi_set_time(tm);
>> + break;
>> + }
>> + case EFIIOC_VAR_GET:
>> + {
>> + struct efi_var_ioc *ev = (struct efi_var_ioc *)addr;
>> + void *data;
>> + efi_char *name;
>> +
>> + data = malloc(ev->datasize, M_TEMP, M_WAITOK);
>> + name = malloc(ev->namesize, M_TEMP, M_WAITOK);
>> + error = copyin(ev->name, name, ev->namesize);
>> + if (error)
>> + goto vg_out;
>> + if (name[ev->namesize / sizeof(efi_char) - 1] != 0) {
>> + error = EINVAL;
>> + goto vg_out;
>> + }
>> +
>> + error = efi_var_get(name, &ev->vendor, &ev->attrib,
>> + &ev->datasize, data);
>> +
>> + if (error == 0) {
>> + error = copyout(data, ev->data, ev->datasize);
>> + } else if (error == EOVERFLOW) {
>> + /*
>> + * Pass back the size we really need, but
>> + * convert the error to 0 so the copyout
>> + * happens. datasize was updated in the
>> + * efi_var_get call.
>> + */
>> + ev->data = NULL;
>> + error = 0;
>> + }
>> +vg_out:
>> + free(data, M_TEMP);
>> + free(name, M_TEMP);
>> + break;
>> + }
>> + case EFIIOC_VAR_NEXT:
>> + {
>> + struct efi_var_ioc *ev = (struct efi_var_ioc *)addr;
>> + efi_char *name;
>> +
>> + name = malloc(ev->namesize, M_TEMP, M_WAITOK);
>> + if (name == NULL) {
> The check is for impossible condition.
>
>> + error = ENOMEM;
>> + goto vn_out;
>> + }
>> + error = copyin(ev->name, name, ev->namesize);
>> + if (error)
>> + goto vn_out;
>> + /* Note: namesize is the buffer size, not the string lenght */
>> +
>> + error = efi_var_nextname(&ev->namesize, name, &ev->vendor);
>> + if (error == 0) {
>> + error = copyout(name, ev->name, ev->namesize);
>> + } else if (error == EOVERFLOW) {
>> + ev->name = NULL;
>> + error = 0;
>> + }
>> + vn_out:
>> + if (name != NULL)
> The check is redundand.
>
>> + free(name, M_TEMP);
>> + break;
>> + }
>> + case EFIIOC_VAR_SET:
>> + {
>> + struct efi_var_ioc *ev = (struct efi_var_ioc *)addr;
>> + void *data = NULL;
>> + efi_char *name;
>> +
>> + /* datasize == 0 -> delete (more or less) */
>> + if (ev->datasize > 0)
>> + data = malloc(ev->datasize, M_TEMP, M_WAITOK);
>> + name = malloc(ev->namesize, M_TEMP, M_WAITOK);
>> + if (ev->datasize) {
>> + error = copyin(ev->data, data, ev->datasize);
>> + if (error)
>> + goto vs_out;
>> + }
>> + error = copyin(ev->name, name, ev->namesize);
>> + if (error)
>> + goto vs_out;
>> + if (name[ev->namesize / sizeof(efi_char) - 1] != 0) {
>> + error = EINVAL;
>> + goto vs_out;
>> + }
>> +
>> + error = efi_var_set(name, &ev->vendor, ev->attrib, ev->datasize,
>> + data);
>> +vs_out:
>> + if (data != NULL)
> The check is redundand.
>
>> + free(data, M_TEMP);
>> + free(name, M_TEMP);
>> + break;
>> + }
>> + default:
>> + error = ENOTTY;
>> + break;
>> + }
>> +
>> + return (error);
>> +}
>> +
>> +int
>> +efidev_init(struct cdev **cdev)
>> +{
>> +
>> + *cdev = make_dev(&efi_cdevsw, 0, UID_ROOT, GID_WHEEL, 0700,
>> + "efidev");
> It is still "/dev/efidev". Please rename as discussed.
>
>> +
>> + return (0);
>> +}
>> +
>> +int
>> +efidev_uninit(struct cdev *cdev)
>> +{
>> +
>> + destroy_dev(cdev);
>> +
>> + return (0);
>> +}
>>
>> Added: head/sys/i386/include/efi.h
>> ==============================================================================
>> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
>> +++ head/sys/i386/include/efi.h Tue Oct 11 22:24:30 2016 (r307070)
>> @@ -0,0 +1,39 @@
>> +/*-
>> + * Copyright (c) 2016 The FreeBSD Foundation
>> + * All rights reserved.
>> + *
>> + * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
>> + * under sponsorship from the FreeBSD Foundation.
> It was not.
>
>> + *
>> + * Redistribution and use in source and binary forms, with or without
>> + * modification, are permitted provided that the following conditions
>> + * are met:
>> + * 1. Redistributions of source code must retain the above copyright
>> + * notice, this list of conditions and the following disclaimer.
>> + * 2. Redistributions in binary form must reproduce the above copyright
>> + * notice, this list of conditions and the following disclaimer in the
>> + * documentation and/or other materials provided with the distribution.
>> + *
>> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
>> + *
>> + * $FreeBSD$
>> + */
>> +
>> +#ifndef __I386_INCLUDE_EFI_H_
>> +#define __I386_INCLUDE_EFI_H_
>> +
>> +#define EFIABI_ATTR /* __attribute__((ms_abi)) */ /* clang fails with this */
>> +
>> +/* Note: we don't actually support this on i386 yet */
>> +
>> +#endif /* __I386_INCLUDE_EFI_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfoCKCj2yLSeJfnB=3V02gwn8SJvFW8BGr8-pkmHMfn03Q>