From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0AF00C0650F for ; Mon, 5 Aug 2019 05:32:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D73B52086D for ; Mon, 5 Aug 2019 05:32:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564983147; bh=OcONSKWbdItvEU/sWxpmF6fZvkQKxZZpl3Eve7qKfzY=; h=Subject:To:Cc:From:Date:List-ID:From; b=zksVIWw9WfjsTSezP+nNEetzcpVxYkkeTwqNOF4j/D/kNf2TLCD4JEsTw12lm12Vy pMp16QR7wz3mSzZ+8x16MFpqDLVtZ29BRaXxTWWYEi+7vxHeD/5yrGmKGN9m3LvCji LxrGaY4urarQe87O/wOXeARA8fw1/By5G9IX5ICA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725992AbfHEFc1 (ORCPT ); Mon, 5 Aug 2019 01:32:27 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:53675 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725976AbfHEFc1 (ORCPT ); Mon, 5 Aug 2019 01:32:27 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 87F9920FE3; Mon, 5 Aug 2019 01:32:26 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Mon, 05 Aug 2019 01:32:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=7F19uy dRzvI8nU5DFM7i/VZ6AUAl1uV26o2vRprvek8=; b=0bW2fDU3BJoy7+jxltBJXX hMWmZ4WLzoE0p6zLru95UwaNoxv2Jq9CLW7N0tQmCN6TxmpTO4GkjRtoYHVSXY0i vijfvzYVTl7V3FQX6z9HjybX1pDEJy9iQiTy9/c3ZTOu9eT4+AzJb3HoWdrKnIp5 CLSt0lhwEzh4oWzmWFMDuMw7c+3XnKT2kmOMV0j9Y1GVkXV1rNSc27heyTB8l6sL f8aR7Q0QI7WZW3zF6l9n4gn/o47o6SNfLRuo8mgb7i9oPVV3IXK+JwPDjaQ4U0RI cdxnkpcXg7pAUcoozaqHQcGxu7IresDQQBu45FobbdhQ2REqDb8LQiNqRkNQ9SUg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddruddtiedgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecukfhppeekfedrkeeirdekledruddtjeenucfrrghrrghmpehmrghilhhfrhhomh epghhrvghgsehkrhhorghhrdgtohhmnecuvehluhhsthgvrhfuihiivgepud X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id D2A9980059; Mon, 5 Aug 2019 01:32:25 -0400 (EDT) Subject: FAILED: patch "[PATCH] arm64: compat: Allow single-byte watchpoints on all addresses" failed to apply to 4.14-stable tree To: will@kernel.org, stable@vger.kernel.org Cc: From: Date: Mon, 05 Aug 2019 07:32:24 +0200 Message-ID: <1564983144193131@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 849adec41203ac5837c40c2d7e08490ffdef3c2c Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Mon, 29 Jul 2019 11:06:17 +0100 Subject: [PATCH] arm64: compat: Allow single-byte watchpoints on all addresses Commit d968d2b801d8 ("ARM: 7497/1: hw_breakpoint: allow single-byte watchpoints on all addresses") changed the validation requirements for hardware watchpoints on arch/arm/. Update our compat layer to implement the same relaxation. Cc: Signed-off-by: Will Deacon diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c index dceb84520948..67b3bae50b92 100644 --- a/arch/arm64/kernel/hw_breakpoint.c +++ b/arch/arm64/kernel/hw_breakpoint.c @@ -536,13 +536,14 @@ int hw_breakpoint_arch_parse(struct perf_event *bp, /* Aligned */ break; case 1: - /* Allow single byte watchpoint. */ - if (hw->ctrl.len == ARM_BREAKPOINT_LEN_1) - break; case 2: /* Allow halfword watchpoints and breakpoints. */ if (hw->ctrl.len == ARM_BREAKPOINT_LEN_2) break; + case 3: + /* Allow single byte watchpoint. */ + if (hw->ctrl.len == ARM_BREAKPOINT_LEN_1) + break; default: return -EINVAL; }