From patchwork Wed Mar 27 07:47:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schimpe, Christina" X-Patchwork-Id: 87688 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D1AAE385E00B for ; Wed, 27 Mar 2024 07:49:07 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by sourceware.org (Postfix) with ESMTPS id CD24F385DC3F for ; Wed, 27 Mar 2024 07:48:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CD24F385DC3F 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 CD24F385DC3F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.17 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711525696; cv=none; b=YbfD4OhrNk/M9/XQAFq3stptiMSGG38vUl2YFPUQvFb9h6lBlegsoltUGSwvv4PHhRDwT5i7bFlHxFzs7pwPozIDrAqbCrRw2hlxGVrR2nP5u8OvbYBnUEf9djzICa7uSO+HkIln2+rNGBhSMw69csJ/8JOZNMJjMyJa4sVV+GQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711525696; c=relaxed/simple; bh=ZfwR7AXNiZX7s5HbmRJ7Okm6JwzLXDHskqN0dZJ1yXo=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=INSDgR9AnwVJtTD7sTzcVo0TQnnoV4edfkj8u0XFzDYlorXTsOSzjd03Ndk5WjU74VmyFBJOPCH1RaV6olXyj2mHw9QBtaBSEREGLfovBBpXo5T0WOXLT248ZTdOEXS3Ao32J4gxL5OxNFoDuEdnjjpULuVL0laEOl9uBlEpqY8= 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=1711525694; x=1743061694; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZfwR7AXNiZX7s5HbmRJ7Okm6JwzLXDHskqN0dZJ1yXo=; b=lPjErxgjLX07ftDS8wC3wwDvkcOw8hd/7eqRIwPADTNmksq8hb8+70TB rVvy6hoeOA5q9JI9xpyV0Dx2vTRLnqdwCDJKRBlPaBXvcmDaDTKAmyUvK 51JfgvOE452feHKzz+tPxvJ464Q/dSBAlr8b0biX/8S8MuYh2mZHf4p99 BPshWF9BWXo78QFtEH4vf3XPd8jEyfALXiSMNnoEHpFJqyJx+/js0z1Z5 ofsfwaPvnaUJGM1xk+AhOYdh06akmH7sU464aHnkT6y2LmVYIpFTLcFlK 0R6ttfoWSvbs/UQLZGkKU7y+nh4fFRuIbCcmU1DzX0/uyTs5WbY+Dn0Iw w==; X-CSE-ConnectionGUID: J/w42g5JQE6gEhksAkjTow== X-CSE-MsgGUID: MN7EqpKtSlyLk+2b8byIhw== X-IronPort-AV: E=McAfee;i="6600,9927,11025"; a="6473674" X-IronPort-AV: E=Sophos;i="6.07,158,1708416000"; d="scan'208";a="6473674" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2024 00:48:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,158,1708416000"; d="scan'208";a="39324688" Received: from gkldtt-dev-004.igk.intel.com (HELO localhost) ([10.123.221.202]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2024 00:48:13 -0700 From: "Schimpe, Christina" To: gdb-patches@sourceware.org Cc: christina.schimpe@intel.com Subject: [PATCH 3/3] LAM: Support kernel space debugging Date: Wed, 27 Mar 2024 07:47:39 +0000 Message-Id: <20240327074739.2969623-4-christina.schimpe@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240327074739.2969623-1-christina.schimpe@intel.com> References: <20240327074739.2969623-1-christina.schimpe@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP 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+patchwork=sourceware.org@sourceware.org From: Christina Schimpe Sign-extend watchpoint address for kernel space support. --- gdb/amd64-linux-tdep.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c index 94c62277623..3498a6d4632 100644 --- a/gdb/amd64-linux-tdep.c +++ b/gdb/amd64-linux-tdep.c @@ -51,6 +51,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' @@ -1852,10 +1854,21 @@ amd64_linux_lam_untag_mask () static CORE_ADDR amd64_linux_remove_non_addr_bits_wpt (gdbarch *gdbarch, CORE_ADDR addr) { + /* 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. */ - return (addr & amd64_linux_lam_untag_mask ()); + addr &= mask; + + /* Sign-extend if we have a kernel-space address. */ + if (kernel_address) + addr |= ~mask; + + return addr; } static void