From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E764C4332F for ; Tue, 18 Oct 2022 18:32:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229775AbiJRSct (ORCPT ); Tue, 18 Oct 2022 14:32:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229710AbiJRSct (ORCPT ); Tue, 18 Oct 2022 14:32:49 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8009267178 for ; Tue, 18 Oct 2022 11:32:48 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id x23-20020a634857000000b0043c700f6441so8560232pgk.21 for ; Tue, 18 Oct 2022 11:32:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=pScL4HsKSlGXXrCDAO9SW0fhqoUdP+2XbMXTHRrK8TE=; b=LM9JAFVF44F8UppjyXfB0lky34OVy+clbEjC7DJB3r88sBTbKEv97oKIiA1IsKFfVD 7pe8/v+RGDpnZFWPDoXWtwS3KtF23/iaHNQ/5HEsFosSxPyq6YvVQuXzgif/HsNm9ON2 ZNk3piPjd2+l9SG85FgVBGdeHr2hwQ7jvL+gkQa6gvLijEpR5GVnvgT+YZZicCYIgszn jw3nnC1WmO29rKPnbZw25ol4zIMBSx4+FTaq4Qr5acMh/uw/VHz1r6LmlRR2lbU/GN11 kX1j+q2x8hkv1/s+Ab1xof00JKN7CSL2nZOF3jZWPwIit1umjBaumNsWm+prQeORLHRW clGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=pScL4HsKSlGXXrCDAO9SW0fhqoUdP+2XbMXTHRrK8TE=; b=bBZUFAo4Ihl0eXX5zwv50aYYE2QavOG9idwYOTAqxkoh+9voQ4obMrrjQkLdU6wP+K c0Rmv4fsMKLlQlb/EMfd30ErZkjHED/51PIm+rjlTedOhdXRRQ73610wZ5vqhb1Cge+/ hWXSMjqs0IVrbCb1ygv0wz38zAyTePmP004iaJM3cOZDgOJWLj7j/V6mcSIsiEqvgjJ4 CjBr6HUkPwlL4aiPISFkbo19AO8ah43WjRntBKNmW9OXXuIwHuVfmOyWks4O/UmcFUTn 08qxw/yEmzsbDL9b3vct4a6lYDuy+q0Xo3T+O7UX4cQrx9A3TDTIiAFEVKz2ajK56Ggp kupQ== X-Gm-Message-State: ACrzQf3w/YhICC6aLcrKQ2CYwJXLyqSFuajbuRwv0cd7hOnnBKHc1Ohc WKVBLFp+pHo32GPUwdYk1RXgqYQ= X-Google-Smtp-Source: AMsMyM712u96NyjOP2AVqntvtVSu2Ssn5/WDnERwMtc9crslzRd9xK7v8pJj47g0ZeOlSkNSpmiViBg= X-Received: from sdf.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5935]) (user=sdf job=sendgmr) by 2002:a17:90a:b794:b0:20a:eab5:cf39 with SMTP id m20-20020a17090ab79400b0020aeab5cf39mr1832310pjr.1.1666117967753; Tue, 18 Oct 2022 11:32:47 -0700 (PDT) Date: Tue, 18 Oct 2022 11:32:46 -0700 In-Reply-To: <20221018145538.2046842-1-xukuohai@huaweicloud.com> Mime-Version: 1.0 References: <20221018145538.2046842-1-xukuohai@huaweicloud.com> Message-ID: Subject: Re: [PATCH] libbpf: Avoid allocating reg_name with sscanf in parse_usdt_arg() From: sdf@google.com To: Xu Kuohai Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , John Fastabend , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , KP Singh , Hao Luo , Jiri Olsa Content-Type: text/plain; charset="UTF-8"; format=flowed; delsp=yes Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On 10/18, Xu Kuohai wrote: > From: Xu Kuohai > The reg_name in parse_usdt_arg() is used to hold register name, which > is short enough to be held in a 16-byte array, so we could define > reg_name as char reg_name[16] to avoid dynamically allocating reg_name > with sscanf. > Suggested-by: Andrii Nakryiko > Signed-off-by: Xu Kuohai Addresses Andrii's suggestion from the following: https://lore.kernel.org/bpf/86c88c01-22eb-b7f8-9c65-0faf97b4096b@huawei.com/ Acked-by: Stanislav Fomichev > --- > tools/lib/bpf/usdt.c | 16 ++++++---------- > 1 file changed, 6 insertions(+), 10 deletions(-) > diff --git a/tools/lib/bpf/usdt.c b/tools/lib/bpf/usdt.c > index 49f3c3b7f609..28fa1b2283de 100644 > --- a/tools/lib/bpf/usdt.c > +++ b/tools/lib/bpf/usdt.c > @@ -1225,26 +1225,24 @@ static int calc_pt_regs_off(const char *reg_name) > static int parse_usdt_arg(const char *arg_str, int arg_num, struct > usdt_arg_spec *arg) > { > - char *reg_name = NULL; > + char reg_name[16]; > int arg_sz, len, reg_off; > long off; > - if (sscanf(arg_str, " %d @ %ld ( %%%m[^)] ) %n", &arg_sz, &off, > ®_name, &len) == 3) { > + if (sscanf(arg_str, " %d @ %ld ( %%%15[^)] ) %n", &arg_sz, &off, > reg_name, &len) == 3) { > /* Memory dereference case, e.g., -4@-20(%rbp) */ > arg->arg_type = USDT_ARG_REG_DEREF; > arg->val_off = off; > reg_off = calc_pt_regs_off(reg_name); > - free(reg_name); > if (reg_off < 0) > return reg_off; > arg->reg_off = reg_off; > - } else if (sscanf(arg_str, " %d @ %%%ms %n", &arg_sz, ®_name, &len) > == 2) { > + } else if (sscanf(arg_str, " %d @ %%%15s %n", &arg_sz, reg_name, &len) > == 2) { > /* Register read case, e.g., -4@%eax */ > arg->arg_type = USDT_ARG_REG; > arg->val_off = 0; > reg_off = calc_pt_regs_off(reg_name); > - free(reg_name); > if (reg_off < 0) > return reg_off; > arg->reg_off = reg_off; > @@ -1456,16 +1454,15 @@ static int calc_pt_regs_off(const char *reg_name) > static int parse_usdt_arg(const char *arg_str, int arg_num, struct > usdt_arg_spec *arg) > { > - char *reg_name = NULL; > + char reg_name[16]; > int arg_sz, len, reg_off; > long off; > - if (sscanf(arg_str, " %d @ %ld ( %m[a-z0-9] ) %n", &arg_sz, &off, > ®_name, &len) == 3) { > + if (sscanf(arg_str, " %d @ %ld ( %15[a-z0-9] ) %n", &arg_sz, &off, > reg_name, &len) == 3) { > /* Memory dereference case, e.g., -8@-88(s0) */ > arg->arg_type = USDT_ARG_REG_DEREF; > arg->val_off = off; > reg_off = calc_pt_regs_off(reg_name); > - free(reg_name); > if (reg_off < 0) > return reg_off; > arg->reg_off = reg_off; > @@ -1474,12 +1471,11 @@ static int parse_usdt_arg(const char *arg_str, > int arg_num, struct usdt_arg_spec > arg->arg_type = USDT_ARG_CONST; > arg->val_off = off; > arg->reg_off = 0; > - } else if (sscanf(arg_str, " %d @ %m[a-z0-9] %n", &arg_sz, ®_name, > &len) == 2) { > + } else if (sscanf(arg_str, " %d @ %15[a-z0-9] %n", &arg_sz, reg_name, > &len) == 2) { > /* Register read case, e.g., -8@a1 */ > arg->arg_type = USDT_ARG_REG; > arg->val_off = 0; > reg_off = calc_pt_regs_off(reg_name); > - free(reg_name); > if (reg_off < 0) > return reg_off; > arg->reg_off = reg_off; > -- > 2.30.2