Commit e865b97f authored by Chen Gang's avatar Chen Gang Committed by Laurent Vivier
Browse files

linux-user: syscall: ioctls: support DRM_IOCTL_VERSION 



Another DRM_IOCTL_* commands will be done later.

Signed-off-by: default avatarChen Gang <chengang@emindsoft.com.cn>
Reviewed-by: default avatarLaurent Vivier <laurent@vivier.eu>
Message-Id: <20200605013221.22828-1-chengang@emindsoft.com.cn>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent d43624c4

configure

+10 −0
Original line number Diff line number Diff line
@@ -3194,6 +3194,13 @@ if ! check_include "ifaddrs.h" ; then 
  have_ifaddrs_h=no

fi



#########################################

# libdrm check

have_drm_h=no

if check_include "libdrm/drm.h" ; then

    have_drm_h=yes

fi



##########################################

# VTE probe
@@ -7377,6 +7384,9 @@ fi 
if test "$have_ifaddrs_h" = "yes" ; then

    echo "HAVE_IFADDRS_H=y" >> $config_host_mak

fi

if test "$have_drm_h" = "yes" ; then

  echo "HAVE_DRM_H=y" >> $config_host_mak

fi

if test "$have_broken_size_max" = "yes" ; then

    echo "HAVE_BROKEN_SIZE_MAX=y" >> $config_host_mak

fi

linux-user/ioctls.h

+5 −0
Original line number Diff line number Diff line
@@ -574,6 +574,11 @@ 
  IOCTL_SPECIAL(SIOCDELRT, IOC_W, do_ioctl_rt,

                MK_PTR(MK_STRUCT(STRUCT_rtentry)))



#ifdef HAVE_DRM_H

  IOCTL_SPECIAL(DRM_IOCTL_VERSION, IOC_RW, do_ioctl_drm,

                MK_PTR(MK_STRUCT(STRUCT_drm_version)))

#endif



#ifdef TARGET_TIOCSTART

  IOCTL_IGNORE(TIOCSTART)

  IOCTL_IGNORE(TIOCSTOP)

linux-user/syscall.c

+98 −0
Original line number Diff line number Diff line
@@ -112,6 +112,9 @@ 
#include <linux/if_alg.h>

#include <linux/rtc.h>

#include <sound/asound.h>

#ifdef HAVE_DRM_H

#include <libdrm/drm.h>

#endif

#include "linux_loop.h"

#include "uname.h"
@@ -5276,6 +5279,101 @@ static abi_long do_ioctl_tiocgptpeer(const IOCTLEntry *ie, uint8_t *buf_temp, 
}

#endif



#ifdef HAVE_DRM_H



static void unlock_drm_version(struct drm_version *host_ver,

                               struct target_drm_version *target_ver,

                               bool copy)

{

    unlock_user(host_ver->name, target_ver->name,

                                copy ? host_ver->name_len : 0);

    unlock_user(host_ver->date, target_ver->date,

                                copy ? host_ver->date_len : 0);

    unlock_user(host_ver->desc, target_ver->desc,

                                copy ? host_ver->desc_len : 0);

}



static inline abi_long target_to_host_drmversion(struct drm_version *host_ver,

                                          struct target_drm_version *target_ver)

{

    memset(host_ver, 0, sizeof(*host_ver));



    __get_user(host_ver->name_len, &target_ver->name_len);

    if (host_ver->name_len) {

        host_ver->name = lock_user(VERIFY_WRITE, target_ver->name,

                                   target_ver->name_len, 0);

        if (!host_ver->name) {

            return -EFAULT;

        }

    }



    __get_user(host_ver->date_len, &target_ver->date_len);

    if (host_ver->date_len) {

        host_ver->date = lock_user(VERIFY_WRITE, target_ver->date,

                                   target_ver->date_len, 0);

        if (!host_ver->date) {

            goto err;

        }

    }



    __get_user(host_ver->desc_len, &target_ver->desc_len);

    if (host_ver->desc_len) {

        host_ver->desc = lock_user(VERIFY_WRITE, target_ver->desc,

                                   target_ver->desc_len, 0);

        if (!host_ver->desc) {

            goto err;

        }

    }



    return 0;

err:

    unlock_drm_version(host_ver, target_ver, false);

    return -EFAULT;

}



static inline void host_to_target_drmversion(

                                          struct target_drm_version *target_ver,

                                          struct drm_version *host_ver)

{

    __put_user(host_ver->version_major, &target_ver->version_major);

    __put_user(host_ver->version_minor, &target_ver->version_minor);

    __put_user(host_ver->version_patchlevel, &target_ver->version_patchlevel);

    __put_user(host_ver->name_len, &target_ver->name_len);

    __put_user(host_ver->date_len, &target_ver->date_len);

    __put_user(host_ver->desc_len, &target_ver->desc_len);

    unlock_drm_version(host_ver, target_ver, true);

}



static abi_long do_ioctl_drm(const IOCTLEntry *ie, uint8_t *buf_temp,

                             int fd, int cmd, abi_long arg)

{

    struct drm_version *ver;

    struct target_drm_version *target_ver;

    abi_long ret;



    switch (ie->host_cmd) {

    case DRM_IOCTL_VERSION:

        if (!lock_user_struct(VERIFY_WRITE, target_ver, arg, 0)) {

            return -TARGET_EFAULT;

        }

        ver = (struct drm_version *)buf_temp;

        ret = target_to_host_drmversion(ver, target_ver);

        if (!is_error(ret)) {

            ret = get_errno(safe_ioctl(fd, ie->host_cmd, ver));

            if (is_error(ret)) {

                unlock_drm_version(ver, target_ver, false);

            } else {

                host_to_target_drmversion(target_ver, ver);

            }

        }

        unlock_user_struct(target_ver, arg, 0);

        return ret;

    }

    return -TARGET_ENOSYS;

}



#endif



static IOCTLEntry ioctl_entries[] = {

#define IOCTL(cmd, access, ...) \

    { TARGET_ ## cmd, cmd, #cmd, access, 0, {  __VA_ARGS__ } },

linux-user/syscall_defs.h

+15 −0
Original line number Diff line number Diff line
@@ -1167,6 +1167,9 @@ struct target_rtc_pll_info { 
#define TARGET_DM_TARGET_MSG          TARGET_IOWRU(0xfd, 0x0e)

#define TARGET_DM_DEV_SET_GEOMETRY    TARGET_IOWRU(0xfd, 0x0f)



/* drm ioctls */

#define TARGET_DRM_IOCTL_VERSION      TARGET_IOWRU('d', 0x00)



/* from asm/termbits.h */



#define TARGET_NCC 8
@@ -2598,6 +2601,18 @@ struct target_mq_attr { 
    abi_long mq_curmsgs;

};



struct target_drm_version {

    int version_major;

    int version_minor;

    int version_patchlevel;

    abi_ulong name_len;

    abi_ulong name;

    abi_ulong date_len;

    abi_ulong date;

    abi_ulong desc_len;

    abi_ulong desc;

};



#include "socket.h"



#include "errno_defs.h"

linux-user/syscall_types.h

+11 −0
Original line number Diff line number Diff line
@@ -292,6 +292,17 @@ STRUCT(dm_target_versions, 
STRUCT(dm_target_msg,

       TYPE_ULONGLONG) /* sector */



STRUCT(drm_version,

       TYPE_INT, /* version_major */

       TYPE_INT, /* version_minor */

       TYPE_INT, /* version_patchlevel */

       TYPE_ULONG, /* name_len */

       TYPE_PTRVOID, /* name */

       TYPE_ULONG, /* date_len */

       TYPE_PTRVOID, /* date */

       TYPE_ULONG, /* desc_len */

       TYPE_PTRVOID) /* desc */



STRUCT(file_clone_range,

       TYPE_LONGLONG, /* src_fd */

       TYPE_ULONGLONG, /* src_offset */