From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 5D4EA384AB58 for ; Fri, 3 May 2024 13:19:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5D4EA384AB58 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5D4EA384AB58 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714742351; cv=none; b=vwk0d6h9dPGwd2NFYcR7ZNMothYmNUZ9C78VJrRi4CcqwMDiGo41/FE1jJjbcrbFXnZNePf/7eOSmOOIBVcFxIPF8s8b4BvJqQl/ryUU6xPjPADGlREclRWZVdj0P+T1BGw00p88w0DMiz5b1wU0iX2Cni0vaU/rcSDu00fn3Ls= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714742351; c=relaxed/simple; bh=bHZL24HdS2ySGIzwrli/nhSnykEilyIxTUuP92wKBIE=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature: Message-ID:Date:MIME-Version:Subject:To:From; b=m0wsZuB4DZrbpYSDWugRau6Vei7ofOcfbmlaeJkJk644uLESQXsmddza3PNp6ioTWRxFju412pTGisBxVBOkSF1SeZb30zUskhFVzkTqTmsp13iCLUzvauKGJSrrzaBzjbkpLoSu18QlQ+88unmSOuRTow06nIhcly30J+c3LZY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 1714120493; Fri, 3 May 2024 13:19:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1714742348; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=71J0L0mX1DO9oYla2Ssw+R8oOMS6WFrOwAHiJgWjWCc=; b=jzKZsUu7g0BHtG12qTfoO5MDsF0RIVXYvOoXUTDPuVqdI6IUo51ijNFTzB/hS+CyEX9Izk EnQS2sbe4VuL5bl2DPtebhWRGt2yVRV50WW3HRZC1+T1/Gk8Zm0ckr6vGfasYAFLFs+XmP +QqTyW/UsngzqFCL9UhYURUiOr14TRw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1714742348; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=71J0L0mX1DO9oYla2Ssw+R8oOMS6WFrOwAHiJgWjWCc=; b=ZyYygLgVx4kuUX9sg7PqkRJXwc3yA4UiDIcf20sb18/uapMsIFZk+KeC228cnABVdPANEB TAbfnd/OoDvG28AQ== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1714742348; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=71J0L0mX1DO9oYla2Ssw+R8oOMS6WFrOwAHiJgWjWCc=; b=jzKZsUu7g0BHtG12qTfoO5MDsF0RIVXYvOoXUTDPuVqdI6IUo51ijNFTzB/hS+CyEX9Izk EnQS2sbe4VuL5bl2DPtebhWRGt2yVRV50WW3HRZC1+T1/Gk8Zm0ckr6vGfasYAFLFs+XmP +QqTyW/UsngzqFCL9UhYURUiOr14TRw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1714742348; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=71J0L0mX1DO9oYla2Ssw+R8oOMS6WFrOwAHiJgWjWCc=; b=ZyYygLgVx4kuUX9sg7PqkRJXwc3yA4UiDIcf20sb18/uapMsIFZk+KeC228cnABVdPANEB TAbfnd/OoDvG28AQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id ECE4B139CB; Fri, 3 May 2024 13:19:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id MrN+OEvkNGbXfgAAD6G6ig (envelope-from ); Fri, 03 May 2024 13:19:07 +0000 Message-ID: <620860f7-cff9-4407-8611-58bd98c8e667@suse.de> Date: Fri, 3 May 2024 15:19:33 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] Fix regression on aarch64-linux gdbserver To: Mark Wielaard , Tom Tromey Cc: gdb-patches@sourceware.org References: <20240422135149.921896-1-tromey@adacore.com> Content-Language: en-US From: Tom de Vries In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -4.29 X-Spam-Level: X-Spamd-Result: default: False [-4.29 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; XM_UA_NO_VERSION(0.01)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns] X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,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 List-Id: On 5/3/24 00:07, Mark Wielaard wrote: > Hi, > > On Mon, Apr 22, 2024 at 07:51:49AM -0600, Tom Tromey wrote: >> diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc >> index 5df67fccd08..da5c1fd0629 100644 >> --- a/gdbserver/linux-aarch64-low.cc >> +++ b/gdbserver/linux-aarch64-low.cc >> @@ -576,41 +576,9 @@ aarch64_target::low_stopped_data_address () >> >> /* Check if the address matches any watched address. */ >> state = aarch64_get_debug_reg_state (pid_of (current_thread)); >> - for (i = aarch64_num_wp_regs - 1; i >= 0; --i) >> - { >> - const unsigned int offset >> - = aarch64_watchpoint_offset (state->dr_ctrl_wp[i]); >> - const unsigned int len = aarch64_watchpoint_length (state->dr_ctrl_wp[i]); >> - const CORE_ADDR addr_watch = state->dr_addr_wp[i] + offset; >> - const CORE_ADDR addr_watch_aligned = align_down (state->dr_addr_wp[i], 8); >> - const CORE_ADDR addr_orig = state->dr_addr_orig_wp[i]; >> - >> - if (state->dr_ref_count_wp[i] >> - && DR_CONTROL_ENABLED (state->dr_ctrl_wp[i]) >> - && addr_trap >= addr_watch_aligned >> - && addr_trap < addr_watch + len) >> - { >> - /* ADDR_TRAP reports the first address of the memory range >> - accessed by the CPU, regardless of what was the memory >> - range watched. Thus, a large CPU access that straddles >> - the ADDR_WATCH..ADDR_WATCH+LEN range may result in an >> - ADDR_TRAP that is lower than the >> - ADDR_WATCH..ADDR_WATCH+LEN range. E.g.: >> - >> - addr: | 4 | 5 | 6 | 7 | 8 | >> - |---- range watched ----| >> - |----------- range accessed ------------| >> - >> - In this case, ADDR_TRAP will be 4. >> - >> - To match a watchpoint known to GDB core, we must never >> - report *ADDR_P outside of any ADDR_WATCH..ADDR_WATCH+LEN >> - range. ADDR_WATCH <= ADDR_TRAP < ADDR_ORIG is a false >> - positive on kernels older than 4.10. See PR >> - external/20207. */ >> - return addr_orig; >> - } >> - } >> + CORE_ADDR result; >> + if (aarch64_stopped_data_address (state, addr_trap, &result)) >> + return result; >> >> return (CORE_ADDR) 0; >> } > > This broke the build on the gdb-fedora-arm64 buildbot: > https://builder.sourceware.org/buildbot/#/builders/181/builds/6402 > > Fix attached. > Hi Mark, thanks for the fix. I ran into the build breaker on an aarch64-linux system, and managed to complete the build after applying your fix. Pushed. Thanks, - Tom