From nobody Thu Oct 2 02:15:10 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8050128C5AA; Thu, 25 Sep 2025 14:06:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758809164; cv=none; b=kFIBtvMLYAggS2w/8lcisThGNHannxDUqT9SJPbuWG1T4TaD8DVR4LwfZ1AJNGniq7aCMB87L2gRXJZCgj/3Q7FF7419b0YX4TZe85Otao3YfMUYYYWTZvT54epzF08/ZXxC82SzEEzM4AO+VsmXfy7YiuF03tlzlEdCMCFbba8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758809164; c=relaxed/simple; bh=qwOjyCwOolTaR7EQcx24KznBowYJ5bSUlzg8zcIWqRA=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=dP0wQgwj5dsaRDtvhSfTtDtrukIkiBQMnWftHCuoYn9Sia5GCyF5HLq5wnj8NNDocKCAqfZ02JWxDUYUaP84wu65N1RiqxoiBbux07hX28LFbCjgCxG9twYXvgyLGIfK7PAkPZqTaEIJxcWmw0uhvJht878zC8Og8LbjmA/oxbI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Cfvq3jlm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Cfvq3jlm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D9E6C113D0; Thu, 25 Sep 2025 14:06:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758809164; bh=qwOjyCwOolTaR7EQcx24KznBowYJ5bSUlzg8zcIWqRA=; h=Date:From:To:Cc:Subject:From; b=Cfvq3jlm5e+UZMh8wPmiquqDrNqEbxS8utvnrArCLQUcVJT7kxD79D26OijzUKSNV mqhl/Tzz21zSIsHRENfpvyEac/B0Q/ovzxTymWi82kjXQ703hasJM7EbwgULEXv4Vo nfta7z6QiqxR0HzmOMkO7NkNGi1k9RuyKB77ZiKsV8Re7riS1iPDbzvXcRPzEVnXw7 hw8M5P2qk4Q7l4TtlPnWiIKNnPamKhwQ3P61Av1MMm6c9c7gGrGlb5IbnlOLvMydT0 EIUMUwGJMH0GC6a3ShRbiIXmytVOs6pmdYxcI+aANtbeDazR3Ds0ZsedtxjFh2YVWK DSXnqoJjwfRDw== Date: Thu, 25 Sep 2025 15:05:59 +0100 From: Mark Brown To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Alexei Starovoitov , Jiri Olsa , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the tip tree with the bpf-next tree Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="5LAhVdHCP2VDM+na" Content-Disposition: inline --5LAhVdHCP2VDM+na Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the tip tree got a conflict in: kernel/events/uprobes.c between commit: 4363264111e12 ("uprobe: Do not emulate/sstep original instruction when ip= is changed") from the bpf-next tree and commit: ba2bfc97b4629 ("uprobes/x86: Add support to optimize uprobes") from the tip tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc kernel/events/uprobes.c index c2ff256dd6419,996a81080d563..0000000000000 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@@ -2741,13 -2765,9 +2765,16 @@@ static void handle_swbp(struct pt_regs=20 =20 handler_chain(uprobe, regs); =20 + /* + * If user decided to take execution elsewhere, it makes little sense + * to execute the original instruction, so let's skip it. + */ + if (instruction_pointer(regs) !=3D bp_vaddr) + goto out; + + /* Try to optimize after first hit. */ + arch_uprobe_optimize(&uprobe->arch, bp_vaddr); +=20 if (arch_uprobe_skip_sstep(&uprobe->arch, regs)) goto out; =20 --5LAhVdHCP2VDM+na Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmjVTEYACgkQJNaLcl1U h9AWmwf/YB690biEQ07FUoa3KLaQrXJTZruYuUwKmf8CRoxxjfKjozPZcgIE6ah8 H18vF/wTtFPWIa5p63xsn27T2qp+O733k8hPEG3/78oUZnN1AE5G04FKvTp1Z1K9 siCQIXz9RmwFT4g6FUHbyri+e8f3ydtdgYFA3MXQPJPk1gH76WdOvtiXzn9eGat1 LuoM0sW0W06Qfa7eyHIBOObhzWXGdPszAyQZh6ozbDp7dFqqnoiaYoVBGPuUUopX 3JnTjliiXenSVutfh2zFPCd6P2Dm4ArVhYop5bXZnetownHP3HKUZHxwVGiv72tm nmtl0xjNXo0hEPGZXwChzKewy6T48g== =CP6V -----END PGP SIGNATURE----- --5LAhVdHCP2VDM+na--