From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C3CC2A1D6; Tue, 1 Oct 2024 01:56:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727747778; cv=none; b=ZF0yhHxOi/MO1HGmyruYAjUceSy2zJZTWEatbCMgbt2W3Jp9eJuKtOUY8YHY5f0apZDCZY5h8xpmDIiBHDmvy92xVox1GGHD9zD+obNU5XArzEySTGnE+P5YUHH7POf+g4fJ5mqBiW5lx3fAmsYPt7OfsbOJ4RebCOuQoozPceA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727747778; c=relaxed/simple; bh=8CcsICJZHQth1jVn5T3iNoWyFSFmj1oO4DCbT0GvzHQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=HefURGMXWFctIYGrZIb2VKBdw7CV1hPenbI5YIBap1gsjxh233KZW5tCziQ2ybqM5IBH9KybiqzcxulKWDH047GaLBCaQuKlP0vdnkNNbeqW+9bYaxBpfObUj5LVdElm2Vt58xMuo/jCAIKpKHp9Y124DwlAmXGt56tLCahsYQ8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=R9xweeIh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="R9xweeIh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A890BC4CECE; Tue, 1 Oct 2024 01:56:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727747778; bh=8CcsICJZHQth1jVn5T3iNoWyFSFmj1oO4DCbT0GvzHQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=R9xweeIhxdzDY2kh9fbQCYJe9jduhS8+QXAaK4jTFPSIQYs1CDJOBTr6yrkeDVQSb B33fkzowR5l8P0asF/YyE+Dve2sBl4ykf+uFm1TXqItDgYqQZKhGMLRslaakOEcymX nDnlNjeDkAQP/I1yMjRBkwHAoeSlEISL7mPJ+6DyidedlltlJMrrk2VLceqqIU8Dv7 B2K78EuBKUIFDGsGSVfK7ai0rxgW6boHuvPUWvmPJv5IkwL43x2c8PBvs/dsIqLB7H sm4ptO+NLPMUS3kqurrhkludD9xxQbMujy5/Kgfxexeq6hMVz70b7UCqC06KUZDSvZ LBAyVv56rp5kQ== Date: Mon, 30 Sep 2024 18:56:16 -0700 From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Kuan-Wei Chiu , Ingo Molnar , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Andrew Morton Subject: Re: [PATCH 2/2] perf tools: Cope with differences for lib/list_sort.c copy from the kernel Message-ID: References: <20240930202136.16904-1-acme@kernel.org> <20240930202136.16904-3-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20240930202136.16904-3-acme@kernel.org> On Mon, Sep 30, 2024 at 05:21:36PM -0300, Arnaldo Carvalho de Melo wrote: > From: Arnaldo Carvalho de Melo > > With 6d74e1e371d43a7b ("tools/lib/list_sort: remove redundant code for > cond_resched handling") we need to use the newly added hunk based > exceptions when comparing the copy we carry in tools/lib/ to the > original file, do it by adding the hunks that we know will be the > expected diff. > > If at some point the original file is updated in other parts, then we > should flag and check the file for update. > > Cc: Adrian Hunter > Cc: Andrew Morton > Cc: Ian Rogers > Cc: Jiri Olsa > Cc: Kan Liang > Cc: Kuan-Wei Chiu > Cc: Namhyung Kim > Signed-off-by: Arnaldo Carvalho de Melo I'm seeing this but I think it's ok since we're adding a patch file as a content. Applying: perf tools: Cope with differences for lib/list_sort.c copy from the kernel .git/rebase-apply/patch:21: space before tab in indent. struct list_head *a, struct list_head *b) .git/rebase-apply/patch:23: space before tab in indent. struct list_head *tail = head; .git/rebase-apply/patch:25: trailing whitespace. .git/rebase-apply/patch:26: space before tab in indent. for (;;) { .git/rebase-apply/patch:27: space before tab in indent. /* if equal, take 'a' -- important for sort stability */ warning: squelched 6 whitespace errors warning: 11 lines add whitespace errors. And build doesn't show the message for lib/list_sort.c anymore. :) I think it's nice to update for later changes, just put the diff in a file with the same name under check-header_ignore_hunks directory. Good job! Thanks, Namhyung > --- > .../check-header_ignore_hunks/lib/list_sort.c | 31 +++++++++++++++++++ > tools/perf/check-headers.sh | 5 ++- > 2 files changed, 35 insertions(+), 1 deletion(-) > create mode 100644 tools/perf/check-header_ignore_hunks/lib/list_sort.c > > diff --git a/tools/perf/check-header_ignore_hunks/lib/list_sort.c b/tools/perf/check-header_ignore_hunks/lib/list_sort.c > new file mode 100644 > index 0000000000000000..32d98cb34f80a987 > --- /dev/null > +++ b/tools/perf/check-header_ignore_hunks/lib/list_sort.c > @@ -0,0 +1,31 @@ > +@@ -1,5 +1,6 @@ > + // SPDX-License-Identifier: GPL-2.0 > + #include > ++#include > + #include > + #include > + #include > +@@ -52,6 +53,7 @@ > + struct list_head *a, struct list_head *b) > + { > + struct list_head *tail = head; > ++ u8 count = 0; > + > + for (;;) { > + /* if equal, take 'a' -- important for sort stability */ > +@@ -77,6 +79,15 @@ > + /* Finish linking remainder of list b on to tail */ > + tail->next = b; > + do { > ++ /* > ++ * If the merge is highly unbalanced (e.g. the input is > ++ * already sorted), this loop may run many iterations. > ++ * Continue callbacks to the client even though no > ++ * element comparison is needed, so the client's cmp() > ++ * routine can invoke cond_resched() periodically. > ++ */ > ++ if (unlikely(!++count)) > ++ cmp(priv, b, b); > + b->prev = tail; > + tail = b; > + b = b->next; > diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh > index 55aba47e5aec9292..f1080d4096663ba1 100755 > --- a/tools/perf/check-headers.sh > +++ b/tools/perf/check-headers.sh > @@ -193,7 +193,6 @@ check include/uapi/linux/mman.h '-I "^#include <\(uapi/\)*asm/mman.h>"' > check include/linux/build_bug.h '-I "^#\(ifndef\|endif\)\( \/\/\)* static_assert$"' > check include/linux/ctype.h '-I "isdigit("' > check lib/ctype.c '-I "^EXPORT_SYMBOL" -I "^#include " -B' > -check lib/list_sort.c '-I "^#include "' > > # diff non-symmetric files > check_2 tools/perf/arch/x86/entry/syscalls/syscall_32.tbl arch/x86/entry/syscalls/syscall_32.tbl > @@ -211,6 +210,10 @@ done > check_2 tools/perf/util/hashmap.h tools/lib/bpf/hashmap.h > check_2 tools/perf/util/hashmap.c tools/lib/bpf/hashmap.c > > +# Files with larger differences > + > +check_ignore_some_hunks lib/list_sort.c > + > cd tools/perf || exit > > if [ ${#FAILURES[@]} -gt 0 ] > -- > 2.46.0 >