Message ID | 20221022092735.114967-2-yangjihong1@huawei.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1146699wrr; Sat, 22 Oct 2022 03:44:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Au7jch4JiDTQuZGHarbNnJ0487LhSlZOjLdkLDxGpP6W3TSq6bVOxTp1blrHG7L09eVXS X-Received: by 2002:aa7:dbd2:0:b0:45c:97bb:4ae0 with SMTP id v18-20020aa7dbd2000000b0045c97bb4ae0mr21596358edt.417.1666435497403; Sat, 22 Oct 2022 03:44:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666435497; cv=none; d=google.com; s=arc-20160816; b=TNU62fTHNfbe3CDc722vaRdXY9FKg0/JObUX2+YTz3VsFJSLifp/AuBgHthuhqNwMR 4l5bdPbd5C4jrIQW1AgNO5+HckFdceG3PYh9V+z3HBw9Lqj5UA9BH7UN1FcaY0Sp+6fG nrYvPs/chbQ3DAaKF1xs4zqktzIZKiK/8S/O1fWDz49A+a2RxUzsoC4WNSpHFcvmROUm I7amOcvnLIX4q7skC9FyRgNF8fCPk2dWyqaxDLOg7s+CkKuzxE/gmr3iSR9xc2Zm4RsT sRDvxm0XfbXvkMPMgglBxsQfgv1yoxWc5uhX/EO0xWnEI761ZLhb5H43xfvRNXQiOXue FrAQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=eGqWLhJfbn5Y82bqsMBxqAnrt8UWry+7Ga3wmJQRfI8=; b=W7w9MM6x2Kk+b5NnoD+TQiH4s/sqK7Fc2mKr+9240KFTEjlKIIiyFXH0PNVJYGjIzf Jb2Rot4+UHwHa5TyARtA/XhmDauaPYCAruQmXGfddf3ERqFiYdsR3Vyq+ZTIPflnZUJn AkE1+qfEZrPbnICXTawxCLYIJNqJrKKNfLBVRoFuslqoNJaxls9y0UfTca7pqSGBFVFz OUc5Mfot9QgQyIUqgAYlY1GG9uRcuONkofcMsOlh/gd2DrsrHcsGFDFD1uV4xthG0IqH ij5qdQiWZeleckbsr1qPH0a4sv971VjAITpCx9d+VoiYWmM4TqBhRnAElbEFaJ5OXJ4t PgZA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hh6-20020a170906a94600b00781b67df7f6si21617257ejb.167.2022.10.22.03.44.33; Sat, 22 Oct 2022 03:44:57 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230106AbiJVKfV (ORCPT <rfc822;pwkd43@gmail.com> + 99 others); Sat, 22 Oct 2022 06:35:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229645AbiJVKeu (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sat, 22 Oct 2022 06:34:50 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07B5BAC388; Sat, 22 Oct 2022 02:51:30 -0700 (PDT) Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MvbYb1tr3zmVBf; Sat, 22 Oct 2022 17:26:11 +0800 (CST) Received: from kwepemm600003.china.huawei.com (7.193.23.202) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 22 Oct 2022 17:30:59 +0800 Received: from ubuntu1804.huawei.com (10.67.174.61) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 22 Oct 2022 17:30:58 +0800 From: Yang Jihong <yangjihong1@huawei.com> To: <peterz@infradead.org>, <mingo@redhat.com>, <acme@kernel.org>, <mark.rutland@arm.com>, <alexander.shishkin@linux.intel.com>, <jolsa@kernel.org>, <namhyung@kernel.org>, <adrian.hunter@intel.com>, <ak@linux.intel.com>, <linux-perf-users@vger.kernel.org>, <linux-kernel@vger.kernel.org> CC: <yangjihong1@huawei.com> Subject: [PATCH 1/3] perf daemon: Check err before calling setup_server_config in __cmd_start Date: Sat, 22 Oct 2022 17:27:33 +0800 Message-ID: <20221022092735.114967-2-yangjihong1@huawei.com> X-Mailer: git-send-email 2.30.GIT In-Reply-To: <20221022092735.114967-1-yangjihong1@huawei.com> References: <20221022092735.114967-1-yangjihong1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.67.174.61] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747384267852504919?= X-GMAIL-MSGID: =?utf-8?q?1747384267852504919?= |
Series |
perf daemon/config: Fix a few minor issues
|
|
Commit Message
Yang Jihong
Oct. 22, 2022, 9:27 a.m. UTC
If err!=0 before calling setup_server_config and reconfig==true,
setup_server_config function may return 0 and err becomes 0.
As a result, previous error is overwritten, need to check value of err first.
Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
---
tools/perf/builtin-daemon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
Em Sat, Oct 22, 2022 at 05:27:33PM +0800, Yang Jihong escreveu: > If err!=0 before calling setup_server_config and reconfig==true, > setup_server_config function may return 0 and err becomes 0. > As a result, previous error is overwritten, need to check value of err first. > > Signed-off-by: Yang Jihong <yangjihong1@huawei.com> > --- > tools/perf/builtin-daemon.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c > index 6cb3f6cc36d0..b82bd902602a 100644 > --- a/tools/perf/builtin-daemon.c > +++ b/tools/perf/builtin-daemon.c > @@ -1333,7 +1333,7 @@ static int __cmd_start(struct daemon *daemon, struct option parent_options[], > if (fda.entries[signal_pos].revents & POLLIN) > err = handle_signalfd(daemon) < 0; > > - if (reconfig) > + if (!err && reconfig) > err = setup_server_config(daemon); > } Expanding the context a bit: while (!done && !err) { err = daemon__reconfig(daemon); if (!err && fdarray__poll(&fda, -1)) { bool reconfig = false; if (fda.entries[sock_pos].revents & POLLIN) err = handle_server_socket(daemon, sock_fd); if (fda.entries[file_pos].revents & POLLIN) err = handle_config_changes(daemon, conf_fd, &reconfig); if (fda.entries[signal_pos].revents & POLLIN) err = handle_signalfd(daemon) < 0; if (!err && reconfig) err = setup_server_config(daemon); } } The err you're checking may be the last one, that may have overwritten 'err' from handle_config_changes(), perhaps moving things around helps? I.e.: if (!err && fdarray__poll(&fda, -1)) { bool reconfig = false; if (fda.entries[sock_pos].revents & POLLIN) err = handle_server_socket(daemon, sock_fd); if (fda.entries[signal_pos].revents & POLLIN) err = handle_signalfd(daemon) < 0; if (fda.entries[file_pos].revents & POLLIN) err = handle_config_changes(daemon, conf_fd, &reconfig); if (!err && reconfig) err = setup_server_config(daemon); } ? Jiri? - Arnaldo > } > -- > 2.30.GIT
Em Mon, Oct 24, 2022 at 08:46:44AM -0300, Arnaldo Carvalho de Melo escreveu: > Em Sat, Oct 22, 2022 at 05:27:33PM +0800, Yang Jihong escreveu: > > If err!=0 before calling setup_server_config and reconfig==true, > > setup_server_config function may return 0 and err becomes 0. > > As a result, previous error is overwritten, need to check value of err first. Applied patches 2 and 3 meanwhile, thanks. - Arnaldo > > Signed-off-by: Yang Jihong <yangjihong1@huawei.com> > > --- > > tools/perf/builtin-daemon.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c > > index 6cb3f6cc36d0..b82bd902602a 100644 > > --- a/tools/perf/builtin-daemon.c > > +++ b/tools/perf/builtin-daemon.c > > @@ -1333,7 +1333,7 @@ static int __cmd_start(struct daemon *daemon, struct option parent_options[], > > if (fda.entries[signal_pos].revents & POLLIN) > > err = handle_signalfd(daemon) < 0; > > > > - if (reconfig) > > + if (!err && reconfig) > > err = setup_server_config(daemon); > > } > > Expanding the context a bit: > > while (!done && !err) { > err = daemon__reconfig(daemon); > > if (!err && fdarray__poll(&fda, -1)) { > bool reconfig = false; > > if (fda.entries[sock_pos].revents & POLLIN) > err = handle_server_socket(daemon, sock_fd); > if (fda.entries[file_pos].revents & POLLIN) > err = handle_config_changes(daemon, conf_fd, &reconfig); > if (fda.entries[signal_pos].revents & POLLIN) > err = handle_signalfd(daemon) < 0; > > if (!err && reconfig) > err = setup_server_config(daemon); > } > } > > The err you're checking may be the last one, that may have overwritten > 'err' from handle_config_changes(), perhaps moving things around helps? > I.e.: > if (!err && fdarray__poll(&fda, -1)) { > bool reconfig = false; > > if (fda.entries[sock_pos].revents & POLLIN) > err = handle_server_socket(daemon, sock_fd); > if (fda.entries[signal_pos].revents & POLLIN) > err = handle_signalfd(daemon) < 0; > if (fda.entries[file_pos].revents & POLLIN) > err = handle_config_changes(daemon, conf_fd, &reconfig); > > if (!err && reconfig) > err = setup_server_config(daemon); > } > > > ? > > Jiri? > > - Arnaldo > > > } > > -- > > 2.30.GIT > > -- > > - Arnaldo
diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c index 6cb3f6cc36d0..b82bd902602a 100644 --- a/tools/perf/builtin-daemon.c +++ b/tools/perf/builtin-daemon.c @@ -1333,7 +1333,7 @@ static int __cmd_start(struct daemon *daemon, struct option parent_options[], if (fda.entries[signal_pos].revents & POLLIN) err = handle_signalfd(daemon) < 0; - if (reconfig) + if (!err && reconfig) err = setup_server_config(daemon); } }