From patchwork Thu Feb 29 08:34:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 208247 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp253136dyb; Thu, 29 Feb 2024 00:35:08 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVPbWPdPjn5CTIPu7zOk19jaWVid3EM8/HdvmNgbEGbTn5Ic9rU1i16xvbsXkLbofuReeVHqp2HMt72zPl+w+16i5sDKA== X-Google-Smtp-Source: AGHT+IH6f7Xc4dtSxgOHQADDG/BuVd5LVopeCZC4gPI2khbQRlKZM2YKE4OwgNzh+yFzvlE65Kla X-Received: by 2002:a17:906:474c:b0:a44:553e:5a1d with SMTP id j12-20020a170906474c00b00a44553e5a1dmr216557ejs.20.1709195708109; Thu, 29 Feb 2024 00:35:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709195708; cv=pass; d=google.com; s=arc-20160816; b=osOzHJwAp53bHgUD5aXBuNh7eKBKtNyhHMXs3IiVU7rMMXA7HTQmU24oaisSIq3tOp YUKZtfkMrgc7M2+VV88R+8y81tfXLM5C1arE+CgtQFx1zhpEruLBNFNOWbCeJe/1R1X6 d2BfqUDJDD4Vv2uEIhKlsiTTxlYlOsD/PANbuAn8iVkRztI3xO6UNw3jk91PJM+YCrUT kuQ4bWBm09W8peVlWBSoXTRpZ0EbeE1uBu3iooxZ1Y6tkSnKqvT4RlTcvJioy/yFrUH9 VXhX/fRcDzKV+kZNhEsMP1i+xczUGJpcSSsFBsHNtZ1MJ7Sovga8mEx/doijvCruh3Qo Ha1A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from; bh=IfHC0HtN5kmwu3qNFRuDW3PsLTEYilNj4cqI1GxWsK8=; fh=tQ6viaFeB/kxCgTWyGZ2VFWhYMFFw5BiHefGgixtung=; b=vmBanTFLvsXskTkiazc7g39gpmxxdhpSeuCQBaC98+MV+txXqrUuUFOSKGgM/n/n74 Ux3ak3yLmwbuLlFvX1eOGAhwb5M+DiaPgn0GXj3NpPgn88bIuLLZrknqxfj/mZBLJPYg IFbJUbwxhBDMWk/nz3xfpEngJS/aQ1qFW/mSRctXrwZSsftQqZAPtFqtq/I5Q5tW4uT0 eGukrS3GNl4RoXF/JVM4+xPCsjFDon5vAhLPVFGNg4j2IPwoIMHTE09o5G+Op9puROxz taEMy917egqcW2tG0lMrtV+wpBZ52DzBkurn0ZuIUgGZwWf999XREFFITH43OwEDOzrD DiBA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-86297-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-86297-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id k3-20020a17090646c300b00a4421afbd7bsi391743ejs.2.2024.02.29.00.35.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 00:35:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-86297-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-86297-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-86297-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id B865E1F258C9 for ; Thu, 29 Feb 2024 08:35:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 56BCD5103E; Thu, 29 Feb 2024 08:34:46 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B5B875025C for ; Thu, 29 Feb 2024 08:34:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709195684; cv=none; b=bP/hbScbOp1nx/CuaNzs0+PZmZ0fuEKckXrONvz0W8TXb+EWOMqNtIvvawMMnN8zp+ftMRhLxJ8uJeAl3FTQJqNmUKAOtLzaGq6Eu+TA04K3TsuxYC8bIGIPIDN9+JGeTSWwO48Z25WSenU21wPVfUFXybnUD5WJyjT9THkd/cw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709195684; c=relaxed/simple; bh=dAYAj7SZmUmbdaksmAoUcV11I0Mcv8AU0oakyneZ/M0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=a0pQzCA3KuJU73hvr3jyfdc5c6lGbmdd1lC5dEPeZUbVBGSSSMBEErDXg6lGNM4VwSgNBEULj58qpOn/ZybDbuZTPxSJRpPYWAJICX6Jp+Hqq+C0in8wva9ZtnixXgra06uDQxIfXzFUszuYzLjZZ5rFHJX1PIrqHaomsXIvH5c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 686681FB; Thu, 29 Feb 2024 00:35:19 -0800 (PST) Received: from a077893.arm.com (unknown [10.163.47.238]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 005BF3F6C4; Thu, 29 Feb 2024 00:34:37 -0800 (PST) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com Cc: Anshuman Khandual , Will Deacon , Mark Rutland , linux-kernel@vger.kernel.org, Mark Brown Subject: [PATCH V2] arm64/hw_breakpoint: Directly use ESR_ELx_WNR for an watchpoint exception Date: Thu, 29 Feb 2024 14:04:31 +0530 Message-Id: <20240229083431.356578-1-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792221599021608486 X-GMAIL-MSGID: 1792221599021608486 Let's use existing ISS encoding for an watchpoint exception i.e ESR_ELx_WNR This represents an instruction's either writing to or reading from a memory location during an watchpoint exception. While here this drops non-standard macro AARCH64_ESR_ACCESS_MASK. Cc: Catalin Marinas Cc: Will Deacon Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Reviewed-by: Mark Brown Signed-off-by: Anshuman Khandual Acked-by: Mark Rutland Reviewed-by: Mark Brown --- This applies on v6.8-rc5 Changes in V2: - Dropped new ISS encoding details ESR_ELx_WnR and ESR_ELx_WnR_SHIFT - Directly used existing ESR_ELx_WNR per Catalin - Updated the commit message as required Changes in V1: https://lore.kernel.org/all/20240223094615.3977323-1-anshuman.khandual@arm.com/ arch/arm64/include/asm/hw_breakpoint.h | 1 - arch/arm64/kernel/hw_breakpoint.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/hw_breakpoint.h b/arch/arm64/include/asm/hw_breakpoint.h index 84055329cd8b..bd81cf17744a 100644 --- a/arch/arm64/include/asm/hw_breakpoint.h +++ b/arch/arm64/include/asm/hw_breakpoint.h @@ -59,7 +59,6 @@ static inline void decode_ctrl_reg(u32 reg, /* Watchpoints */ #define ARM_BREAKPOINT_LOAD 1 #define ARM_BREAKPOINT_STORE 2 -#define AARCH64_ESR_ACCESS_MASK (1 << 6) /* Lengths */ #define ARM_BREAKPOINT_LEN_1 0x1 diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c index 35225632d70a..2f5755192c2b 100644 --- a/arch/arm64/kernel/hw_breakpoint.c +++ b/arch/arm64/kernel/hw_breakpoint.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -779,7 +780,7 @@ static int watchpoint_handler(unsigned long addr, unsigned long esr, * Check that the access type matches. * 0 => load, otherwise => store */ - access = (esr & AARCH64_ESR_ACCESS_MASK) ? HW_BREAKPOINT_W : + access = (esr & ESR_ELx_WNR) ? HW_BREAKPOINT_W : HW_BREAKPOINT_R; if (!(access & hw_breakpoint_type(wp))) continue;