/*
* Copyright (c) 2012 The Chromium OS Authors.
+ * Copyright (c) 2012-2017 The strace developers.
* Written by Mike Frysinger <vapier@gentoo.org>.
*
* Redistribution and use in source and binary forms, with or without
#include <linux/ioctl.h>
#include <linux/loop.h>
+typedef struct loop_info struct_loop_info;
+
+#include DEF_MPERS_TYPE(struct_loop_info)
+
+#include MPERS_DEFS
+
+#include "print_fields.h"
+#include "xlat/loop_cmds.h"
#include "xlat/loop_flags_options.h"
#include "xlat/loop_crypt_type_options.h"
static void
-decode_loop_info(struct tcb *tcp, const long addr)
+decode_loop_info(struct tcb *const tcp, const kernel_ulong_t addr)
{
- struct loop_info info;
+ struct_loop_info info;
tprints(", ");
if (umove_or_printaddr(tcp, addr, &info))
return;
- tprintf("{number=%d", info.lo_number);
+ tprintf("{lo_number=%d", info.lo_number);
if (!abbrev(tcp)) {
- tprintf(", device=%#lx, inode=%lu, rdevice=%#lx",
- (unsigned long) info.lo_device,
- info.lo_inode,
- (unsigned long) info.lo_rdevice);
+ PRINT_FIELD_DEV(", ", info, lo_device);
+ tprintf(", lo_inode=%" PRI_klu, (kernel_ulong_t) info.lo_inode);
+ PRINT_FIELD_DEV(", ", info, lo_rdevice);
}
- tprintf(", offset=%#x", info.lo_offset);
+ tprintf(", lo_offset=%#x", info.lo_offset);
if (!abbrev(tcp) || info.lo_encrypt_type != LO_CRYPT_NONE) {
- tprints(", encrypt_type=");
+ tprints(", lo_encrypt_type=");
printxval(loop_crypt_type_options, info.lo_encrypt_type,
"LO_CRYPT_???");
- tprintf(", encrypt_key_size=%d", info.lo_encrypt_key_size);
+ /*
+ * It is converted to unsigned before use in kernel, see
+ * loop_info64_from_old in drivers/block/loop.c
+ */
+ tprintf(", lo_encrypt_key_size=%" PRIu32,
+ (uint32_t) info.lo_encrypt_key_size);
}
- tprints(", flags=");
+ tprints(", lo_flags=");
printflags(loop_flags_options, info.lo_flags, "LO_FLAGS_???");
- tprints(", name=");
- print_quoted_string(info.lo_name, LO_NAME_SIZE,
- QUOTE_0_TERMINATED);
+ PRINT_FIELD_CSTRING(", ", info, lo_name);
if (!abbrev(tcp) || info.lo_encrypt_type != LO_CRYPT_NONE) {
- tprints(", encrypt_key=");
- print_quoted_string((void *) info.lo_encrypt_key,
- LO_KEY_SIZE, 0);
+ const unsigned int lo_encrypt_key_size =
+ MIN((unsigned) info.lo_encrypt_key_size, LO_KEY_SIZE);
+ PRINT_FIELD_STRING(", ", info, lo_encrypt_key,
+ lo_encrypt_key_size, 0);
}
if (!abbrev(tcp))
- tprintf(", init={%#lx, %#lx}"
- ", reserved={%#x, %#x, %#x, %#x}}",
- info.lo_init[0], info.lo_init[1],
+ tprintf(", lo_init=[%#" PRI_klx ", %#" PRI_klx "]"
+ ", reserved=[%#hhx, %#hhx, %#hhx, %#hhx]}",
+ (kernel_ulong_t) info.lo_init[0],
+ (kernel_ulong_t) info.lo_init[1],
info.reserved[0], info.reserved[1],
info.reserved[2], info.reserved[3]);
else
}
static void
-decode_loop_info64(struct tcb *tcp, const long addr)
+decode_loop_info64(struct tcb *const tcp, const kernel_ulong_t addr)
{
struct loop_info64 info64;
return;
if (!abbrev(tcp)) {
- tprintf("{device=%" PRIu64 ", inode=%" PRIu64 ", "
- "rdevice=%" PRIu64 ", offset=%#" PRIx64 ", "
- "sizelimit=%" PRIu64 ", number=%" PRIu32,
- (uint64_t) info64.lo_device,
- (uint64_t) info64.lo_inode,
- (uint64_t) info64.lo_rdevice,
+ PRINT_FIELD_DEV("{", info64, lo_device);
+ tprintf(", lo_inode=%" PRIu64, (uint64_t) info64.lo_inode);
+ PRINT_FIELD_DEV(", ", info64, lo_rdevice);
+ tprintf(", lo_offset=%#" PRIx64 ", lo_sizelimit=%" PRIu64
+ ", lo_number=%" PRIu32,
(uint64_t) info64.lo_offset,
(uint64_t) info64.lo_sizelimit,
(uint32_t) info64.lo_number);
} else {
- tprintf("{offset=%#" PRIx64 ", number=%" PRIu32,
+ tprintf("{lo_offset=%#" PRIx64 ", lo_number=%" PRIu32,
(uint64_t) info64.lo_offset,
(uint32_t) info64.lo_number);
}
if (!abbrev(tcp) || info64.lo_encrypt_type != LO_CRYPT_NONE) {
- tprints(", encrypt_type=");
+ tprints(", lo_encrypt_type=");
printxval(loop_crypt_type_options, info64.lo_encrypt_type,
"LO_CRYPT_???");
- tprintf(", encrypt_key_size=%" PRIu32,
+ tprintf(", lo_encrypt_key_size=%" PRIu32,
info64.lo_encrypt_key_size);
}
- tprints(", flags=");
+ tprints(", lo_flags=");
printflags(loop_flags_options, info64.lo_flags, "LO_FLAGS_???");
- tprints(", file_name=");
- print_quoted_string((void *) info64.lo_file_name,
- LO_NAME_SIZE, QUOTE_0_TERMINATED);
+ PRINT_FIELD_CSTRING(", ", info64, lo_file_name);
if (!abbrev(tcp) || info64.lo_encrypt_type != LO_CRYPT_NONE) {
- tprints(", crypt_name=");
- print_quoted_string((void *) info64.lo_crypt_name,
- LO_NAME_SIZE, QUOTE_0_TERMINATED);
- tprints(", encrypt_key=");
- print_quoted_string((void *) info64.lo_encrypt_key,
- LO_KEY_SIZE, 0);
+ PRINT_FIELD_CSTRING(", ", info64, lo_crypt_name);
+ const unsigned int lo_encrypt_key_size =
+ MIN((unsigned) info64.lo_encrypt_key_size, LO_KEY_SIZE);
+ PRINT_FIELD_STRING(", ", info64, lo_encrypt_key,
+ lo_encrypt_key_size, 0);
}
if (!abbrev(tcp))
- tprintf(", init={%#" PRIx64 ", %#" PRIx64 "}}",
+ tprintf(", lo_init=[%#" PRIx64 ", %#" PRIx64 "]}",
(uint64_t) info64.lo_init[0],
(uint64_t) info64.lo_init[1]);
else
tprints(", ...}");
}
-int
-loop_ioctl(struct tcb *tcp, const unsigned int code, long arg)
+MPERS_PRINTER_DECL(int, loop_ioctl,
+ struct tcb *tcp, const unsigned int code,
+ const kernel_ulong_t arg)
{
- if (!verbose(tcp))
- return RVAL_DECODED;
-
switch (code) {
case LOOP_GET_STATUS:
if (entering(tcp))
break;
case LOOP_CLR_FD:
-#ifdef LOOP_SET_CAPACITY
case LOOP_SET_CAPACITY:
-#endif
-#ifdef LOOP_CTL_GET_FREE
/* newer loop-control stuff */
case LOOP_CTL_GET_FREE:
-#endif
/* Takes no arguments */
break;
printfd(tcp, arg);
break;
-#ifdef LOOP_CTL_ADD
/* newer loop-control stuff */
case LOOP_CTL_ADD:
case LOOP_CTL_REMOVE:
tprintf(", %d", (int) arg);
break;
-#endif
+
+ case LOOP_SET_DIRECT_IO:
+ tprintf(", %" PRI_klu, arg);
+ break;
default:
return RVAL_DECODED;