From patchwork Tue Jul 11 02:11:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 118203 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp201104vqm; Mon, 10 Jul 2023 19:34:03 -0700 (PDT) X-Google-Smtp-Source: APBJJlGOu5BwI4GOds/wQTzpT1IYMjIIgP8Q1YgfdQPI2R0/u7GjGU81I+PiMM5Il5qtJ0KtLc7X X-Received: by 2002:a05:6808:1246:b0:3a3:eabe:7fc0 with SMTP id o6-20020a056808124600b003a3eabe7fc0mr11894219oiv.7.1689042843606; Mon, 10 Jul 2023 19:34:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689042843; cv=none; d=google.com; s=arc-20160816; b=sUtkDjKFUOMa1GCpO9z+iU0jl9kFteZVUeha3wBt8DKw93Cy/oYiMPjpsgecor1D+p lNbKnq/a5otyNCaVpFxC3OdIRUh5HHEx9gLbOwMNNXClDdMON1wTSIWCyTv54h5eVScq 04iCKEELd//ybUYAh2/nAZh56YWIZGOYwLXo0Y/OuJ4DPNdWeQqZA3dYJt72w424K38H gYmO3Uu/APJcNCOw9Agum3X836WNRlKau26cd1Wa6kat5vlbAfxlOb9awa/YMwQSMrbR YSxojvYUy/ZM/6fAYCD7N1G0VR17TebEmum645enYi9UOs8LWCLZVh/HqAJuN4ULcpjV 7j/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WH/D6moMhfq7Wty+9IXECmMgcbR77jt2lkbVyrgwC0s=; fh=hf24JvveL55vCfzfv0agRHDWsuhzZqIeZ7dfs5kcUjQ=; b=cgyN0F5eaBvtdQ81cf3LmQgQ6h0XAqmYYH2V/LLp/KoxTplTp10b26nJCsShTSgBtg FZGK02ZuoOE4FROprn46ypr3V9vGok78hm3EcyY4DcmNVyFrHQ7R3/m67a507Tla1jp3 EJCACsawZAenY4H+dgGS6LA80EgJRm50iP1cK8zW0xcAZsVktSAgVkZX6+0LmlJCDe9g 4Y/dPwNerpjQqLMPLFT88qiF7qUATPiY/HYwYDoArKnRuNcXY+jCHVQ+22xcjL5SaY7R bfjAfQcs3AZZrVZP57Tb8lh8R1CQdZQKB7taB8d+vRdAt46VTFW11YxcXor0LPAGdkrT +vyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="jp5PL+r/"; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cw11-20020a056a00450b00b0066215192dd4si667592pfb.295.2023.07.10.19.33.50; Mon, 10 Jul 2023 19:34:03 -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=@kernel.org header.s=k20201202 header.b="jp5PL+r/"; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229936AbjGKCLb (ORCPT + 99 others); Mon, 10 Jul 2023 22:11:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231260AbjGKCL3 (ORCPT ); Mon, 10 Jul 2023 22:11:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10E2912E; Mon, 10 Jul 2023 19:11:29 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9CD05612B9; Tue, 11 Jul 2023 02:11:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1AABC433C8; Tue, 11 Jul 2023 02:11:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689041488; bh=zwpa7syMeSYhTZBa9ItWWjpkC7dz4g0aJQWZT5Tc5g8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jp5PL+r/ZBA4NiHySk0h/kh9G2ejCb9dvpJqZdD1f43zVnusgqqA0XVGmO4Vrdk54 B4QAv4hF0SP9e2jiFJaZtkdXqBVSklAdFOuOFucqZ614i065wJNmD/UpzFp2gyTHm0 6IDI6PQNqy2yppOkNfIUKTNBC/ZAK4oXF1FTFHMOZ8GxO5w7VARFytEFEuzmdLErAf Bv+cvxvzPwvUI8dQx5Wra6hdKp3I1INM2ZFb+hQgaMZJFsqo/iDO59EnEowOo70nM/ m84crjA7vg4z2K2zWxvPOw546DX9OBLBt8xVbwp2SOS2cohJ4rr2cit9jq9Andtnbc p8sIdOc2PZEmA== From: "Masami Hiramatsu (Google)" To: Steven Rostedt Cc: Dan Carpenter , linux-trace-kernel@vger.kernel.org, LKML , Masami Hiramatsu Subject: [PATCH v4 1/4] tracing/probes: Fix to avoid double count of the string length on the array Date: Tue, 11 Jul 2023 11:11:24 +0900 Message-ID: <168904148467.2908673.7907708071012864793.stgit@mhiramat.roam.corp.google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog In-Reply-To: <168904147563.2908673.18054267804278861545.stgit@mhiramat.roam.corp.google.com> References: <168904147563.2908673.18054267804278861545.stgit@mhiramat.roam.corp.google.com> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1771089788315395586 X-GMAIL-MSGID: 1771089788315395586 From: Masami Hiramatsu (Google) If an array is specified with the ustring or symstr, the length of the strings are accumlated on both of 'ret' and 'total', which means the length is double counted. Just set the length to the 'ret' value for avoiding double counting. Reported-by: Dan Carpenter Closes: https://lore.kernel.org/all/8819b154-2ba1-43c3-98a2-cbde20892023@moroto.mountain/ Fixes: 88903c464321 ("tracing/probe: Add ustring type for user-space string") Cc: stable@vger.kernel.org Signed-off-by: Masami Hiramatsu (Google) Reviewed-by: Steven Rostedt (Google) --- Changes in v2: - Fix patch description. --- kernel/trace/trace_probe_tmpl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_probe_tmpl.h b/kernel/trace/trace_probe_tmpl.h index 00707630788d..4735c5cb76fa 100644 --- a/kernel/trace/trace_probe_tmpl.h +++ b/kernel/trace/trace_probe_tmpl.h @@ -156,11 +156,11 @@ process_fetch_insn_bottom(struct fetch_insn *code, unsigned long val, code++; goto array; case FETCH_OP_ST_USTRING: - ret += fetch_store_strlen_user(val + code->offset); + ret = fetch_store_strlen_user(val + code->offset); code++; goto array; case FETCH_OP_ST_SYMSTR: - ret += fetch_store_symstrlen(val + code->offset); + ret = fetch_store_symstrlen(val + code->offset); code++; goto array; default: From patchwork Tue Jul 11 02:11:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 118206 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp201597vqm; Mon, 10 Jul 2023 19:35:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlE2+izexLBmw+hI8mjgF13WT/t1qDiuN07uWFc4Gcw1pvwqoOhvxCKBuBny+LzH5MQ19I2l X-Received: by 2002:a17:903:455:b0:1b8:897a:b3be with SMTP id iw21-20020a170903045500b001b8897ab3bemr9936074plb.1.1689042946082; Mon, 10 Jul 2023 19:35:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689042946; cv=none; d=google.com; s=arc-20160816; b=cqTFatkBfLYOKf/QaXyRS8QqUwc/7miR3py8SJHbsaLwskbcoRgnugZYl/JJ5n3Dgd XTAK4QzL/NDZrdqJk2YXGwqww4SSc6yhyoupCEkJHA2fZRdGHlN//wOZ+bmwuVMSU/wO 3+FB9stInmJHv2Xij2KQVtJR7jeyFXa5QpRjVgiH4EnNPbO5nu7s2jNr5Fdrsc1e0bHt 1sF1aZL7JkBHwikkc4n+wVWMkkENVLnpYOXKB8m9hJ/JIHassdt6MSkIKBYhlJQ1021d UG/vH8wxKPrqdSjA9GBIo3CB7TWZB8jzgbAp+8y40VqFR54Sz+jW6/33Ss4F89aRAxiE MsMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=sxIQGyI3tMazojJNFIxSWRn1VdVpnCyCuMxtm4X9PKY=; fh=hf24JvveL55vCfzfv0agRHDWsuhzZqIeZ7dfs5kcUjQ=; b=kGNZSBG5QGeF4SnOTe76A2d6cM6hRpYgGI+NkPuP0RlUtq54LSwFufMqFs252euKLD 5xB1Mh0mfgsgD93ARdy2wtC2dVZBqrPbDVGBH6Aa8TcLa1HeVR+cVTdU8ydAa0P8V5XS ROMibqOU4q7+ksZKfPb7gBsDCVOTwXe0an1cVCuMvU0CfNYJIo6O/LexG79zKOx1wbl+ 1+wkpvwD3CfPvOgqI+Oq/g2sALs7LoELptWjoXoR0ed9BaFBPMJZfj1S50XOewAoHbJf e0mVwRr5J3fNt5GA8DOLmytFi7rxsLlCN5BXaedJpIv1+0/H760EwUzVhkjzj+zbv3o+ 0rIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LS4AZJpl; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d9-20020a170902f14900b001b8b6089eeasi749089plb.326.2023.07.10.19.35.33; Mon, 10 Jul 2023 19:35:46 -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=@kernel.org header.s=k20201202 header.b=LS4AZJpl; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231437AbjGKCLn (ORCPT + 99 others); Mon, 10 Jul 2023 22:11:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231433AbjGKCLl (ORCPT ); Mon, 10 Jul 2023 22:11:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A64AF1B8; Mon, 10 Jul 2023 19:11:37 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2598D61143; Tue, 11 Jul 2023 02:11:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E3FBC433C7; Tue, 11 Jul 2023 02:11:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689041496; bh=AdroxX5P9OziwCjJV/WVhJbrj4bvgg6m7fGwBk22czA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LS4AZJplDnDayCGJge+ulo91nFVzhLWCK+OVYOp6KEvdYeMgIPAIGZj7Rr2oXHf7e LrM3oqwHxdnma4Owrc4QvoL8qzsdF2j7kuBGX3un+bDNXRuvOzw5oLVu/D7SemlfN3 1IOFCmtcWnwLo1WCpJNHG7kafoAqGN7Tez659foxUn1DCcwo6KAX8GGV0kzGNPnjt0 7tBlsytl1ddqvtWU1/uYCU+L2s9ezpHETaz0Ddt/UuUbwVLjPWjO8sm9tztmh+uJ0Z fOX+d5a2fzQeGqMxU3OdfL53avUIMVkK0o6irrYsSVXimweeUlz0DFvAims+f/zs6C UsV8mZDNa+Xrw== From: "Masami Hiramatsu (Google)" To: Steven Rostedt Cc: Dan Carpenter , linux-trace-kernel@vger.kernel.org, LKML , Masami Hiramatsu Subject: [PATCH v4 2/4] tracing/probes: Fix not to count error code to total length Date: Tue, 11 Jul 2023 11:11:33 +0900 Message-ID: <168904149337.2908673.1200969484356641870.stgit@mhiramat.roam.corp.google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog In-Reply-To: <168904147563.2908673.18054267804278861545.stgit@mhiramat.roam.corp.google.com> References: <168904147563.2908673.18054267804278861545.stgit@mhiramat.roam.corp.google.com> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1771089896717662560 X-GMAIL-MSGID: 1771089896717662560 From: Masami Hiramatsu (Google) Fix not to count the error code (which is minus value) to the total used length of array, because it can mess up the return code of process_fetch_insn_bottom(). Also clear the 'ret' value because it will be used for calculating next data_loc entry. Reported-by: Dan Carpenter Closes: https://lore.kernel.org/all/8819b154-2ba1-43c3-98a2-cbde20892023@moroto.mountain/ Fixes: 9b960a38835f ("tracing: probeevent: Unify fetch_insn processing common part") Cc: stable@vger.kernel.org Signed-off-by: Masami Hiramatsu (Google) Reviewed-by: Steven Rostedt (Google) --- Changes in v2: - Check and clear ret only for the array argument. --- kernel/trace/trace_probe_tmpl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/trace/trace_probe_tmpl.h b/kernel/trace/trace_probe_tmpl.h index 4735c5cb76fa..ed9d57c6b041 100644 --- a/kernel/trace/trace_probe_tmpl.h +++ b/kernel/trace/trace_probe_tmpl.h @@ -204,6 +204,8 @@ process_fetch_insn_bottom(struct fetch_insn *code, unsigned long val, array: /* the last stage: Loop on array */ if (code->op == FETCH_OP_LP_ARRAY) { + if (ret < 0) + ret = 0; total += ret; if (++i < code->param) { code = s3; From patchwork Tue Jul 11 02:11:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 118199 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp196418vqm; Mon, 10 Jul 2023 19:19:31 -0700 (PDT) X-Google-Smtp-Source: APBJJlGRamOtkIGPzz7o05iw2i0HdjoihHSYSP0nYVL2V8pZPxkGLKMFRICEz3j7S7Ok0OoHNHbq X-Received: by 2002:a05:6870:438d:b0:1b0:6f63:736f with SMTP id r13-20020a056870438d00b001b06f63736fmr15891656oah.9.1689041970930; Mon, 10 Jul 2023 19:19:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689041970; cv=none; d=google.com; s=arc-20160816; b=wONHZDAmO/tAq0TG9lEGgu7Rk7uZe3TEbMT5A3pXbmRftWtdk/Zt6bLNsC577TRL2e Ihe9s6VGHFZl4zHWhijtR5pOnPLL1Dwq2MU4MyRqaDWSX3uU5dQH2duZxtDyPTjLHTqh 1dr8+MzlBSgYIbRYbRL4dDkV8AEaTE7K8+/N9wdu1ipUa2uyB++NT9dbXq4rCA+lO/W5 f3z+D24DV7EpAM086/Uy3CMrMTXPLnrL6NYTKWOEeZHAt25MYt+ZyKXLnJQbWp6Wc6zW gkiL/+qT9SKyrRSzBqQGNetgvWLGLV0waxh8KG6r4ybiPZLicjydDG9fJWyXYuOsLdVU Q9/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=cxuZpaUPZNKgwjL2Pzc6mWl0zvaejBDY1cJwfpsZwfo=; fh=hf24JvveL55vCfzfv0agRHDWsuhzZqIeZ7dfs5kcUjQ=; b=ZWMI0tjlrBDLBDsxcp0qMbNC2PKphoEMWUF/siEp0LKVnEKTsSXdxGvKxMCqoLrnnP ZhdlZ4YWCFq9Lg1FnkFQQ1cEsG5S08l+GV6vb6Zs3v4gjdkbjR65Xc6lFkanyamoZ4oa lvfLWDdvjzMTnzsZ+cVCOw+RBLvP5410NMtQDmRZWSJjNwJ2RCyEK57x38aISnXJBAto mkm3TkEVoD2s1enNnzDyav/xwW3wNv12hzQkMDHGbME2yucEgj2kluVrXfyTfpOQB7Bp UphSGM3RqHUIvAURd9iD5blvrcAJHBTji+9U4HquYhqBfnbttuSGuHOWZj/wLaO7ZEtr pN1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DeRKMbFR; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w7-20020a17090a5e0700b002639c4f81d5si8205761pjf.147.2023.07.10.19.18.54; Mon, 10 Jul 2023 19:19:30 -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=@kernel.org header.s=k20201202 header.b=DeRKMbFR; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231562AbjGKCL4 (ORCPT + 99 others); Mon, 10 Jul 2023 22:11:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231503AbjGKCLu (ORCPT ); Mon, 10 Jul 2023 22:11:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9AA7E47; Mon, 10 Jul 2023 19:11:46 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3C672612D8; Tue, 11 Jul 2023 02:11:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40BD8C433C7; Tue, 11 Jul 2023 02:11:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689041505; bh=dyGyLJr8vd+bW4LxAKW9oZijQiFuiaTQ8/8k42bABvk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DeRKMbFR46yWLVqZlbFemJTwHS3Vm0RrRZ1idmE/FkP0AHbmelEGghaBFLF+C4iH/ lG8osBDSPZhcH6IphWUijV2duyUI+cN3fi4Y2bV8kZW3mU/pcAB5524f5GSlVjXwpG NJ24pNB+oXEMj5lxoXP8wleqKp+9NKAck6RGgSTG44+MhRqy4SG2ZfOLe1x7j8g9xV ZAFlQOwJ5kZsyFYCfg5PRqNROPeL6Pn3g2VXoUl9izSbzMbbNTtHYa6q0EwO/ilIzu YcIKJFJI9BmXlpbhUZ6y7NbczqbHleCI6+HeQ5dK8XLY29q8L4gaMICYJBxph7w1GC U4ITF8dF1NJSA== From: "Masami Hiramatsu (Google)" To: Steven Rostedt Cc: Dan Carpenter , linux-trace-kernel@vger.kernel.org, LKML , Masami Hiramatsu Subject: [PATCH v4 3/4] Revert "tracing: Add "(fault)" name injection to kernel probes" Date: Tue, 11 Jul 2023 11:11:42 +0900 Message-ID: <168904150193.2908673.2202766623358215003.stgit@mhiramat.roam.corp.google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog In-Reply-To: <168904147563.2908673.18054267804278861545.stgit@mhiramat.roam.corp.google.com> References: <168904147563.2908673.18054267804278861545.stgit@mhiramat.roam.corp.google.com> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1771088873674172979 X-GMAIL-MSGID: 1771088873674172979 From: Masami Hiramatsu (Google) This reverts commit 2e9906f84fc7c99388bb7123ade167250d50f1c0. It was turned out that commit 2e9906f84fc7 ("tracing: Add "(fault)" name injection to kernel probes") did not work correctly and probe events still show just '(fault)' (instead of '"(fault)"'). Also, current '(fault)' is more explicit that it faulted. This also moves FAULT_STRING macro to trace.h so that synthetic event can keep using it, and uses it in trace_probe.c too. Link: https://lore.kernel.org/all/20230706230642.3793a593@rorschach.local.home/ Cc: stable@vger.kernel.org Cc: Andrew Morton Cc: Tom Zanussi Signed-off-by: Masami Hiramatsu (Google) --- Changes in v3: - Move FAULT_STRING macro to trace.h so that synthetic event can keep using it. - Use FAULT_STRING in trace_probe.c. --- kernel/trace/trace.h | 2 ++ kernel/trace/trace_probe.c | 2 +- kernel/trace/trace_probe_kernel.h | 31 ++++++------------------------- 3 files changed, 9 insertions(+), 26 deletions(-) diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 79bdefe9261b..eee1f3ca4749 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -113,6 +113,8 @@ enum trace_type { #define MEM_FAIL(condition, fmt, ...) \ DO_ONCE_LITE_IF(condition, pr_err, "ERROR: " fmt, ##__VA_ARGS__) +#define FAULT_STRING "(fault)" + #define HIST_STACKTRACE_DEPTH 16 #define HIST_STACKTRACE_SIZE (HIST_STACKTRACE_DEPTH * sizeof(unsigned long)) #define HIST_STACKTRACE_SKIP 5 diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 2d2616678295..591399ddcee5 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -65,7 +65,7 @@ int PRINT_TYPE_FUNC_NAME(string)(struct trace_seq *s, void *data, void *ent) int len = *(u32 *)data >> 16; if (!len) - trace_seq_puts(s, "(fault)"); + trace_seq_puts(s, FAULT_STRING); else trace_seq_printf(s, "\"%s\"", (const char *)get_loc_data(data, ent)); diff --git a/kernel/trace/trace_probe_kernel.h b/kernel/trace/trace_probe_kernel.h index c4e1d4c03a85..6deae2ce34f8 100644 --- a/kernel/trace/trace_probe_kernel.h +++ b/kernel/trace/trace_probe_kernel.h @@ -2,8 +2,6 @@ #ifndef __TRACE_PROBE_KERNEL_H_ #define __TRACE_PROBE_KERNEL_H_ -#define FAULT_STRING "(fault)" - /* * This depends on trace_probe.h, but can not include it due to * the way trace_probe_tmpl.h is used by trace_kprobe.c and trace_eprobe.c. @@ -15,16 +13,8 @@ static nokprobe_inline int fetch_store_strlen_user(unsigned long addr) { const void __user *uaddr = (__force const void __user *)addr; - int ret; - ret = strnlen_user_nofault(uaddr, MAX_STRING_SIZE); - /* - * strnlen_user_nofault returns zero on fault, insert the - * FAULT_STRING when that occurs. - */ - if (ret <= 0) - return strlen(FAULT_STRING) + 1; - return ret; + return strnlen_user_nofault(uaddr, MAX_STRING_SIZE); } /* Return the length of string -- including null terminal byte */ @@ -44,18 +34,7 @@ fetch_store_strlen(unsigned long addr) len++; } while (c && ret == 0 && len < MAX_STRING_SIZE); - /* For faults, return enough to hold the FAULT_STRING */ - return (ret < 0) ? strlen(FAULT_STRING) + 1 : len; -} - -static nokprobe_inline void set_data_loc(int ret, void *dest, void *__dest, void *base, int len) -{ - if (ret >= 0) { - *(u32 *)dest = make_data_loc(ret, __dest - base); - } else { - strscpy(__dest, FAULT_STRING, len); - ret = strlen(__dest) + 1; - } + return (ret < 0) ? ret : len; } /* @@ -76,7 +55,8 @@ fetch_store_string_user(unsigned long addr, void *dest, void *base) __dest = get_loc_data(dest, base); ret = strncpy_from_user_nofault(__dest, uaddr, maxlen); - set_data_loc(ret, dest, __dest, base, maxlen); + if (ret >= 0) + *(u32 *)dest = make_data_loc(ret, __dest - base); return ret; } @@ -107,7 +87,8 @@ fetch_store_string(unsigned long addr, void *dest, void *base) * probing. */ ret = strncpy_from_kernel_nofault(__dest, (void *)addr, maxlen); - set_data_loc(ret, dest, __dest, base, maxlen); + if (ret >= 0) + *(u32 *)dest = make_data_loc(ret, __dest - base); return ret; } From patchwork Tue Jul 11 02:11:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 118198 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp195954vqm; Mon, 10 Jul 2023 19:18:17 -0700 (PDT) X-Google-Smtp-Source: APBJJlEDzzVeHQHCUR1ClyayFxtU1y8ygYg13kycu5P6kzr91yTOt+NL8WyQjYwEQ8O75Af/rChg X-Received: by 2002:a67:f94d:0:b0:443:f93f:4698 with SMTP id u13-20020a67f94d000000b00443f93f4698mr6015183vsq.22.1689041897114; Mon, 10 Jul 2023 19:18:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689041897; cv=none; d=google.com; s=arc-20160816; b=SfUbUMaYpnl/DLwRAmlxuAlDrm4GflQ3eUKkg3YmpYsh6IajsuApahj3rNHvCyA6JP DBknnzTl15ARmwSFBVPdZU2HDNfjg7qxgpDFs0KjiAEhXIeqEFpR2PpH2qKqJnZU6WRW oYX3YigycnmXnSnU16fSSf74JNTKYFAs8olCyEvGrfhVUbVAvSkSX6L8IamymgXRQIVt /+IU2ucoDuXPkQYDLFoYf+6j48dU35iJgcOC6EaPJ+6bfxmEJICtV6L77hLJwrnscaMQ 6bDeVm76t4SwW3DbyQgKFX/NSNj9rZsg+baR3ruptQGi7On8o+OqrT7liHuDjEmorjke t10Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=c87A7/mZJ8c9nPdngoZJI6UviXp+X4TaJ+Kzmxflhiw=; fh=hf24JvveL55vCfzfv0agRHDWsuhzZqIeZ7dfs5kcUjQ=; b=B6Hh6w+icegT46IhzpTC4bkgTy0cVwo+MQPopY9/vGr8xwk6naj4gwAXOL1OAcaRpq TTgIt7xAPUEuAL8pcaoJYQgA79j9H2+nYXpIYWK68i6aWqSe4YtzU8SsAje/8J1CECfI uRNQQhuRXid1mDEEVUYh+g9iWznRCvQfpY8xrkGxIK3jbtMgFrdtRt1q5UJhNvj0Pvsr Fysyh63tc5iNTE2z4xUtLfh0VyGDwTwxp2nd4R6EHvt/clzt5GaSsKrCNzjtJmZAUJdG 8f+AKbzTziMO7w7qK4RDwSmJ+D2oS1LYCw2LSCmiNby1U8Aa3tlRbZjuXrDlLBFYdJvC UUgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QsSDko6g; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m16-20020a6562d0000000b0055acc9baa64si610107pgv.33.2023.07.10.19.17.41; Mon, 10 Jul 2023 19:18:17 -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=@kernel.org header.s=k20201202 header.b=QsSDko6g; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231601AbjGKCMF (ORCPT + 99 others); Mon, 10 Jul 2023 22:12:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231509AbjGKCL6 (ORCPT ); Mon, 10 Jul 2023 22:11:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E805E56; Mon, 10 Jul 2023 19:11:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E836A612A3; Tue, 11 Jul 2023 02:11:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C505C433C8; Tue, 11 Jul 2023 02:11:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689041514; bh=gUegrzHhvvaBqWHNN20WA8icpvNMacfxlYx9KW3dn5w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QsSDko6g7gXMiaV8SwdrbId5bgscD6LT08/kHZsDdhOIyawbnzY6UGEdcilZnU9Qr jdmUxhZU+ufl6FFI3aXbd8Rr6A0yQe/CbRH1PerMPm9WgrbYuxF3QQuWe8r1AJ43RF 4uKHn6QI1O1Rh5yQyayERFBoCxi0H++Hidst6g1J4LsxFCFnylU16IMlnCUu2Jc+H0 cMJoieOoIPWDxMN3KtxiBWxTFSxA4mj7kgYGocYZhZGlp5o4/HQkVtkKQSPRi0BPXo hEdWIsu0L7fxV1HrKX2eSxF4FpSHe/DdVaSR0foONNkS4BGFJP+bs1p3WPUQAPfivp ewWW5ho1W349A== From: "Masami Hiramatsu (Google)" To: Steven Rostedt Cc: Dan Carpenter , linux-trace-kernel@vger.kernel.org, LKML , Masami Hiramatsu Subject: [PATCH v4 4/4] tracing/probes: Fix to record 0-length data_loc in fetch_store_string*() if fails Date: Tue, 11 Jul 2023 11:11:51 +0900 Message-ID: <168904151104.2908673.8401909922292791503.stgit@mhiramat.roam.corp.google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog In-Reply-To: <168904147563.2908673.18054267804278861545.stgit@mhiramat.roam.corp.google.com> References: <168904147563.2908673.18054267804278861545.stgit@mhiramat.roam.corp.google.com> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1771088796234063884 X-GMAIL-MSGID: 1771088796234063884 From: Masami Hiramatsu (Google) Fix to record 0-length data to data_loc in fetch_store_string*() if it fails to get the string data. Currently those expect that the data_loc is updated by store_trace_args() if it returns the error code. However, that does not work correctly if the argument is an array of strings. In that case, store_trace_args() only clears the first entry of the array (which may have no error) and leaves other entries. So it should be cleared by fetch_store_string*() itself. Also, 'dyndata' and 'maxlen' in store_trace_args() should be updated only if it is used (ret > 0 and argument is a dynamic data.) Fixes: 40b53b771806 ("tracing: probeevent: Add array type support") Cc: stable@vger.kernel.org Signed-off-by: Masami Hiramatsu (Google) --- Changes in v4: - Simplify the updating data_loc code with set_data_loc(). --- kernel/trace/trace_probe_kernel.h | 13 +++++++++---- kernel/trace/trace_probe_tmpl.h | 4 +--- kernel/trace/trace_uprobe.c | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/kernel/trace/trace_probe_kernel.h b/kernel/trace/trace_probe_kernel.h index 6deae2ce34f8..bb723eefd7b7 100644 --- a/kernel/trace/trace_probe_kernel.h +++ b/kernel/trace/trace_probe_kernel.h @@ -37,6 +37,13 @@ fetch_store_strlen(unsigned long addr) return (ret < 0) ? ret : len; } +static nokprobe_inline void set_data_loc(int ret, void *dest, void *__dest, void *base) +{ + if (ret < 0) + ret = 0; + *(u32 *)dest = make_data_loc(ret, __dest - base); +} + /* * Fetch a null-terminated string from user. Caller MUST set *(u32 *)buf * with max length and relative data location. @@ -55,8 +62,7 @@ fetch_store_string_user(unsigned long addr, void *dest, void *base) __dest = get_loc_data(dest, base); ret = strncpy_from_user_nofault(__dest, uaddr, maxlen); - if (ret >= 0) - *(u32 *)dest = make_data_loc(ret, __dest - base); + set_data_loc(ret, dest, __dest, base); return ret; } @@ -87,8 +93,7 @@ fetch_store_string(unsigned long addr, void *dest, void *base) * probing. */ ret = strncpy_from_kernel_nofault(__dest, (void *)addr, maxlen); - if (ret >= 0) - *(u32 *)dest = make_data_loc(ret, __dest - base); + set_data_loc(ret, dest, __dest, base); return ret; } diff --git a/kernel/trace/trace_probe_tmpl.h b/kernel/trace/trace_probe_tmpl.h index ed9d57c6b041..bbad0503f166 100644 --- a/kernel/trace/trace_probe_tmpl.h +++ b/kernel/trace/trace_probe_tmpl.h @@ -267,9 +267,7 @@ store_trace_args(void *data, struct trace_probe *tp, void *rec, if (unlikely(arg->dynamic)) *dl = make_data_loc(maxlen, dyndata - base); ret = process_fetch_insn(arg->code, rec, dl, base); - if (unlikely(ret < 0 && arg->dynamic)) { - *dl = make_data_loc(0, dyndata - base); - } else { + if (unlikely(ret > 0 && arg->dynamic)) { dyndata += ret; maxlen -= ret; } diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 8b92e34ff0c8..7b47e9a2c010 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -170,7 +170,8 @@ fetch_store_string(unsigned long addr, void *dest, void *base) */ ret++; *(u32 *)dest = make_data_loc(ret, (void *)dst - base); - } + } else + *(u32 *)dest = make_data_loc(0, (void *)dst - base); return ret; }