From patchwork Sun Feb 11 23:09:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Kellermann X-Patchwork-Id: 199523 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp2139890dyd; Sun, 11 Feb 2024 15:10:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IFyKfJ0KDPHrVjuuDUHG+BHCCRXSsoQ/Rg/cp4UbK7XEhaHKQkyuhSVxQy+C4fVSa/Ma5pH X-Received: by 2002:a05:620a:2a01:b0:785:a2d9:70f5 with SMTP id o1-20020a05620a2a0100b00785a2d970f5mr7353951qkp.53.1707693031474; Sun, 11 Feb 2024 15:10:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707693031; cv=pass; d=google.com; s=arc-20160816; b=0YcZcTdHGgFaKPbU+cQGeNZ5XBcBNkPlW0mU/e8Xi1OQAGQqX0qIeMoDHSuNv1MJUJ BYrqlQphYyUAaa1HyjC9gOLUPd8GbxLZlL6qsCtezxUPN5ORouq9VHSGaZdqQqKXc6ds j31aW5L2SBxAB6cvd2zM+CDvruhbtc3MlirIm0WCCM2TrcCm9rCDjIcIfUZVzhceS/UE m5cBlYPVmu7txN/qrNMMP34L2GIapAj0XZBZ12TgTwyP1NBdrTSqaM3BJgI1oyKuCGJ/ kSYKKTUeubNo1xPGQwokiaQ9vg2Pxvm121NO8dWM1nKyp/fzOHmzx2H5a1/ykmxpu+Yz YQ0A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=XH/aCjJt/DiB7MsEbqzKT+olkUUu+T5Xb1GlIEopZ2s=; fh=pGg4r1nhRck+fxKLFFCa2ADv+imoaJtDhg8Zwx2rHXo=; b=Rt6+wKibxfBDXaCFCLvYSZJB6KVUtogEB+mOWvVAvJzx2FUj5wZkHTDz7F018YBzxD pQCyhZ4UwpKx5gPKjNwve/EODi4bRT0EE9mamIpX/VGt1Z+jOMQPYgrJ3+PwgMa+6hUX 4HByNAo7DixolQtw05C6q8zDLwzO7F43Y/e76xBhmyGIMAHWKvMBT1yV6qY5G69cft2Y UYilnJp+jGCbmX+TqnwtKM/JuoH5UV+gj3LUV4Tff4ZfofyxNwu4kys7upPMkFxt2k4s 9vhGakMQesZNhpzuflMSE1EvI045BB0zaSk70mKFX6v0u6aSuI5pLo2/dPmIU0Ix8Efz 6Usg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=M5JSqYeC; arc=pass (i=1 spf=pass spfdomain=ionos.com dkim=pass dkdomain=ionos.com dmarc=pass fromdomain=ionos.com); spf=pass (google.com: domain of linux-kernel+bounces-60980-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60980-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com X-Forwarded-Encrypted: i=2; AJvYcCXmyV5VG27pU5vTn74PVNPQey+dznYXxXhRilTX5rB25dLzOugc9tRYmmJWg3pCP4PK4wNdH16KUse2WpLS58izOhb8XQ== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id wa6-20020a05620a4d0600b007838dfec439si4802076qkn.297.2024.02.11.15.10.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 15:10:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-60980-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=M5JSqYeC; arc=pass (i=1 spf=pass spfdomain=ionos.com dkim=pass dkdomain=ionos.com dmarc=pass fromdomain=ionos.com); spf=pass (google.com: domain of linux-kernel+bounces-60980-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60980-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id EB0E31C20BC9 for ; Sun, 11 Feb 2024 23:10:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0AFAC1774C; Sun, 11 Feb 2024 23:10:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="M5JSqYeC" Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 917011427B for ; Sun, 11 Feb 2024 23:09:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707692998; cv=none; b=PqeUNWYhLjIU8CNj4JgJ7QnnIAPDTNC3J+o0pTBJthDauyCkvDBSTt5+8ZByHXFPOy/DFnjOHpl8jSroU9eEH0G1bnwIcX+fMg38XNI1p61ZhaxM+7aLhBeDuO6MMVj/txdFhHQ2BUgF2KRx6EYXj24H60jCUoLnU+KPjAW1/qQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707692998; c=relaxed/simple; bh=0UHBFd8KsfNzuUb6VByQxElPhKzrj40UEzATEtX2vCE=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=JLnXq7SUhQkvINH3IJIybR1zQ2VAqe5TKke2jjEXVUhMFSg4WEFMfymk9bXaju1zb9kIMoS86Jva6Ma09A5V6X01XFW1YDCgr+XAQzTuc2YnBeqERRaAzXYjYSntJ0UWbxalyEAof0aOezf3uAwYXgCXCTzSGEmzMRQ/Ks1yTS4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ionos.com; spf=pass smtp.mailfrom=ionos.com; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b=M5JSqYeC; arc=none smtp.client-ip=209.85.208.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ionos.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionos.com Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-5601eb97b29so4806704a12.0 for ; Sun, 11 Feb 2024 15:09:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1707692994; x=1708297794; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=XH/aCjJt/DiB7MsEbqzKT+olkUUu+T5Xb1GlIEopZ2s=; b=M5JSqYeCSp8QZJ0B2mc5PfXQd8UPl+0ebY+0u3Y8K2A0g/yx5mmKb5TiyY96kReG60 rdBafxGQe9jaEMLth/9RIT43xfVjJ3VUAfpxec6sEX7XaN+r+HJv/hodKAmEScigPQmb b5HIFSqr9NsYSACyYYq0ZPq3/sDHQSxyW87siIYAIv65M3EnrxP0zVbjtRhiJUmlISWK PW9LIMxa4nyxbONBqWD9F6jSJ/spDArZ7X3oJ9txipFILbKmt6sS3dQ7HaZvv6aVRU1J N/M4IlywRgLrZEMoxTgcxCNQDardrOj//vbYNC7Qv1EYRsu5dnB+UA1191K5D/ZvI4lL zL9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707692994; x=1708297794; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XH/aCjJt/DiB7MsEbqzKT+olkUUu+T5Xb1GlIEopZ2s=; b=wt6xzGADKcr42NOhhJRzLYiWrLuWyQ+XZRFeB2lw8XoRJyca6wJfjYOFmPgym3ft/R MEIfT6k2FSKTvOBM8BgQbk5Q/AyyjzxRRF7szFbZOqrSeETPMZnOOBfG/ufNEJNQlc1l 5Myb1b8KYukB2Mz+ZBUoitLTlvzAZUrEAIqF2BURSFIlD6ll+JtWrAzi1eofUzqK+p42 lHTT5YcHKV9g73JeKAezOf9mwytUXLZPXILUaw7ocXkQ/K5PNsiHOf+zvQhsC1OC7Uhj c9zwjGBWioNSW0bl5ePaaou5nBq7cHggf4lmf8eUxZDKfJzRgoMNi6yjP+Takt2Leexl rVWg== X-Gm-Message-State: AOJu0Yy64UIE16YJogLP6IEEaNwB51PMevE/qNG0hriqmXquK3aVCzyE gD0qeIP6/VwErfguvzL3jpopURYn397FQ0eBfufy8E5mWYCgXzCGa/iFrKE2VAY= X-Received: by 2002:a05:6402:35d2:b0:561:841f:ed03 with SMTP id z18-20020a05640235d200b00561841fed03mr4116845edc.14.1707692993755; Sun, 11 Feb 2024 15:09:53 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCU8klcKZ40EjoIvJcSdkTkkctgF4aLklrTh0LA3GCGFlxsHvhu2iaJDoXh8SbFR2ykdO1OHYPmnwHRIRne8/iFWv3Xnx0P+iJDrLWI3UsTxy6mYBkjPS80zr+xF81W5Ft2FoFZePwaIKyF9/s3hpXjyma4TfGT/DY7z4np6u7S1JBY+bE4BqXDohnuaPizfwn/i7uNKjGn/8uPde2l6nDNATh26taFPA6bdDegmDFNeIFxVY2t1k16RyJRZ69GTdUGujLgEM1HxzKEx2YkKBGRrta4cmsvtaw== Received: from raven.blarg.de (p200300dc6f267100023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f26:7100:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id e8-20020a056402148800b0055ff9299f71sm2183566edv.46.2024.02.11.15.09.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 15:09:53 -0800 (PST) From: Max Kellermann To: svens@stackframe.org, James.Bottomley@HansenPartnership.com, deller@gmx.de, mcgrof@kernel.org, linux-parisc@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH] parisc/kprobes: always include asm-generic/kprobes.h Date: Mon, 12 Feb 2024 00:09:45 +0100 Message-Id: <20240211230945.297104-1-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790645928480484895 X-GMAIL-MSGID: 1790645928480484895 The NOKPROBE_SYMBOL macro (and others) were moved to asm-generic/kprobes.h in 2017 by commit 7d134b2ce639 ("kprobes: move kprobe declarations to asm-generic/kprobes.h"), and this new header was included by asm/kprobes.h unconditionally on all architectures. When kprobe support was added to parisc in 2017 by commit 8858ac8e9e9b1 ("parisc: Implement kprobes"), that header was only included when CONFIG_KPROBES was enabled. This can lead to build failures when NOKPROBE_SYMBOL is used, but CONFIG_KPROBES is disabled. This mistake however was never actually noticed because linux/kprobes.h also includes asm-generic/kprobes.h (though I do not understand why that is, because it also includes asm/kprobes.h). To prevent eventual build failures, I suggest to always include asm-generic/kprobes.h on parisc, just like all the other architectures do. This way, including asm/kprobes.h suffices, and nobody (outside of arch/) ever needs to explicitly include asm-generic/kprobes.h. Signed-off-by: Max Kellermann --- arch/parisc/include/asm/kprobes.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/parisc/include/asm/kprobes.h b/arch/parisc/include/asm/kprobes.h index 0a175ac87698..0f42f5c8e3b6 100644 --- a/arch/parisc/include/asm/kprobes.h +++ b/arch/parisc/include/asm/kprobes.h @@ -10,9 +10,10 @@ #ifndef _PARISC_KPROBES_H #define _PARISC_KPROBES_H +#include + #ifdef CONFIG_KPROBES -#include #include #include #include