From: Mukesh Ojha <quic_mojha@quicinc.com> To: <jaegeuk@kernel.org>, <chao@kernel.org>, <mhiramat@kernel.org> Cc: <linux-f2fs-devel@lists.sourceforge.net>, <linux-kernel@vger.kernel.org>, <quic_mojha@quicinc.com> Subject: [PATCH] f2fs: fix the assign logic of iocb Date: Wed, 19 Oct 2022 21:47:57 +0530 [thread overview] Message-ID: <1666196277-27014-1-git-send-email-quic_mojha@quicinc.com> (raw) commit 18ae8d12991b ("f2fs: show more DIO information in tracepoint") introduces iocb field in 'f2fs_direct_IO_enter' trace event And it only assigns the pointer and later it accesses its field in trace print log. Fix it by correcting data type and memcpy the content of iocb. Fixes: 18ae8d12991b ("f2fs: show more DIO information in tracepoint") Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com> --- include/trace/events/f2fs.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h index c6b3724..7727ec9 100644 --- a/include/trace/events/f2fs.h +++ b/include/trace/events/f2fs.h @@ -940,7 +940,7 @@ TRACE_EVENT(f2fs_direct_IO_enter, TP_STRUCT__entry( __field(dev_t, dev) __field(ino_t, ino) - __field(struct kiocb *, iocb) + __field_struct(struct kiocb, iocb) __field(unsigned long, len) __field(int, rw) ), @@ -948,17 +948,17 @@ TRACE_EVENT(f2fs_direct_IO_enter, TP_fast_assign( __entry->dev = inode->i_sb->s_dev; __entry->ino = inode->i_ino; - __entry->iocb = iocb; + memcpy(&__entry->iocb, iocb, sizeof(*iocb)); __entry->len = len; __entry->rw = rw; ), TP_printk("dev = (%d,%d), ino = %lu pos = %lld len = %lu ki_flags = %x ki_ioprio = %x rw = %d", show_dev_ino(__entry), - __entry->iocb->ki_pos, + __entry->iocb.ki_pos, __entry->len, - __entry->iocb->ki_flags, - __entry->iocb->ki_ioprio, + __entry->iocb.ki_flags, + __entry->iocb.ki_ioprio, __entry->rw) ); -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Mukesh Ojha <quic_mojha@quicinc.com> To: <jaegeuk@kernel.org>, <chao@kernel.org>, <mhiramat@kernel.org> Cc: quic_mojha@quicinc.com, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Subject: [f2fs-dev] [PATCH] f2fs: fix the assign logic of iocb Date: Wed, 19 Oct 2022 21:47:57 +0530 [thread overview] Message-ID: <1666196277-27014-1-git-send-email-quic_mojha@quicinc.com> (raw) commit 18ae8d12991b ("f2fs: show more DIO information in tracepoint") introduces iocb field in 'f2fs_direct_IO_enter' trace event And it only assigns the pointer and later it accesses its field in trace print log. Fix it by correcting data type and memcpy the content of iocb. Fixes: 18ae8d12991b ("f2fs: show more DIO information in tracepoint") Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com> --- include/trace/events/f2fs.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h index c6b3724..7727ec9 100644 --- a/include/trace/events/f2fs.h +++ b/include/trace/events/f2fs.h @@ -940,7 +940,7 @@ TRACE_EVENT(f2fs_direct_IO_enter, TP_STRUCT__entry( __field(dev_t, dev) __field(ino_t, ino) - __field(struct kiocb *, iocb) + __field_struct(struct kiocb, iocb) __field(unsigned long, len) __field(int, rw) ), @@ -948,17 +948,17 @@ TRACE_EVENT(f2fs_direct_IO_enter, TP_fast_assign( __entry->dev = inode->i_sb->s_dev; __entry->ino = inode->i_ino; - __entry->iocb = iocb; + memcpy(&__entry->iocb, iocb, sizeof(*iocb)); __entry->len = len; __entry->rw = rw; ), TP_printk("dev = (%d,%d), ino = %lu pos = %lld len = %lu ki_flags = %x ki_ioprio = %x rw = %d", show_dev_ino(__entry), - __entry->iocb->ki_pos, + __entry->iocb.ki_pos, __entry->len, - __entry->iocb->ki_flags, - __entry->iocb->ki_ioprio, + __entry->iocb.ki_flags, + __entry->iocb.ki_ioprio, __entry->rw) ); -- 2.7.4 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next reply other threads:[~2022-10-19 16:18 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-10-19 16:17 Mukesh Ojha [this message] 2022-10-19 16:17 ` [f2fs-dev] [PATCH] f2fs: fix the assign logic of iocb Mukesh Ojha 2022-10-20 9:01 ` Chao Yu 2022-10-20 9:01 ` [f2fs-dev] " Chao Yu 2022-10-20 9:27 ` Mukesh Ojha 2022-10-20 9:27 ` [f2fs-dev] " Mukesh Ojha 2022-10-20 10:26 ` Chao Yu 2022-10-20 10:26 ` [f2fs-dev] " Chao Yu 2022-10-21 5:00 ` Pavan Kondeti 2022-10-21 5:00 ` [f2fs-dev] " Pavan Kondeti 2022-10-24 5:07 ` Masami Hiramatsu 2022-10-24 5:07 ` [f2fs-dev] " Masami Hiramatsu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1666196277-27014-1-git-send-email-quic_mojha@quicinc.com \ --to=quic_mojha@quicinc.com \ --cc=chao@kernel.org \ --cc=jaegeuk@kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-kernel@vger.kernel.org \ --cc=mhiramat@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.