From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 6OdQFstfVGbZZB4AWB0awg (envelope-from ) for ; Mon, 27 May 2024 06:26:19 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=Q3ZesTjw; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 5823B1E0C1; Mon, 27 May 2024 06:26:19 -0400 (EDT) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 470151E092 for ; Mon, 27 May 2024 06:26:17 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E5FA1385840D for ; Mon, 27 May 2024 10:26:16 +0000 (GMT) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by sourceware.org (Postfix) with ESMTPS id 07DDF385840D for ; Mon, 27 May 2024 10:25:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 07DDF385840D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 07DDF385840D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.14 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716805508; cv=none; b=uCFGxfmDvIhI7vLd7eiqz+/hCpMYZ2jfJZ47hUHFtZhuzUqkNZc4yNGmy3v0BcBzTNMY+JQtdrnPhOhcMXETXdzonGccGfp7WwhVvS/gW1dTLEmZ52hB2l6K22tx0N2+LUNCPjT6cNpUmDiVqLtHPFjfgjwZxLbBjgQl5trvX6s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716805508; c=relaxed/simple; bh=sPspcDKA7MXUfBNnID8RkG+qyonmqOtRMwnUEFdyNLU=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=Vxxibv34FwQrbKHnkKgBkrmnJZiO67ttaAMYS74ELALw5rZPKa5B8ZnhtQZAIMpvmL3xY50kMdQJo5Q2NICTF6L0n1HscKvEjKQup/2y1wbWjvwMlvzgXQcyjpadUuI69R2WCy3zS3lU0qGgrNzD/fiUQO7GrAlYH7iKth8s4K8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716805505; x=1748341505; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sPspcDKA7MXUfBNnID8RkG+qyonmqOtRMwnUEFdyNLU=; b=Q3ZesTjw9mHK8qdofyDYsD4KBn58FXLjmGKZB2s8rJoXNtoPnr2wleKD /RRm3SNqylEc9yD+Alenv+LbnCcM7zB1MCWHWac8tpxlRDPh832lb4o+L tsubSJ2IyDT8GaXwqq4Zribew9gTa0nbJvqsGNap1XEWVW63r9lrm9KHN wFgJixzWR8RP6FhmX/P0+McD+WNe8VUCGNi+pb+tAksjqO6T0yqiv/4w7 /4XHWo8mRSc0T8tbqVmwF6dWRbItIAKKCi9pGRE/bKV0BrwqTbHw9k4nO UcTgbR7pDoQmuPk0UyxHAm9haqq0H1Vps8CWpOTbHLZa+OPkNdt8ppZcp w==; X-CSE-ConnectionGUID: ohe6OfAFRLCquADVLRtYQA== X-CSE-MsgGUID: L5x1zBwHR1Gel3IomqfoHg== X-IronPort-AV: E=McAfee;i="6600,9927,11084"; a="13341036" X-IronPort-AV: E=Sophos;i="6.08,192,1712646000"; d="scan'208";a="13341036" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 May 2024 03:25:04 -0700 X-CSE-ConnectionGUID: 7CLH04iSRiaqkWTO8j7xMQ== X-CSE-MsgGUID: /jOkM/WLRSWx1Ry5twPXsQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,192,1712646000"; d="scan'208";a="34632077" Received: from gkldtt-dev-004.igk.intel.com (HELO localhost) ([10.123.221.202]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 May 2024 03:25:02 -0700 From: "Schimpe, Christina" To: gdb-patches@sourceware.org Cc: felix.willgerodt@intel.com, eliz@gnu.org, luis.machado@arm.com Subject: [PATCH v2 3/3] LAM: Support kernel space debugging Date: Mon, 27 May 2024 10:24:23 +0000 Message-Id: <20240527102423.1361410-4-christina.schimpe@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240527102423.1361410-1-christina.schimpe@intel.com> References: <20240527102423.1361410-1-christina.schimpe@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP, 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 server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org From: Christina Schimpe Sign-extend watchpoint address for kernel space support. --- gdb/amd64-linux-tdep.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c index b19b12842fd..285d3dd0ae2 100644 --- a/gdb/amd64-linux-tdep.c +++ b/gdb/amd64-linux-tdep.c @@ -52,6 +52,8 @@ #include +/* Bit 63 is used to select between a kernel-space and user-space address. */ +#define VA_RANGE_SELECT_BIT_MASK 0x8000000000000000UL #define DEFAULT_TAG_MASK 0xffffffffffffffffULL /* Mapping between the general-purpose registers in `struct user' @@ -1848,9 +1850,21 @@ static CORE_ADDR amd64_linux_remove_non_address_bits_watchpoint (gdbarch *gdbarch, CORE_ADDR addr) { - /* Clear insignificant bits of a target address using the untag - mask. */ - return (addr & amd64_linux_lam_untag_mask ()); + /* The topmost bit tells us if we have a kernel-space address or a user-space + address. */ + const bool kernel_address = (addr & VA_RANGE_SELECT_BIT_MASK) != 0; + + CORE_ADDR mask = amd64_linux_lam_untag_mask (); + /* Clear insignificant bits of a target address using the untag mask. + The untag mask preserves the topmost bit, which distinguishes user space + from kernel space address. */ + addr &= mask; + + /* Sign-extend if we have a kernel-space address. */ + if (kernel_address) + addr |= ~mask; + + return addr; } static void -- 2.34.1 Intel Deutschland GmbH Registered Address: Am Campeon 10, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Sean Fennelly, Jeffrey Schneiderman, Tiffany Doon Silva Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928