Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12909327 authored by Amir Shehata's avatar Amir Shehata Committed by Greg Kroah-Hartman
Browse files

staging: lustre: Dynamic LNet Configuration (DLC) IOCTL changes 



This is the fourth patch of a set of patches that enables DLC.

This patch changes the IOCTL infrastructure in preparation of
adding extra IOCTL communication between user and kernel space.
The changes include:
- adding a common header to be passed to ioctl infra functions
  instead of passing an exact structure.  This header is meant
  to be included in all structures to be passed through that
  interface.  The IOCTL handler casts this header to a particular
  type that it expects
- All sanity testing on the past in structure is performed in the
  generic ioctl infrastructure code.
- All ioctl handlers changed to take the header instead of a
  particular structure type

Signed-off-by: default avatarAmir Shehata <amir.shehata@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2456
Reviewed-on: http://review.whamcloud.com/8021


Reviewed-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@gmail.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bb27d499

drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h

+12 −11
Original line number Diff line number Diff line
@@ -43,9 +43,13 @@ 


#define LIBCFS_IOCTL_VERSION 0x0001000a



struct libcfs_ioctl_data {

struct libcfs_ioctl_hdr {

	__u32 ioc_len;

	__u32 ioc_version;

};



struct libcfs_ioctl_data {

	struct libcfs_ioctl_hdr ioc_hdr;



	__u64 ioc_nid;

	__u64 ioc_u64[1];
@@ -70,11 +74,6 @@ struct libcfs_ioctl_data { 


#define ioc_priority ioc_u32[0]



struct libcfs_ioctl_hdr {

	__u32 ioc_len;

	__u32 ioc_version;

};



struct libcfs_debug_ioctl_data {

	struct libcfs_ioctl_hdr hdr;

	unsigned int subs;
@@ -90,7 +89,7 @@ do { \ 


struct libcfs_ioctl_handler {

	struct list_head item;

	int (*handle_ioctl)(unsigned int cmd, struct libcfs_ioctl_data *data);

	int (*handle_ioctl)(unsigned int cmd, struct libcfs_ioctl_hdr *hdr);

};



#define DECLARE_IOCTL_HANDLER(ident, func)		      \
@@ -148,9 +147,9 @@ static inline int libcfs_ioctl_packlen(struct libcfs_ioctl_data *data) 
	return len;

}



static inline int libcfs_ioctl_is_invalid(struct libcfs_ioctl_data *data)

static inline bool libcfs_ioctl_is_invalid(struct libcfs_ioctl_data *data)

{

	if (data->ioc_len > (1<<30)) {

	if (data->ioc_hdr.ioc_len > (1 << 30)) {

		CERROR("LIBCFS ioctl: ioc_len larger than 1<<30\n");

		return 1;

	}
@@ -186,7 +185,7 @@ static inline int libcfs_ioctl_is_invalid(struct libcfs_ioctl_data *data) 
		CERROR("LIBCFS ioctl: plen2 nonzero but no pbuf2 pointer\n");

		return 1;

	}

	if ((__u32)libcfs_ioctl_packlen(data) != data->ioc_len) {

	if ((__u32)libcfs_ioctl_packlen(data) != data->ioc_hdr.ioc_len) {

		CERROR("LIBCFS ioctl: packlen != ioc_len\n");

		return 1;

	}
@@ -206,7 +205,9 @@ static inline int libcfs_ioctl_is_invalid(struct libcfs_ioctl_data *data) 


int libcfs_register_ioctl(struct libcfs_ioctl_handler *hand);

int libcfs_deregister_ioctl(struct libcfs_ioctl_handler *hand);

int libcfs_ioctl_getdata(char *buf, char *end, void __user *arg);

int libcfs_ioctl_getdata_len(const struct libcfs_ioctl_hdr __user *arg,

			     __u32 *buf_len);

int libcfs_ioctl_popdata(void __user *arg, void *buf, int size);

int libcfs_ioctl_data_adjust(struct libcfs_ioctl_data *data);



#endif /* __LIBCFS_IOCTL_H__ */

drivers/staging/lustre/lnet/lnet/module.c

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ lnet_unconfigure(void) 
}



static int

lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_data *data)

lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr)

{

	int rc;
@@ -103,7 +103,7 @@ lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_data *data) 
		 */

		rc = LNetNIInit(LNET_PID_ANY);

		if (rc >= 0) {

			rc = LNetCtl(cmd, data);

			rc = LNetCtl(cmd, hdr);

			LNetNIFini();

		}

		return rc;

drivers/staging/lustre/lnet/selftest/conctl.c

+7 −2
Original line number Diff line number Diff line
@@ -801,15 +801,20 @@ static int lst_test_add_ioctl(lstio_test_args_t *args) 
}



int

lstcon_ioctl_entry(unsigned int cmd, struct libcfs_ioctl_data *data)

lstcon_ioctl_entry(unsigned int cmd, struct libcfs_ioctl_hdr *hdr)

{

	char   *buf;

	int     opc = data->ioc_u32[0];

	struct libcfs_ioctl_data *data;

	int     opc;

	int     rc;



	if (cmd != IOC_LIBCFS_LNETST)

		return -EINVAL;



	data = container_of(hdr, struct libcfs_ioctl_data, ioc_hdr);



	opc = data->ioc_u32[0];



	if (data->ioc_plen1 > PAGE_CACHE_SIZE)

		return -EINVAL;

drivers/staging/lustre/lnet/selftest/console.c

+1 −1
Original line number Diff line number Diff line
@@ -1983,7 +1983,7 @@ static void lstcon_init_acceptor_service(void) 
	lstcon_acceptor_service.sv_wi_total = SFW_FRWK_WI_MAX;

}



extern int lstcon_ioctl_entry(unsigned int cmd, struct libcfs_ioctl_data *data);

extern int lstcon_ioctl_entry(unsigned int cmd, struct libcfs_ioctl_hdr *hdr);



static DECLARE_IOCTL_HANDLER(lstcon_ioctl_handler, lstcon_ioctl_entry);

drivers/staging/lustre/lnet/selftest/console.h

+0 −1
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ lstcon_id2hash(lnet_process_id_t id, struct list_head *hash) 
}



int lstcon_console_init(void);

int lstcon_ioctl_entry(unsigned int cmd, struct libcfs_ioctl_data *data);

int lstcon_console_fini(void);

int lstcon_session_match(lst_sid_t sid);

int lstcon_session_new(char *name, int key, unsigned version,