From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (unknown [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 3190B8045D for ; Mon, 19 Oct 2026 18:28:34 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69JIRF2K025433; Mon, 19 Oct 2026 21:27:16 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69JIRF2K025433 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="C0avUdg1" Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69JIR0Gs025396 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 19 Oct 2026 21:27:02 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69JIR0Gs025396 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-48df730c035so1617036f8f.0 for ; Mon, 19 Oct 2026 11:27:01 -0700 (PDT) X-Gm-Message-State: AFq9FYIBHYDI8PP0dMBHpV2gFoCjl4XmbBG/NAqQrbcUCJAdflZVXU28 Xxc3swYhKWM4GHVsA9HMTqWdrOvup3GdoIGbB0oU4GBlRqiaWqslotNQzEMIjdFcBGl7HdCze/K OEfUrot2Acw5nsYdIjsz75NiWRSigZ2i+f0Xh0WLx+8M6cLnMf+QK/g== X-Gm-Gg: AYBFou1Z7lq98xYViSn6beMTmIzHQ607nX1YelFvEse2Fm0LF6ThNlylW0lzV49us+J H5fRfOhsN/yFRc+eCYqn9rYPD2TzcZUpQITBGshKs63ZOVrXhQuQiFbcsHES6k1b5Gub82zschx wW0vXuNyvieJQYYC6L80aGEVffOAii4xgIrD9z5F++ELNlVcrSp83jgvLGdG5tpFXYcowgiCShA UmFb/fq8ubUSYp3vZ7WfZdFZBmhCD8Pg9NLGNeKpvzOZ9/NaBjnM8sAxFJpQfVh0vWQrWeKQaYs R+tbLfbjnvEXaavVZcmdcryjTlLCf3JavFJcQUBemdx+AAqMJx/AL7qx/kPzg3bNYAuzVGGI7Wm 5/SHVMZm/pGj00z4+nw== X-Received: by 2002:a05:6000:1887:b0:48e:870:778f with SMTP id ffacd0b85a97d-48e08707839mr19371693f8f.16.1792434420630; Mon, 19 Oct 2026 11:27:00 -0700 (PDT) X-Received: by 2002:a05:6000:1887:b0:48e:870:778f with SMTP id ffacd0b85a97d-48e08707839mr19371644f8f.16.1792434420030; Mon, 19 Oct 2026 11:27:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1792434420; cv=none; d=google.com; s=arc-20260327; b=b1pOa7DzXEyQsEANqCTGBJKVJ05fH6o+DqxlctGuJnWLzLtBdfuvUDP8v3VFLoK7Tj nqvhygpObhTpCESKMi+r0NVrVKUTcLiaCXmTRppWNI4yUzjRUoSuTv5Xf6h9XOq7HVPe Di16VmOm8RiRpOC4zy+mGLuDFWVEUW2CP/dtj9rrDyjUUN82UOW7NkySfRnzpcL/i7Jc tf0JG7MuJ8lMHqGMveyQgiLzhozPaGfIySE/Ioke368a3P606JJL02hFtxe2WbeQGMDD Xk19+q+dnPvfmgilpPBfp/i/DVz++4/kFXZnc6A/wcjxVHw55lc1B7FM3TJFUN2jh2Yz PYbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=TxDN7Hp5kvqKiYeU08mPOZDBoH1tpzbXmQS0ro4zlv8=; fh=u94vpSnbACPnIkIPa1XdGqhjZt/kxdbqUA9AiFps/bg=; b=C7RN04zltFReYfE6h+K4JFkWfW2Fv/zVWIP/s1sTBQY2jltR5HNZ0HUTwLapE/mbX0 D4SyP/WHElPcPQDg0FU1m/9uwjVJXlFklMzgqYHO7CkOgqfPWUt2iJszo71bzeqAbGzE FjN7koV9ILzHCcH2Q05dkIOTt4M9+d8TDJsLFyYxnb9IV4qA333rlt8XO5CHLJNAJMih M/pXa3Vk34Gjn8cElHn29FAFjf29TQtrXD/o8yBsj7+60II0otsWfFWGHLl6TA3Pz1/m u/vtdPT2ivUTEPKTw8Hc7a2KlCFxJS+g7LHPLoiP3eJ1GLn2SNkM5F+EwWfAS8yeFE5P gShA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=C0avUdg1; spf=pass (google.com: domain of khorenko@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=khorenko@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-48e1d82167asi439554f8f.182.2026.10.19.11.26.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Oct 2026 11:27:00 -0700 (PDT) Received-SPF: pass (google.com: domain of khorenko@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=C0avUdg1; spf=pass (google.com: domain of khorenko@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=khorenko@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=Message-Id:Content-Type:MIME-Version:Subject:Date :From; bh=TxDN7Hp5kvqKiYeU08mPOZDBoH1tpzbXmQS0ro4zlv8=; b=C0avUdg1ORxBNIKIWnz tlRC8fu5PU1vL2Kt6IyTTibwW9O148HhJuiCOd5+h10JZRqsz0gCyeJVivQlwO61iwjAI7HcorbIp ythFnlC2aJ6c5Y6jW5bG1bbC8CFXt5V70h6ex+vmx9ZRr/vup/0OUSfh41V+oZTuGfGTWOo0b6Yj2 vOOs/haRfqPh+j3PeZQKfa6zl5oWb5W9bffD7xL9rNWuMXoAiHFyhOagsB1tRmL0w2mvWnCa20r0h Yx1v0A0jWrrTcFJDrrfKidgWxCUDuTJJidsUx1QpZCE0cdBbXFXklDMjE1gAjJ0HtfS2C9qN7w6Yi LRiYOdAyMYanQ4w==; Received: from ch-demo-asa.virtuozzo.com ([130.117.225.8] helo=f0.sw.ru) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1xIs10-0087zV-31; Mon, 19 Oct 2026 20:26:51 +0200 From: Konstantin Khorenko Date: Mon, 19 Oct 2026 20:26:51 +0200 MIME-Version: 1.0 Message-Id: <20261019-b4-prep-khorenko-vstor-148131-gcov-followups-v1-2-2932ec685608@virtuozzo.com> References: <20261019-b4-prep-khorenko-vstor-148131-gcov-followups-v1-0-2932ec685608@virtuozzo.com> In-Reply-To: <20261019-b4-prep-khorenko-vstor-148131-gcov-followups-v1-0-2932ec685608@virtuozzo.com> To: devel@openvz.org, Konstantin Khorenko X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4960; i=khorenko@virtuozzo.com; h=from:subject:message-id; bh=ap78H0e/u2FIG3sDCXa6WmSNzZmNqQ7y1ObSL5u85LU=; b=owEBbQKS/ZANAwAKAVGWCkf5YVwqAcsmYgBq1mDyH6DWIMwtF/7slALKeN5ZY6sg4NXaXqteY pxkGcB2Pe6JAjMEAAEKAB0WIQRWD23IPcXT0GO9CCxRlgpH+WFcKgUCatZg8gAKCRBRlgpH+WFc KgfwD/9YHszXlbqhzZHXbELlQr312c60Ee0xcnPPFdskCd7dCKUKegNiRU40HhufUEZoDZTIkf9 zn9HNgF5ef0wo5n/XvCqRucYxlsdMcEsDPPOtMnzu6ZyKPNyzQEto9iteRpDNHYdA1dbF3ih9sB hloSXL2aIvxGSe60qWZ25lX6jKlfA2OlyEjqlMpN9Dz3fLIwLIxjVaz1eV8bafzpGEoVZIfivYg JFVnqw01lU8RD5AG6sS449n8WOfWguR9ZSGCtTsv9AGQOTatYVp4xa3npEeUNjSDGgtgSkNoZ09 cnHW1mUFknSA5yNvPL9EwFHJ37fY4UDzOlp/JeLPE64QJ+fyOSTvkwc1UNR4xnjgI0MDxDb4u6q wzTmr6Whu1O542jETzoAxPsYUw5d46IQMlQr3MTUJOSSlI8ett/PCPo4qR8A0Z62/COysbFlFvX aX95uVdxjE+rLhWEq89Lu2cwLuUP30yCQnL43v2Xpz2qdYFFYanx1xfnSBbN2ka1WdRjK29j2co zAKPmDhvRrAZRNzv8FXDa3/PfKh+2Jx/+Gy24MLZtFQF5yNEtxaLiTOM0hY9ibeFf/x4CnPwteY KY42nOLriqvTb//yYDhCnOHLqQu2mbhF7LaXa9Vc+GadOZwybCWeylls60gFKgY7vST1+E+Omdm WEsovs475kPmIgg== X-Developer-Key: i=khorenko@virtuozzo.com; a=openpgp; fpr=560F6DC83DC5D3D063BD082C51960A47F9615C2A X-OZ-Fwd: true Subject: [Devel] [PATCH hci-8.1 2/2] ms/kbuild: move GCOV flags to scripts/Makefile.gcov X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org * split the CFLAGS_GCOV block out of the top-level Makefile into scripts/Makefile.gcov * include it via include-$(CONFIG_GCOV_KERNEL) like neighbour KASAN/KCOV/UBSAN makefiles do * keep the include before scripts/Makefile.gcc-plugins: the try-run must not get -fplugin= options, plugins do not exist on clean builds CFLAGS_GCOV is no longer defined when CONFIG_GCOV_KERNEL is off: * its user in scripts/Makefile.lib is guarded by the CONFIG_GCOV_KERNEL * in i915/xe header an empty value is harmless The try-run compiler invocations also stop running on builds without GCOV. Link: https://lore.kernel.org/20261001-b4-prep-gcov-v1-2-794792e06f24@virtuozzo.com Signed-off-by: Konstantin Khorenko Signed-off-by: Andrew Morton Suggested-by: Peter Oberparleiter Cc: Nathan Chancellor Cc: Nicolas Schier Cc: Masahiro Yamada Cc: Arnd Bergmann Cc: Mikhail Zaslonko (cherry picked from commit f541906e89f9d08ef29f058b6cef1db071cd8163) Picked from the akpm/mm tree, branch mm-nonmm-stable: not in Linus's tree yet. Conflict in Makefile: the CFLAGS_GCOV block sits next to different lines in this tree. Removed the block and kept the local context. https://virtuozzo.atlassian.net/browse/VSTOR-148131 Feature: fix ms/gcov Assisted-by: LLM Signed-off-by: Konstantin Khorenko --- MAINTAINERS | 1 + Makefile | 22 +--------------------- scripts/Makefile.gcov | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9523da3c767cb..f0f955907fd7d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9535,6 +9535,7 @@ M: Peter Oberparleiter S: Maintained F: Documentation/dev-tools/gcov.rst F: kernel/gcov/ +F: scripts/Makefile.gcov GDB KERNEL DEBUGGING HELPER SCRIPTS M: Jan Kiszka diff --git a/Makefile b/Makefile index 3524889b5bb5f..7c8f8e9b9be99 100644 --- a/Makefile +++ b/Makefile @@ -1033,27 +1033,6 @@ ifdef CONFIG_CC_IS_GCC KBUILD_CFLAGS += -fconserve-stack endif -CFLAGS_GCOV := -fprofile-arcs -ftest-coverage -ifdef CONFIG_CC_IS_GCC -CFLAGS_GCOV += -fno-tree-loop-im -# Use atomic counter updates to avoid concurrent-access crashes in GCOV. -# Only enable if -fprofile-update=prefer-atomic does not introduce new -# undefined symbols (e.g. libatomic calls that the kernel cannot link). -CFLAGS_GCOV += $(call try-run,\ - echo 'long long x; void f(void){x++;}' | \ - $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -w $(CFLAGS_GCOV) \ - -x c - -c -o "$$TMP.base" && \ - echo 'long long x; void f(void){x++;}' | \ - $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -w $(CFLAGS_GCOV) \ - -fprofile-update=prefer-atomic \ - -x c - -c -o "$$TMP" && \ - $(NM) "$$TMP.base" | grep ' U ' > "$$TMP.ubase" || true ; \ - $(NM) "$$TMP" | grep ' U ' > "$$TMP.utest" || true ; \ - cmp -s "$$TMP.ubase" "$$TMP.utest",\ - -fprofile-update=prefer-atomic) -endif -export CFLAGS_GCOV - # change __FILE__ to the relative path from the srctree KBUILD_CPPFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=) @@ -1066,6 +1045,7 @@ include-$(CONFIG_KCSAN) += scripts/Makefile.kcsan include-$(CONFIG_KMSAN) += scripts/Makefile.kmsan include-$(CONFIG_UBSAN) += scripts/Makefile.ubsan include-$(CONFIG_KCOV) += scripts/Makefile.kcov +include-$(CONFIG_GCOV_KERNEL) += scripts/Makefile.gcov include-$(CONFIG_RANDSTRUCT) += scripts/Makefile.randstruct include-$(CONFIG_AUTOFDO_CLANG) += scripts/Makefile.autofdo include-$(CONFIG_PROPELLER_CLANG) += scripts/Makefile.propeller diff --git a/scripts/Makefile.gcov b/scripts/Makefile.gcov new file mode 100644 index 0000000000000..16c5b876440c2 --- /dev/null +++ b/scripts/Makefile.gcov @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: GPL-2.0-only +CFLAGS_GCOV := -fprofile-arcs -ftest-coverage +ifdef CONFIG_CC_IS_GCC +CFLAGS_GCOV += -fno-tree-loop-im +# Use atomic counter updates to avoid concurrent-access crashes in GCOV. +# Only enable if -fprofile-update=prefer-atomic does not introduce new +# undefined symbols (e.g. libatomic calls that the kernel cannot link). +CFLAGS_GCOV += $(call try-run,\ + echo 'long long x; void f(void){x++;}' | \ + $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -w $(CFLAGS_GCOV) \ + -x c - -c -o "$$TMP.base" && \ + echo 'long long x; void f(void){x++;}' | \ + $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -w $(CFLAGS_GCOV) \ + -fprofile-update=prefer-atomic \ + -x c - -c -o "$$TMP" && \ + $(NM) "$$TMP.base" | grep ' U ' > "$$TMP.ubase" || true ; \ + $(NM) "$$TMP" | grep ' U ' > "$$TMP.utest" || true ; \ + cmp -s "$$TMP.ubase" "$$TMP.utest",\ + -fprofile-update=prefer-atomic) +endif +export CFLAGS_GCOV -- 2.43.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel