From patchwork Wed Oct 19 16:17:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mukesh Ojha X-Patchwork-Id: 5735 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp415079wrs; Wed, 19 Oct 2022 09:20:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM69IeLqn45RBXez0vVzBkvcdSUpCTt3UhxO8YO3q0ut/hSWGcA4rd6YAWfZu8eQCJxvwJ36 X-Received: by 2002:a65:68cb:0:b0:460:b552:fbf4 with SMTP id k11-20020a6568cb000000b00460b552fbf4mr7897471pgt.457.1666196449938; Wed, 19 Oct 2022 09:20:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666196449; cv=none; d=google.com; s=arc-20160816; b=YBZkQD7u44IbEE3jlmSCCoCNooYNQVfURPr1oItNRkJrmQ0zY1nAEjWEQtR1S3QaMm RxANbaVCbWkXvQwIxm2TCXDzMPkQLX8fZWpagQAuWgfyuGqA5bV35IZ5XA2KS7ctvM8Q 5YpPtnFvhMQ1D0QzZrv4arax5KIH+IbaT1G/E52tqQSVkVR+v+a59NKK076sr9Br26uA DjRQ5Ys3b7Wbl1eRerVUbPZMmJaQHl9/ivI9wUssUVLz/YG9yI0xtPSdpKTPIwqF5rNj XP1yIDt0iNqcMSOlMA2WKeu5BmtckJEmmYN1rHESo6F+WzsesqAoOmxIuhjKG+S53qnU kGsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from :dkim-signature; bh=zD/R05w9rQH2nIBrqXkHmKmhtd3douq60/H0+KYKCxg=; b=E9u76fVFihSvg6FPON+TTpugHtKjcNqSYPrv61iO+mxG5LmBGlaY3y/l+cVcaJLMSq DEPnYhxXu1viamUDt8C/hILdYoPRRlIMSINQTQniZYboqfgzvWX97808+WahLsJJmltr dlPMGmIBdQkmHwl2E+nqN/xk2NmQ54/+6De8YUu0yR2N5qnwT5wALUgn8w5f7YIU44dz G0OB0xeNFyA7TkAs9LcLyb83PMo6osM8BnurctkZGE2cSd/rtOkG5jc7MlvhSifsRAbe ZFCMzj9lTVMkKTL4QWArooNAoMpKuIYjFDKKApOe3QyWPt7hOZOK065sKuGIY5zyN6W6 vRFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=dVzgO9Mb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d5-20020aa78e45000000b005635bfe397bsi16855183pfr.218.2022.10.19.09.20.34; Wed, 19 Oct 2022 09:20:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=dVzgO9Mb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230410AbiJSQSq (ORCPT + 99 others); Wed, 19 Oct 2022 12:18:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230053AbiJSQSd (ORCPT ); Wed, 19 Oct 2022 12:18:33 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F085A1BF22C for ; Wed, 19 Oct 2022 09:18:30 -0700 (PDT) Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 29J8BHbV027441; Wed, 19 Oct 2022 16:18:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=qcppdkim1; bh=zD/R05w9rQH2nIBrqXkHmKmhtd3douq60/H0+KYKCxg=; b=dVzgO9Mb7K1f7zsB6P9QNWKeBgnGIC4mW7e8y5GbOzJZhbmnZQK+FsRXe0h4fCZleOe7 4a1av88PjeZMEgtml36EmQvee2lE8j50hVPgtqBiapKg2Akbp3HUn76P1bL2aDiwJGPU 1lfiYZhUxgeHLYh5SAaQohbC455CI7mBKvZYewEnahO371Ln+ugf1/ypphBC0gSSV/Pf LQzrIINbXWglqV5uTBkNhqnzPdTQuXSMym3Af2xNqZMHYHzJJbxwMFhgS5cfwSIbFW/C 0OLnKaLWE4yeuiA77wB/TO+pPCW82OVYkEswIjIgLEjODuJAZKuGh9xkqRHKMvfeyMF0 7A== Received: from nasanppmta01.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3ka3j1uhqp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 19 Oct 2022 16:18:13 +0000 Received: from nasanex01c.na.qualcomm.com (corens_vlan604_snip.qualcomm.com [10.53.140.1]) by NASANPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 29JGID2D028693 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 19 Oct 2022 16:18:13 GMT Received: from hu-mojha-hyd.qualcomm.com (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Wed, 19 Oct 2022 09:18:11 -0700 From: Mukesh Ojha To: , , CC: , , Subject: [PATCH] f2fs: fix the assign logic of iocb Date: Wed, 19 Oct 2022 21:47:57 +0530 Message-ID: <1666196277-27014-1-git-send-email-quic_mojha@quicinc.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: mjlz_ZOW_AuU4Z9v5eIXSpeO4_68gAL8 X-Proofpoint-GUID: mjlz_ZOW_AuU4Z9v5eIXSpeO4_68gAL8 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-10-19_09,2022-10-19_04,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 mlxlogscore=875 bulkscore=0 mlxscore=0 phishscore=0 impostorscore=0 spamscore=0 priorityscore=1501 malwarescore=0 lowpriorityscore=0 clxscore=1011 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2210190092 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747133608757361364?= X-GMAIL-MSGID: =?utf-8?q?1747133608757361364?= 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 --- 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) );