tests: check decoding of netlink smc_diag_msg attributes

[strace] / sg_io_v3.c

diff --git a/sg_io_v3.c b/sg_io_v3.c
index 18a005844f4cb042877da3990fa693ac914a5550..33aff50667605e684b89b5b6489a2539b674d3cb 100644 (file)
--- a/sg_io_v3.c
+++ b/sg_io_v3.c
@@ -49,9 +49,14 @@ typedef struct sg_io_hdr struct_sg_io_hdr;
 
 static void
 print_sg_io_buffer(struct tcb *const tcp, const kernel_ulong_t addr,
-                  const unsigned int len)
+                  const unsigned int data_size, const unsigned int iovec_count)
 {
-       printstr_ex(tcp, addr, len, QUOTE_FORCE_HEX);
+       if (iovec_count) {
+               tprint_iov_upto(tcp, iovec_count, addr, IOV_DECODE_STR,
+                               data_size);
+       } else {
+               printstr_ex(tcp, addr, data_size, QUOTE_FORCE_HEX);
+       }
 }
 
 static int
@@ -72,7 +77,7 @@ decode_request(struct tcb *const tcp, const kernel_ulong_t arg)
        printxval(sg_io_dxfer_direction, sg_io.dxfer_direction,
                  "SG_DXFER_???");
        tprintf(", cmd_len=%u, cmdp=", sg_io.cmd_len);
-       print_sg_io_buffer(tcp, ptr_to_kulong(sg_io.cmdp), sg_io.cmd_len);
+       print_sg_io_buffer(tcp, ptr_to_kulong(sg_io.cmdp), sg_io.cmd_len, 0);
        tprintf(", mx_sb_len=%d", sg_io.mx_sb_len);
        tprintf(", iovec_count=%d", sg_io.iovec_count);
        tprintf(", dxfer_len=%u", sg_io.dxfer_len);
@@ -83,29 +88,38 @@ decode_request(struct tcb *const tcp, const kernel_ulong_t arg)
        if (sg_io.dxfer_direction == SG_DXFER_TO_DEV ||
            sg_io.dxfer_direction == SG_DXFER_TO_FROM_DEV) {
                tprints(", dxferp=");
-               if (sg_io.iovec_count)
-                       tprint_iov_upto(tcp, sg_io.iovec_count,
-                                       ptr_to_kulong(sg_io.dxferp),
-                                       IOV_DECODE_STR,
-                                       sg_io.dxfer_len);
-               else
-                       print_sg_io_buffer(tcp, ptr_to_kulong(sg_io.dxferp),
-                                          sg_io.dxfer_len);
+               print_sg_io_buffer(tcp, ptr_to_kulong(sg_io.dxferp),
+                                  sg_io.dxfer_len, sg_io.iovec_count);
+       }
+
+       struct_sg_io_hdr *entering_sg_io = malloc(sizeof(*entering_sg_io));
+       if (entering_sg_io) {
+               memcpy(entering_sg_io, &sg_io, sizeof(sg_io));
+               entering_sg_io->interface_id = (unsigned char) 'S';
+               set_tcb_priv_data(tcp, entering_sg_io, free);
        }
+
        return 1;
 }
 
 static int
 decode_response(struct tcb *const tcp, const kernel_ulong_t arg)
 {
+       struct_sg_io_hdr *entering_sg_io = get_tcb_priv_data(tcp);
        struct_sg_io_hdr sg_io;
 
        if (umove(tcp, arg, &sg_io) < 0) {
-               tprints(", ???");
+               /* print i/o fields fetched on entering syscall */
+               if (entering_sg_io->dxfer_direction == SG_DXFER_FROM_DEV) {
+                       tprints(", dxferp=");
+                       printaddr(ptr_to_kulong(entering_sg_io->dxferp));
+               }
+               tprints(", sbp=");
+               printaddr(ptr_to_kulong(entering_sg_io->sbp));
                return RVAL_DECODED | 1;
        }
 
-       if (sg_io.interface_id != (unsigned char) 'S') {
+       if (sg_io.interface_id != entering_sg_io->interface_id) {
                tprintf(" => interface_id=%u", sg_io.interface_id);
                return RVAL_DECODED | 1;
        }
@@ -114,23 +128,23 @@ decode_response(struct tcb *const tcp, const kernel_ulong_t arg)
            sg_io.dxfer_direction == SG_DXFER_TO_FROM_DEV) {
                uint32_t din_len = sg_io.dxfer_len;
 
-               if (sg_io.resid > 0)
+               if (sg_io.resid > 0 && (unsigned int) sg_io.resid <= din_len)
                        din_len -= sg_io.resid;
-               tprints(", dxferp=");
-               if (sg_io.iovec_count)
-                       tprint_iov_upto(tcp, sg_io.iovec_count,
-                                       ptr_to_kulong(sg_io.dxferp),
-                                       syserror(tcp) ? IOV_DECODE_ADDR :
-                                       IOV_DECODE_STR, din_len);
-               else
+               if (sg_io.dxfer_direction == SG_DXFER_FROM_DEV) {
+                       tprints(", dxferp=");
+               } else if (din_len) {
+                       tprints(" => dxferp=");
+               }
+               if (sg_io.dxfer_direction == SG_DXFER_FROM_DEV || din_len) {
                        print_sg_io_buffer(tcp, ptr_to_kulong(sg_io.dxferp),
-                                          din_len);
+                                          din_len, sg_io.iovec_count);
+               }
        }
        tprintf(", status=%#x", sg_io.status);
        tprintf(", masked_status=%#x", sg_io.masked_status);
        tprintf(", msg_status=%#x", sg_io.msg_status);
        tprintf(", sb_len_wr=%u, sbp=", sg_io.sb_len_wr);
-       print_sg_io_buffer(tcp, ptr_to_kulong(sg_io.sbp), sg_io.sb_len_wr);
+       print_sg_io_buffer(tcp, ptr_to_kulong(sg_io.sbp), sg_io.sb_len_wr, 0);
        tprintf(", host_status=%#x", sg_io.host_status);
        tprintf(", driver_status=%#x", sg_io.driver_status);
        tprintf(", resid=%d", sg_io.resid);