From patchwork Mon Jul 26 15:40:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 485846 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp3982406jao; Mon, 26 Jul 2021 09:20:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhumqimayGsQy8LLHk4HlEsVhxAq1IXSqX/uRV7nN35i7sdyT3AWsOBsNJ+gKNttTvhs4g X-Received: by 2002:a17:906:f845:: with SMTP id ks5mr9288824ejb.129.1627316303012; Mon, 26 Jul 2021 09:18:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627316303; cv=none; d=google.com; s=arc-20160816; b=sCHgY1K+NItyhZkc2lyFPtVN0h/SMcrVgZkWqX2iW4pO4147jjvbHef+9LJtrXxqPl U7E4Va2/iDtwy8FYGNLg1NuX5YM/qeJRb0SFxAuVXeHK9nskhSe3Qq3tV7Phum3nluAu VpEDWsAoI4CqS2EKwsWWpfJ5nBzlOT0sR2OH5FktKu2X+dlUXhKPPW60RScQknRZv7hL Et0x07EkzWhBMuCTevbYqB6Y0xL7JT8ezFkE9l1P40CW6D2E5f0v5N3v757F5yp9jI15 EFAGzsrmyU/erPAgsb3QHedbsu2VYAEbnL/qcD4ZikkSModJBqsiZFuoCww3ZZ3WJ8Z6 1N6g== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/8Q4b39TR5wBopNUbisBFVUDnsjW1lzPKpwlnoqWD30=; b=0PbQWIVHtIyrPts3WEIDI8Ed0sAM0jSt+0YVmhjymCUhS1xL6nlb4+kpUa8JEVvE8J TB9YdOT3iT7US0LxWEWlKeXCoSbK5vjEwFi+B4HmGdT47SDAo4Min11maBapNHkR7Yoq iHWNT0sQvSma1JiFvdbY33pQDdcDWGzB9M0Sgy98HkLl6MnFaiBxm1R4RtOU9D5lSoCQ fEJDoOfCQKk83RSTXtui/3LuCGuzfrMsQODUL7imCfjDGbFqQJkhKVHMbPmtIkVTaNUy rA6HOQtWmgfnjTjT4xIWSo3BFG6tdsMYVuDaYMt+6Nv/CvlKgOfZ/guSdSBioGPGrPRO DVsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gaMa2wrH; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id pv18si289902ejb.567.2021.07.26.09.18.22; Mon, 26 Jul 2021 09:18:23 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gaMa2wrH; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234406AbhGZPgP (ORCPT + 12 others); Mon, 26 Jul 2021 11:36:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:53888 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233768AbhGZPfy (ORCPT ); Mon, 26 Jul 2021 11:35:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E3F86604AC; Mon, 26 Jul 2021 16:16:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627316180; bh=84u/XjAnu2b9gXNw6fBDvyiuCJA9UbdN0DmegULQy6w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gaMa2wrH1ogjLj0cKwGELpvAawr2Zej/wge+VJl2OeXY3mV2L6cTZFXGjNwuq9DUC E1qX+f+kHfOl621vAdEjujM47Pa8WbM1qvadsMMM09umOiXQU9dZGPMZzGb4iDlRhd SQW/ZY7C6FX2NSNzLRLRpzvjwxbCMWjsSGmrr+yk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mark Rutland , Catalin Marinas , James Morse , Marc Zyngier , Will Deacon Subject: [PATCH 5.13 219/223] arm64: entry: fix KCOV suppression Date: Mon, 26 Jul 2021 17:40:11 +0200 Message-Id: <20210726153853.344320397@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210726153846.245305071@linuxfoundation.org> References: <20210726153846.245305071@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Rutland commit e6f85cbeb23bd74b8966cf1f15bf7d01399ff625 upstream. We suppress KCOV for entry.o rather than entry-common.o. As entry.o is built from entry.S, this is pointless, and permits instrumentation of entry-common.o, which is built from entry-common.c. Fix the Makefile to suppress KCOV for entry-common.o, as we had intended to begin with. I've verified with objdump that this is working as expected. Fixes: bf6fa2c0dda7 ("arm64: entry: don't instrument entry code with KCOV") Signed-off-by: Mark Rutland Cc: Catalin Marinas Cc: James Morse Cc: Marc Zyngier Cc: Will Deacon Link: https://lore.kernel.org/r/20210715123049.9990-1-mark.rutland@arm.com Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -17,7 +17,7 @@ CFLAGS_syscall.o += -fno-stack-protector # It's not safe to invoke KCOV when portions of the kernel environment aren't # available or are out-of-sync with HW state. Since `noinstr` doesn't always # inhibit KCOV instrumentation, disable it for the entire compilation unit. -KCOV_INSTRUMENT_entry.o := n +KCOV_INSTRUMENT_entry-common.o := n # Object file lists. obj-y := debug-monitors.o entry.o irq.o fpsimd.o \