Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp1042391ybi; Fri, 31 May 2019 12:50:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqyBFtvHA1pLFKKpu16kY3VtyvQmHawk+DGhIRIKjWQMkoZnCn6VLMrULYgIf8JnmaiDey6x X-Received: by 2002:a62:ae19:: with SMTP id q25mr12125557pff.35.1559332228242; Fri, 31 May 2019 12:50:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559332228; cv=none; d=google.com; s=arc-20160816; b=McfMRXcysLEWic9ZwKQrRsXAZiWzHFhy7Yqd3WI1NIve8cMncPKLTYaUIGq+667kI5 SFC7xyo6oD+fBb1w4HKGyZO0sJdza5j++EvzDBb5OdoOwe8MNB4H8tShkeGApHMUIasm J7YlhM9GzDZVI/ruocKSHuJv8j/jK3wOhyyLrsZrr3bzrO/2/5JYbiJzDqz+J8Y2erOn 77RZWq46fuY/OyYhHjZ+CI9UYoyl36VRSZjZPn6fkXhC49dBqXn92mvUm1qqhO6/2cf5 Oljoo1Z/r+PtoNzG426gwzt9Wmww2hHObNSeK35s6vGPo9qvK9q/IJLAIMi1fQkLu8Ho eD/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=F3AqsJcah4GIcgPT0/+5kExX5tqdoxZ29ByRG5iNwTw=; b=Oxv2xms1EJgTose/VYvLXXd6HEvYcdamqBXD3NGyABwFHli//QKZ9kmv6fvQgdlQho +T7IbOuW8+LZanHfJz8eA9usr/bJ35NTZpMLaPFU2JX2WaFDVFuBh9fOlDPxYygeMPn4 G0LWd1xV9qr1Z10rTAKKyZvp/Vuv/vkwjtYSIVLjtAvLJu30VzQRJ9MWocEo1HGiJiQD QyzS6tcYYS/E/LWV5UxninvYR92QVkd4VHmWyftmBGWWMEGK9TDL14cA/rlJsqsMLkxG am0vSILpQ2tBeQWonxCTD3ur+g3k0wD7qudTn3L8sH28xhDC2L+PAl2ASyCHy/w6MSO0 QBiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=H06IvE9G; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fb.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d125si8004156pfd.257.2019.05.31.12.50.10; Fri, 31 May 2019 12:50:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=H06IvE9G; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fb.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727395AbfEaTtG (ORCPT + 99 others); Fri, 31 May 2019 15:49:06 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:45126 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727343AbfEaTtG (ORCPT ); Fri, 31 May 2019 15:49:06 -0400 Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x4VJf8tH024565; Fri, 31 May 2019 12:48:25 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=facebook; bh=F3AqsJcah4GIcgPT0/+5kExX5tqdoxZ29ByRG5iNwTw=; b=H06IvE9GRDH1sOBESJGfJPtR4GCttSqBbUFjXedIfRujx5SlWjAT2S6sz1quRn5b6xu7 qhxCAOFGT1wJBiSQ1WyzDlCCAhn/iJRoOHmTHrJJR4JsQn0V1e0WM/Fg8Yb4AKXlQJX/ Xb1WA1NKEleU3o2YfcyFnfD5+nM1jQ1kpTA= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 2su10ka05j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 31 May 2019 12:48:24 -0700 Received: from mmullins-1.thefacebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::7) with Microsoft SMTP Server id 15.1.1713.5; Fri, 31 May 2019 12:48:21 -0700 From: Matt Mullins To: , , , , , CC: Thomas Gleixner , "H. Peter Anvin" , , Daniel Thompson , "Rick Edgecombe" , Christophe Leroy , Douglas Anderson , Subject: [PATCH] x86/kgdb: return 0 from kgdb_arch_set_breakpoint Date: Fri, 31 May 2019 12:47:54 -0700 Message-ID: <20190531194755.6320-1-mmullins@fb.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c0a8:1b::d] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-05-31_13:,, signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905310119 X-FB-Internal: deliver Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org err must be nonzero in order to reach text_poke(), which caused kgdb to fail to set breakpoints: (gdb) break __x64_sys_sync Breakpoint 1 at 0xffffffff81288910: file ../fs/sync.c, line 124. (gdb) c Continuing. Warning: Cannot insert breakpoint 1. Cannot access memory at address 0xffffffff81288910 Command aborted. Fixes: 86a22057127d ("x86/kgdb: Avoid redundant comparison of patched code") Signed-off-by: Matt Mullins --- arch/x86/kernel/kgdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c index 9a8c1648fc9a..6690c5652aeb 100644 --- a/arch/x86/kernel/kgdb.c +++ b/arch/x86/kernel/kgdb.c @@ -758,7 +758,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt) BREAK_INSTR_SIZE); bpt->type = BP_POKE_BREAKPOINT; - return err; + return 0; } int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt) -- 2.17.1