From patchwork Tue Jul 11 11:27:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Yejian X-Patchwork-Id: 118425 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp405725vqm; Tue, 11 Jul 2023 04:30:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlHhAH0xkKPX2f4xSAY/wFRvMuqNiod3pUlS7EEdemH566G7VdNr5GHtNt1mElZTBaLYva53 X-Received: by 2002:a17:902:a9c1:b0:1b8:64e9:e4b3 with SMTP id b1-20020a170902a9c100b001b864e9e4b3mr10180770plr.39.1689075004844; Tue, 11 Jul 2023 04:30:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689075004; cv=none; d=google.com; s=arc-20160816; b=KpzwhkkqSicqcK0n6dlFR+JEdz5eQOz+nHx310yl7B/htnqM0ozsP/BgnTptZ/actD wbUzfoUbZbQygg3Lzt8xdFEuza5Vl67cy/2ULJi26zL38COBwpgkT+jNzKFtlgMzQrQ0 ZAKBfjKoXWgEaxnkZ2rCvuV5fIcF+6Cm9jj8a6p7VMo5eaOuDTmGbSrSiAQLiXDzygnU TeJvI4bI25HBohjOdDuxtb5vtBj582tZ76gKPvga8CTg88dZDET9Yx+9p1XmucQZ7i09 rtHAq3Ynkp3fIXfJZ1fIiJ6ssqM+6eRnAzFialNAjpyLTdXoJEJRuY2ZL44+Hkih5+fN zu7g== 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=47cIy5F7A05MC0eSLGdGxRqOCXpvj/hTxJbc377aiZs=; fh=APhBgUjYXesXWOIgKm8aSjIctaOGtmXBvn0W6GCNYWk=; b=AaZGR4hK6QFWiDLnsuVYzvOsz2XBo3XYF3EosOG+2/Zh2SqW8j6qU+y8Q/uD75cp9i mclrORdGCRNB0nLnKEU6S3VwQWDLqJPaGhDAv7HbtZhi82XVGoWfjlt0UkCh0mi3uNhS Lr2qCwSUhUg7VoqyZbNpJcsA3cmgixd1QMYMrTfQKtNFjtYJFAsyJVDSuogZeHQrwN+x 3v6cOuqM2lyUDuCasJy9ur1dN92kp1p5At6FTwlIEDjO6mSA2sqesyvRu7Jpnc7TbP+m QdQ1ZCAwKSM3+xxTjhHpqNFYT0Ia1akgmAGrva/HMgS5rC6B2g2O9St7TogXXbUcOrwY /8jw== 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 x15-20020a170902ec8f00b001b8920564cesi1523175plg.17.2023.07.11.04.29.51; Tue, 11 Jul 2023 04:30:04 -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 S231919AbjGKL2J (ORCPT + 99 others); Tue, 11 Jul 2023 07:28:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231706AbjGKL2D (ORCPT ); Tue, 11 Jul 2023 07:28:03 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 175C411D; Tue, 11 Jul 2023 04:28:00 -0700 (PDT) Received: from dggpeml500012.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4R0drX2DJDzqVrV; Tue, 11 Jul 2023 19:27:24 +0800 (CST) Received: from localhost.localdomain (10.67.175.61) by dggpeml500012.china.huawei.com (7.185.36.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 11 Jul 2023 19:27:58 +0800 From: Zheng Yejian To: CC: , , , Subject: [PATCH v3] ftrace: Fix possible warning on checking all pages used in ftrace_process_locs() Date: Tue, 11 Jul 2023 19:27:52 +0800 Message-ID: <20230711112752.2595316-1-zhengyejian1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230710104625.421c851a@gandalf.local.home> References: <20230710104625.421c851a@gandalf.local.home> MIME-Version: 1.0 X-Originating-IP: [10.67.175.61] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpeml500012.china.huawei.com (7.185.36.15) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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: 1771026112620047218 X-GMAIL-MSGID: 1771123512223243453 As comments in ftrace_process_locs(), there may be NULL pointers in mcount_loc section: > Some architecture linkers will pad between > the different mcount_loc sections of different > object files to satisfy alignments. > Skip any NULL pointers. After commit 20e5227e9f55 ("ftrace: allow NULL pointers in mcount_loc"), NULL pointers will be accounted when allocating ftrace pages but skipped before adding into ftrace pages, this may result in some pages not being used. Then after commit 706c81f87f84 ("ftrace: Remove extra helper functions"), warning may occur at: WARN_ON(pg->next); To fix it, only warn for case that no pointers skipped but pages not used up, then free those unused pages after releasing ftrace_lock. Fixes: 706c81f87f84 ("ftrace: Remove extra helper functions") Suggested-by: Steven Rostedt Signed-off-by: Zheng Yejian --- Changes v2 -> v3: https://lore.kernel.org/all/20230711201630.1837109-1-zhengyejian1@huawei.com/ - Check NULL for 'pg->next' before assigning it to variable 'pg_unuse' Changes v1 -> v2: https://lore.kernel.org/all/20230710104625.421c851a@gandalf.local.home/ - As suggested by Steve, only warn for case that no pointers skipped but pages not used up then free those unused pages. But I move the free process after releasing ftrace_lock. kernel/trace/ftrace.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 3740aca79fe7..e43e21a3d5fd 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -6473,7 +6473,9 @@ static int ftrace_process_locs(struct module *mod, { struct ftrace_page *start_pg; struct ftrace_page *pg; + struct ftrace_page *pg_unuse = NULL; struct dyn_ftrace *rec; + unsigned long skipped = 0; unsigned long count; unsigned long *p; unsigned long addr; @@ -6536,8 +6538,10 @@ static int ftrace_process_locs(struct module *mod, * object files to satisfy alignments. * Skip any NULL pointers. */ - if (!addr) + if (!addr) { + skipped++; continue; + } end_offset = (pg->index+1) * sizeof(pg->records[0]); if (end_offset > PAGE_SIZE << pg->order) { @@ -6551,8 +6555,10 @@ static int ftrace_process_locs(struct module *mod, rec->ip = addr; } - /* We should have used all pages */ - WARN_ON(pg->next); + if (pg->next) { + pg_unuse = pg->next; + pg->next = NULL; + } /* Assign the last page to ftrace_pages */ ftrace_pages = pg; @@ -6574,6 +6580,20 @@ static int ftrace_process_locs(struct module *mod, out: mutex_unlock(&ftrace_lock); + /* We should have used all pages unless we skipped some */ + if (pg_unuse) { + WARN_ON(!skipped); + while (pg_unuse) { + pg = pg_unuse; + pg_unuse = pg->next; + if (pg->records) { + free_pages((unsigned long)pg->records, pg->order); + ftrace_number_of_pages -= 1 << pg->order; + } + kfree(pg); + ftrace_number_of_groups--; + } + } return ret; }